stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Migliorie ad auto_filter, vosi -> sub-ita

Browse Source 
--- RIAVVIARE AD AGGIORNAMENTO TERMINATO! ---
This commit is contained in:
Alhaziel
2019-10-19 10:01:07 +02:00
parent 40531e074c
commit ead0fefd01
25 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/test-canale.md vendored
View File

@@ -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

2
channels/0example.json
View File

@@ -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": "",

2
channels/altadefinizione01.json
View File

@@ -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",

2
channels/altadefinizione01_link.json
View File

@@ -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"],

2
channels/altadefinizioneclick.json
View File

@@ -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"],

2
channels/animeleggendari.json
View File

@@ -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"],

4
channels/animesubita.json
View File

@@ -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": []
}

2
channels/animeworld.json
View File

@@ -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"],

2
channels/casacinema.json
View File

@@ -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",

2
channels/casacinemaInfo.json
View File

@@ -1,7 +1,7 @@
{
"id": "casacinemaInfo",
"name": "La Casa del Cinema",
"language": ["ita", "vosi"],
"language": ["ita", "sub-ita"],
"active": true,
"adult": false,
"thumbnail": "",

2
channels/cb01anime.json
View File

@@ -1,7 +1,7 @@
{
"id": "cb01anime",
"name": "Cb01anime",
"language": ["ita", "vos", "vosi"],
"language": ["ita", "vos", "sub-ita"],
"active": true,
"adult": false,
"thumbnail": "cb01anime.png",

4
channels/cineblog01.json
View File

@@ -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": []
}

2
channels/dreamsub.json
View File

@@ -1,7 +1,7 @@
{
"id": "dreamsub",
"name": "DreamSub",
"language": ["ita", "vosi"],
"language": ["ita", "sub-ita"],
"active": true,
"adult": false,
"thumbnail": "dreamsub.png",

2
channels/fastsubita.json
View File

@@ -1,7 +1,7 @@
{
"id": "fastsubita",
"name": "Fastsubita",
"language": ["vosi"],
"language": ["sub-ita"],
"active": true,
"adult": false,
"thumbnail": "fastsubita.png",

2
channels/italiaserie.json
View File

@@ -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"],

2
channels/mondolunatico2.json
View File

@@ -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",

2
channels/toonitalia.json
View File

@@ -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",

58
channelselector.py
View File

@@ -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):

2
platformcode/config.py
View File

@@ -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

6
platformcode/unify.py
View File

@@ -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:

4
resources/language/English/strings.po
View File

@@ -21,6 +21,10 @@ msgctxt "#20000"
msgid "KOD"
msgstr ""
msgctxt "#20001"
msgid "eng"
msgstr ""
msgctxt "#30001"
msgid "Check for updates:"
msgstr ""

4
resources/language/Italian/strings.po
View File

@@ -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:"

2
resources/settings.xml
View File

@@ -106,7 +106,7 @@
<setting id="vose_color" type="labelenum" label="70142"
values="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
default="white" visible="eq(-10,true)+eq(-11,true)"/>
<setting id="vosi_color" type="labelenum" label="70566"
<setting id="sub-ita_color" type="labelenum" label="70566"
values="[COLOR white]white[/COLOR]|[COLOR cyan]cyan[/COLOR]|[COLOR deepskyblue]deepskyblue[/COLOR]|[COLOR firebrick]firebrick[/COLOR]|[COLOR gold]gold[/COLOR]|[COLOR goldenrod]goldenrod[/COLOR]|[COLOR hotpink]hotpink[/COLOR]|[COLOR limegreen]limegreen[/COLOR]|[COLOR orange]orange[/COLOR]|[COLOR orchid]orchid[/COLOR]|[COLOR red]red[/COLOR]|[COLOR salmon]salmon[/COLOR]|[COLOR yellow]yellow[/COLOR]"
default="white" visible="eq(-11,true)+eq(-12,true)"/>
<setting id="vos_color" type="labelenum" label="70143"

6
specials/news.py
View File

@@ -46,7 +46,7 @@ def mainlist(item):
list_canales, any_active = get_channels_list()
channel_language = config.get_setting("channel_language", default="auto")
if channel_language == 'auto':
channel_language = auto_filter()[0]
channel_language = auto_filter()
#if list_canales['peliculas']:
thumbnail = get_thumb("channels_movie.png")
@@ -134,7 +134,7 @@ def get_channels_list():
channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json')
channel_language = config.get_setting("channel_language", default="all")
if channel_language =="auto":
channel_language = auto_filter()[0]
channel_language = auto_filter()
for infile in sorted(glob.glob(channels_path)):
channel_id = os.path.basename(infile)[:-5]
@@ -607,7 +607,7 @@ def setting_channel(item):
channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json')
channel_language = config.get_setting("channel_language", default="auto")
if channel_language == 'auto':
channel_language = auto_filter()[0]
channel_language = auto_filter()
list_controls = []

2
specials/search.py
View File

@@ -475,7 +475,7 @@ def do_search(item, categories=None):
logger.info("channels_path=%s" % channels_path)
# 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)
# Para Kodi es necesario esperar antes de cargar el progreso, de lo contrario