From 770a2e215ab2f00149ac3832a71c5cd0d535b7e7 Mon Sep 17 00:00:00 2001 From: numa00009 <31534460+numa00009@users.noreply.github.com> Date: Thu, 9 Nov 2017 10:17:45 +0100 Subject: [PATCH 01/11] Update httptools.py Change Firefor Headers into Chrome ones. default_headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36" default_headers["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" --- plugin.video.alfa/core/httptools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/core/httptools.py b/plugin.video.alfa/core/httptools.py index 3409dcb7..a071f602 100755 --- a/plugin.video.alfa/core/httptools.py +++ b/plugin.video.alfa/core/httptools.py @@ -23,8 +23,8 @@ ficherocookies = os.path.join(config.get_data_path(), "cookies.dat") # Headers por defecto, si no se especifica nada default_headers = dict() -default_headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0" -default_headers["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" +default_headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36" +default_headers["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" default_headers["Accept-Language"] = "es-ES,es;q=0.8,en-US;q=0.5,en;q=0.3" default_headers["Accept-Charset"] = "UTF-8" default_headers["Accept-Encoding"] = "gzip" From a9caf59ce1d5f5ceb29f30247c07dde9df7b726d Mon Sep 17 00:00:00 2001 From: q1316480 <32616665+q1316480@users.noreply.github.com> Date: Fri, 10 Nov 2017 00:57:26 +0100 Subject: [PATCH 02/11] Seriesblanco -> StreamixCloud https://github.com/alfa-addon/addon/issues/163 --- plugin.video.alfa/channels/seriesblanco.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py index f630f794..e668d0db 100644 --- a/plugin.video.alfa/channels/seriesblanco.py +++ b/plugin.video.alfa/channels/seriesblanco.py @@ -29,7 +29,8 @@ list_servers = ['powvideo', 'nowvideo', 'gamovideo', 'kingvid', - 'vidabc' + 'vidabc', + 'streamixcloud' ] @@ -312,7 +313,7 @@ def findvideos(item): c=b.split('[') d=c[0].rstrip( ) d=d.lstrip( ) - list_links[i].server=d + list_links[i].server=d.replace("streamix", "streamixcloud") list_links = servertools.get_servers_itemlist(list_links) autoplay.start(list_links, item) From c344832c8c167e02f9107c327cd445c72472dd9d Mon Sep 17 00:00:00 2001 From: q1316480 <32616665+q1316480@users.noreply.github.com> Date: Fri, 10 Nov 2017 01:21:05 +0100 Subject: [PATCH 03/11] Fix: Borar "Ver en" y "Descargar en" --- plugin.video.alfa/channels/seriesblanco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py index e668d0db..15008287 100644 --- a/plugin.video.alfa/channels/seriesblanco.py +++ b/plugin.video.alfa/channels/seriesblanco.py @@ -309,7 +309,7 @@ def findvideos(item): for i in range(len(list_links)): a=list_links[i].title - b=a.lstrip('Ver en') + b=a[a.find("en") + 2:] c=b.split('[') d=c[0].rstrip( ) d=d.lstrip( ) From 74e6145d2fdbf265b328639cd43aa973931c1174 Mon Sep 17 00:00:00 2001 From: danielr460 Date: Fri, 10 Nov 2017 11:12:07 -0500 Subject: [PATCH 04/11] Fix netutv --- plugin.video.alfa/channels/anitoonstv.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 58efb7c6..8db2b7bc 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -132,6 +132,17 @@ def episodios(item): return itemlist +def googl(url): + logger.info() + url="http://goo.gl/Y2Xus4" + a=url.split("/") + link=a[3] + link="http://www.trueurl.net/?q=http%3A%2F%2Fgoo.gl%2F"+link+"&lucky=on&Uncloak=Find+True+URL" + data_other = httptools.downloadpage(link).data + data_other = re.sub(r"\n|\r|\t|\s{2}| ", "", data_other) + patron='Destination URL<\/td>') itemla = scrapertools.find_multiple_matches(data_vid, '
.+?-(.+?)-(.+?)<\/div><.+? src="(.+?)"') for server, quality, url in itemla: - if "Calidad Alta" in quality: - quality = "HQ" if "HQ" in quality: quality = "HD" + if "Calidad Alta" in quality: + quality = "HQ" if " Calidad media - Carga mas rapido" in quality: quality = "360p" server = server.lower().strip() @@ -160,6 +171,7 @@ def findvideos(item): server = 'rapidvideo' if "netu" in server: server = 'netutv' + url = googl(url) itemlist.append(item.clone(url=url, action="play", server=server, contentQuality=quality, thumbnail=scrapedthumbnail, plot=scrapedplot, title="Enlace encontrado en: %s [%s]" % (server.capitalize(), quality))) From 0bad69a7cb44e021636ed93771efd914f6fd3c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rinc=C3=B3n=20Rodr=C3=ADguez?= Date: Fri, 10 Nov 2017 11:15:54 -0500 Subject: [PATCH 05/11] lineas innecesarias --- plugin.video.alfa/channels/anitoonstv.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 8db2b7bc..ff450062 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -134,7 +134,6 @@ def episodios(item): def googl(url): logger.info() - url="http://goo.gl/Y2Xus4" a=url.split("/") link=a[3] link="http://www.trueurl.net/?q=http%3A%2F%2Fgoo.gl%2F"+link+"&lucky=on&Uncloak=Find+True+URL" From 41a39ff02b760aa676508e563841be367bd7863a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rinc=C3=B3n=20Rodr=C3=ADguez?= Date: Fri, 10 Nov 2017 11:16:35 -0500 Subject: [PATCH 06/11] Update anitoonstv.py --- plugin.video.alfa/channels/anitoonstv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index ff450062..819a9275 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -139,7 +139,7 @@ def googl(url): link="http://www.trueurl.net/?q=http%3A%2F%2Fgoo.gl%2F"+link+"&lucky=on&Uncloak=Find+True+URL" data_other = httptools.downloadpage(link).data data_other = re.sub(r"\n|\r|\t|\s{2}| ", "", data_other) - patron='Destination URL<\/td> Date: Fri, 10 Nov 2017 13:45:26 -0500 Subject: [PATCH 07/11] Eliminado codigo innecesario --- plugin.video.alfa/channels/serieslan.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py index 05d15b36..f437b38e 100644 --- a/plugin.video.alfa/channels/serieslan.py +++ b/plugin.video.alfa/channels/serieslan.py @@ -136,7 +136,7 @@ def episodios(item): thumbnail=scrapedthumbnail)) if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, + itemlist.append(Item(channel=item.channel, title="[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]", url=item.url, action="add_serie_to_library", extra="episodios", show=show)) return itemlist @@ -201,17 +201,3 @@ def findvideos(item): else: return [] - -def play(item): - logger.info() - itemlist = [] - # Buscamos video por servidor ... - devuelve = servertools.findvideosbyserver(item.url, item.server) - if not devuelve: - # ...sino lo encontramos buscamos en todos los servidores disponibles - devuelve = servertools.findvideos(item.url, skip=True) - if devuelve: - # logger.debug(devuelve) - itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2], - url=devuelve[0][1], thumbnail=item.thumbnail, folder=False)) - return itemlist From 5d592f724de2fed8f3b4c6ca9728df99ff2ce2ea Mon Sep 17 00:00:00 2001 From: danielr460 Date: Fri, 10 Nov 2017 14:04:07 -0500 Subject: [PATCH 08/11] Serieslan: Actualizado --- plugin.video.alfa/channels/serieslan.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py index f437b38e..65490a8a 100644 --- a/plugin.video.alfa/channels/serieslan.py +++ b/plugin.video.alfa/channels/serieslan.py @@ -67,10 +67,12 @@ def lista(item): title = name url = host + link scrapedthumbnail = host + img - context1=[renumbertools.context(item), autoplay.context] + context = renumbertools.context(item) + context2 = autoplay.context + context.extend(context2) + itemlist.append(item.clone(title=title, url=url, action="episodios", thumbnail=scrapedthumbnail, show=title, - context=context1)) - logger.info("gasdfsa "+str(b)) + context=context)) if b<29: a=a+1 url="https://serieslan.com/pag-"+str(a) From 9aa77400d55ac5c18b11f46843d3be3b3d17b68f Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Sun, 12 Nov 2017 09:57:26 -0500 Subject: [PATCH 09/11] hdfull: actualizado --- plugin.video.alfa/channels/hdfull.py | 52 +++++++++++++--------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index 1a311969..9e4ad2f1 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -1,4 +1,3 @@ - # -*- coding: utf-8 -*- import base64 @@ -16,7 +15,6 @@ from platformcode import platformtools host = "http://hdfull.tv" -A_A = {'User-Agent':'Mozilla/5.0 AppLeWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 SaFAri/537.36'} if config.get_setting('hdfulluser', 'hdfull'): account = True else: @@ -30,7 +28,7 @@ def settingCanal(item): def login(): logger.info() - data = agrupa_datos(httptools.downloadpage(host, headers=A_A).data) + data = agrupa_datos(httptools.downloadpage(host).data) patron = "" sid = scrapertools.find_single_match(data, patron) @@ -39,7 +37,7 @@ def login(): 'hdfull') + "&password=" + config.get_setting( 'hdfullpassword', 'hdfull') + "&action=login" - httptools.downloadpage(host, post=post, headers=A_A) + httptools.downloadpage(host, post=post) def mainlist(item): @@ -139,7 +137,7 @@ def menuseries(item): def search(item, texto): logger.info() - data = agrupa_datos(httptools.downloadpage(host, headers=A_A).data) + data = agrupa_datos(httptools.downloadpage(host).data) sid = scrapertools.get_match(data, '.__csrf_magic. value="(sid:[^"]+)"') item.extra = urllib.urlencode({'__csrf_magic': sid}) + '&menu=search&query=' + texto @@ -175,7 +173,7 @@ def items_usuario(item): itemlist = [] ## Carga estados - status = jsontools.load(httptools.downloadpage(host + '/a/status/all', headers=A_A).data) + status = jsontools.load(httptools.downloadpage(host + '/a/status/all').data) ## Fichas usuario url = item.url.split("?")[0] @@ -189,7 +187,7 @@ def items_usuario(item): next_page = url + "?" + post ## Carga las fichas de usuario - data = httptools.downloadpage(url, post=post, headers=A_A).data + data = httptools.downloadpage(url, post=post).data fichas_usuario = jsontools.load(data) for ficha in fichas_usuario: @@ -257,7 +255,7 @@ def listado_series(item): itemlist = [] - data = agrupa_datos(httptools.downloadpage(item.url, headers=A_A).data) + data = agrupa_datos(httptools.downloadpage(item.url).data) patron = '
]+>([^<]+)
' matches = re.compile(patron, re.DOTALL).findall(data) @@ -277,10 +275,10 @@ def fichas(item): textoidiomas='' infoLabels=dict() ## Carga estados - status = jsontools.load(httptools.downloadpage(host + '/a/status/all', headers=A_A).data) + status = jsontools.load(httptools.downloadpage(host + '/a/status/all').data) if item.title == "Buscar...": - data = agrupa_datos(httptools.downloadpage(item.url, post=item.extra, headers=A_A).data) + data = agrupa_datos(httptools.downloadpage(item.url, post=item.extra).data) s_p = scrapertools.get_match(data, '

(.*?)