diff --git a/channels/altadefinizionecommunity.py b/channels/altadefinizionecommunity.py index c8e847ee..cb2cf80a 100644 --- a/channels/altadefinizionecommunity.py +++ b/channels/altadefinizionecommunity.py @@ -36,7 +36,6 @@ def mainlist(item): ('Qualità', ['/film/movie', 'genres', 'quality']), ('Anni', ['/anno', 'genres', 'years']) ] - search = '' return locals() @@ -151,7 +150,7 @@ def peliculas(item): json = support.httptools.downloadpage(item.url, headers=headers, cloudscraper=True).json data = "\n".join(json['data']) - patron = r'wrapFilm">\s*\s*(?P[0-9]{4})\s*]+>[^<]+\s*(?P[^<]+).*?]+>.*?

(?P[^<[]+)(?:\[(?P<lang>[sSuUbBiItTaA-]+))?' + patron = r'wrapFilm">\s*<a href="(?P<url>[^"]+)">\s*<span class="year">(?P<year>[0-9]{4})</span>\s*(?:<span[^>]+>[^<]+</span>)?\s*<span class="qual">(?P<quality>[^<]+).*?<img src="(?P<thumbnail>[^"]+)[^>]+>.*?<h3>(?P<title>[^<[]+)(?:\[(?P<lang>[sSuUbBiItTaA-]+))?' # paginazione if json.get('have_next'): def fullItemlistHook(itemlist): @@ -168,7 +167,7 @@ def search(item, texto): logger.debug("search ", texto) item.args = 'search' - item.url = host + "/search?s={}&page=1".format(texto) + item.url = host + "/search?s={}&f={}&page=1".format(texto, item.contentType) try: return peliculas(item) # Continua la ricerca in caso di errore diff --git a/servers/deltabit.py b/servers/deltabit.py index 859c777c..8b511405 100644 --- a/servers/deltabit.py +++ b/servers/deltabit.py @@ -24,8 +24,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= global data, real_url post = {k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")} time.sleep(2.5) - data = httptools.downloadpage(real_url, post=post).data - - # videos_packed = scrapertools.find_single_match(data, r"<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>") - # video_unpacked = jsunpack.unpack(videos_packed) - return support.get_jwplayer_mediaurl(data, 'DeltaBit', True) + link = support.match(real_url, post=post, patron='sources:\s*\["([^"]+)').match + return [[".mp4" + " [deltabit]", link]]