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

Wstream quick fix, no resolution displayed :(

Browse Source
This commit is contained in:
Alhaziel
2019-06-10 18:49:21 +02:00
parent 04e15d8ed0
commit 5699e65b9e
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/dreamsub.py
+3 -3
View File
@@ -14,8 +14,8 @@ from platformcode import logger, config
__channel__ = "dreamsub" __channel__ = "dreamsub"
host = config.get_channel_url(__channel__) host = config.get_channel_url(__channel__)
list_servers = ['animeworld', 'verystream', 'streamango', 'openload', 'directo'] list_servers = ['verystream', 'streamango', 'openload']
list_quality = ['default', '480p', '720p', '1080p'] list_quality = ['default']
def mainlist(item): def mainlist(item):
@@ -25,7 +25,7 @@ def mainlist(item):
menu(itemlist, 'Anime / Cartoni', 'peliculas', host + '/anime', 'tvshow') menu(itemlist, 'Anime / Cartoni', 'peliculas', host + '/anime', 'tvshow')
menu(itemlist, 'Categorie', 'categorie', host + '/filter?genere=', 'tvshow') menu(itemlist, 'Categorie', 'categorie', host + '/filter?genere=', 'tvshow')
menu(itemlist, 'Ultimi Episodi', 'last', host, 'episode') menu(itemlist, 'Ultimi Episodi', 'last', host, 'episode')
menu(itemlist, 'Cerca', 'search') menu(itemlist, 'Cerca...', 'search')
support.aplay(item, itemlist, list_servers, list_quality) support.aplay(item, itemlist, list_servers, list_quality)
support.channel_config(item, itemlist) support.channel_config(item, itemlist)
servers/wstream.json
+1 -5
View File
@@ -9,11 +9,7 @@
{ {
"pattern": "wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)", "pattern": "wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)",
"url": "http:\/\/wstream.video\/\\1" "url": "http:\/\/wstream.video\/\\1"
}, }
{
"pattern": "wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)",
"url": "http:\/\/wstream.video\/video\/\\1"
}
], ],
"ignore_urls": [ ] "ignore_urls": [ ]
}, },
servers/wstream.py
+5 -6
View File
@@ -24,15 +24,14 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
video_urls = [] video_urls = []
data = httptools.downloadpage(page_url, headers=headers).data.replace('https', 'http') data = httptools.downloadpage(page_url, headers=headers).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])
post_data = scrapertools.find_single_match(data,"</div>\s*<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>") post_data = scrapertools.find_single_match(data,"</div>\s*<script type='text/javascript'>(eval.function.p,a,c,k,e,.*?)\s*</script>")
if post_data != "": if post_data != "":
from lib import jsunpack from lib import jsunpack
data = jsunpack.unpack(post_data) data = jsunpack.unpack(post_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 if block: data = block
@@ -41,7 +40,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
i = 0 i = 0
for media_url in media_urls: for media_url in media_urls:
video_urls.append([vid[i] + " 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:
@@ -54,7 +53,7 @@ def find_videos(data):
encontrados = set() encontrados = set()
devuelve = [] devuelve = []
patronvideos = r"wstream.video/(?:embed-)?([a-z0-9A-Z]+)" patronvideos = r"wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)"
logger.info("[wstream.py] find_videos #" + patronvideos + "#") logger.info("[wstream.py] find_videos #" + patronvideos + "#")
matches = re.compile(patronvideos, re.DOTALL).findall(data) matches = re.compile(patronvideos, re.DOTALL).findall(data)
@@ -69,4 +68,4 @@ def find_videos(data):
else: else:
logger.info(" url duplicada=" + url) logger.info(" url duplicada=" + url)
return devuelve return devuelve