From b2d3692f7f64899ed5434687b55c4f89f9407990 Mon Sep 17 00:00:00 2001 From: pipcat Date: Tue, 7 Aug 2018 15:57:43 +0200 Subject: [PATCH] Cambio dominio estrenosgo y server gvideo --- plugin.video.alfa/channels/estrenosgo.py | 4 ++-- plugin.video.alfa/servers/gvideo.py | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/plugin.video.alfa/channels/estrenosgo.py b/plugin.video.alfa/channels/estrenosgo.py index c087cc9c..f5f52bd0 100644 --- a/plugin.video.alfa/channels/estrenosgo.py +++ b/plugin.video.alfa/channels/estrenosgo.py @@ -10,7 +10,7 @@ from core import tmdb from core.item import Item from platformcode import config, logger -HOST = 'http://estrenosli.org/' +HOST = 'http://estrenosby.net/' # 'http://estrenosli.org/' parameters = channeltools.get_channel_parameters('estrenosgo') fanart_host = parameters['fanart'] thumbnail_host = parameters['thumbnail'] @@ -138,7 +138,7 @@ def findvideos(item): list_opciones = [] IDIOMAS = {"banderita1": "EspaƱol", "banderita2": "VOSE", "banderita3": "Latino"} - url = "http://estrenosli.org/ver-online-" + item.url + url = HOST + "ver-online-" + item.url data = httptools.downloadpage(url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) diff --git a/plugin.video.alfa/servers/gvideo.py b/plugin.video.alfa/servers/gvideo.py index a987c6c4..8953f2e7 100644 --- a/plugin.video.alfa/servers/gvideo.py +++ b/plugin.video.alfa/servers/gvideo.py @@ -8,6 +8,8 @@ from platformcode import logger def test_video_exists(page_url): + if 'googleusercontent' in page_url: + return True, "" # desactivada verificación pq se encalla! response = httptools.downloadpage(page_url, cookies=False, headers={"Referer": page_url}) if "no+existe" in response.data: @@ -34,13 +36,19 @@ def get_video_url(page_url, user="", password="", video_password=""): response = httptools.downloadpage(page_url, follow_redirects = False, cookies=False, headers={"Referer": page_url}) url=response.headers['location'] - cookies = "" - cookie = response.headers["set-cookie"].split("HttpOnly, ") - for c in cookie: - cookies += c.split(";", 1)[0] + "; " - data = response.data.decode('unicode-escape') - data = urllib.unquote_plus(urllib.unquote_plus(data)) - headers_string = "|Cookie=" + cookies + if "set-cookie" in response.headers: + try: + cookies = "" + cookie = response.headers["set-cookie"].split("HttpOnly, ") + for c in cookie: + cookies += c.split(";", 1)[0] + "; " + data = response.data.decode('unicode-escape') + data = urllib.unquote_plus(urllib.unquote_plus(data)) + headers_string = "|Cookie=" + cookies + except: + headers_string = "" + else: + headers_string = "" quality = scrapertools.find_single_match (url, '.itag=(\d+).')