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

Hopefully fix playlist sync loops

Browse source
This commit is contained in:
croneter 2018-07-15 19:20:51 +02:00
parent 59a64d227d
commit 06bfb95623
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/lib/playlists/__init__.py
View file

@ -40,6 +40,8 @@ SUPPORTED_FILETYPES = (
# 'pls', # 'pls',
# 'cue', # 'cue',
) )
# Avoid endless loops
IGNORE_KODI_PLAYLIST_CHANGE = list()
############################################################################### ###############################################################################
@ -70,9 +72,10 @@ def websocket(plex_id, status):
if sync_plex_playlist(playlist=playlist): if sync_plex_playlist(playlist=playlist):
LOG.debug('Plex deletion of playlist detected: %s', playlist) LOG.debug('Plex deletion of playlist detected: %s', playlist)
try: try:
IGNORE_KODI_PLAYLIST_CHANGE.append(plex_id)
kodi_pl.delete(playlist) kodi_pl.delete(playlist)
except PlaylistError: except PlaylistError:
pass IGNORE_KODI_PLAYLIST_CHANGE.remove(plex_id)
return return
xml = pms.metadata(plex_id) xml = pms.metadata(plex_id)
if xml is None: if xml is None:
@ -90,6 +93,7 @@ def websocket(plex_id, status):
else: else:
LOG.debug('Change of Plex playlist detected: %s', LOG.debug('Change of Plex playlist detected: %s',
playlist) playlist)
IGNORE_KODI_PLAYLIST_CHANGE.append(plex_id)
kodi_pl.delete(playlist) kodi_pl.delete(playlist)
create = True create = True
elif not playlist and not status == 9: elif not playlist and not status == 9:
@ -98,9 +102,10 @@ def websocket(plex_id, status):
create = True create = True
# To the actual work # To the actual work
if create: if create:
IGNORE_KODI_PLAYLIST_CHANGE.append(plex_id)
kodi_pl.create(plex_id) kodi_pl.create(plex_id)
except PlaylistError: except PlaylistError:
pass IGNORE_KODI_PLAYLIST_CHANGE.remove(plex_id)
def full_sync(): def full_sync():
@ -140,22 +145,28 @@ def _full_sync():
if not playlist: if not playlist:
LOG.debug('New Plex playlist %s discovered: %s', LOG.debug('New Plex playlist %s discovered: %s',
api.plex_id(), api.title()) api.plex_id(), api.title())
IGNORE_KODI_PLAYLIST_CHANGE.append(api.plex_id())
kodi_pl.create(api.plex_id()) kodi_pl.create(api.plex_id())
elif playlist.plex_updatedat != api.updated_at(): elif playlist.plex_updatedat != api.updated_at():
LOG.debug('Detected changed Plex playlist %s: %s', LOG.debug('Detected changed Plex playlist %s: %s',
api.plex_id(), api.title()) api.plex_id(), api.title())
IGNORE_KODI_PLAYLIST_CHANGE.append(api.plex_id())
kodi_pl.delete(playlist) kodi_pl.delete(playlist)
IGNORE_KODI_PLAYLIST_CHANGE.append(api.plex_id())
kodi_pl.create(api.plex_id()) kodi_pl.create(api.plex_id())
except PlaylistError: except PlaylistError:
LOG.info('Skipping playlist %s: %s', api.plex_id(), api.title()) LOG.info('Skipping playlist %s: %s', api.plex_id(), api.title())
IGNORE_KODI_PLAYLIST_CHANGE.remove(api.plex_id())
# Get rid of old Plex playlists that were deleted on the Plex side # Get rid of old Plex playlists that were deleted on the Plex side
for plex_id in old_plex_ids: for plex_id in old_plex_ids:
playlist = db.get_playlist(plex_id=plex_id) playlist = db.get_playlist(plex_id=plex_id)
LOG.debug('Removing outdated Plex playlist: %s', playlist) LOG.debug('Removing outdated Plex playlist: %s', playlist)
try: try:
IGNORE_KODI_PLAYLIST_CHANGE.append(playlist.plex_id)
kodi_pl.delete(playlist) kodi_pl.delete(playlist)
except PlaylistError: except PlaylistError:
LOG.debug('Skipping deletion of playlist: %s', playlist) LOG.debug('Skipping deletion of playlist: %s', playlist)
IGNORE_KODI_PLAYLIST_CHANGE.remove(playlist.plex_id)
# Look at all supported Kodi playlists. Check whether they are in the DB. # Look at all supported Kodi playlists. Check whether they are in the DB.
old_kodi_paths = db.kodi_playlist_paths() old_kodi_paths = db.kodi_playlist_paths()
for root, _, files in path_ops.walk(v.PLAYLIST_PATH): for root, _, files in path_ops.walk(v.PLAYLIST_PATH):
@ -275,6 +286,11 @@ class PlaylistEventhandler(events.FileSystemEventHandler):
else event.src_path else event.src_path
if not sync_kodi_playlist(path): if not sync_kodi_playlist(path):
return return
playlist = db.get_playlist(path=path)
if playlist and playlist.plex_id in IGNORE_KODI_PLAYLIST_CHANGE:
LOG.debug('Ignoring event %s for playlist %s', event, playlist)
IGNORE_KODI_PLAYLIST_CHANGE.remove(playlist.plex_id)
return
_method_map = { _method_map = {
events.EVENT_TYPE_MODIFIED: self.on_modified, events.EVENT_TYPE_MODIFIED: self.on_modified,
events.EVENT_TYPE_MOVED: self.on_moved, events.EVENT_TYPE_MOVED: self.on_moved,

1
resources/lib/playlists/kodi_pl.py
View file

@ -77,6 +77,7 @@ def delete(playlist):
if path_ops.exists(playlist.kodi_path): if path_ops.exists(playlist.kodi_path):
try: try:
path_ops.remove(playlist.kodi_path) path_ops.remove(playlist.kodi_path)
LOG.debug('Deleted Kodi playlist: %s', playlist)
except (OSError, IOError) as err: except (OSError, IOError) as err:
LOG.error('Could not delete Kodi playlist file %s. Error:\n%s: %s', LOG.error('Could not delete Kodi playlist file %s. Error:\n%s: %s',
playlist, err.errno, err.strerror) playlist, err.errno, err.strerror)