Merge remote-tracking branch 'origin/master'

core/channeltools.py

@@ -178,18 +178,27 @@ def get_default_settings(channel_name):
         return get_channel_json(channel_name).get('settings', list())
 
     list_language = [config.get_localized_string(70522)]
-    sub = False
+    if hasattr(channel, 'list_language'):
-    langs = []
+        for language in channel.list_language:
-    language = get_channel_json(channel_name).get('language', list())
+            list_language.append(language)
-    for lang in language:
+        logger.info(list_language)
-        if 'vos' not in lang:
+    else:
-            langs.append(lang.upper())
+        sub = False
+        langs = []
+        language = get_channel_json(channel_name).get('language', list())
+        for lang in language:
+            if 'vos' not in lang:
+                langs.append(lang.upper())
+            else:
+                sub = True
+        if sub == True:
+            for lang in langs:
+                list_language.append(lang)
+                list_language.append('Sub-' + lang)
         else:
-            sub = True
+            for lang in langs:
-    if sub == True:
+                list_language.append(lang)
-        for lang in langs:
+
-            list_language.append(lang)
-            list_language.append('Sub-' + lang)
 
     # Check if the automatic renumbering function exists
     renumber = False
@@ -200,6 +209,7 @@ def get_default_settings(channel_name):
             renumber = True
 
     #  Collects configurations
+    channel_language = categories = get_channel_json(channel_name).get('language', list())
     channel_controls = get_channel_json(channel_name).get('settings', list())
     default_path = filetools.join(config.get_runtime_path(), 'default_channel_settings' + '.json')
     default_controls = jsontools.load(filetools.read(default_path)).get('settings', list())
@@ -233,7 +243,7 @@ def get_default_settings(channel_name):
                     channel_controls.append(control)
 
             elif control['id'] == 'filter_languages':
-                if len(list_language) > 1:
+                if len(channel_language) > 1:
                     control['lvalues'] = list_language
                     channel_controls.append(control)
                 else: pass

core/support.py

@@ -402,19 +402,7 @@ def scrape(func):
         if 'fullItemlistHook' in args:
             itemlist = args['fullItemlistHook'](itemlist)
 
-        filterLang = False
+        itemlist = filterLang(item, itemlist)
-        for item in itemlist:
-            if item.contentLanguage:
-                filterLang = True
-                break
-        if item.channel:
-            import channeltools
-            list_language = channeltools.get_channel_json(item.channel).get('language', list())
-            log('Lista Lingue = ', list_language)
-            if len(list_language) > 1 and filterLang:
-                log('Lista Lingue = ', list_language)
-                from specials import filtertools
-                itemlist = filtertools.get_links(itemlist, item, list_language)
 
         return itemlist
 
@@ -920,8 +908,15 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True):
 
     if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3)
     if get_setting('downloadenabled'): download(itemlist, item, function_level=3)
+    filterLang(item, itemlist)
     return itemlist
 
+def filterLang(item, itemlist):
+    import channeltools
+    list_language = channeltools.get_channel_json(item.channel).get('language', list())
+    from specials import filtertools
+    itemlist = filtertools.get_links(itemlist, item, list_language)
+    return itemlist
 
 def aplay(item, itemlist, list_servers='', list_quality=''):
     if inspect.stack()[1][3] == 'mainlist':