From 653313f7acc6c5b65ac066456675b622bba37706 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Sun, 6 Aug 2017 09:57:38 -0500 Subject: [PATCH] vimeo: Cambio de estructura Cambio de estructura --- plugin.video.alfa/servers/vimeo.py | 32 +++++++++++------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/plugin.video.alfa/servers/vimeo.py b/plugin.video.alfa/servers/vimeo.py index 857f18ac..ead9058f 100755 --- a/plugin.video.alfa/servers/vimeo.py +++ b/plugin.video.alfa/servers/vimeo.py @@ -2,39 +2,31 @@ import re -from core import jsontools from core import logger from core import scrapertools +from core import httptools - -# Returns an array of possible video url's from the page_url def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - + video_urls = [] headers = [['User-Agent', 'Mozilla/5.0']] if "|" in page_url: page_url, referer = page_url.split("|", 1) headers.append(['Referer', referer]) - if not page_url.endswith("/config"): - page_url = find_videos(page_url)[0][1] + page_url = scrapertools.find_single_match(page_url, ".*?video/[0-9]+") - video_urls = [] - data = scrapertools.downloadpage(page_url, headers=headers) - json_object = jsontools.load(data) - - url_data = json_object['request']['files']['progressive'] - for data_media in url_data: - media_url = data_media['url'] - title = "%s (%s) [vimeo]" % (data_media['mime'].replace("video/", "."), data_media['quality']) - video_urls.append([title, media_url, data_media['height']]) + data = httptools.downloadpage(page_url, headers = headers).data + logger.info("Intel11 %s" %data) + patron = 'mime":"([^"]+)"' + patron += '.*?url":"([^"]+)"' + patron += '.*?quality":"([^"]+)"' + match = scrapertools.find_multiple_matches(data, patron) + for mime, media_url, calidad in match: + title = "%s (%s) [vimeo]" % (mime.replace("video/", "."), calidad) + video_urls.append([title, media_url, int(calidad.replace("p",""))]) video_urls.sort(key=lambda x: x[2]) - try: - video_urls.insert(0, [".m3u8 (SD) [vimeo]", json_object['request']['files']['hls']['cdns'] - ["akfire_interconnect"]["url"].replace("master.m3u8", "playlist.m3u8"), 0]) - except: - pass for video_url in video_urls: video_url[2] = 0 logger.info("%s - %s" % (video_url[0], video_url[1]))