From 09631d585fc358c3ccc2c9c90cf86842fffdec6f Mon Sep 17 00:00:00 2001 From: greko17 Date: Tue, 5 Nov 2019 23:24:26 +0100 Subject: [PATCH 1/5] fix: servers/decrypters/zcrypt.py per i link vcript verso verystream --- servers/decrypters/zcrypt.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index ad520aa8..a1f0e408 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -47,8 +47,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data, status = unshortenit.unshorten(url) logger.info("Data - Status zcrypt xshield.net: [%s] [%s] " %(data, status)) elif 'vcrypt.net' in url: - if 'myfoldersakstream.php' in url: - continue #'very' in url or + if 'myfoldersakstream.php' in url or '/verys/' in url: continue else: from lib import unshortenit data, status = unshortenit.unshorten(url) From e5b6c0a7903e05a7d27ccc28b9351bee1a5bc875 Mon Sep 17 00:00:00 2001 From: greko17 Date: Tue, 5 Nov 2019 23:34:36 +0100 Subject: [PATCH 2/5] fix: servers/decrypters/zcrypt.py per i link rapidcript verso verystream --- servers/decrypters/zcrypt.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index a1f0e408..5372ea4a 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -47,7 +47,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data, status = unshortenit.unshorten(url) logger.info("Data - Status zcrypt xshield.net: [%s] [%s] " %(data, status)) elif 'vcrypt.net' in url: - if 'myfoldersakstream.php' in url or '/verys/' in url: continue + if 'myfoldersakstream.php' in url or '/verys/' in url: + continue else: from lib import unshortenit data, status = unshortenit.unshorten(url) @@ -88,7 +89,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for url in matches: if url not in encontrados: - if 'https://rapidcrypt.net/open/' in url: + if 'https://rapidcrypt.net/open/' in url or 'https://rapidcrypt.net/verys/' in url: continue logger.info(" url=" + url) encontrados.add(url) From 03eb2a0e9f0c1d4b8fa590d580b61e7f497679c6 Mon Sep 17 00:00:00 2001 From: greko17 Date: Wed, 6 Nov 2019 10:36:46 +0100 Subject: [PATCH 3/5] fix: channels/serietvonline.py --- channels/serietvonline.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/serietvonline.py b/channels/serietvonline.py index c92fbe3b..293f57c4 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -46,7 +46,7 @@ def mainlist(item): ('Aggiornamenti', ['/ultimi-episodi-aggiunti/', 'peliculas', 'update']), ('Tutte', ['/lista-serie-tv/', 'peliculas', 'qualcosa']), ('Italiane', ['/lista-serie-tv-italiane/', 'peliculas', 'qualcosa']), - ('Anni 50-60-70-80-90', ['/lista-serie-tv-anni-60-70-80/', 'peliculas', 'qualcosa']), + ('Anni 50-60-70-80', ['/lista-serie-tv-anni-60-70-80/', 'peliculas', 'qualcosa']), ('HD', ['/lista-serie-tv-in-altadefinizione/', 'peliculas', 'qualcosa']) ] @@ -63,7 +63,7 @@ def peliculas(item): support.log() #findhost() - blacklist = ['DMCA', 'Contatti', 'Attenzione NON FARTI OSCURARE', 'Lista Ccartoni Animati e Anime'] + blacklist = ['DMCA', 'Contatti', 'Attenzione NON FARTI OSCURARE', 'Lista Cartoni Animati e Anime'] patronBlock = r'

.+?

(?P.*?)
' patronNext = r'
' @@ -111,7 +111,7 @@ def peliculas(item): else: #patronBlock = r'

Ultimi film aggiunti

