From a5ce165bda3a2f26bd7a2b348c340bb7f69d1630 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 14 Aug 2020 10:19:21 +0200 Subject: [PATCH] casacinema cambio dominio, popcornstream eliminato (chiuso) e fix altadefinizione01 --- channels.json | 2 +- channels/altadefinizione01.py | 7 ++----- channels/filmpertutti.py | 1 - channels/serietvonline.py | 5 +---- channels/serietvsubita.py | 7 +++---- channels/streamingaltadefinizione.json | 2 +- channels/streamingaltadefinizione.py | 3 --- tests/test_generic.py | 2 +- 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/channels.json b/channels.json index e677f9ee..5bc41217 100644 --- a/channels.json +++ b/channels.json @@ -12,7 +12,7 @@ "animeunity": "https://www.animeunity.it", "animeuniverse" : "https://www.animeuniverse.it/", "animeworld": "https://www.animeworld.tv", - "casacinema": "https://www.casacinema.rest", + "casacinema": "https://www.casacinema.page", "cb01anime": "https://www.cineblog01.red", "cinemalibero": "https://cinemalibero.plus", "cinetecadibologna": "http://cinestore.cinetecadibologna.it", diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index 43faedb5..f1b272b0 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -52,10 +52,7 @@ def peliculas(item): ## deflang = 'ITA' action="findvideos" - patron = r'

..*?<.*?src="(?P[^"]+)"'\ - '.+?[^>]+>[^>]+
(?P[A-Z/]+)<[^>]+>(?:.[^>]+>(?P.*?)<[^>]+>).*?'\ - '

(?P.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> '\ - '[^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>.*?<p>(?P<plot>[^<]+)<' + patron = r'<div class="cover boxcaption"> <h2>\s*<a href="(?P<url>[^"]+)">(?P<title>[^<]+).*?src="(?P<thumb>[^"]+).*?<div class="trdublaj">(?P<quality>[^<]+).*?<span class="ml-label">(?P<year>[0-9]+).*?<span class="ml-label">(?P<duration>[^<]+).*?<p>(?P<plot>[^<]+)' if item.args == "search": patronBlock = r'</script> <div class="boxgrid caption">(?P<block>.*)<div id="right_bar">' @@ -67,7 +64,7 @@ def peliculas(item): patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">' patronNext = '<span>\d</span> <a href="([^"]+)">' -## debug = True + # debug = True return locals() @support.scrape diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index d3ed0b54..5a67ad8f 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -18,7 +18,6 @@ host = config.get_channel_url(findhost) headers = [['Referer', host]] - @support.menu def mainlist(item): diff --git a/channels/serietvonline.py b/channels/serietvonline.py index c4c7a5c8..5c6ac43d 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -29,9 +29,6 @@ host = config.get_channel_url(findhost) headers = [['Referer', host]] - - - @support.menu def mainlist(item): support.log() @@ -76,7 +73,7 @@ def peliculas(item): elif item.contentType == 'tvshow': # SEZIONE Serie TV- Anime - Documentari - # pagination = 35 + pagination = 35 if not item.args and 'anime' not in item.url: patron = r'<div class="movie">[^>]+>.+?src="(?P<thumb>[^"]+)" alt="[^"]+".+?href="(?P<url>[^"]+)">[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[ ](?P<rating>\d+.\d+|\d+)<[^>]+>[^>]+><h2>(?P<title>[^"]+)</h2>[ ]?(?:<span class="year">(?P<year>\d+|\-\d+))?<' diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index d55adfce..a052df09 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -19,7 +19,6 @@ IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() - @support.menu def mainlist(item): log() @@ -100,8 +99,8 @@ def lista_serie(item): item.url, p = item.url.split('{}') p = int(p) - if '||' in item.url: - series = item.url.split('\n\n') + if '||' in item.data: + series = item.data.split('\n\n') matches = [] for i, serie in enumerate(series): matches.append(serie.split('||')) @@ -338,7 +337,7 @@ def list_az(item): for letter in sorted(alphabet): itemlist.append( item.clone(action="lista_serie", - url='\n\n'.join(alphabet[letter]), + data='\n\n'.join(alphabet[letter]), title=letter, fulltitle=letter)) diff --git a/channels/streamingaltadefinizione.json b/channels/streamingaltadefinizione.json index 9cb5d12f..404c2ddb 100644 --- a/channels/streamingaltadefinizione.json +++ b/channels/streamingaltadefinizione.json @@ -2,7 +2,7 @@ "id": "streamingaltadefinizione", "name": "Popcorn Stream", "language": ["ita"], - "active": true, + "active": false, "thumbnail": "popcornstream.png", "banner": "popcornstream.png", "categories": ["movie","tvshow","anime"], diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index 1eb9473d..78bca72c 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -13,9 +13,6 @@ else: from urllib import unquote - - - def findhost(): data = httptools.downloadpage('https://www.popcornstream-nuovo-indirizzo.online/').data return support.scrapertools.find_single_match(data, '<a href="([^"]+)') diff --git a/tests/test_generic.py b/tests/test_generic.py index f88d43ef..012d5d62 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -224,7 +224,7 @@ class GenericChannelMenuItemTest(unittest.TestCase): break for resIt in self.itemlist: - print resIt.title + ' -> ' + resIt.url + logger.info(resIt.title + ' -> ' + resIt.url) self.assertLess(len(resIt.fulltitle), 110, 'channel ' + self.ch + ' -> ' + self.title + ' might contain wrong titles<br>' + resIt.fulltitle) if resIt.url: