stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'stable' of github.com:kodiondemand/addon into stable

Browse Source
This commit is contained in:
marco
2020-03-08 14:40:52 +01:00
parent e8e1a7bab8 2b2691d1c7
commit c4912c946b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/wstream.py
+3 -3
View File
@@ -58,11 +58,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
video_urls = [] video_urls = []
global data, real_url global data, real_url
sitekey = scrapertools.find_single_match(data, """data-sitekey=['"] *([^"']+)""") sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""")
if sitekey: sitekey = sitekey[-1]
captcha = platformtools.show_recaptcha(sitekey, page_url) if sitekey else '' captcha = platformtools.show_recaptcha(sitekey, page_url) if sitekey else ''
possibleParam = scrapertools.find_multiple_matches(data, possibleParam = scrapertools.find_multiple_matches(data,r"""<input.*?(?:name=["']([^'"]+).*?value=["']([^'"]*)['"]>|>)""")
r"""<input.*?(?:name=["']([^'"]+).*?value=["']([^'"]*)['"]>|>)""")
if possibleParam: if possibleParam:
post = {param[0]: param[1] for param in possibleParam if param[0]} post = {param[0]: param[1] for param in possibleParam if param[0]}
if captcha: post['g-recaptcha-response'] = captcha if captcha: post['g-recaptcha-response'] = captcha
specials/downloads.py
+3 -5
View File
@@ -782,11 +782,9 @@ def get_episodes(item):
episode.contentTitle = re.sub("\[[^\]]+\]|\([^\)]+\)|\d*x\d*\s*-", "", episode.title).strip() 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()))) 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:
if season: itemlist.append(episode)
if scrapertools.find_single_match(episode.title, r'(\d+)x') == season_number:
itemlist.append(episode)
else: else:
itemlist.append(episode) itemlist.append(episode)
# Cualquier otro resultado no nos vale, lo ignoramos # Cualquier otro resultado no nos vale, lo ignoramos