From 74e6145d2fdbf265b328639cd43aa973931c1174 Mon Sep 17 00:00:00 2001 From: danielr460 Date: Fri, 10 Nov 2017 11:12:07 -0500 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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)