From a0377fad29a17463f6504b19c796139318ac9fc4 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 29 Jan 2020 21:14:17 +0100 Subject: [PATCH] fix autoplay -> nascondi server --- channels/cineblog01.py | 11 ++++++----- resources/language/English/strings.po | 4 ++++ resources/language/Italian/strings.po | 4 ++++ specials/autoplay.py | 18 ++++++++++-------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 2337f951..be882be5 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -221,11 +221,12 @@ def findvideos(item): load_links(itemlist, 'Streamin?g 3D[^<]+(.*?)cbtable', "pink", "Streaming 3D") itemlist=support.server(item, itemlist=itemlist) - itemlist.insert(0, - Item(channel=item.channel, - action="", - title="[COLOR orange]%s[/COLOR]" % QualityStr, - folder=False)) + if itemlist and QualityStr: + itemlist.insert(0, + Item(channel=item.channel, + action="", + title="[COLOR orange]%s[/COLOR]" % QualityStr, + folder=False)) return itemlist diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index a31357a3..b126159c 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -5801,3 +5801,7 @@ msgstr "" msgctxt "#707416" msgid "how often you want to check for updates? (hours)" msgstr "" + +msgctxt "#707417" +msgid "Favourite quality" +msgstr "" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 7e9473f7..fea225ce 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5805,3 +5805,7 @@ msgstr "Non hai selezionato nessuna scelta!\nVerranno utilizzati i DNS di cloudf msgctxt "#707416" msgid "how often you want to check for updates? (hours)" msgstr "Ogni quanto vuoi che vengano controllati? (ore)" + +msgctxt "#707417" +msgid "Favourite quality" +msgstr "Qualità preferita" diff --git a/specials/autoplay.py b/specials/autoplay.py index 7a11f281..d67975bd 100644 --- a/specials/autoplay.py +++ b/specials/autoplay.py @@ -504,7 +504,7 @@ def autoplay_config(item): dict_values['active'] = settings_node.get('active', False) hide_servers = {"id": "hide_servers", "label": config.get_localized_string(70747), - "type": "bool", "default": False, "enabled": "eq(-1,true)", + "type": "bool", "default": False, "enabled": "eq(-" + str(len(list_controls)) + ",true)", "visible": allow_option} list_controls.append(hide_servers) @@ -516,7 +516,7 @@ def autoplay_config(item): status_language = 0 set_language = {"id": "language", "label": config.get_localized_string(60080), - "type": "list", "default": 0, "enabled": "eq(-2,true)", "visible": True, + "type": "list", "default": 0, "enabled": "eq(-" + str(len(list_controls)) + ",true)", "visible": True, "lvalues": get_languages(item.from_channel)} list_controls.append(set_language) @@ -533,10 +533,11 @@ def autoplay_config(item): enabled = False server_list = ["No disponible"] else: - enabled = "eq(-3,true)" + enabled = "eq(-" + str(len(list_controls)) + ",true)" custom_servers_settings = {"id": "custom_servers", "label": config.get_localized_string(60081), "type": "bool", "default": False, "enabled": enabled, "visible": True} + custom_servers_pos = len(list_controls) list_controls.append(custom_servers_settings) if dict_values['active'] and enabled: dict_values['custom_servers'] = settings_node.get('custom_servers', False) @@ -544,7 +545,7 @@ def autoplay_config(item): dict_values['custom_servers'] = False for num in range(1, 4): - pos1 = num + 3 + pos1 = num + custom_servers_pos default = num - 1 if default > len(server_list) - 1: default = 0 @@ -564,10 +565,11 @@ def autoplay_config(item): enabled = False quality_list = ["No disponible"] else: - enabled = "eq(-7,true)" + enabled = "eq(-" + str(len(list_controls)) + ",true)" custom_quality_settings = {"id": "custom_quality", "label": config.get_localized_string(60083), "type": "bool", "default": False, "enabled": enabled, "visible": True} + custom_quality_pos = len(list_controls) list_controls.append(custom_quality_settings) if dict_values['active'] and enabled: dict_values['custom_quality'] = settings_node.get('custom_quality', False) @@ -575,12 +577,12 @@ def autoplay_config(item): dict_values['custom_quality'] = False for num in range(1, 4): - pos1 = num + 7 + pos1 = num + custom_quality_pos default = num - 1 if default > len(quality_list) - 1: default = 0 - set_quality = {"id": "quality_%s" % num, "label": u" \u2665 Calidad Favorita %s" % num, + set_quality = {"id": "quality_%s" % num, "label": u" \u2665 " + config.get_localized_string(707417) + " %s" % num, "type": "list", "default": default, "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True, "lvalues": quality_list} @@ -591,7 +593,7 @@ def autoplay_config(item): # Plan B dict_values['plan_b'] = settings_node.get('plan_b', False) - enabled = "eq(-4,true)|eq(-8,true)" + enabled = "eq(-" + str(custom_servers_pos) + ",true)|eq(-" + str(custom_quality_pos) + ",true)" plan_b = {"id": "plan_b", "label": config.get_localized_string(70172),"type": "bool", "default": False, "enabled": enabled, "visible": True} list_controls.append(plan_b)