From 72068dcda9673859cef87f297e877eecc0e18d7e Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Mon, 22 Jun 2020 09:24:42 +0200 Subject: [PATCH] Fix Wstream --- servers/wstream.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/servers/wstream.py b/servers/wstream.py index ebf28d83..fe876450 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -92,7 +92,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= logger.info("[Wstream] url=" + page_url) video_urls = [] global data, real_url, headers - # logger.info(data) + # from core.support import dbg;dbg() + logger.info(data) sitekey = scrapertools.find_multiple_matches(data, """data-sitekey=['"] *([^"']+)""") if sitekey: sitekey = sitekey[-1] @@ -124,9 +125,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= getSources(data) if not video_urls: - media_urls = scrapertools.find_multiple_matches(data, r'(http[^\s]*?\.mp4)') + media_urls = scrapertools.find_multiple_matches(data, r'(http[^\s]*?\.(?:mp4|m3u8))') for media_url in media_urls: - video_urls.append(['video' + " mp4 [wstream] ", media_url + '|' + _headers]) + video_urls.append([media_url.split('.')[-1] + " [Wstream] ", media_url + '|' + _headers]) video_urls.sort(key=lambda x: x[0]) return video_urls