From 0b5c138709baa2a11e0b7a8092381b42a4ad03ed Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Sun, 26 Feb 2017 15:16:03 +0100
Subject: [PATCH] Better error handling for Plex Companion playqueues

- Partially solves #236
---
 resources/lib/playbackutils.py |  5 ++-
 resources/lib/playlist_func.py | 60 +++++++++++++++++++---------------
 resources/lib/playqueue.py     |  7 ++--
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py
index d9cd867e..14e8894f 100644
--- a/resources/lib/playbackutils.py
+++ b/resources/lib/playbackutils.py
@@ -138,7 +138,10 @@ class PlaybackUtils():
                                       plex_lib_UUID,
                                       mediatype=api.getType(),
                                       trailers=trailers)
-            get_playlist_details_from_xml(playqueue, xml=xml)
+            try:
+                get_playlist_details_from_xml(playqueue, xml=xml)
+            except KeyError:
+                return
 
             if (not homeScreen and not seektime and sizePlaylist < 2 and
                     window('plex_customplaylist') != "true" and
diff --git a/resources/lib/playlist_func.py b/resources/lib/playlist_func.py
index f5afa8b6..1485d9b5 100644
--- a/resources/lib/playlist_func.py
+++ b/resources/lib/playlist_func.py
@@ -209,15 +209,14 @@ def update_playlist_from_PMS(playlist, playlist_id=None, xml=None):
     """
     if xml is None:
         xml = get_PMS_playlist(playlist, playlist_id)
-    try:
-        xml.attrib['%sVersion' % playlist.kind]
-    except:
-        log.error('Could not process Plex playlist')
-        return
     # Clear our existing playlist and the associated Kodi playlist
     playlist.clear()
     # Set new values
-    get_playlist_details_from_xml(playlist, xml)
+    try:
+        get_playlist_details_from_xml(playlist, xml)
+    except KeyError:
+        log.error('Could not update playlist from PMS')
+        return
     for plex_item in xml:
         playlist_item = add_to_Kodi_playlist(playlist, plex_item)
         if playlist_item is not None:
@@ -231,19 +230,23 @@ def init_Plex_playlist(playlist, plex_id=None, kodi_item=None):
     WILL ALSO UPDATE OUR PLAYLISTS
     """
     log.debug('Initializing the playlist %s on the Plex side' % playlist)
-    if plex_id:
-        item = playlist_item_from_plex(plex_id)
-    else:
-        item = playlist_item_from_kodi(kodi_item)
-    params = {
-        'next': 0,
-        'type': playlist.type,
-        'uri': item.uri
-    }
-    xml = DU().downloadUrl(url="{server}/%ss" % playlist.kind,
-                           action_type="POST",
-                           parameters=params)
-    get_playlist_details_from_xml(playlist, xml)
+    try:
+        if plex_id:
+            item = playlist_item_from_plex(plex_id)
+        else:
+            item = playlist_item_from_kodi(kodi_item)
+        params = {
+            'next': 0,
+            'type': playlist.type,
+            'uri': item.uri
+        }
+        xml = DU().downloadUrl(url="{server}/%ss" % playlist.kind,
+                               action_type="POST",
+                               parameters=params)
+        get_playlist_details_from_xml(playlist, xml)
+    except KeyError:
+        log.error('Could not init Plex playlist')
+        return
     item.ID = xml[-1].attrib['%sItemID' % playlist.kind]
     playlist.items.append(item)
     log.debug('Initialized the playlist on the Plex side: %s' % playlist)
@@ -305,7 +308,11 @@ def add_item_to_PMS_playlist(playlist, pos, plex_id=None, kodi_item=None):
     log.debug('Adding new item plex_id: %s, kodi_item: %s on the Plex side at '
               'position %s for %s' % (plex_id, kodi_item, pos, playlist))
     if plex_id:
-        item = playlist_item_from_plex(plex_id)
+        try:
+            item = playlist_item_from_plex(plex_id)
+        except KeyError:
+            log.error('Could not add new item to the PMS playlist')
+            return
     else:
         item = playlist_item_from_kodi(kodi_item)
     url = "{server}/%ss/%s?uri=%s" % (playlist.kind, playlist.ID, item.uri)
@@ -418,11 +425,9 @@ def refresh_playlist_from_PMS(playlist):
     """
     xml = get_PMS_playlist(playlist)
     try:
-        xml.attrib['%sVersion' % playlist.kind]
-    except:
-        log.error('Could not download Plex playlist.')
-        return
-    get_playlist_details_from_xml(playlist, xml)
+        get_playlist_details_from_xml(playlist, xml)
+    except KeyError:
+        log.error('Could not refresh playlist from PMS')
 
 
 def delete_playlist_item_from_PMS(playlist, pos):
@@ -469,8 +474,9 @@ def get_kodi_playqueues():
     try:
         queues = queues['result']
     except KeyError:
-        raise KeyError('Could not get Kodi playqueues. JSON Result was: %s'
-                       % queues)
+        log.error('Could not get Kodi playqueues. JSON Result was: %s'
+                  % queues)
+        queues = []
     return queues
 
 
diff --git a/resources/lib/playqueue.py b/resources/lib/playqueue.py
index a07ec325..0e8939f1 100644
--- a/resources/lib/playqueue.py
+++ b/resources/lib/playqueue.py
@@ -85,11 +85,12 @@ class Playqueue(Thread):
                  '%s, repeat %s' % (playqueue_id, offset, repeat))
         with lock:
             xml = PL.get_PMS_playlist(playqueue, playqueue_id)
-            if xml is None:
+            playqueue.clear()
+            try:
+                PL.get_playlist_details_from_xml(playqueue, xml)
+            except KeyError:
                 log.error('Could not get playqueue ID %s' % playqueue_id)
                 return
-            playqueue.clear()
-            PL.get_playlist_details_from_xml(playqueue, xml)
             PlaybackUtils(xml, playqueue).play_all()
             playqueue.repeat = 0 if not repeat else int(repeat)
             window('plex_customplaylist', value="true")