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

fix wstream

Browse Source
This commit is contained in:
mac12m99
2019-11-06 20:58:15 +01:00
committed by marco
parent aa4b2d2f6b
commit c3bf4eac2d
2 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/wstream.json
+4 -4
View File
@@ -8,19 +8,19 @@
"patterns": [ "patterns": [
{ {
"pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=[0-9a-zA-Z]+)", "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=[0-9a-zA-Z]+)",
"url": "http:\/\/wstream.video\/\\1" "url": "https://wstream.video/video.php?file_code=\\1"
}, },
{ {
"pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)", "pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)",
"url": "http:\/\/wstream.video\/\\1" "url": "https://wstream.video/video.php?file_code=\\1"
}, },
{ {
"pattern": "wstream\\.video\/(?:embed-|videos/|video/|videow/|videoj/)([a-z0-9A-Z]+)", "pattern": "wstream\\.video\/(?:embed-|videos/|video/|videow/|videoj/)([a-z0-9A-Z]+)",
"url": "http:\/\/wstream.video\/\\1" "url": "https://wstream.video/video.php?file_code=\\1"
}, },
{ {
"pattern": "wstream\\.video\/(?!api/)([a-z0-9A-Z]+)", "pattern": "wstream\\.video\/(?!api/)([a-z0-9A-Z]+)",
"url": "http:\/\/wstream.video\/\\1" "url": "https://wstream.video/video.php?file_code=\\1"
} }
], ],
"ignore_urls": [ ] "ignore_urls": [ ]
servers/wstream.py
+17 -43
View File
@@ -17,13 +17,17 @@ def test_video_exists(page_url):
return False, "[wstream.py] Il File Non esiste" 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
def get_video_url(page_url, premium=False, user="", password="", video_password=""): def get_video_url(page_url, premium=False, user="", password="", video_password=""):
# import web_pdb; web_pdb.set_trace()
logger.info("[wstream.py] url=" + page_url) logger.info("[wstream.py] url=" + page_url)
video_urls = [] video_urls = []
code = page_url.split('=')[-1]
post = urllib.urlencode({
'videox': code
})
data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data.replace('https','http') data = httptools.downloadpage(page_url, headers=headers, post=post, 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])
@@ -33,49 +37,19 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
data = jsunpack.unpack(post_data) data = jsunpack.unpack(post_data)
logger.info("[wstream.py] data=" + data) logger.info("[wstream.py] data=" + data)
block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]') block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]')
if block: data = block
data = block
media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)') media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)')
_headers = urllib.urlencode(dict(headers)) _headers = urllib.urlencode(dict(headers))
i = 0 i = 0
for media_url in media_urls: for media_url in media_urls:
video_urls.append([vid[i] if vid else 'video' + " mp4 [wstream] ", media_url + '|' + _headers]) video_urls.append([vid[i] if vid else 'video' + " mp4 [wstream] ", media_url + '|' + _headers])
i = i + 1 i = i + 1
for video_url in video_urls: for video_url in video_urls:
logger.info("[wstream.py] %s - %s" % (video_url[0], video_url[1])) logger.info("[wstream.py] %s - %s" % (video_url[0], video_url[1]))
logger.info(video_urls) logger.info(video_urls)
return video_urls return video_urls
else:
page_urls = scrapertools.find_multiple_matches(data, '''<input type='hidden' id='videox' name='videox' value='([^']+)'>''')
for page_url in page_urls:
page_url = 'https://wstream.video/video5rqlew27k/'+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):
encontrados = set()
devuelve = []
patronvideos = r"wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)"
logger.info("[wstream.py] find_videos #" + patronvideos + "#")
matches = re.compile(patronvideos, re.DOTALL).findall(data)
for match in matches:
titulo = "[wstream]"
url = 'http://wstream.video/%s' % match
if url not in encontrados:
logger.info(" url=" + url)
devuelve.append([titulo, url, 'wstream'])
encontrados.add(url)
else:
logger.info(" url duplicada=" + url)
return devuelve