From 815e22d916093f40a76f4651ed582c61943eae50 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Fri, 22 Mar 2019 19:04:03 +0100 Subject: [PATCH] Add Custom Theme Setting and Auto Thumb (partial) --- plugin.video.alfa/channelselector.py | 81 +++++++++++++++++-- .../resources/language/English/strings.po | 8 ++ .../resources/language/Italian/strings.po | 11 +++ .../language/Spanish (Argentina)/strings.po | 14 ++-- .../language/Spanish (Mexico)/strings.po | 12 +-- .../resources/language/Spanish/strings.po | 12 +-- plugin.video.alfa/resources/settings.xml | 2 + 7 files changed, 114 insertions(+), 26 deletions(-) diff --git a/plugin.video.alfa/channelselector.py b/plugin.video.alfa/channelselector.py index e311a994..9c1f8fc6 100644 --- a/plugin.video.alfa/channelselector.py +++ b/plugin.video.alfa/channelselector.py @@ -224,25 +224,54 @@ def filterchannels(category, view="thumb_"): return channelslist +# def get_thumb(thumb_name, view="thumb_", auto=False): + +# if auto: +# thumbnail = '' + +# thumb_name = unify.set_genre(unify.simplify(thumb_name)) + + +# if thumb_name in thumb_dict: +# thumbnail = thumb_dict[thumb_name] +# return thumbnail +# else: +# icon_pack_name = config.get_setting('icon_set', default="default") +# if icon_pack_name == "default": +# resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes") +# else: +# resource_path = "https://raw.githubusercontent.com/alfa-addon/media/master/themes/" + +# media_path = os.path.join(resource_path, icon_pack_name) + +# return os.path.join(media_path, view + thumb_name) + def get_thumb(thumb_name, view="thumb_", auto=False): if auto: thumbnail = '' thumb_name = unify.set_genre(unify.simplify(thumb_name)) - + if thumb_name in thumb_dict: thumbnail = thumb_dict[thumb_name] return thumbnail + else: icon_pack_name = config.get_setting('icon_set', default="default") - if icon_pack_name == "default": - resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes") - else: - resource_path = "https://raw.githubusercontent.com/alfa-addon/media/master/themes/" - + + if auto_filter() == 'ita' and icon_pack_name == "default": + icon_pack_name = 'default_ita' + resource_path = os.path.join(config.get_runtime_path(), "resources", "media", "themes") media_path = os.path.join(resource_path, icon_pack_name) + if config.get_setting('enable_custom_theme') and config.get_setting('custom_theme'): + media_path = config.get_setting('custom_theme') + elif os.path.isdir(media_path) == False: + media_path = os.path.join("https://raw.githubusercontent.com/alfa-addon/media/master/themes/", icon_pack_name) + else: + media_path = os.path.join(resource_path, icon_pack_name) + return os.path.join(media_path, view + thumb_name) @@ -299,3 +328,43 @@ def auto_filter(): lang = config.get_setting("channel_language", default="all") return lang + +def thumb(itemlist): + + for item in itemlist: + thumb = '' + logger.info("TITLE= " + item.title.lower()) + if 'film' in item.title.lower(): + thumb = 'channels_movie' + if 'serie' in item.title.lower(): + thumb = 'channels_tvshow' + if 'autoplay' in item.title.lower(): + thumb = 'autoplay' + + + + + if 'hd' in item.title.lower(): + thumb = thumb + '_hd' + if '4k' in item.title.lower(): + thumb = thumb + '_4k' + if any( word in item.title.lower() for word in ['lettera','lista','alfabetico','a-z']): + thumb = thumb + '_az' + if 'anno' in item.title.lower(): + thumb = thumb + '_year' + if 'genere' in item.title.lower(): + thumb = thumb + '_genre' + + + + if 'cerca' in item.title.lower(): + thumb = 'search' + if 'film' in item.title.lower(): + thumb = thumb + '_movie' + if 'serie' in item.title.lower(): + thumb = thumb + '_tvshow' + + item.thumbnail = get_thumb(thumb + '.png') + item.fanart = get_thumb(thumb + '.png', 'fanart_') + + return itemlist \ No newline at end of file diff --git a/plugin.video.alfa/resources/language/English/strings.po b/plugin.video.alfa/resources/language/English/strings.po index accaaf30..cebed038 100644 --- a/plugin.video.alfa/resources/language/English/strings.po +++ b/plugin.video.alfa/resources/language/English/strings.po @@ -4934,3 +4934,11 @@ msgstr "Autoplay (Enable autoplay on all supported channels)" msgctxt "#70563" msgid "Italian" msgstr "" + +msgctxt "#70564" +msgid "Enable Custom Theme" +msgstr "" + +msgctxt "#70565" +msgid "Custom Theme Path" +msgstr "" diff --git a/plugin.video.alfa/resources/language/Italian/strings.po b/plugin.video.alfa/resources/language/Italian/strings.po index cfcdddc2..624a5d42 100644 --- a/plugin.video.alfa/resources/language/Italian/strings.po +++ b/plugin.video.alfa/resources/language/Italian/strings.po @@ -4922,3 +4922,14 @@ msgstr "Autoplay (Abilita autoplay in tutti i canali)" msgctxt "#70563" msgid "Italian" msgstr "Italiano" +<<<<<<< HEAD +======= + +msgctxt "#70564" +msgid "Enable Custom Theme" +msgstr "Abilita Tema Personalizzato" + +msgctxt "#70565" +msgid "Custom Theme Path" +msgstr "Percorso Tema Personalizzato" +>>>>>>> e253911b... Add Custom Theme Setting and Auto Thumb (partial) diff --git a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po index e378087a..e680e41a 100644 --- a/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Argentina)/strings.po @@ -4935,12 +4935,10 @@ msgctxt "#70563" msgid "Italian" msgstr "Italiano" +msgctxt "#70564" +msgid "Enable Custom Theme" +msgstr "Abilita Tema Personalizado" - - - - - - - - +msgctxt "#70565" +msgid "Custom Theme Path" +msgstr "Percorso Tema Personalizado" diff --git a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po index b744b56b..e680e41a 100644 --- a/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po +++ b/plugin.video.alfa/resources/language/Spanish (Mexico)/strings.po @@ -4935,10 +4935,10 @@ msgctxt "#70563" msgid "Italian" msgstr "Italiano" +msgctxt "#70564" +msgid "Enable Custom Theme" +msgstr "Abilita Tema Personalizado" - - - - - - +msgctxt "#70565" +msgid "Custom Theme Path" +msgstr "Percorso Tema Personalizado" diff --git a/plugin.video.alfa/resources/language/Spanish/strings.po b/plugin.video.alfa/resources/language/Spanish/strings.po index b744b56b..e680e41a 100644 --- a/plugin.video.alfa/resources/language/Spanish/strings.po +++ b/plugin.video.alfa/resources/language/Spanish/strings.po @@ -4935,10 +4935,10 @@ msgctxt "#70563" msgid "Italian" msgstr "Italiano" +msgctxt "#70564" +msgid "Enable Custom Theme" +msgstr "Abilita Tema Personalizado" - - - - - - +msgctxt "#70565" +msgid "Custom Theme Path" +msgstr "Percorso Tema Personalizado" diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml index c0d95e36..0148b849 100644 --- a/plugin.video.alfa/resources/settings.xml +++ b/plugin.video.alfa/resources/settings.xml @@ -48,6 +48,8 @@ + +