From 4e78da1b6dfb887c910fca7f11488fdf114a2f6d Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Thu, 7 Nov 2019 20:54:16 +0100 Subject: [PATCH] ennesimo fix wstream per cambio di struttura --- servers/wstream.json | 10 +++++++--- servers/wstream.py | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/servers/wstream.json b/servers/wstream.json index 2b934bbc..7b331fd7 100644 --- a/servers/wstream.json +++ b/servers/wstream.json @@ -6,10 +6,14 @@ "thumbnail": "http:\/\/media.tvalacarta.info\/servers\/server_wstream.png", "find_videos": { "patterns": [ - { - "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=[0-9a-zA-Z]+)", + { + "pattern": "https://wstream.video/stream/switch_embed.php\\?file_code=([a-z0-9A-Z]+)", "url": "https://wstream.video/video.php?file_code=\\1" }, + { + "pattern":"wstream.video\/api\/vcmod\/fastredirect\/streaming.php\\?id=([0-9a-zA-Z]+)", + "url": "https://wstream.video/api/vcmod/fastredirect/streaming.php?id=\\1" + }, { "pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)", "url": "https://wstream.video/video.php?file_code=\\1" @@ -19,7 +23,7 @@ "url": "https://wstream.video/video.php?file_code=\\1" }, { - "pattern": "wstream\\.video\/(?!api/)([a-z0-9A-Z]+)", + "pattern": "wstream\\.video/(?!api/|stream/)([a-z0-9A-Z]+)", "url": "https://wstream.video/video.php?file_code=\\1" } ], diff --git a/servers/wstream.py b/servers/wstream.py index 53a2dc26..1a80faf5 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -22,6 +22,11 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("[wstream.py] url=" + page_url) video_urls = [] + + if '/streaming.php' in page_url: + code = httptools.downloadpage(page_url, headers=headers, follow_redirects=False).headers['location'].split('/')[-1] + page_url = 'https://wstream.video/video.php?file_code=' + code + code = page_url.split('=')[-1] post = urllib.urlencode({ 'videox': code