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

Ennesimo Fix per Wstream...

Browse Source
This commit is contained in:
Alhaziel
2019-10-24 20:37:22 +02:00
parent c14fe12eef
commit 27df24c2dc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/wstream.py
+7 -5
View File
@@ -14,7 +14,7 @@ def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url) logger.info("(page_url='%s')" % page_url)
data = httptools.downloadpage(page_url).data data = httptools.downloadpage(page_url).data
if "Not Found" in data or "File was deleted" in data: if "Not Found" in data or "File was deleted" in data:
return False, "[wstream.py] El fichero no existe o ha sido borrado" return False, "[wstream.py] Il File Non esiste"
return True, "" return True, ""
# Returns an array of possible video url's from the page_url # Returns an array of possible video url's from the page_url
@@ -23,7 +23,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
logger.info("[wstream.py] url=" + page_url) logger.info("[wstream.py] url=" + page_url)
video_urls = [] video_urls = []
data = httptools.downloadpage(page_url, headers=headers).data.replace('https', 'http') data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data.replace('https','http')
logger.info("[wstream.py] data=" + data) logger.info("[wstream.py] data=" + data)
vid = scrapertools.find_multiple_matches(data, 'download_video.*?>.*?<.*?<td>([^\,,\s]+)') vid = scrapertools.find_multiple_matches(data, 'download_video.*?>.*?<.*?<td>([^\,,\s]+)')
headers.append(['Referer', page_url]) headers.append(['Referer', page_url])
@@ -51,9 +51,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
return video_urls return video_urls
else: else:
page_urls = scrapertools.find_multiple_matches(data, '''<a href=(?:"|')([^"']+)(?:"|')>''') page_urls = scrapertools.find_multiple_matches(data, '''<a href=(?:"|')([^"']+)(?:"|')''')
if page_urls: page_url = page_urls[-1] for page_url in page_urls:
return get_video_url(page_url) if '404 Not Found' not in httptools.downloadpage(page_url, headers=headers).data.replace('https', 'http'):
return get_video_url(page_url)
def find_videos(data): def find_videos(data):