From 95c3f619af00a67c6f30d60ee0a98a3b6fad5672 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 26 Jan 2018 12:05:38 -0500 Subject: [PATCH] sendvid: fix --- plugin.video.alfa/servers/sendvid.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/plugin.video.alfa/servers/sendvid.py b/plugin.video.alfa/servers/sendvid.py index 2d0ac02a..cf9ba80d 100755 --- a/plugin.video.alfa/servers/sendvid.py +++ b/plugin.video.alfa/servers/sendvid.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +from core import httptools from core import scrapertools from platformcode import logger @@ -10,28 +11,19 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - video_urls = [] - - data = scrapertools.cache_page(page_url) - # var video_source = "//cache-2.sendvid.com/1v0chsus.mp4"; - - media_url = "http:" + scrapertools.find_single_match(data, 'var\s+video_source\s+\=\s+"([^"]+)"') - + data = scrapertools.httptools.downloadpage(page_url).data + media_url = scrapertools.find_single_match(data, 'var\s+video_source\s+\=\s+"([^"]+)"') if "cache-1" in media_url: video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " (cache1) [sendvid]", media_url]) video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " (cache2) [sendvid]", media_url.replace("cache-1", "cache-2")]) - elif "cache-2" in media_url: video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " (cache1) [sendvid]", media_url.replace("cache-2", "cache-1")]) video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " (cache2) [sendvid]", media_url]) - else: video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [sendvid]", media_url]) - for video_url in video_urls: logger.info("%s - %s" % (video_url[0], video_url[1])) - return video_urls