From 3202c71141125efc0e2ff91bbf3e36b02679e2e8 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 1 Jun 2019 16:15:20 +0200 Subject: [PATCH] Fix Guardaserieclick, sorry 4l3x87 --- channels/guardaserieclick.py | 63 +++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py index 1617cc92..c451326f 100644 --- a/channels/guardaserieclick.py +++ b/channels/guardaserieclick.py @@ -95,6 +95,7 @@ def cleantitle(scrapedtitle): # ================================================================================================================ # ---------------------------------------------------------------------------------------------------------------- + def nuoveserie(item): log() itemlist = [] @@ -109,8 +110,26 @@ def nuoveserie(item): else: patron_block = r'
(.*?)
\s[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)

' - return support.scrape(item, patron, ['url', 'thumb', 'title'], patron_block=patron_block, action='episodios') + patron = r'[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<\/p>' + + matches = support.match(item, patron, patron_block, headers)[0] + + for scrapedurl, scrapedthumbnail, scrapedtitle in matches: + scrapedtitle = cleantitle(scrapedtitle) + + itemlist.append( + Item(channel=item.channel, + action="episodios", + contentType="episode", + title=scrapedtitle, + fulltitle=scrapedtitle, + url=scrapedurl, + show=scrapedtitle, + thumbnail=scrapedthumbnail, + folder=True)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + return itemlist # ================================================================================================================ @@ -121,9 +140,45 @@ def serietvaggiornate(item): itemlist = [] patron_block = r'
(.*?)<\/div><\/div>]+> ]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^(?:<|\()]+)(?:\(([^\)]+)\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>' + patron = r']+>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>([^<]+)<[^>]+>' - return support.scrape(item, patron, ['url', 'thumb', 'episode', 'lang', 'title'], patron_block=patron_block, action='findvideos') + matches = support.match(item, patron, patron_block, headers)[0] + + for scrapedurl, scrapedthumbnail, scrapedep, scrapedtitle in matches: + episode = re.compile(r'^(\d+)x(\d+)', re.DOTALL).findall(scrapedep) # Prendo stagione ed episodioso + scrapedtitle = cleantitle(scrapedtitle) + + contentlanguage = "" + if 'sub-ita' in scrapedep.strip().lower(): + contentlanguage = 'Sub-ITA' + + extra = r']*>' % ( + episode[0][0], episode[0][1].lstrip("0")) + + infoLabels = {} + infoLabels['episode'] = episode[0][1].zfill(2) + infoLabels['season'] = episode[0][0] + + title = str( + "%s - %sx%s %s" % (scrapedtitle, infoLabels['season'], infoLabels['episode'], contentlanguage)).strip() + + itemlist.append( + Item(channel=item.channel, + action="findepvideos", + contentType="episode", + title=title, + show=scrapedtitle, + fulltitle=scrapedtitle, + url=scrapedurl, + extra=extra, + thumbnail=scrapedthumbnail, + contentLanguage=contentlanguage, + infoLabels=infoLabels, + folder=True)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + return itemlist # ================================================================================================================