diff --git a/channels/cineblog01.py b/channels/cineblog01.py index fc3527f3..b5d470a7 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -7,7 +7,7 @@ import re import urlparse from channels import autoplay, filtertools, support -from core import scrapertoolsV2, httptools, servertools +from core import scrapertoolsV2, httptools, servertools, tmdb from core.item import Item from lib import unshortenit from platformcode import logger, config @@ -31,7 +31,7 @@ __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cineblog01') __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cineblog01') #esclusione degli articoli 'di servizio' -blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', 'Aggiornamento Quotidiano Serie TV', 'OSCAR 2019 ▶ CB01.UNO: Vota il tuo film preferito! 🎬'] +blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', 'Aggiornamento Quotidiano Serie TV', 'OSCAR 2019 ▶ CB01.UNO: Vota il tuo film preferito! 🎬', 'Openload: la situazione. Benvenuto Verystream'] def mainlist(item): @@ -41,6 +41,8 @@ def mainlist(item): # Main options itemlist = [] + support.menu(itemlist, 'Ultimi 100 Film Aggiornati bold', 'last', host + '/lista-film-ultimi-100-film-aggiornati/') + support.menu(itemlist, 'Film bold', 'peliculas', host) support.menu(itemlist, 'HD submenu', 'menu', host, args="Film HD Streaming") support.menu(itemlist, 'Per genere submenu', 'menu', host, args="Film per Genere") @@ -106,6 +108,43 @@ def newest(categoria): patron_block=r'Ultimi 100 film aggiunti:.*?<\/td>') +def last(item): + support.log() + + itemlist = [] + infoLabels = {} + quality = '' + + matches = support.match(item, r']+)>([^(:(|[)]+)([^<]+)<\/a>', r'Ultimi 100 film Aggiornati:<\/a><\/strong>(.*?)', headers)[0] + + for url, title, info in matches: + title = title.rstrip() + infoLabels['year'] = scrapertoolsV2.find_single_match(info, r'\(([0-9]+)\)') + quality = scrapertoolsV2.find_single_match(info, r'\[([A-Z]+)\]') + + if quality: + longtitle = title + support.typo(quality,'_ [] color kod') + else: + longtitle = title + + itemlist.append( + Item(channel=item.channel, + action='findvideos', + contentType=item.contentType, + title=longtitle, + fulltitle=title, + show=title, + quality=quality, + url=url, + infoLabels=infoLabels + ) + ) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist + + def peliculas(item): support.log() if item.contentType == 'movie' or '/serietv/' not in item.url: @@ -127,7 +166,7 @@ def episodios(item): item.contentType = 'episode' return support.scrape(item, patron_block=[r'
(.*?)<\/article>', r'
[^<>]*?
(.*?)
\[riduci\]
'], - patron='(?:

)?([0-9]+×[0-9]+)(.*?)(?:

|Streaming 3D[^<]+
(.*?)', "pink", "Streaming 3D") # Estrae i contenuti - Download - load_links(itemlist, 'Download:(.*?)', "aqua", "Download") + # load_links(itemlist, 'Download:(.*?)', "aqua", "Download") # Estrae i contenuti - Download HD - load_links(itemlist, 'Download HD[^<]+(.*?)', "azure", - "Download HD") + # load_links(itemlist, 'Download HD[^<]+(.*?)', "azure", "Download HD") if len(itemlist) == 0: itemlist = servertools.find_video_items(item=item) @@ -213,6 +251,7 @@ def findvideos(item): def findvid_serie(item): def load_vid_series(html, item, itemlist, blktxt): + logger.info('HTML' + html) patron = ']+>(.*?)' # Estrae i contenuti matches = re.compile(patron, re.DOTALL).finditer(html)