From 5ecb4e0f0e18a4d29f2effe49e886f4e5274fbec Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 16 Nov 2019 15:36:48 +0100 Subject: [PATCH] Fix Akstream Wstream (risoluzioni in ordine) --- servers/akstream.py | 3 +-- servers/wstream.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/servers/akstream.py b/servers/akstream.py index 28bbaf66..a30c6ea5 100644 --- a/servers/akstream.py +++ b/servers/akstream.py @@ -41,5 +41,4 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for video_url in video_urls: logger.info(" %s - %s" % (video_url[0], video_url[1])) - - return video_urls + return sorted(video_urls, key=lambda x: x[0].split('x')[1]) diff --git a/servers/wstream.py b/servers/wstream.py index 71b15c0c..a47cff37 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -45,9 +45,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for key in keys: video_urls.append(['%s [%sp]' % (key['type'].replace('video/',''), key['label']), key['src'].replace('https','http') + '|' + _headers]) else: - media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)') + media_urls = scrapertools.find_multiple_matches(data, r'(http.*?\.mp4)') for media_url in media_urls: video_urls.append(['video' + " mp4 [wstream] ", media_url + '|' + _headers]) - + video_urls.sort(key=lambda x: x[0]) return video_urls