diff --git a/channels/netfreex.py b/channels/netfreex.py index 5f177a7a..afce9a0f 100644 --- a/channels/netfreex.py +++ b/channels/netfreex.py @@ -17,8 +17,6 @@ IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() - - @support.menu def mainlist(item): diff --git a/core/support.py b/core/support.py index 6894b686..c34d6435 100755 --- a/core/support.py +++ b/core/support.py @@ -596,12 +596,13 @@ def dooplay_get_episodes(item): @scrape def dooplay_peliculas(item, mixed=False, blacklist=""): actLike = 'peliculas' + # debug = True if item.args == 'searchPage': return dooplay_search_vars(item, blacklist) else: if item.contentType == 'movie': action = 'findvideos' - patron = '
.*?(?P[^<>]+).*?(?P[^<>]+)</a></h3>.*?(?:<span>[^<>]*(?P<year>[0-9]{4})</span>|</article>)' + patron = '<article id="post-[0-9]+" class="item movies">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?(?:<span class="quality">(?P<quality>[^<>]+).*?)?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>[^<>]*(?P<year>[0-9]{4})</span>|</article>)' else: action = 'episodios' patron = '<article id="post-[0-9]+" class="item (?P<type>' + ('\w+' if mixed else 'tvshows') + ')">.*?<img src="(?!data)(?P<thumb>[^"]+)".*?(?:<span class="quality">(?P<quality>[^<>]+))?.*?<a href="(?P<url>[^"]+)">(?P<title>[^<>]+)</a></h3>.*?(?:<span>(?P<year>[0-9]{4})</span>|</article>).*?(?:<div class="texto">(?P<plot>[^<>]+)|</article>).*?(?:genres">(?P<genre>.*?)</div>|</article>)' diff --git a/servers/wstream.py b/servers/wstream.py index 84c7c1f7..bf7ab005 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -19,7 +19,7 @@ def test_video_exists(page_url): headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0'], ['Host', scrapertools.get_domain_from_url(page_url)]] - if 'nored.icu' in str(headers): real_host = 'wstream.video' + # if 'nored.icu' in str(headers): real_host = 'wstream.video' logger.info("(page_url='%s')" % page_url) resp = httptools.downloadpage(page_url, headers=headers, verify=False)