diff --git a/plugin.video.alfa/channels/seriehd.py b/plugin.video.alfa/channels/seriehd.py index 8e6cc7a3..bdebdaef 100644 --- a/plugin.video.alfa/channels/seriehd.py +++ b/plugin.video.alfa/channels/seriehd.py @@ -1,16 +1,14 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -# Ringraziamo Icarus crew # Canale per seriehd # ------------------------------------------------------------ -import base64 -import re import urlparse from channels import autoplay, filtertools, support -from core import scrapertools, servertools, httptools, tmdb -from platformcode import logger, config +from channels.support import menu, log +from core import scrapertoolsV2, servertools, httptools from core.item import Item +from platformcode import logger, config from channelselector import thumb host = "https://www.seriehd.video" @@ -27,43 +25,27 @@ headers = [['Referer', host]] def mainlist(item): - logger.info("seriehd.py mainlist") + log() + itemlist = [] + + menu(itemlist, 'Serie TV', 'peliculas', host + '/serie-tv-streaming/', 'tvshow') + menu(itemlist, 'Per Genere submenu', 'genre', host, 'tvshow', 'TV') + menu(itemlist, 'Per Nazione submenu', 'nation', host + '/serie-tv-streaming/', 'tvshow', 'TV') + menu(itemlist, 'Cerca...', 'peliculas', contentType='tvshow', args='TV') autoplay.init(item.channel, list_servers, list_quality) - - itemlist = [Item(channel=item.channel, - action="fichas", - title="[B]Serie TV[/B]", - url=host + "/serie-tv-streaming/"), - Item(channel=item.channel, - action="sottomenu", - title=" > Serie TV per Genere", - url=host), - Item(channel=item.channel, - action="nation", - title=" > Serie TV per Nazione", - url=host), - Item(channel=item.channel, - action="search", - extra="tvshow", - title="[COLOR blue]Cerca...[/COLOR]", - thumbnail="")] - autoplay.show_option(item.channel, itemlist) - # auto thumb - itemlist=thumb(itemlist) - return itemlist def search(item, texto): - logger.info("[seriehd.py] search") + log(texto) item.url = host + "/?s=" + texto try: - return fichas(item) + return peliculas(item) # Continua la ricerca in caso di errore . except: @@ -73,140 +55,82 @@ def search(item, texto): return [] -def sottomenu(item): - logger.info("[seriehd.py] sottomenu") +def newest(categoria): + log(categoria) itemlist = [] + item = Item() + try: - data = httptools.downloadpage(item.url).data + ## cambiar los valores "peliculas, infantiles, series, anime, documentales por los que correspondan aqui en + # el py y en l json ### + if categoria == "series": + item.url = host + itemlist = peliculas(item) - patron = '([^<]+)' + if 'Successivo>>' in itemlist[-1].title: + itemlist.pop() - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedtitle in matches: - itemlist.append( - Item(channel=item.channel, - action="fichas", - title=scrapedtitle, - url=scrapedurl)) - - # Elimina 'voci dal menu' de la lista de 'sottomenu' - itemlist.pop(0) - itemlist.pop(0) - itemlist.pop(0) - itemlist.pop(28) + # Continua la ricerca in caso di errore + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] return itemlist + +def genre(item): + itemlist = support.scrape(item, '([^<]+)', ['url', 'title'], headers,['Serie TV','Serie TV Americane','Serie TV Italiane','altadefinizione'], action='peliculas') + return thumb(itemlist) + + def nation(item): - itemlist = [Item(channel=item.channel, - action="fichas", - title="Serie TV Americane", - url=host+'/serie-tv-streaming/serie-tv-americane/'), - Item(channel=item.channel, - action="fichas", - title="Serie TV Italiane", - url=host+'/serie-tv-streaming/serie-tv-italiane/')] - # auto thumb - itemlist=thumb(itemlist) - - return itemlist - -def fichas(item): - logger.info("[seriehd.py] fichas") + log() itemlist = [] - - data = httptools.downloadpage(item.url).data - - patron = r'