Merge pull request #477 from anxdpanic/pr-1

Failed playback fixups

addon.xml

@@ -13,8 +13,10 @@
     <extension point='xbmc.addon.metadata'>
         <platform>all</platform>
         <news>
+[fix] resolve indefinite busy dialog on failed playback
 [fix] sort by viewers for followed live channels, restoring previous behavior
 [fix] menu settings not taking effect
+[fix] handle no stream available error
 [rem] remove Playlists
         </news>
         <assets>

changelog.txt

@@ -1,6 +1,8 @@
 2.4.8
+[fix] resolve indefinite busy dialog on failed playback
 [fix] sort by viewers for followed live channels, restoring previous behavior
 [fix] menu settings not taking effect
+[fix] handle no stream available error
 [rem] remove Playlists
 
 2.4.7

resources/lib/twitch_addon/addon/api.py

@@ -15,7 +15,7 @@
 from .common import kodi, log_utils
 from .constants import Keys, SCOPES
 from .error_handling import api_error_handler
-from .twitch_exceptions import TwitchException
+from .twitch_exceptions import PlaybackFailed, TwitchException
 
 from twitch import queries as twitch_queries
 from twitch import oauth
@@ -368,7 +368,12 @@ def get_user_blocks(self):
 
     @staticmethod
     def error_check(results):
-        if 'error' in results: raise TwitchException(results)
+        if 'stream' in results and results['stream'] is None:
+            raise PlaybackFailed()
+
+        if 'error' in results:
+            raise TwitchException(results)
+
         return results
 
     @staticmethod

resources/lib/twitch_addon/addon/error_handling.py

@@ -56,6 +56,7 @@ def wrapper(*args, **kwargs):
                 message = error.message
             log_utils.log('Playback Failed |{0}|'.format(message), log_utils.LOGDEBUG)
             kodi.notify(kodi.get_name(), i18n('playback_failed'), duration=5000, sound=False)
+            kodi.set_resolved_url(kodi.ListItem(), succeeded=False)
         except TwitchException as error:
             _error = ''
             if PY3:

resources/lib/twitch_addon/routes/play.py

@@ -183,7 +183,9 @@ def _set_seek_time(value):
                             utils.exec_irc_script(username, name)
                 return
             else:
+                kodi.set_resolved_url(kodi.ListItem(), succeeded=False)
                 return
+
         raise PlaybackFailed()
     except:
         _reset()