Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'stable-version' into beta-version

Browse source
This commit is contained in:
croneter 2018-06-17 17:09:07 +02:00
commit ba04d85310
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/lib/kodidb_functions.py
View file

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

4
resources/lib/kodimonitor.py
View file

@ -313,7 +313,11 @@ class KodiMonitor(xbmc.Monitor):
# element otherwise # element otherwise
self._already_slept = True self._already_slept = True
xbmc.sleep(1000) xbmc.sleep(1000)
try:
json_item = js.get_item(playerid) 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) LOG.debug('Kodi playing item properties: %s', json_item)
return (json_item.get('id'), return (json_item.get('id'),
json_item.get('type'), json_item.get('type'),

5
resources/lib/librarysync.py
View file

@ -1508,7 +1508,10 @@ class LibrarySync(Thread):
# Link to Websocket queue # Link to Websocket queue
queue = state.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 # Database does not exists
LOG.error("The current Kodi version is incompatible " LOG.error("The current Kodi version is incompatible "
"to know which Kodi versions are supported.") "to know which Kodi versions are supported.")

2
service.py
View file

@ -77,7 +77,7 @@ class Service():
LOG.info("Platform: %s", v.PLATFORM) LOG.info("Platform: %s", v.PLATFORM)
LOG.info("KODI Version: %s", v.KODILONGVERSION) LOG.info("KODI Version: %s", v.KODILONGVERSION)
LOG.info("%s Version: %s", v.ADDON_NAME, v.ADDON_VERSION) 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("Number of sync threads: %s", settings('syncThreadNumber'))
LOG.info("Full sys.argv received: %s", argv) LOG.info("Full sys.argv received: %s", argv)
self.monitor = Monitor() self.monitor = Monitor()