From b115f926b5245a3eb3c2369895418d8a7d77ad05 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 29 Jan 2018 09:10:21 -0500 Subject: [PATCH 1/3] hdfull: fix --- plugin.video.alfa/channels/hdfull.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index e5714a34..db57d137 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -13,7 +13,7 @@ from core.item import Item from platformcode import config, logger from platformcode import platformtools -host = "http://hdfull.tv" +host = "https://hdfull.tv" if config.get_setting('hdfulluser', 'hdfull'): account = True @@ -569,7 +569,7 @@ def generos(item): itemlist = [] data = agrupa_datos(httptools.downloadpage(item.url).data) - data = scrapertools.find_single_match(data, '
  • ') + data = scrapertools.find_single_match(data, '
  • ') patron = '
  • ([^<]+)
    • ' matches = re.compile(patron, re.DOTALL).findall(data) @@ -591,7 +591,7 @@ def generos_series(item): itemlist = [] data = agrupa_datos(httptools.downloadpage(item.url).data) - data = scrapertools.find_single_match(data, '
  • ') + data = scrapertools.find_single_match(data, '
  • ') patron = '
  • ([^<]+)
    • ' matches = re.compile(patron, re.DOTALL).findall(data) @@ -642,10 +642,10 @@ def findvideos(item): it1.append(Item(channel=item.channel, action="set_status", title=title, fulltitle=title, url=url_targets, thumbnail=item.thumbnail, show=item.show, folder=True)) - data_js = httptools.downloadpage("http://hdfull.tv/templates/hdfull/js/jquery.hdfull.view.min.js").data + data_js = httptools.downloadpage("https://hdfull.tv/templates/hdfull/js/jquery.hdfull.view.min.js").data key = scrapertools.find_single_match(data_js, 'JSON.parse\(atob.*?substrings\((.*?)\)') - data_js = httptools.downloadpage("http://hdfull.tv/js/providers.js").data + data_js = httptools.downloadpage("https://hdfull.tv/js/providers.js").data try: data_js = jhexdecode(data_js) From d22bb54ac6ce67b043b7c8689c27d5a1d0a8b988 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 29 Jan 2018 10:26:38 -0500 Subject: [PATCH 2/3] thevideome: patron actualizado --- plugin.video.alfa/servers/thevideome.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugin.video.alfa/servers/thevideome.json b/plugin.video.alfa/servers/thevideome.json index 673d0eed..54794889 100755 --- a/plugin.video.alfa/servers/thevideome.json +++ b/plugin.video.alfa/servers/thevideome.json @@ -4,11 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "(?:thevideo.me|tvad.me|thevid.net)/(?:embed-|)([A-z0-9]+)", - "url": "http://thevideo.me/embed-\\1.html" - }, - { - "pattern": "(?:thevideo.me|tvad.me|thevid.net|thevideo.us)/(?:embed-|)([A-z0-9]+)", + "pattern": "(?:thevideo.me|tvad.me|thevid.net|thevideo.ch|thevideo.us)/(?:embed-|)([A-z0-9]+)", "url": "http://thevideo.me/embed-\\1.html" } ] From 425c96f32307623eb71540001fbbbb17a791820b Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Mon, 29 Jan 2018 17:32:05 -0500 Subject: [PATCH 3/3] pelisplus: fix enlaces de series --- plugin.video.alfa/channels/pelisplus.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py index 23a950b9..fefe287d 100644 --- a/plugin.video.alfa/channels/pelisplus.py +++ b/plugin.video.alfa/channels/pelisplus.py @@ -434,11 +434,20 @@ def get_vip(url): if 'plus'in item: id, tipo, lang= scrapertools.find_single_match(item,'plus\/(\d+)\/.*?=(\d+).*?=(.*)') new_url = 'https://www.elreyxhd.com/pelisplus.php?id=%s&tipo=%s&idioma=%s' % (id, tipo, lang) + datax=httptools.downloadpage(new_url, follow_redirects=False).headers.get("location", "") + itemlist.append(Item(url=datax)) else: id = scrapertools.find_single_match(item,'episodes\/(\d+)') - new_url = 'https://www.elreyxhd.com/samir.php?id=%s&tipo=capitulo&idioma=latino&x=&sv=' % id - data=httptools.downloadpage(new_url, follow_redirects=False).headers.get("location", "") - itemlist.append(Item(url=data)) + data_vip = httptools.downloadpage(item).data + patron = '' + matches = re.compile(patron, re.DOTALL).findall(data_vip) + for urls in matches: + x = scrapertools.find_single_match(urls,r"&x=(\d)&") + if x != '': + new_url = 'https://www.elreyxhd.com/samir.php?id=%s&tipo=capitulo&idioma=latino&x=%s&sv=si' % (id, x) + datax = httptools.downloadpage(new_url, follow_redirects=False).headers.get("location", "") + itemlist.append(Item(url=datax)) + return itemlist