(?P.*?)
' - patron = r'(?:  )?[ ]?(?P.*?)[ ]?(?:HD)?[ ]?(?P<year>\d+)?(?: | HD | Streaming | MD(?: iSTANCE)? )?</a>' + patron = r'<tr><td><a href="(?P<url>[^"]+)"(?:|.+?)?>(?:  )?[ ]?(?P<title>.*?)[ ]?(?P<quality>HD)?[ ]?(?P<year>\d+)?(?: | HD | Streaming | MD(?: iSTANCE)? )?</a>' def itemHook(item): if 'film' in item.url: From d8d2bb7111dd41d440192c03dfd85ecea58420b1 Mon Sep 17 00:00:00 2001 From: greko17 <sex1712@email.it> Date: Wed, 6 Nov 2019 15:25:42 +0100 Subject: [PATCH 4/5] fix /servers/wstream.py toppa...fino a domani! --- servers/wstream.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/servers/wstream.py b/servers/wstream.py index 3b808c8d..68ba13ad 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -51,8 +51,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= return video_urls else: - page_urls = scrapertools.find_multiple_matches(data, '''<a href=(?:"|')([^"']+)(?:"|')''') + page_urls = scrapertools.find_multiple_matches(data, '''<input type='hidden' id='videox' name='videox' value='([^']+)'>''') for page_url in page_urls: + page_url = 'https://wstream.video/video5rqlew27k/'+page_url if '404 Not Found' not in httptools.downloadpage(page_url, headers=headers).data.replace('https', 'http'): return get_video_url(page_url) @@ -77,4 +78,4 @@ def find_videos(data): else: logger.info(" url duplicada=" + url) - return devuelve \ No newline at end of file + return devuelve From 2835da67e5700e5bd04df26d4d5391228e3c286b Mon Sep 17 00:00:00 2001 From: greko17 <sex1712@email.it> Date: Wed, 6 Nov 2019 16:35:33 +0100 Subject: [PATCH 5/5] fix: serietvonline.py --- channels/serietvonline.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/channels/serietvonline.py b/channels/serietvonline.py index 293f57c4..647b804a 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -3,15 +3,17 @@ # Canale per serietvonline.py # ---------------------------------------------------------- """ - Novità. Indicare in quale/i sezione/i è presente il canale: - film, serie Avvisi: - Al massimo 25 titoli per le sezioni: Film - Al massimo 35 titoli per le sezioni: Tutte le altre - - + Per aggiungere in videoteca le Anime: + Se hanno la forma 1x01: + -si posso aggiungere direttamente dalla pagina della serie, sulla voce in fondo "aggiungi in videoteca". + Altrimenti: + - Prima fare la 'Rinumerazione' dal menu contestuale dal titolo della serie """ import re from core import support, httptools, scrapertoolsV2 @@ -67,31 +69,14 @@ def peliculas(item): patronBlock = r'<h1>.+?</h1>(?P<block>.*?)<div class="footer_c">' patronNext = r'<div class="siguiente"><a href="([^"]+)" >' -## if 'film' in item.url: -## contentType = 'movie' -## action = 'findvideos' -## else: -## contentType = 'tvshow' -## action = 'episodios' - if item.args == 'search': patronBlock = r'>Lista Serie Tv</a></li></ul></div><div id="box_movies">(?P<block>.*?)<div id="paginador">' patron = r'<div class="movie">[^>]+[^>]+>\s?<img src="(?P<thumb>[^"]+)" alt="(?P<title>.+?)\s?(?P<year>[\d\-]+)?"[^>]+>\s?<a href="(?P<url>[^"]+)">' - -## def itemHook(item): -## if 'film' in item.url: -## item.action = 'findvideos' -## item.contentType = 'movie' -## else: -## item.contentType = 'tvshow' -## item.action = 'episodios' -## return item - elif item.contentType == 'episode': pagination = 35 action = 'findvideos' patron = r'<td><a href="(?P<url>[^"]+)"(?:[^>]+)?>\s?(?P<title>[^<]+)(?P<episode>[\d\-x]+)?(?P<title2>[^<]+)?<' - + elif item.contentType == 'tvshow': # SEZIONE Serie TV- Anime - Documentari pagination = 35 @@ -99,8 +84,8 @@ def peliculas(item): 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+))?<' else: + anime = True patron = r'(?:<td>)?<a href="(?P<url>[^"]+)"(?:[^>]+)?>\s?(?P<title>[^<]+)(?P<episode>[\d\-x]+)?(?P<title2>[^<]+)?<' - else: # SEZIONE FILM pagination = 25 @@ -108,7 +93,6 @@ def peliculas(item): if item.args == 'lista': patron = r'href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)[ ]?(?P<year>\d+)?(?: Streaming | MD iSTANCE )?<' patronBlock = r'Lista dei film disponibili in streaming e anche in download\.</p>(?P<block>.*?)<div class="footer_c">' - else: #patronBlock = r'<h1>Ultimi film aggiunti</h1>(?P<block>.*?)<div class="footer_c">' patron = r'<tr><td><a href="(?P<url>[^"]+)"(?:|.+?)?>(?:  )?[ ]?(?P<title>.*?)[ ]?(?P<quality>HD)?[ ]?(?P<year>\d+)?(?: | HD | Streaming | MD(?: iSTANCE)? )?</a>' @@ -136,7 +120,7 @@ def episodios(item): action = 'findvideos' patronBlock = r'<table>(?P<block>.*?)<\/table>' - patron = r'<tr><td>(?:[^<]+)[ ](?:Parte)?(?P<episode>\d+x\d+)(?:|[ ]?(?P<title2>.+?)?(?:avi)?)<(?P<url>.*?)</td><tr>' + patron = r'<tr><td>(?:[^<]+)[ ](?:Parte)?(?P<episode>\d+x\d+|\d+)(?:|[ ]?(?P<title2>.+?)?(?:avi)?)<(?P<url>.*?)</td><tr>' #debug = True return locals()