diff --git a/channels/serietvonline.json b/channels/serietvonline.json index 833b8edc..700fe885 100644 --- a/channels/serietvonline.json +++ b/channels/serietvonline.json @@ -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": [] diff --git a/channels/streamingaltadefinizione.json b/channels/streamingaltadefinizione.json index 2fbcfdb5..c028f749 100644 --- a/channels/streamingaltadefinizione.json +++ b/channels/streamingaltadefinizione.json @@ -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": [] } diff --git a/channels/tantifilm.json b/channels/tantifilm.json index a869f0de..e50875c3 100644 --- a/channels/tantifilm.json +++ b/channels/tantifilm.json @@ -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": [] } diff --git a/channels/vvvvid.py b/channels/vvvvid.py index 983fa91d..9269cf2e 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -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 \ No newline at end of file diff --git a/platformcode/config.py b/platformcode/config.py index 1a752590..ba6813fc 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -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(): diff --git a/specials/news.py b/specials/news.py index 38ecb05c..f1274853 100644 --- a/specials/news.py +++ b/specials/news.py @@ -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 diff --git a/specials/search.py b/specials/search.py index a4f19373..196614f4 100644 --- a/specials/search.py +++ b/specials/search.py @@ -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 diff --git a/specials/searchall.py b/specials/searchall.py index de795570..fa3db25f 100644 --- a/specials/searchall.py +++ b/specials/searchall.py @@ -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