From 239a73219e26e58774f17dd93db6b92923846e42 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 27 Dec 2017 15:08:38 -0500 Subject: [PATCH] vk: actualizado test_video_exists --- plugin.video.alfa/servers/vk.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/plugin.video.alfa/servers/vk.py b/plugin.video.alfa/servers/vk.py index d3e8cb8e..b5062745 100755 --- a/plugin.video.alfa/servers/vk.py +++ b/plugin.video.alfa/servers/vk.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +from core import httptools from core import scrapertools from platformcode import logger @@ -7,35 +8,28 @@ from platformcode import logger def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) - data = scrapertools.cache_page(page_url) + data = httptools.downloadpage(page_url).data - if "This video has been removed from public access" in data: + if "This video has been removed from public access" in data or "Video not found." in data: return False, "El archivo ya no esta disponible
en VK (ha sido borrado)" - else: - return True, "" + return True, "" # 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 = [] try: oid, id = scrapertools.find_single_match(page_url, 'oid=([^&]+)&id=(\d+)') except: oid, id = scrapertools.find_single_match(page_url, 'video(\d+)_(\d+)') - - from core import httptools headers = {'User-Agent': 'Mozilla/5.0'} url = "http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s" % (oid, id) data = httptools.downloadpage(url, headers=headers).data - matches = scrapertools.find_multiple_matches(data, '