From ead0fefd01477746fb79ac1a5db5daf7a5212c41 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 19 Oct 2019 10:01:07 +0200 Subject: [PATCH] Migliorie ad auto_filter, vosi -> sub-ita --- RIAVVIARE AD AGGIORNAMENTO TERMINATO! --- --- .github/ISSUE_TEMPLATE/test-canale.md | 2 +- channels/0example.json | 2 +- channels/altadefinizione01.json | 2 +- channels/altadefinizione01_link.json | 2 +- channels/altadefinizioneclick.json | 2 +- channels/animeleggendari.json | 2 +- channels/animesubita.json | 4 +- channels/animeworld.json | 2 +- channels/casacinema.json | 2 +- channels/casacinemaInfo.json | 2 +- channels/cb01anime.json | 2 +- channels/cineblog01.json | 4 +- channels/dreamsub.json | 2 +- channels/fastsubita.json | 2 +- channels/italiaserie.json | 2 +- channels/mondolunatico2.json | 2 +- channels/toonitalia.json | 2 +- channelselector.py | 58 +++++++++++++++------------ platformcode/config.py | 2 +- platformcode/unify.py | 6 +-- resources/language/English/strings.po | 4 ++ resources/language/Italian/strings.po | 4 ++ resources/settings.xml | 2 +- specials/news.py | 6 +-- specials/search.py | 2 +- 25 files changed, 69 insertions(+), 53 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/test-canale.md b/.github/ISSUE_TEMPLATE/test-canale.md index 74759500..de8af5e7 100644 --- a/.github/ISSUE_TEMPLATE/test-canale.md +++ b/.github/ISSUE_TEMPLATE/test-canale.md @@ -45,7 +45,7 @@ Per aprirli non servono programmi particolari un semplice editor di testo è suf Occorrente: file .json **1. Indica la coerenza delle voci presenti in "language" con i contenuti presenti sul sito:** -valori: ita, vosi (sub-ita) +valori: ita, sub-ita (sub-ita) - [ ] coerenti - [ ] non coerenti diff --git a/channels/0example.json b/channels/0example.json index a66bf1a8..783193c6 100644 --- a/channels/0example.json +++ b/channels/0example.json @@ -19,7 +19,7 @@ se vanno cancellati tutti deve rimanere la voce: { "id": "nome del file .json", "name": "Nome del canale visualizzato in KOD", - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "active": false, "adult": false, "thumbnail": "", diff --git a/channels/altadefinizione01.json b/channels/altadefinizione01.json index a8690559..8f0d698a 100644 --- a/channels/altadefinizione01.json +++ b/channels/altadefinizione01.json @@ -1,7 +1,7 @@ { "id": "altadefinizione01", "name": "Altadefinizione01", - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "active": true, "adult": false, "thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/altadefinizione01.png", diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json index 068a1ee4..fe102b43 100644 --- a/channels/altadefinizione01_link.json +++ b/channels/altadefinizione01_link.json @@ -3,7 +3,7 @@ "name": "Altadefinizione01 L", "active": true, "adult": false, - "language": ["ita","vosi"], + "language": ["ita","sub-ita"], "thumbnail": "altadefinizione01_L.png", "banner": "altadefinizione01_L.png", "categories": ["movie","vos"], diff --git a/channels/altadefinizioneclick.json b/channels/altadefinizioneclick.json index dbf3ca0a..d5190e8c 100644 --- a/channels/altadefinizioneclick.json +++ b/channels/altadefinizioneclick.json @@ -3,7 +3,7 @@ "name": "AltadefinizioneClick", "active": true, "adult": false, - "language": ["ita","vosi"], + "language": ["ita","sub-ita"], "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneclick.png", "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/altadefinizioneciclk.png", "categories": ["movie","vos"], diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json index 24509255..5fd0cf6b 100644 --- a/channels/animeleggendari.json +++ b/channels/animeleggendari.json @@ -3,7 +3,7 @@ "name": "AnimePerTutti", "active": true, "adult": false, - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "thumbnail": "animepertutti.png", "bannermenu": "animepertutti.png", "categories": ["anime", "vos"], diff --git a/channels/animesubita.json b/channels/animesubita.json index 60140b85..aa00009f 100644 --- a/channels/animesubita.json +++ b/channels/animesubita.json @@ -3,10 +3,10 @@ "name": "AnimeSubIta", "active": true, "adult": false, - "language": ["vosi"], + "language": ["sub-ita"], "thumbnail": "animesubita.png", "bannermenu": "animesubita.png", - "categories": ["anime", "vosi", "movie"], + "categories": ["anime", "vos", "movie"], "settings": [] } diff --git a/channels/animeworld.json b/channels/animeworld.json index 6d619898..0aa9aa1d 100644 --- a/channels/animeworld.json +++ b/channels/animeworld.json @@ -3,7 +3,7 @@ "name": "AnimeWorld", "active": true, "adult": false, - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "thumbnail": "animeworld.png", "banner": "animeworld.png", "categories": ["anime", "vos"], diff --git a/channels/casacinema.json b/channels/casacinema.json index ee2514ad..8f092063 100644 --- a/channels/casacinema.json +++ b/channels/casacinema.json @@ -1,7 +1,7 @@ { "id": "casacinema", "name": "Casacinema", - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "active": true, "adult": false, "thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/casacinema.png", diff --git a/channels/casacinemaInfo.json b/channels/casacinemaInfo.json index ff6d339b..f8e17a26 100644 --- a/channels/casacinemaInfo.json +++ b/channels/casacinemaInfo.json @@ -1,7 +1,7 @@ { "id": "casacinemaInfo", "name": "La Casa del Cinema", - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "active": true, "adult": false, "thumbnail": "", diff --git a/channels/cb01anime.json b/channels/cb01anime.json index b985c4e8..24fd0c8d 100644 --- a/channels/cb01anime.json +++ b/channels/cb01anime.json @@ -1,7 +1,7 @@ { "id": "cb01anime", "name": "Cb01anime", - "language": ["ita", "vos", "vosi"], + "language": ["ita", "vos", "sub-ita"], "active": true, "adult": false, "thumbnail": "cb01anime.png", diff --git a/channels/cineblog01.json b/channels/cineblog01.json index ddf2eaca..a758b139 100644 --- a/channels/cineblog01.json +++ b/channels/cineblog01.json @@ -1,11 +1,11 @@ { "id": "cineblog01", "name": "CB01", - "language": ["ita"], + "language": ["ita", "sub-ita"], "active": true, "adult": false, "thumbnail": "cb01.png", "banner": "cb01.png", - "categories": ["tvshow", "movie", "vosi"], + "categories": ["tvshow", "movie", "vos"], "settings": [] } \ No newline at end of file diff --git a/channels/dreamsub.json b/channels/dreamsub.json index b5ed2795..d0d39ea9 100644 --- a/channels/dreamsub.json +++ b/channels/dreamsub.json @@ -1,7 +1,7 @@ { "id": "dreamsub", "name": "DreamSub", - "language": ["ita", "vosi"], + "language": ["ita", "sub-ita"], "active": true, "adult": false, "thumbnail": "dreamsub.png", diff --git a/channels/fastsubita.json b/channels/fastsubita.json index 9c0cb466..aad4d706 100644 --- a/channels/fastsubita.json +++ b/channels/fastsubita.json @@ -1,7 +1,7 @@ { "id": "fastsubita", "name": "Fastsubita", - "language": ["vosi"], + "language": ["sub-ita"], "active": true, "adult": false, "thumbnail": "fastsubita.png", diff --git a/channels/italiaserie.json b/channels/italiaserie.json index bb53c218..5d487c0a 100644 --- a/channels/italiaserie.json +++ b/channels/italiaserie.json @@ -3,7 +3,7 @@ "name": "Italia Serie", "active": true, "adult": false, - "language": ["ita","vosi"], + "language": ["ita","sub-ita"], "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png", "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png", "categories": ["tvshow"], diff --git a/channels/mondolunatico2.json b/channels/mondolunatico2.json index ed77f7a2..c07479c2 100644 --- a/channels/mondolunatico2.json +++ b/channels/mondolunatico2.json @@ -6,7 +6,7 @@ "adult": false, "thumbnail": "mondolunatico2.png", "banner": "mondolunatico2.png", - "categories": ["tvshow", "movie", "vosi", "anime"], + "categories": ["tvshow", "movie", "vos", "anime"], "settings": [ { "id": "include_in_global_search", diff --git a/channels/toonitalia.json b/channels/toonitalia.json index a8cd2928..deaa9b02 100644 --- a/channels/toonitalia.json +++ b/channels/toonitalia.json @@ -6,7 +6,7 @@ "adult": false, "thumbnail": "toonitalia.png", "banner": "toonitalia.png", - "categories": ["tvshow", "movie", "vosi", "anime"], + "categories": ["tvshow", "movie", "vos", "anime"], "settings": [ { "id": "include_in_global_search", diff --git a/channelselector.py b/channelselector.py index d594766d..c3e63042 100644 --- a/channelselector.py +++ b/channelselector.py @@ -88,7 +88,7 @@ def getchanneltypes(view="thumb_"): channel_types.append("adult") # channel_language = config.get_setting("channel_language", default="all") - channel_language = auto_filter()[0] + channel_language = auto_filter() logger.info("channel_language=%s" % channel_language) # Ahora construye el itemlist ordenadamente @@ -138,7 +138,7 @@ def filterchannels(category, view="thumb_"): logger.info("channel_files encontrados %s" % (len(channel_files))) # channel_language = config.get_setting("channel_language", default="all") - channel_language, channel_language_list = auto_filter() + channel_language = auto_filter() logger.info("channel_language=%s" % channel_language) for channel_path in channel_files: @@ -193,15 +193,14 @@ def filterchannels(category, view="thumb_"): # Se muestran sólo los idiomas filtrados, cast o lat # Los canales de adultos se mostrarán siempre que estén activos - for c in channel_language_list: - if c in channel_parameters["language"]: - L = True - else: - L = False + # for channel_language_list in channel_language_list: + # if c in channel_parameters["language"]: + # L = True + # else: + # L = False # logger.info('CCLANG= ' + channel_language + ' ' + str(channel_language_list)) if channel_language != "all" and "*" not in channel_parameters["language"] \ - and L == False and channel_language not in channel_parameters["language"]: - logger.info('STOP!!!!') + and channel_language not in str(channel_parameters["language"]): continue # Se salta el canal si está en una categoria filtrado @@ -291,12 +290,13 @@ def set_channel_info(parameters): content = '' langs = parameters['language'] lang_dict = {'ita':'Italiano', - 'vosi':'Sottotitolato in Italiano', + 'sub-ita':'Sottotitolato in Italiano', '*':'Italiano, Sottotitolato in Italiano'} + for lang in langs: # if 'vos' in parameters['categories']: # lang = '*' - # if 'vosi' in parameters['categories']: + # if 'sub-ita' in parameters['categories']: # lang = 'ita' if lang in lang_dict: @@ -320,25 +320,33 @@ def set_channel_info(parameters): def auto_filter(auto_lang=False): - import xbmc, xbmcaddon - - addon = xbmcaddon.Addon('metadata.themoviedb.org') - def_lang = addon.getSetting('language') - lang = 'all' - lang_list = ['all'] - - lang_dict = {'it':'ita'} - lang_list_dict = {'it':['ita','vosi']} - if config.get_setting("channel_language") == 'auto' or auto_lang == True: - lang = lang_dict[def_lang] - lang_list = lang_list_dict[def_lang] + lang = config.get_localized_string(20001) else: lang = config.get_setting("channel_language", default="all") - lang_list = lang_list_dict[def_lang] - return lang, lang_list + return lang + + # import xbmc, xbmcaddon + + # addon = xbmcaddon.Addon('metadata.themoviedb.org') + # def_lang = addon.getSetting('language') + # lang = 'all' + # lang_list = ['all'] + + # lang_dict = {'it':'ita'} + # lang_list_dict = {'it':['ita','vosi']} + + # if config.get_setting("channel_language") == 'auto' or auto_lang == True: + # lang = lang_dict[def_lang] + # lang_list = lang_list_dict[def_lang] + + # else: + # lang = config.get_setting("channel_language", default="all") + # lang_list = lang_list_dict[def_lang] + + # return lang, lang_list def thumb(itemlist=[], genre=False): diff --git a/platformcode/config.py b/platformcode/config.py index a4da4250..87ea5ea1 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -366,7 +366,7 @@ def get_localized_string(code): def get_localized_category(categ): categories = {'movie': get_localized_string(30122), 'tvshow': get_localized_string(30123), 'anime': get_localized_string(30124), 'documentary': get_localized_string(30125), - 'vos': get_localized_string(30136), 'vosi': get_localized_string(70566), 'adult': get_localized_string(30126), + 'vos': get_localized_string(30136), 'sub-ita': get_localized_string(70566), 'adult': get_localized_string(30126), 'direct': get_localized_string(30137), 'torrent': get_localized_string(70015)} return categories[categ] if categ in categories else categ diff --git a/platformcode/unify.py b/platformcode/unify.py index c06f6eb1..0c8c41af 100644 --- a/platformcode/unify.py +++ b/platformcode/unify.py @@ -253,7 +253,7 @@ def set_lang(language): lat=['latino','lat','la', 'espanol latino', 'espaol latino', 'zl', 'mx', 'co', 'vl'] vose=['subtitulado','subtitulada','sub','sub espanol','vose','espsub','su','subs castellano', 'sub: español', 'vs', 'zs', 'vs', 'english-spanish subs', 'ingles sub espanol'] - vosi=['sottotitolato','sottotitolata','sub','sub ita','vosi','sub-ita','subs italiano', + sub_ita=['sottotitolato','sottotitolata','sub','sub ita','subs italiano', 'sub: italiano', 'inglese sottotitolato'] vos=['vos', 'sub ingles', 'engsub','ingles subtitulado', 'sub: ingles'] vo=['ingles', 'en','vo', 'ovos', 'eng','v.o', 'english'] @@ -272,8 +272,8 @@ def set_lang(language): language = 'lat' elif language in ita: language = 'ita' - elif language in vosi: - language = 'vosi' + elif language in sub_ita: + language = 'sub-ita' elif language in vose: language = 'vose' elif language in vos: diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 34aaf082..9ec7c01e 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -21,6 +21,10 @@ msgctxt "#20000" msgid "KOD" msgstr "" +msgctxt "#20001" +msgid "eng" +msgstr "" + msgctxt "#30001" msgid "Check for updates:" msgstr "" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index ccf02711..65efc50a 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -21,6 +21,10 @@ msgctxt "#20000" msgid "KOD" msgstr "KOD" +msgctxt "#20001" +msgid "eng" +msgstr "ita" + msgctxt "#30001" msgid "Check for updates:" msgstr "Verifica aggiornamenti:" diff --git a/resources/settings.xml b/resources/settings.xml index d5bf0175..89b0e9cb 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -106,7 +106,7 @@ -