Merge pull request #633 from anxdpanic/pr_isengard

fixup rerun playback

Author: anxdpanic

resources/lib/twitch_addon/addon/api.py

@@ -120,7 +120,12 @@ def get_username(self):
     @cache.cache_method(cache_limit=cache.limit)
     def get_user_ids(self, logins):
         results = self.api.users.get_users(user_login=logins)
-        return self.error_check(results)
+        results = self.error_check(results)
+        ids = []
+        for user in results.get(Keys.DATA, [{}]):
+            if user.get(Keys.ID):
+                ids.append(user.get(Keys.ID))
+        return ids
 
     @api_error_handler
     @cache.cache_method(cache_limit=cache.limit)

resources/lib/twitch_addon/addon/converter.py

@@ -281,11 +281,15 @@ def video_to_playitem(self, video):
                 'content_type': 'video',
                 'is_playable': True}
 
-    def stream_to_playitem(self, stream):
+    def stream_to_playitem(self, stream, id_only=False):
         # path is returned '' and must be set after
         image = self.get_thumbnail(stream.get(Keys.THUMBNAIL_URL), Images.VIDEOTHUMB)
-        title = self.get_title_for_stream(stream)
-        info = self.get_plot_for_stream(stream, include_title=False)
+        if not id_only:
+            title = self.get_title_for_stream(stream)
+            info = self.get_plot_for_stream(stream, include_title=False)
+        else:
+            title = stream.get(Keys.USER_NAME, stream.get(Keys.USER_LOGIN))
+            info = {}
         info.update({'mediatype': 'video'})
         return {'label': title,
                 'path': '',

resources/lib/twitch_addon/routes/play.py

@@ -104,21 +104,34 @@ def _set_seek_time(value):
         elif channel_id or channel_name:
             if channel_name and not channel_id:
                 result = api.get_user_ids(channel_name)
-                result = result.get(Keys.DATA, [{}])[0]
-                channel_id = result.get(Keys.ID)
+                if result:
+                    channel_id = result[0]
             if channel_id:
                 if not quality:
                     quality = utils.get_default_quality('stream', channel_id)
                     if quality:
                         quality = quality[str(channel_id)]['quality']
+                id_only = False
                 result = api.get_channel_stream(channel_id)[Keys.DATA]
                 if result:
                     result = result[0]
                     channel_name = result[Keys.USER_NAME] \
                         if result[Keys.USER_NAME] else result[Keys.USER_LOGIN]
                     name = result[Keys.USER_LOGIN]
+                else:  # rerun
+                    user = api.get_users(user_ids=channel_id)
+                    if user.get(Keys.DATA, [{}]):
+                        user = user[Keys.DATA][0]
+                        id_only = True
+                        name = user.get(Keys.LOGIN)
+                        result = {
+                            Keys.USER_NAME: user.get(Keys.DISPLAY_NAME, Keys.LOGIN),
+                            Keys.USER_LOGIN: user.get(Keys.LOGIN),
+                            Keys.USER_ID: user.get(Keys.ID),
+                        }  # make a dummy result to continue with playback
+                if name:
                     videos = api.get_live(name)
-                    item_dict = converter.stream_to_playitem(result)
+                    item_dict = converter.stream_to_playitem(result, id_only=id_only)
                     is_live = True
         elif slug:
             result = api.get_clip_by_slug(slug)