Merge branch 'stable-version' into beta-version

resources/lib/kodidb_functions.py

@@ -653,7 +653,7 @@ class KodiDBMethods(object):
                 movie_id = self.cursor.fetchone()[0]
                 typus = v.KODI_TYPE_EPISODE
             except TypeError:
-                LOG.warn('Unexpectantly did not find a match!')
+                LOG.debug('Did not find a video DB match')
                 return
         return movie_id, typus
 

resources/lib/kodimonitor.py

@@ -313,7 +313,11 @@ class KodiMonitor(xbmc.Monitor):
             # element otherwise
             self._already_slept = True
             xbmc.sleep(1000)
-        json_item = js.get_item(playerid)
+        try:
+            json_item = js.get_item(playerid)
+        except KeyError:
+            LOG.debug('No playing item returned by Kodi')
+            return None, None, None
         LOG.debug('Kodi playing item properties: %s', json_item)
         return (json_item.get('id'),
                 json_item.get('type'),

resources/lib/librarysync.py

@@ -1508,7 +1508,10 @@ class LibrarySync(Thread):
         # Link to Websocket queue
         queue = state.WEBSOCKET_QUEUE
 
-        if not exists(try_encode(v.DB_VIDEO_PATH)):
+        if (not exists(try_encode(v.DB_VIDEO_PATH)) or
+                not exists(try_encode(v.DB_TEXTURE_PATH)) or
+                (state.ENABLE_MUSIC and
+                 not exists(try_encode(v.DB_MUSIC_PATH)))):
             # Database does not exists
             LOG.error("The current Kodi version is incompatible "
                       "to know which Kodi versions are supported.")

service.py

@@ -77,7 +77,7 @@ class Service():
         LOG.info("Platform: %s", v.PLATFORM)
         LOG.info("KODI Version: %s", v.KODILONGVERSION)
         LOG.info("%s Version: %s", v.ADDON_NAME, v.ADDON_VERSION)
-        LOG.info("PKC Direct Paths: %s", settings('useDirectPaths') == "true")
+        LOG.info("PKC Direct Paths: %s", settings('useDirectPaths') == '1')
         LOG.info("Number of sync threads: %s", settings('syncThreadNumber'))
         LOG.info("Full sys.argv received: %s", argv)
         self.monitor = Monitor()