From 08e7a9509bf680cf51b0323c147b49ecb9096ad1 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Sun, 28 Apr 2019 13:57:36 +0200 Subject: [PATCH] fix verystream hd on cineblog and divide search on filmpertutti --- channels/cineblog01.py | 2 +- channels/filmpertutti.py | 2 + channels/guardogratis.py | 221 --------------------------------------- 3 files changed, 3 insertions(+), 222 deletions(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 5739e94e..fc3527f3 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -139,7 +139,7 @@ def findvideos(item): def load_links(itemlist, re_txt, color, desc_txt, quality=""): streaming = scrapertoolsV2.find_single_match(data, re_txt).replace('"', '') support.log('STREAMING=',streaming) - patron = ']+>([^<]+)<' + patron = ']+>([^<]+)<' matches = re.compile(patron, re.DOTALL).findall(streaming) for scrapedurl, scrapedtitle in matches: logger.debug("##### findvideos %s ## %s ## %s ##" % (desc_txt, scrapedurl, scrapedtitle)) diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index ce1077ea..e486f9be 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -25,6 +25,7 @@ def mainlist(item): support.menu(itemlist, '[B]Film[/B]', 'peliculas', host + '/category/film/', 'movie') support.menu(itemlist, '[B] > Film per Genere[/B]', 'genre', host, 'episode') + support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR]', 'search', '') support.menu(itemlist, '[B]Serie TV[/B]', 'peliculas', host + '/category/serie-tv/', 'episode') support.menu(itemlist, '[B] > Serie TV in ordine alfabetico[/B]', 'az', host + '/category/serie-tv/', 'episode') support.menu(itemlist, '[COLOR blue]Cerca Serie TV...[/COLOR]', 'search', '', 'episode') @@ -111,6 +112,7 @@ def az(item): itemlist = thumb(itemlist) return itemlist + def peliculas(item): logger.info(item.channel + 'peliculas') itemlist = [] diff --git a/channels/guardogratis.py b/channels/guardogratis.py index f5808ef4..e69de29b 100644 --- a/channels/guardogratis.py +++ b/channels/guardogratis.py @@ -1,221 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------ -# Ringraziamo Icarus crew -# Canale per guardogratis -# -# ---------------------------------------------------------- -import re -import urlparse - -from core import httptools -from platformcode import logger, config -from core import scrapertools -from core import servertools -from core.item import Item -from core import tmdb - -__channel__ = "guardogratis" - -host = "https://guardogratis.it/" - -headers = [['Referer', host]] - -def mainlist(item): - logger.info("[guardogratis.py] mainlist") - - # Main options - itemlist = [Item(channel=item.channel, - action="list_titles", - title="[COLOR azure]Film[/COLOR]", - url="%s/movies/" % host, - extra="movie", - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="list_titles", - title="[COLOR azure]Top Film[/COLOR]", - url="%s/top-imdb/" % host, - extra="movie", - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="categorie", - title="[COLOR azure]Categorie[/COLOR]", - url="%s" % host, - extra="categorie", - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="list_titles", - title="[COLOR azure]Serie Tv[/COLOR]", - url="%s/series/" % host, - extra="tvshow", - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="search", - title="[COLOR yellow]Cerca Film[/COLOR]", - extra="movie", - thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search"), - Item(channel=item.channel, - action="search", - title="[COLOR yellow]Cerca SerieTV[/COLOR]", - extra="tvshow", - thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")] - - return itemlist - -def list_titles(item): - logger.info("[guardogratis.py] list_titles") - itemlist = [] - - tipo='movie' - if 'tvshow' in item.extra: tipo='tv' - - if item.url == "": - item.url = host - # Carica la pagina - data = httptools.downloadpage(item.url, headers=headers).data - - patronvideos = '
([^<]+)<\/h2>.*?[I,T]MDb:\s*([^<]+)<\/div>' - - matches = re.compile(patronvideos, re.DOTALL).finditer(data) - - for match in matches: - scrapedurl = urlparse.urljoin(item.url, match.group(1)) - scrapedthumbnail = urlparse.urljoin(item.url, match.group(2)) - scrapedthumbnail = scrapedthumbnail.replace(" ", "%20") - rate=' IMDb: [[COLOR orange]%s[/COLOR]]' % match.group(4) if match.group(4)!='N/A'else '' - scrapedtitle = scrapertools.unescape(match.group(3)) - #scrapedtitle = scrapertools.unescape(match.group(3))+rate - itemlist.append( - Item(channel=item.channel, - action="findvideos" if not 'tvshow' in item.extra else 'serietv', - contentType="movie" if not 'tvshow' in item.extra else 'serie', - fulltitle=scrapedtitle, - show=scrapedtitle, - title=scrapedtitle, - url=scrapedurl, - thumbnail=scrapedthumbnail, - extra=item.extra, - viewmode="movie_with_plot")) - - nextpage_regex='' - if item.extra in "movies,tvshow": - nextpage_regex='' - elif item.extra=="categorie": - nextpage_regex='
  • .*?href=\'([^\']+)\'.*?
    • ' - - if nextpage_regex: - next_page = scrapertools.find_single_match(data, nextpage_regex) - if next_page != "": - itemlist.append( - Item(channel=item.channel, - action="list_titles", - title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]", - url="%s" % next_page, - extra=item.extra, - thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png")) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - return itemlist - -def search(item, texto): - logger.info("[guardogratis.py] search") - item.url = host + "/?s=" + texto - try: - if item.extra == "movie": - return list_titles(item) - if item.extra == "tvshow": - return list_titles(item) - # Continua la ricerca in caso di errore - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - -def categorie(item): - logger.info("[guardogratis.py] categorie") - itemlist = [] - - if item.url == "": - item.url = host - - # Carica la pagina - data = httptools.downloadpage(item.url, headers=headers).data - patronvideos = '