Merge pull request #638 from anxdpanic/pr_isengard

2.6.0~beta5

Author: anxdpanic

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.twitch" version="2.6.0~beta4" name="Twitch" provider-name="anxdpanic, A Talented Community">
+<addon id="plugin.video.twitch" version="2.6.0~beta5" name="Twitch" provider-name="anxdpanic, A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
         <import addon="script.module.six" version="1.11.0"/>

resources/lib/twitch_addon/addon/converter.py

@@ -320,11 +320,11 @@ def get_title_for_clip(self, clip):
     @staticmethod
     def extract_clip_title_values(clip):
         viewers = clip.get(Keys.VIEW_COUNT)
-        viewers = viewers if (viewers or isinstance(viewers, int)) else i18n('unknown_viewer_count')
+        viewers = viewers if (viewers or isinstance(viewers, int)) else ''
 
         streamer = clip.get(Keys.BROADCASTER_NAME)
         title = clip.get(Keys.TITLE)
-        game = clip.get(Keys.GAME_NAME) if clip.get(Keys.GAME_NAME) else i18n('unknown_game')
+        game = clip.get(Keys.GAME_NAME) if clip.get(Keys.GAME_NAME) else ''
         broadcaster_language = clip.get(Keys.LANGUAGE) if clip.get(Keys.LANGUAGE) else i18n('unknown_language')
 
         return {'streamer': streamer,
@@ -342,13 +342,16 @@ def extract_search_title_values(stream):
         streamer = stream.get(Keys.DISPLAY_NAME) \
             if stream.get(Keys.DISPLAY_NAME) else stream.get(Keys.BROADCASTER_LOGIN)
         title = stream.get(Keys.TITLE) if stream.get(Keys.TITLE) else i18n('untitled_stream')
-        game = stream.get(Keys.GAME_NAME) if stream.get(Keys.GAME_NAME) else i18n('unknown_game')
+        game = stream.get(Keys.GAME_NAME) if stream.get(Keys.GAME_NAME) else ''
         broadcaster_language = stream.get(Keys.BROADCASTER_LANGUAGE) \
             if stream.get(Keys.BROADCASTER_LANGUAGE) else i18n('unknown_language')
+        viewers = stream.get(Keys.VIEWER_COUNT)
+        viewers = viewers if (viewers or isinstance(viewers, int)) else ''
 
         return {'streamer': streamer,
                 'title': title,
                 'game': game,
+                'viewers': viewers,
                 'broadcaster_language': broadcaster_language}
 
     def get_title_for_stream(self, stream):
@@ -358,11 +361,11 @@ def get_title_for_stream(self, stream):
     @staticmethod
     def extract_stream_title_values(stream):
         viewers = stream.get(Keys.VIEWER_COUNT)
-        viewers = viewers if (viewers or isinstance(viewers, int)) else i18n('unknown_viewer_count')
+        viewers = viewers if (viewers or isinstance(viewers, int)) else ''
 
         streamer = stream.get(Keys.USER_NAME) if stream.get(Keys.USER_NAME) else stream.get(Keys.USER_LOGIN)
         title = stream.get(Keys.TITLE) if stream.get(Keys.TITLE) else i18n('untitled_stream')
-        game = stream.get(Keys.GAME_NAME) if stream.get(Keys.GAME_NAME) else i18n('unknown_game')
+        game = stream.get(Keys.GAME_NAME) if stream.get(Keys.GAME_NAME) else ''
         broadcaster_language = stream.get(Keys.LANGUAGE) if stream.get(Keys.LANGUAGE) else i18n('unknown_language')
 
         return {'streamer': streamer,
@@ -378,11 +381,11 @@ def get_title_for_video(self, video):
     @staticmethod
     def extract_video_title_values(video):
         viewers = video.get(Keys.VIEW_COUNT)
-        viewers = viewers if (viewers or isinstance(viewers, int)) else i18n('unknown_viewer_count')
+        viewers = viewers if (viewers or isinstance(viewers, int)) else ''
 
         streamer = video.get(Keys.USER_NAME) if video.get(Keys.USER_NAME) else video.get(Keys.USER_LOGIN)
         title = video.get(Keys.TITLE) if video.get(Keys.TITLE) else i18n('untitled_stream')
-        game = video.get(Keys.GAME_NAME) if video.get(Keys.GAME_NAME) else i18n('unknown_game')
+        game = video.get(Keys.GAME_NAME) if video.get(Keys.GAME_NAME) else ''
         broadcaster_language = video.get(Keys.LANGUAGE) if video.get(Keys.LANGUAGE) else i18n('unknown_language')
 
         return {'streamer': streamer,
@@ -396,10 +399,11 @@ def extract_channel_title_values(channel):
         streamer = channel.get(Keys.DISPLAY_NAME) if channel.get(Keys.DISPLAY_NAME) else channel.get(Keys.NAME)
         title = channel.get(Keys.TITLE) if channel.get(Keys.TITLE) else i18n('untitled_stream')
         game = channel.get(Keys.GAME) if channel.get(Keys.GAME) else channel.get(Keys.META_GAME)
-        game = game if game else i18n('unknown_game')
+        game = game if game else ''
         viewers = channel.get(Keys.CURRENT_VIEWERS) \
-            if (channel.get(Keys.CURRENT_VIEWERS) or isinstance(channel.get(Keys.CURRENT_VIEWERS), int)) else i18n('unknown_viewer_count')
-        broadcaster_language = channel.get(Keys.BROADCASTER_LANGUAGE) if channel.get(Keys.BROADCASTER_LANGUAGE) else i18n('unknown_language')
+            if (channel.get(Keys.CURRENT_VIEWERS) or isinstance(channel.get(Keys.CURRENT_VIEWERS), int)) else ''
+        broadcaster_language = channel.get(Keys.BROADCASTER_LANGUAGE) \
+            if channel.get(Keys.BROADCASTER_LANGUAGE) else i18n('unknown_language')
 
         return {'streamer': streamer,
                 'title': title,

resources/lib/twitch_addon/addon/utils.py

@@ -519,6 +519,7 @@ class Templates(object):
         VIEWERS_STREAMER_TITLE = u"{viewers} - {streamer} - {title}"
         STREAMER_GAME_TITLE = u"{streamer} - {game} - {title}"
         GAME_VIEWERS_STREAMER_TITLE = u"[{game}] {viewers} | {streamer} - {title}"
+        GAME_STREAMER_TITLE = u"[{game}] | {streamer} - {title}"
         BROADCASTER_LANGUAGE_STREAMER_TITLE = u"{broadcaster_language} | {streamer} - {title}"
         ELLIPSIS = u'...'
 
@@ -527,7 +528,7 @@ def __init__(self, line_length):
 
     def format_title(self, title_values):
         title_setting = int(kodi.get_setting('title_display'))
-        template = self.get_title_template(title_setting)
+        template = self.get_title_template(title_setting, title_values)
 
         for key, value in iteritems(title_values):
             title_values[key] = self.clean_title_value(value)
@@ -536,14 +537,35 @@ def format_title(self, title_values):
         return self.truncate_title(title)
 
     @staticmethod
-    def get_title_template(title_setting):
-        options = {0: TitleBuilder.Templates.STREAMER_TITLE,
-                   1: TitleBuilder.Templates.VIEWERS_STREAMER_TITLE,
-                   2: TitleBuilder.Templates.TITLE,
-                   3: TitleBuilder.Templates.STREAMER,
-                   4: TitleBuilder.Templates.STREAMER_GAME_TITLE,
-                   5: TitleBuilder.Templates.GAME_VIEWERS_STREAMER_TITLE,
-                   6: TitleBuilder.Templates.BROADCASTER_LANGUAGE_STREAMER_TITLE}
+    def get_title_template(title_setting, title_values):
+        options = {
+            0: TitleBuilder.Templates.STREAMER_TITLE,
+            1: TitleBuilder.Templates.VIEWERS_STREAMER_TITLE,
+            2: TitleBuilder.Templates.TITLE,
+            3: TitleBuilder.Templates.STREAMER,
+            4: TitleBuilder.Templates.STREAMER_GAME_TITLE,
+            5: TitleBuilder.Templates.GAME_VIEWERS_STREAMER_TITLE,
+            6: TitleBuilder.Templates.BROADCASTER_LANGUAGE_STREAMER_TITLE,
+            7: TitleBuilder.Templates.GAME_STREAMER_TITLE,
+        }
+
+        if title_setting == 1:
+            if not title_values.get('viewers'):
+                title_setting = 0
+        elif title_setting == 4:
+            if not title_values.get('game'):
+                title_setting = 0
+        elif title_setting == 5:
+            if not title_values.get('game') and not title_values.get('viewers'):
+                title_setting = 0
+            elif title_values.get('game') and not title_values.get('viewers'):
+                title_setting = 7
+            elif not title_values.get('game') and title_values.get('viewers'):
+                title_setting = 1
+        elif title_setting == 6:
+            if not title_values.get('broadcaster_language'):
+                title_setting = 0
+
         return options.get(title_setting, TitleBuilder.Templates.STREAMER)
 
     @staticmethod