diff --git a/channelselector.py b/channelselector.py index f9efbd89..2786c419 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() + channel_language = auto_filter()[0] 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 = auto_filter() + channel_language, channel_language_list = auto_filter() logger.info("channel_language=%s" % channel_language) for channel_path in channel_files: @@ -192,8 +192,16 @@ def filterchannels(category, view="thumb_"): # Se muestran todos los canales si se elige "all" en el filtrado de idioma # Se muestran sólo los idiomas filtrados, cast o lat # Los canales de adultos se mostrarán siempre que estén activos - if channel_language != "all" and channel_language not in channel_parameters["language"] \ - and "*" not in channel_parameters["language"]: + + for c 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!!!!') continue # Se salta el canal si está en una categoria filtrado @@ -283,12 +291,13 @@ def set_channel_info(parameters): content = '' langs = parameters['language'] lang_dict = {'ita':'Italiano', - '*':'Italiano, VOSI, VO'} + 'vosi':'Sottotitolato in Italiano', + '*':'Italiano, Sottotitolato in Italiano'} for lang in langs: - if 'vos' in parameters['categories']: - lang = '*' - if 'vosi' in parameters['categories']: - lang = 'ita' + # if 'vos' in parameters['categories']: + # lang = '*' + # if 'vosi' in parameters['categories']: + # lang = 'ita' if lang in lang_dict: if language != '' and language != '*' and not parameters['adult']: @@ -316,18 +325,20 @@ def auto_filter(auto_lang=False): addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') lang = 'all' + lang_list = ['all'] - lang_dict = {'ita':'it'} + lang_dict = {'it':'ita'} + lang_list_dict = {'it':['ita','vosi']} if config.get_setting("channel_language") == 'auto' or auto_lang == True: - for langs, variant in lang_dict.items(): - if def_lang in variant: - lang = langs + 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 + return lang, lang_list def thumb(itemlist=[], genre=False): diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 65188d2c..8d95b45b 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -587,7 +587,6 @@ def set_context_commands(item, parent_item): if (item.channel != "videolibrary" and not config.get_localized_string(70585) in str(item.context)) \ or (item.channel != "videolibrary" and config.get_localized_string(70585) in str(item.context) and config.get_localized_string(70714) in str(item.context)): # Añadir Serie a la videoteca - logger.info('context= '+ str(item.context)) if item.action in ["episodios", "get_episodios"] and item.contentSerieName: context_commands.append((config.get_localized_string(60352), "XBMC.RunPlugin(%s?%s)" % (sys.argv[0], item.clone(action="add_serie_to_library", diff --git a/platformcode/unify.py b/platformcode/unify.py index b93c1e84..c06f6eb1 100644 --- a/platformcode/unify.py +++ b/platformcode/unify.py @@ -255,7 +255,7 @@ def set_lang(language): 'sub: español', 'vs', 'zs', 'vs', 'english-spanish subs', 'ingles sub espanol'] vosi=['sottotitolato','sottotitolata','sub','sub ita','vosi','sub-ita','subs italiano', 'sub: italiano', 'inglese sottotitolato'] - vos=['vos', 'sub ingles', 'engsub', 'vosi','ingles subtitulado', 'sub: ingles'] + vos=['vos', 'sub ingles', 'engsub','ingles subtitulado', 'sub: ingles'] vo=['ingles', 'en','vo', 'ovos', 'eng','v.o', 'english'] dual=['dual'] @@ -271,7 +271,9 @@ def set_lang(language): elif language in lat: language = 'lat' elif language in ita: - language = 'ita' + language = 'ita' + elif language in vosi: + language = 'vosi' elif language in vose: language = 'vose' elif language in vos: @@ -280,8 +282,6 @@ def set_lang(language): language = 'vo' elif language in dual: language = 'dual' - elif language in dual: - language = 'vosi' else: language = 'otro'