From 16631f653459e12f9d588cc1a6de88e3f50696ce Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 7 Mar 2020 19:06:50 +0100 Subject: [PATCH 1/3] Fix Scarica Stagione --- specials/downloads.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/specials/downloads.py b/specials/downloads.py index 2f42dcf9..15a4af03 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -782,11 +782,9 @@ def get_episodes(item): episode.contentTitle = re.sub("\[[^\]]+\]|\([^\)]+\)|\d*x\d*\s*-", "", episode.title).strip() episode.downloadFilename = filetools.validate_path(filetools.join(item.downloadFilename, "%dx%0.2d - %s" % (episode.contentSeason, episode.contentEpisodeNumber, episode.contentTitle.strip()))) - itemlist.append(episode) - - if season: - if scrapertools.find_single_match(episode.title, r'(\d+)x') == season_number: - itemlist.append(episode) + if season: + if scrapertools.find_single_match(episode.title, r'(\d+)x') == season_number: + itemlist.append(episode) else: itemlist.append(episode) # Cualquier otro resultado no nos vale, lo ignoramos From c584e16256d7b81ef0acd35acfac83e637a12c9c Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 7 Mar 2020 19:40:31 +0100 Subject: [PATCH 2/3] Fix Wstream --- servers/wstream.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/servers/wstream.py b/servers/wstream.py index 05256db9..fe323d92 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -58,11 +58,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= video_urls = [] global data, real_url - sitekey = scrapertools.find_single_match(data, """data-sitekey=['"] *([^"']+)""") + sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""")[-1] captcha = platformtools.show_recaptcha(sitekey, page_url) if sitekey else '' - possibleParam = scrapertools.find_multiple_matches(data, - r"""|>)""") + possibleParam = scrapertools.find_multiple_matches(data,r"""|>)""") if possibleParam: post = {param[0]: param[1] for param in possibleParam if param[0]} if captcha: post['g-recaptcha-response'] = captcha From 2b2691d1c75692b4867b120e4bdf2eb4c8079068 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Sun, 8 Mar 2020 13:48:27 +0100 Subject: [PATCH 3/3] Fix Wstream --- servers/wstream.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/wstream.py b/servers/wstream.py index fe323d92..9c1595d8 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -58,7 +58,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= video_urls = [] global data, real_url - sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""")[-1] + sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""") + if sitekey: sitekey = sitekey[-1] captcha = platformtools.show_recaptcha(sitekey, page_url) if sitekey else '' possibleParam = scrapertools.find_multiple_matches(data,r"""|>)""")