From c4c63aed5303be88a0e8cfe1f04f070d4ef67f3c Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sat, 20 Jan 2018 23:13:59 -0500 Subject: [PATCH 1/6] Arreglado AnitoonsTV --- plugin.video.alfa/channels/anitoonstv.py | 90 +++++++++++------------- 1 file changed, 41 insertions(+), 49 deletions(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 417ef1f1..909293f5 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -32,7 +32,7 @@ def mainlist(item): itemlist = list() - itemlist.append(Item(channel=item.channel, action="lista", title="Anime", url=host, + itemlist.append(Item(channel=item.channel, action="lista", title="Series", url=host+"/lista-de-anime.php", thumbnail=thumb_series)) itemlist.append(Item(channel=item.channel, action="lista", title="Series Animadas", url=host, thumbnail=thumb_series)) @@ -52,45 +52,38 @@ def lista(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - if 'Novedades' in item.title: - patron_cat = '

(.+?)<\/h2><\/a><\/div>' - patron = '

(.+?)<\/span>' - else: - patron_cat = '
  • ' - patron_cat += str(item.title) - patron_cat += '<\/a>
    (.+?)<\/div><\/li>' - patron = "(.+?)<\/a>" - data = scrapertools.find_single_match(data, patron_cat) + #logger.info("Pagina para regex "+data) + patron = '
    ' #Encabezado regex + patron +="" #scrapedurl + patron +="Titulo.+?<\/span>(.+?)
    ') scrapedthumbnail = scrapertools.find_single_match(data, "") @@ -150,29 +143,28 @@ def findvideos(item): data = httptools.downloadpage(item.url).data data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - data_vid = scrapertools.find_single_match(data1, '
    (.+?)<\/div>
    ') - + data_vid = scrapertools.find_single_match(data1, 'var q = \[ \[(.+?)\] \]') + logger.info("h12ghcvh1 "+data_vid) # name = scrapertools.find_single_match(data,'Titulo.+?<\/span>([^<]+)
    ') scrapedplot = scrapertools.find_single_match(data, '
    Descrip.+?<\/span>([^<]+)
    ') scrapedthumbnail = scrapertools.find_single_match(data, '
    ') - itemla = scrapertools.find_multiple_matches(data_vid, '
    .+?-(.+?)-(.+?)<\/div><.+? src="(.+?)"') - for server, quality, url in itemla: - 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() - if "ok" in server: - server = 'okru' - if "rapid" in server: - server = 'rapidvideo' - if "netu" in server: - server = 'netutv' + itemla = scrapertools.find_multiple_matches(data_vid, '"(.+?)"') + for url in itemla: + url=url.replace('\/', '/') + server1=url.split('/') + server=server1[2] + if "." in server: + server1=server.split('.') + if len(server1)==3: + server=server1[1] + else: + server=server1[0] + if "goo" in url: url = googl(url) - itemlist.append(item.clone(url=url, action="play", server=server, contentQuality=quality, - thumbnail=scrapedthumbnail, plot=scrapedplot, + server='netutv' + quality="360p" + itemlist.append(item.clone(url=url, action="play", + thumbnail=scrapedthumbnail, server=server, plot=scrapedplot, title="Enlace encontrado en: %s [%s]" % (server.capitalize(), quality))) autoplay.start(itemlist, item) From 453b71bc7a27f119501fdb4a417f39bebea7b94c Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sat, 20 Jan 2018 23:17:39 -0500 Subject: [PATCH 2/6] Eliminando opciones innecesarias --- plugin.video.alfa/channels/anitoonstv.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 909293f5..0de7af50 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -34,12 +34,12 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, action="lista", title="Series", url=host+"/lista-de-anime.php", thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="lista", title="Series Animadas", url=host, - thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", url=host, - thumbnail=thumb_series)) - itemlist.append(Item(channel=item.channel, action="lista", title="Pokemon", url=host, - thumbnail=thumb_series)) + #itemlist.append(Item(channel=item.channel, action="lista", title="Series Animadas", url=host, + # thumbnail=thumb_series)) + #itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", url=host, + # thumbnail=thumb_series)) + #itemlist.append(Item(channel=item.channel, action="lista", title="Pokemon", url=host, + # thumbnail=thumb_series)) itemlist = renumbertools.show_option(item.channel, itemlist) autoplay.show_option(item.channel, itemlist) return itemlist From b42aae2eb99a0ec8100296ebf81b1621e42a006a Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sun, 21 Jan 2018 14:59:37 -0500 Subject: [PATCH 3/6] =?UTF-8?q?Mejora=20en=20funci=C3=B3n=20test=5Fvideo?= =?UTF-8?q?=5Fexists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/servers/flashx.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py index cb325d53..6c33cac0 100644 --- a/plugin.video.alfa/servers/flashx.py +++ b/plugin.video.alfa/servers/flashx.py @@ -16,6 +16,8 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url, cookies=False).data if 'file was deleted' in data: return False, "[FlashX] El archivo no existe o ha sido borrado" + elif 'File Not Found' in data: + return False, "[FlashX] El archivo no existe" elif 'Video is processing now' in data: return False, "[FlashX] El archivo se está procesando" From 0d342552d3a98ad2a1420c9a226806987624051f Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sun, 21 Jan 2018 15:00:35 -0500 Subject: [PATCH 4/6] Autoplay: Evitando Popup de enlace por medio de test_video_exists --- plugin.video.alfa/channels/autoplay.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/plugin.video.alfa/channels/autoplay.py b/plugin.video.alfa/channels/autoplay.py index 467d7621..9c0977f0 100644 --- a/plugin.video.alfa/channels/autoplay.py +++ b/plugin.video.alfa/channels/autoplay.py @@ -89,7 +89,6 @@ def start(itemlist, item): videoitem.contentTitle=item.contentTitle videoitem.contentType=item.contentType videoitem.episode_id=item.episode_id - videoitem.hasContentDetails=item.hasContentDetails #videoitem.infoLabels=item.infoLabels videoitem.thumbnail=item.thumbnail #videoitem.title=item.title @@ -276,11 +275,23 @@ def start(itemlist, item): videoitem = resolved_item[0] # si no directamente reproduce y marca como visto - from platformcode import xbmc_videolibrary - xbmc_videolibrary.mark_auto_as_watched(item) - #platformtools.play_video(videoitem) videoitem.contentChannel='videolibrary' - launcher.run(videoitem) + import importlib + actual_server="servers."+videoitem.server + i = importlib.import_module(actual_server) + #from servers import streamango + try: + testv=i.test_video_exists(videoitem.url) + logger.info(testv) + except: + testv=(True,'') + logger.debug("La funcion no existe en el conector "+videoitem.server) + testvideo=list(testv) + if testvideo[0]==True: + from platformcode import xbmc_videolibrary + xbmc_videolibrary.mark_auto_as_watched(item) + #platformtools.play_video(videoitem) + launcher.run(videoitem) try: if platformtools.is_playing(): From 4ef6efdc5da9d7e1cb9922fb5129f83a980300b5 Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sun, 21 Jan 2018 16:24:46 -0500 Subject: [PATCH 5/6] Anitoonstv: Arreglo menor en servidor --- plugin.video.alfa/channels/anitoonstv.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 0de7af50..70cc6fb8 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -144,7 +144,6 @@ def findvideos(item): data = httptools.downloadpage(item.url).data data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data) data_vid = scrapertools.find_single_match(data1, 'var q = \[ \[(.+?)\] \]') - logger.info("h12ghcvh1 "+data_vid) # name = scrapertools.find_single_match(data,'Titulo.+?<\/span>([^<]+)
    ') scrapedplot = scrapertools.find_single_match(data, '
    Descrip.+?<\/span>([^<]+)
    ') scrapedthumbnail = scrapertools.find_single_match(data, '
    ') @@ -162,6 +161,9 @@ def findvideos(item): if "goo" in url: url = googl(url) server='netutv' + if "ok" in url: + url = googl(url) + server='okru' quality="360p" itemlist.append(item.clone(url=url, action="play", thumbnail=scrapedthumbnail, server=server, plot=scrapedplot, From dc095616dc53e8aa45443a19822b389df005f653 Mon Sep 17 00:00:00 2001 From: danielr460 Date: Sun, 21 Jan 2018 16:50:40 -0500 Subject: [PATCH 6/6] Anitoonstv: Arreglo en okru --- plugin.video.alfa/channels/anitoonstv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/anitoonstv.py b/plugin.video.alfa/channels/anitoonstv.py index 70cc6fb8..df815baa 100644 --- a/plugin.video.alfa/channels/anitoonstv.py +++ b/plugin.video.alfa/channels/anitoonstv.py @@ -121,7 +121,7 @@ def episodios(item): if config.get_videolibrary_support() and len(itemlist) > 0: 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)) + action="add_serie_to_library", extra="episodios", show=item.title)) return itemlist @@ -162,7 +162,7 @@ def findvideos(item): url = googl(url) server='netutv' if "ok" in url: - url = googl(url) + url = "https:"+url server='okru' quality="360p" itemlist.append(item.clone(url=url, action="play",