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

Merge branch 'master' of github.com:kodiondemand/addon

Browse Source 
* 'master' of github.com:kodiondemand/addon:
  Fix VVVVID
  ops
  Thumb e Banner per: Popcorn Stream Tanti Film Serie TV Online
  ripristino vecchio metodo per identificare la versione
  Fix per Ricerca e Novità per Sub-ITA con selezione auto o ita in impostazioni
This commit is contained in:
greko17
2019-11-04 23:51:32 +01:00
parent 080ae3187d d2af1a86da
commit 81bc172569
8 changed files with 26 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/serietvonline.json
View File

@@ -4,8 +4,8 @@
"active": true,
"adult": false,
"language": ["ita"],
"thumbnail": "https:\/\/serietvonline.com\/wp-content\/uploads\/2016\/08\/logo2016-1.png",
"bannermenu": "https:\/\/serietvonline.com\/wp-content\/uploads\/2016\/08\/logo2016-1.png",
"thumbnail": "serietvonline.png",
"bannermenu": "serietvonline.png",
"categories": ["anime","tvshow","movie","documentary"],
"not_active": ["include_in_newest_anime"],
"settings": []

4
channels/streamingaltadefinizione.json
View File

@@ -4,8 +4,8 @@
"language": ["ita"],
"active": true,
"adult": false,
"thumbnail": "https://www.popcornstream.best/wp-content/uploads/2019/09/PopLogo40.png",
"banner": "https://www.popcornstream.info/media/PopcornStream820x428.png",
"thumbnail": "popcornstream.png",
"banner": "popcornstream.png",
"categories": ["movie","tvshow","anime"],
"settings": []
}

77
channels/tantifilm.json
View File

@@ -4,76 +4,9 @@
"language": ["ita"],
"active": true,
"adult": false,
"thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/tantifilm.png",
"banner": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/tantifilm.png",
"categories": ["tvshow", "movie", "anime"],
"settings": [
{
"id": "include_in_global_search",
"type": "bool",
"label": "Includi in ricerca globale",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_peliculas",
"type": "bool",
"label": "Includi in Novità - Film",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "include_in_newest_italiano",
"type": "bool",
"label": "Includi in Novità - Italiano",
"default": true,
"enabled": true,
"visible": true
},
{
"id": "checklinks",
"type": "bool",
"label": "Verifica se i link esistono",
"default": false,
"enabled": true,
"visible": true
},
{
"id": "checklinks_number",
"type": "list",
"label": "Numero di link da verificare",
"default": 1,
"enabled": true,
"visible": "eq(-1,true)",
"lvalues": [ "5", "10", "15", "20" ]
},
{
"id": "filter_languages",
"type": "list",
"label": "Mostra link in lingua...",
"default": 0,
"enabled": true,
"visible": true,
"lvalues": ["Non filtrare","IT"]
},
{
"id": "autorenumber",
"type": "bool",
"label": "@70712",
"default": false,
"enabled": true,
"visible": true
},
{
"id": "autorenumber_mode",
"type": "bool",
"label": "@70688",
"default": false,
"enabled": true,
"visible": "eq(-1,true)"
}
]
"thumbnail": "tantifilm.png",
"banner": "tantifilm.png",
"categories": ["tvshow", "movie", "anime"],
"not_active":["include_in_newest_anime"],
"settings": []
}

18
channels/vvvvid.py
View File

@@ -137,12 +137,12 @@ def episodios(item):
episodes.append(episode['episodes'])
for episode in episodes:
for key in episode:
if 'stagione' in key['title'].lower():
match = support.match(key['title'].encode('ascii', 'replace'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0]
if 'stagione' in key['title'].encode('utf8').lower():
match = support.match(key['title'].encode('utf8'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0]
title = match[0]+'x'+match[1] + ' - ' + item.fulltitle
make_item = True
elif int(key['season_id']) == int(season_id):
title = 'Episodio ' + key['number'] + ' - ' + key['title'].encode('ascii', 'replace'),
title = 'Episodio ' + key['number'] + ' - ' + key['title'].encode('utf8'),
make_item = True
else:
make_item = False
@@ -193,21 +193,21 @@ def make_itemlist(itemlist, item, data):
search = item.search if item.search else ''
infoLabels = {}
for key in data['data']:
if search.lower() in key['title'].lower():
if search.lower() in key['title'].encode('utf8').lower():
infoLabels['year'] = key['date_published']
infoLabels['title'] = infoLabels['tvshowtitle'] = key['title']
support.log(infoLabels)
title = key['title'].encode('utf8')
itemlist.append(
Item(
channel = item.channel,
title = support.typo(key['title'], 'bold'),
fulltitle= key['title'],
show= key['title'],
title = support.typo(title, 'bold'),
fulltitle= title,
show= title,
url= host + str(key['show_id']) + '/seasons/',
action= 'findvideos' if item.contentType == 'movie' else 'episodios',
contentType = item.contentType,
contentSerieName= key['title'] if item.contentType != 'movie' else '',
contentTitle= key['title'] if item.contentType == 'movie' else '',
contentTitle= title if item.contentType == 'movie' else '',
infoLabels=infoLabels
))
return itemlist

9
platformcode/config.py
View File

@@ -20,15 +20,12 @@ def get_addon_core():
def get_addon_version(with_fix=True):
'''
Trova la versione dell'addon, senza usare le funzioni di kodi perchè non si aggiornano fino al riavvio
Devuelve el número de versión del addon, y opcionalmente número de fix si lo hay
'''
info = open(os.path.join(get_runtime_path(), 'addon.xml')).read()
ver = re.search('plugin.video.kod.*?version="([^"]+)"', info).group(1)
if with_fix:
return ver + " " + get_addon_version_fix()
return __settings__.getAddonInfo('version') + " " + get_addon_version_fix()
else:
return ver
return __settings__.getAddonInfo('version')
def get_addon_version_fix():

4
specials/news.py
View File

@@ -149,7 +149,7 @@ def get_channels_list():
continue
# No incluir si el canal es en un idioma filtrado
if channel_language != "all" and channel_language not in channel_parameters["language"] \
if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
and "*" not in channel_parameters["language"]:
continue
@@ -624,7 +624,7 @@ def setting_channel(item):
continue
# No incluir si el canal es en un idioma filtrado
if channel_language != "all" and channel_language not in channel_parameters["language"] \
if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
and "*" not in channel_parameters["language"]:
continue

4
specials/search.py
View File

@@ -256,7 +256,7 @@ def setting_channel_old(item):
continue
# No incluir si el canal es en un idioma filtrado
if channel_language != "all" and channel_language not in channel_parameters["language"] \
if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
and "*" not in channel_parameters["language"]:
continue
@@ -524,7 +524,7 @@ def do_search(item, categories=None):
continue
# No busca si el canal es en un idioma filtrado
if channel_language != "all" and channel_language not in channel_parameters["language"] \
if channel_language != "all" and channel_language not in str(channel_parameters["language"]) \
and "*" not in channel_parameters["language"]:
logger.info("%s -idioma no válido-" % basename_without_extension)
continue

2
specials/searchall.py
View File

@@ -705,7 +705,7 @@ def do_channels_search(item):
continue
# No busca si el canal es en un idioma filtrado
if channel_language != "all" and channel_parameters["language"] != channel_language:
if channel_language != "all" and channel_language not in str(channel_parameters["language"]):
continue
# No busca si es un canal excluido de la busqueda global