Several small fixes to allow first time config to work

maikito26 · Oct 24, 2015 · 70a9529 · 70a9529
1 parent fbec545
commit 70a9529
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.surveillanceroom" name="Surveillance Room" version="1.0.5" provider-name="Maikito26">
+<addon id="plugin.video.surveillanceroom" name="Surveillance Room" version="1.0.6" provider-name="Maikito26">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>
     <import addon="script.module.requests" version="2.3.0" optional="false"/>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+v1.0.6 (Oct 24 2015)
+--------------------
+Fixed Issues: 
+- Several small fixes to work on first time config
+
 v1.0.5 (Oct 24 2015)
 --------------------
 Fixed Issues: 

diff --git a/default.py b/default.py
@@ -12,7 +12,7 @@
 
 __addon__ = xbmcaddon.Addon() 
 __addonid__ = __addon__.getAddonInfo('id') 
-__path__ = xbmc.translatePath(('special://home/addons/{0}').format(__addonid__)).decode('utf-8')                 
+_path = xbmc.translatePath(('special://home/addons/{0}').format(__addonid__)).decode('utf-8')                 
 
 
 def param_to_dict(parameters):
@@ -74,14 +74,14 @@ def advanced_camera_menu(camera_number):
         #Show Preview
         addDirectoryItem(name = utils.translation(32210),
                      icon = utils.get_icon('settings'),
-                     fanart = utils.get_fanart('default'),
+                     fanart = utils.get_fanart(camera_number),
                      parameters = {'action': 'show_preview',
                                    'camera_number': camera_number})
 
         #Disable Preview
         addDirectoryItem(name = utils.translation(32212),
                          icon = utils.get_icon('settings'),
-                         fanart = utils.get_fanart('default'),
+                         fanart = utils.get_fanart(camera_number),
                          parameters = {'action': 'disable_preview',
                                        'camera_number': camera_number})
 
@@ -90,7 +90,7 @@ def advanced_camera_menu(camera_number):
         #Enable Preview
         addDirectoryItem(name = utils.translation(32211),
                          icon = utils.get_icon('settings'),
-                         fanart = utils.get_fanart('default'),
+                         fanart = utils.get_fanart(camera_number),
                          parameters = {'action': 'enable_preview',
                                        'camera_number': camera_number})
 
@@ -110,22 +110,22 @@ def advanced_camera_menu(camera_number):
         #Play Stream no Controls
         addDirectoryItem(name = utils.translation(32214),
                          icon = utils.get_icon('settings'),
-                         fanart = utils.get_fanart('default'),
+                         fanart = utils.get_fanart(camera_number),
                          parameters = {'action': 'single_camera_no_controls',
                                        'camera_number': camera_number})
 
 
         #Camera Settings
         addDirectoryItem(name = utils.translation(32215),
                          icon = utils.get_icon('settings'),
-                         fanart = utils.get_fanart('default'),
+                         fanart = utils.get_fanart(camera_number),
                          parameters = {'action': 'camera_settings',
                                        'camera_number': camera_number})
 
         #Reboot Camera
         addDirectoryItem(name = utils.translation(32216),
                          icon = utils.get_icon('settings'),
-                         fanart = utils.get_fanart('default'),
+                         fanart = utils.get_fanart(camera_number),
                          parameters = {'action': 'reboot',
                                        'camera_number': camera_number})
 
@@ -192,9 +192,11 @@ def main_menu():
 
                 camera_settings = settings.getBasicSettings(camera_number)
                 list_label = settings.getCameraName(camera_number)
-
-                new_art_url = settings.getNewArt(camera_number)
-                utils.log(4, 'Get New Fanart Enabled: %s' %new_art_url)
+
+                new_art_url = None
+                if camera_settings:
+                    new_art_url = settings.getNewArt(camera_number)
+                    utils.log(4, 'Get New Fanart Enabled: %s' %new_art_url)
 
                 # Single Camera Player for enabled cameras
                 addDirectoryItem(name = list_label,

diff --git a/resources/lib/allcameraplayer.py b/resources/lib/allcameraplayer.py
@@ -146,12 +146,12 @@ def getImagesSnapshot(self, i, url, control):
         while not monitor.abortRequested() and self.isRunning:
 
             try:
-                filename = os.path.join(_datapath, 'AllCamera_%d.%d.jpg') %(i, x)
+                filename = os.path.join(_datapath, 'AllCamera_%s.%d.jpg') %(i, x)
                 urlretrieve(url, filename)
 
                 if os.path.exists(filename): 
                     control[0].setImage(filename, useCache=False)                
-                    xbmcvfs.delete(os.path.join(_datapath, 'AllCamera_%d.%d.jpg') %(i, x - 1))
+                    xbmcvfs.delete(os.path.join(_datapath, 'AllCamera_%s.%d.jpg') %(i, x - 1))
                     control[1].setImage(filename, useCache=False)
                     x+=1
 

diff --git a/resources/lib/settings.py b/resources/lib/settings.py
@@ -119,15 +119,15 @@ def getSnapShotUrl(camera_number):
 def getNewArt(camera_number, value = None):
     if value is None:
         value = getSetting_int('fanart')
-    print 'Value' + str(value)
+
     if value == 0:
         return getSnapShotUrl(camera_number)
     return None
 
 def getCameraName(camera_number):
     name = getSetting('name', camera_number)
     if name == '':
-        name = '%s %s' %(translation(32000 + int(camera_number)), camera_number)
+        name = '%s' %utils.translation(32000 + int(camera_number))
     return name
 
 def getDisabledWindowIds():   
@@ -290,20 +290,20 @@ def getBasicSettings(camera_number, monitor=None, useCache=True):
             utils.log(3, 'SETTINGS :: Camera %s - No port specified.' %camera_number)
             return None
 
-        username = getSetting('username', camera_number)
+        username = getSetting('user', camera_number)
         invalid = invalid_user_char(username)
         if invalid:
             utils.log(3, 'SETTINGS :: Camera %s - Invalid character in user name: %s' %(camera_number, invalid))
             return None
 
-        password = getSetting('password', camera_number)
+        password = getSetting('pass', camera_number)
         invalid = invalid_password_char(password)
         if invalid:
             utils.log(3, 'SETTINGS :: Camera %s - Invalid character in password: %s' %(camera_number, invalid))
             return None
 
         basic_settings = [camera_number, host, port, username, password]
-
+        
         # Camera test and caching logic
         if monitor:
             if useCache:
@@ -317,7 +317,7 @@ def getBasicSettings(camera_number, monitor=None, useCache=True):
                 monitor.cache_set_test_result(camera_number, success_code)
 
             if success_code != 0:
-                utils.log(3, 'SETTINGS :: Unable to connect to Camera %s' %camera_number)
+                utils.log(3, 'SETTINGS :: No connection to Camera %s.  Code: %s.  Settings: %s' %(camera_number, success_code, basic_settings))
                 return None
 
             utils.log(2, 'SETTINGS :: Successful connection to Camera %s' %camera_number)