From 87ca7f83c21da75dd03b1ffdb8ae8b1ecbe31236 Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Sat, 7 Aug 2021 17:32:12 +0200 Subject: [PATCH] Fix vidmoly, aniplay(A-Z), rimossi serieHD e DSDA, rimosso player premium altacommunity --- channels/altadefinizionecommunity.py | 6 +++--- channels/aniplay.py | 13 ++++++------- channels/dsda.json | 2 +- channels/seriehd.json | 2 +- channels/tantifilm.py | 2 +- servers/vidmoly.py | 2 +- tests/test_generic.py | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/channels/altadefinizionecommunity.py b/channels/altadefinizionecommunity.py index f1ed990d..a2fd9cf1 100644 --- a/channels/altadefinizionecommunity.py +++ b/channels/altadefinizionecommunity.py @@ -203,9 +203,9 @@ def findvideos(item): return episodios(item) item.contentType = 'movie' itemlist.append(item.clone(action='play', url=support.match(video_url.replace('/watch-unsubscribed', '/watch-external'), - patron='src="([^"]+)').match, quality='')) - itemlist.append(item.clone(action='play', server='directo', title=support.config.get_localized_string(30137), - url=video_url.replace('/watch-unsubscribed', '/watch'))) + patron='allowfullscreen[^<]+src="([^"]+)"').match, quality='')) + # itemlist.append(item.clone(action='play', server='directo', title=support.config.get_localized_string(30137), + # url=video_url.replace('/watch-unsubscribed', '/watch'))) return support.server(item, itemlist=itemlist) diff --git a/channels/aniplay.py b/channels/aniplay.py index 8d522504..dd43e9dc 100644 --- a/channels/aniplay.py +++ b/channels/aniplay.py @@ -26,13 +26,12 @@ def mainlist(item): def submenu_az(item): itemlist = [] - if item.args == 'az': - for letter in ['0-9'] + list('ABCDEFGHIJKLMNOPQRSTUVWXYZ'): - itemlist.append(item.clone(title = support.typo(letter, 'bold'), - url= host + '/api/anime/find-by-char', - action= 'peliculas', - variable= '&character=' + letter, - thumbnail=support.thumb('az'))) + for letter in ['0-9'] + list('ABCDEFGHIJKLMNOPQRSTUVWXYZ'): + itemlist.append(item.clone(title = support.typo(letter, 'bold'), + url= host + '/api/anime/find-by-char', + action= 'peliculas', + variable= '&character=' + letter, + thumbnail=support.thumb('az'))) return itemlist def submenu_year(item): diff --git a/channels/dsda.json b/channels/dsda.json index 4ec18a80..9ae3060f 100644 --- a/channels/dsda.json +++ b/channels/dsda.json @@ -2,7 +2,7 @@ "id": "dsda", "name": "D.S.D.A", "language": ["ita"], - "active": true, + "active": false, "thumbnail": "dsda.png", "banner": "dsda.png", "categories": ["documentary"], diff --git a/channels/seriehd.json b/channels/seriehd.json index eda29eb2..9c7ade33 100644 --- a/channels/seriehd.json +++ b/channels/seriehd.json @@ -1,7 +1,7 @@ { "id": "seriehd", "name": "SerieHD", - "active": true, + "active": false, "language": ["ita"], "thumbnail": "seriehd.png", "banner": "seriehd.png", diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 70b531ad..f39abca1 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -133,7 +133,7 @@ def search(item, texto): @support.scrape def newest(categoria): if categoria == 'series': - item = Item(url=host + '/aggiornamenti-giornalieri-serie-tv') + item = Item(url=host + '/aggiornamenti-serie-tv') data = support.match(item).data.replace('','').replace('','') item.contentType = 'episode' patronBlock = r'Aggiornamenti Giornalieri Serie TV.*?
(?P.*?)
' diff --git a/servers/vidmoly.py b/servers/vidmoly.py index 14d775a3..29b12330 100644 --- a/servers/vidmoly.py +++ b/servers/vidmoly.py @@ -20,6 +20,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= video_urls = support.get_jwplayer_mediaurl(data, 'Vidmoly') for url in video_urls: logger.debug(url) - url[-1] = url[-1].replace(',','').replace('.urlset','').replace('/hls','') + url[-1] = url[-1].replace(',','').replace('.urlset','').replace('/hls','') + '|Referer=' + page_url return video_urls diff --git a/tests/test_generic.py b/tests/test_generic.py index e89b677e..6d02caf4 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -76,7 +76,7 @@ chNumRis = { }, 'altadefinizioneclick': { 'Film': 36, - 'Serie TV': 12, + 'Serie TV': 36, }, 'casacinema': { 'Film': 10,