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:
marco
2020-04-14 20:16:47 +02:00
parent 0b0f01515d
commit 6caba23bfb
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/wstream.json
+2 -2
View File
@@ -8,11 +8,11 @@
"patterns": [ "patterns": [
{ {
"pattern": "wstream\\.video(?!<)(?:=|/)(?:video[a-zA-Z0-9.?_]*|embed[a-zA-Z0-9]*|)?(?!api|swembedid)(?:-|/|=)?(?:[a-z0-9A-Z]+/)?([a-z0-9A-Z]+)", "pattern": "wstream\\.video(?!<)(?:=|/)(?:video[a-zA-Z0-9.?_]*|embed[a-zA-Z0-9]*|)?(?!api|swembedid)(?:-|/|=)?(?:[a-z0-9A-Z]+/)?([a-z0-9A-Z]+)",
"url": "http://116.202.226.34/video.php?file_code=\\1" "url": "http://wstream.video/video.php?file_code=\\1"
}, },
{ {
"pattern": "wstream\\.video/(api/vcmod/fastredirect/streaming\\.php\\?id=[$0-9]+)", "pattern": "wstream\\.video/(api/vcmod/fastredirect/streaming\\.php\\?id=[$0-9]+)",
"url": "http://116.202.226.34/\\1" "url": "http://wstream.video/\\1"
} }
], ],
"ignore_urls": [] "ignore_urls": []
servers/wstream.py
+10 -6
View File
@@ -2,7 +2,9 @@
# Kodi on Demand - Kodi Addon - Kodi Addon # Kodi on Demand - Kodi Addon - Kodi Addon
# by DrZ3r0 - Fix Alhaziel # by DrZ3r0 - Fix Alhaziel
import re, json import json
import re
try: try:
import urllib.parse as urllib import urllib.parse as urllib
except ImportError: except ImportError:
@@ -15,17 +17,17 @@ headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20
def test_video_exists(page_url): def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url) logger.info("(page_url='%s')" % page_url)
resp = httptools.downloadpage(page_url, headers=headers) resp = httptools.downloadpage(page_url.replace('wstream.video', '116.202.226.34'), headers=headers, verify=False)
global data, real_url global data, real_url
data = resp.data data = resp.data
page_url = resp.url.replace('wstream.video', '116.202.226.34') page_url = resp.url.replace('wstream.video', '116.202.226.34')
if '/streaming.php' in page_url in page_url: if '/streaming.php' in page_url in page_url:
code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1].replace('.html', '') code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False, only_headers=True, verify=False).headers['location'].split('/')[-1].replace('.html', '')
# logger.info('WCODE=' + code) # logger.info('WCODE=' + code)
page_url = 'https://116.202.226.34/video.php?file_code=' + code page_url = 'https://116.202.226.34/video.php?file_code=' + code
data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True).data data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, verify=False).data
real_url = page_url real_url = page_url
if "Not Found" in data or "File was deleted" in data: if "Not Found" in data or "File was deleted" in data:
@@ -40,7 +42,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
global data,headers global data,headers
page_url = scrapertools.find_single_match(data, r"""<center><a href='(https?:\/\/wstream[^']+)'\s*title='bkg'""") page_url = scrapertools.find_single_match(data, r"""<center><a href='(https?:\/\/wstream[^']+)'\s*title='bkg'""")
if page_url: if page_url:
data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, post={'g-recaptcha-response': captcha}).data data = httptools.downloadpage(page_url, headers=headers, follow_redirects=True, post={'g-recaptcha-response': captcha}, verify=False).data
def getSources(data): def getSources(data):
possibileSources = scrapertools.find_multiple_matches(data, r'sources:\s*(\[[^\]]+\])') possibileSources = scrapertools.find_multiple_matches(data, r'sources:\s*(\[[^\]]+\])')
@@ -57,6 +59,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
video_urls.append(['%s [%s]' % (key['type'].replace('video/', ''), key['label']), video_urls.append(['%s [%s]' % (key['type'].replace('video/', ''), key['label']),
key['src'].replace('https', 'http') + '|' + _headers]) key['src'].replace('https', 'http') + '|' + _headers])
else: else:
if not 'src' in key and 'file' in key: key['src'] = key['file']
if key['file'].split('.')[-1] == 'mpd': pass
video_urls.append([key['src'].split('.')[-1], key['src'].replace('https', 'http') + '|' + _headers]) video_urls.append([key['src'].split('.')[-1], key['src'].replace('https', 'http') + '|' + _headers])
except: except:
pass pass
@@ -74,7 +78,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
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
if post: if post:
data = httptools.downloadpage(real_url, headers=headers, post=post, follow_redirects=True).data data = httptools.downloadpage(real_url, headers=headers, post=post, follow_redirects=True, verify=False).data
elif captcha: elif captcha:
int_bckup_method() int_bckup_method()
elif captcha: elif captcha: