From f2ee0bf7af0a502dfd93c33a459dc601786bcfd9 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 21 Nov 2019 19:23:32 +0100 Subject: [PATCH] Fix dailimotion --- servers/dailymotion.json | 3 ++- servers/dailymotion.py | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/servers/dailymotion.json b/servers/dailymotion.json index 25e8b935..a7b7c161 100644 --- a/servers/dailymotion.json +++ b/servers/dailymotion.json @@ -41,5 +41,6 @@ "type": "list", "visible": false } - ] + ], + "thumbnail": "server_dailymotion.png" } \ No newline at end of file diff --git a/servers/dailymotion.py b/servers/dailymotion.py index e8c10078..6a7d6d5a 100644 --- a/servers/dailymotion.py +++ b/servers/dailymotion.py @@ -8,10 +8,8 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) response = httptools.downloadpage(page_url) - if "Contenido rechazado" in response.data: - return False, "[Dailymotion] El archivo no existe o ha sido borrado" if response.code == 404: - return False, "[Dailymotion] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "dailymotion" return True, "" @@ -21,8 +19,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= response = httptools.downloadpage(page_url, cookies=False) cookie = {'Cookie': response.headers["set-cookie"]} data = response.data.replace("\\", "") - subtitle = scrapertools.find_single_match(data, '"subtitles":.*?"es":.*?urls":\["([^"]+)"') - qualities = scrapertools.find_multiple_matches(data, '"([^"]+)":(\[\{"type":".*?\}\])') + subtitle = scrapertools.find_single_match(data, r'"subtitles":.*?"es":.*?urls":\["([^"]+)"') + qualities = scrapertools.find_multiple_matches(data, r'"([^"]+)":(\[\{"type":".*?\}\])') for calidad, urls in qualities: patron = '"type":"(?:video|application)/([^"]+)","url":"([^"]+)"' matches = scrapertools.find_multiple_matches(urls, patron) @@ -31,12 +29,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= if stream_type == "mp4": stream_url = httptools.downloadpage(stream_url, headers=cookie, only_headers=True, follow_redirects=False).headers.get("location", stream_url) - else: - data_m3u8 = httptools.downloadpage(stream_url).data - stream_url_http = scrapertools.find_single_match(data_m3u8, '(http:.*?\.m3u8)') - if stream_url_http: - stream_url = stream_url_http - video_urls.append(["%sp .%s [dailymotion]" % (calidad, stream_type), stream_url, 0, subtitle]) + video_urls.append(["%sp .%s [dailymotion]" % (calidad, stream_type), stream_url, 0, subtitle]) + # else: + # data_m3u8 = httptools.downloadpage(stream_url).data + # stream_url_http = scrapertools.find_single_match(data_m3u8, r'(http:.*?\.m3u8)') + # if stream_url_http: + # stream_url = stream_url_http + # video_urls.append(["%sp .%s [Dailymotion]" % (calidad, stream_type), stream_url, 0, subtitle]) for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) return video_urls