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

Compare playqueue items more reliably

Browse source
This commit is contained in:
croneter 2018-02-07 14:57:36 +01:00
parent 0731ae0179
commit e393547e13
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/lib/playqueue.py
View file

@ -3,6 +3,7 @@ Monitors the Kodi playqueue and adjusts the Plex playqueue accordingly
""" """
from logging import getLogger from logging import getLogger
from threading import Thread from threading import Thread
from re import compile as re_compile
from xbmc import Player, PlayList, PLAYLIST_MUSIC, PLAYLIST_VIDEO, sleep from xbmc import Player, PlayList, PLAYLIST_MUSIC, PLAYLIST_VIDEO, sleep
@ -19,6 +20,7 @@ import variables as v
LOG = getLogger("PLEX." + __name__) LOG = getLogger("PLEX." + __name__)
PLUGIN = 'plugin://%s' % v.ADDON_ID PLUGIN = 'plugin://%s' % v.ADDON_ID
REGEX = re_compile(r'''plex_id=(\d+)''')
# Our PKC playqueues (3 instances of Playqueue_Object()) # Our PKC playqueues (3 instances of Playqueue_Object())
PLAYQUEUES = [] PLAYQUEUES = []
@ -159,11 +161,17 @@ class PlayqueueMonitor(Thread):
except AttributeError: except AttributeError:
# were not passed a filename; ignore # were not passed a filename; ignore
pass pass
if new_item.get('id') is None: if 'id' in new_item:
identical = old_item.file == new_item['file']
else:
identical = (old_item.kodi_id == new_item['id'] and identical = (old_item.kodi_id == new_item['id'] and
old_item.kodi_type == new_item['type']) old_item.kodi_type == new_item['type'])
else:
try:
plex_id = REGEX.findall(new_item['file'])[0]
except IndexError:
LOG.debug('Comparing paths directly as a fallback')
identical = old_item.file == new_item['file']
else:
identical = plex_id == old_item.plex_id
if j == 0 and identical: if j == 0 and identical:
del old[j], index[j] del old[j], index[j]
break break