From bdf9a89bd9c7d43b91fb86abbe5e3802613f21b2 Mon Sep 17 00:00:00 2001 From: pipcat Date: Thu, 19 Jul 2018 13:29:17 +0200 Subject: [PATCH 01/10] =?UTF-8?q?Categor=C3=ADas=20incorrectas=20en=20json?= =?UTF-8?q?=20de=20canales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/cinedetodo.json | 2 +- plugin.video.alfa/channels/cinemahd.json | 2 +- plugin.video.alfa/channels/cuevana3.json | 2 +- plugin.video.alfa/channels/newpct1.json | 1 - plugin.video.alfa/channels/peliscity.json | 2 +- plugin.video.alfa/channels/seodiv.json | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/channels/cinedetodo.json b/plugin.video.alfa/channels/cinedetodo.json index 037cbb3b..94868116 100644 --- a/plugin.video.alfa/channels/cinedetodo.json +++ b/plugin.video.alfa/channels/cinedetodo.json @@ -8,7 +8,7 @@ "banner": "", "version": 1, "categories": [ - "movies" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/cinemahd.json b/plugin.video.alfa/channels/cinemahd.json index 27d04684..99e3905a 100644 --- a/plugin.video.alfa/channels/cinemahd.json +++ b/plugin.video.alfa/channels/cinemahd.json @@ -8,7 +8,7 @@ "banner": "", "version": 1, "categories": [ - "movies" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/cuevana3.json b/plugin.video.alfa/channels/cuevana3.json index 9734b502..d8824e24 100644 --- a/plugin.video.alfa/channels/cuevana3.json +++ b/plugin.video.alfa/channels/cuevana3.json @@ -8,7 +8,7 @@ "banner": "", "version": 1, "categories": [ - "movies" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json index 364395eb..4a0c0cfd 100644 --- a/plugin.video.alfa/channels/newpct1.json +++ b/plugin.video.alfa/channels/newpct1.json @@ -11,7 +11,6 @@ "tvshow", "anime", "torrent", - "latino", "documentary", "vos", "direct" diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json index a9497196..e57b47bb 100755 --- a/plugin.video.alfa/channels/peliscity.json +++ b/plugin.video.alfa/channels/peliscity.json @@ -9,7 +9,7 @@ "categories": [ "movie", "direct", - "VOS" + "vos" ], "settings":[ { diff --git a/plugin.video.alfa/channels/seodiv.json b/plugin.video.alfa/channels/seodiv.json index 8f6aa61f..79241049 100755 --- a/plugin.video.alfa/channels/seodiv.json +++ b/plugin.video.alfa/channels/seodiv.json @@ -7,7 +7,7 @@ "thumbnail": "https://s32.postimg.cc/gh8lhbkb9/seodiv.png", "banner": "https://s31.postimg.cc/klwjzp7t7/seodiv_banner.png", "categories": [ - "tvshows" + "tvshow" ], "settings": [ { From 7c682cc3945538022900504703f0d5c697777566 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 19 Jul 2018 10:45:18 -0500 Subject: [PATCH 02/10] xbmc_info_window: fix error update language --- plugin.video.alfa/platformcode/xbmc_info_window.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/platformcode/xbmc_info_window.py b/plugin.video.alfa/platformcode/xbmc_info_window.py index b7efce30..557bff6c 100755 --- a/plugin.video.alfa/platformcode/xbmc_info_window.py +++ b/plugin.video.alfa/platformcode/xbmc_info_window.py @@ -2,7 +2,7 @@ import xbmcgui from core.tmdb import Tmdb -from platformcode import logger +from platformcode import config, logger ID_BUTTON_CLOSE = 10003 ID_BUTTON_PREVIOUS = 10025 @@ -217,7 +217,7 @@ class InfoWindow(xbmcgui.WindowXMLDialog): self.getControl(10009).setLabel(self.result.get("language", "N/A")) self.getControl(100010).setLabel(config.get_localized_string(60380)) self.getControl(100011).setLabel(self.result.get("puntuacion", "N/A")) - self.getControl(100012).setLabel(config.get_localized_string(60382) + self.getControl(100012).setLabel(config.get_localized_string(60382)) self.getControl(100013).setLabel(self.result.get("genre", "N/A")) if self.result.get("season"): From d16fa3daf704141636e3d36b1be476706e7bbf9a Mon Sep 17 00:00:00 2001 From: Alfa <30527549+alfa-addon@users.noreply.github.com> Date: Thu, 19 Jul 2018 10:48:06 -0500 Subject: [PATCH 03/10] v2.5.27 --- plugin.video.alfa/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 0dfbb8c9..f83fb434 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@ - + From 7ee6759948740e07a084f61e856fa63abd922171 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 19 Jul 2018 18:41:07 +0200 Subject: [PATCH 04/10] =?UTF-8?q?MejorTorrent:=20reparaci=C3=B3n=20desacti?= =?UTF-8?q?vaci=C3=B3n=20autom=C3=A1tica=20del=20canal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/mejortorrent.py | 14 +++++++------- plugin.video.alfa/channels/mejortorrent1.py | 10 ++++------ plugin.video.alfa/lib/generictools.py | 16 ++++++++++++---- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py index 2a975f77..3f2f8909 100755 --- a/plugin.video.alfa/channels/mejortorrent.py +++ b/plugin.video.alfa/channels/mejortorrent.py @@ -810,19 +810,19 @@ def episodios(item): # Carga la página try: - data = re.sub(r"\n|\r|\t|\s{2}|()", "", httptools.downloadpage(item.url).data) + data_alt = re.sub(r"\n|\r|\t|\s{2}|()", "", httptools.downloadpage(item.url).data) except: #Algún error de proceso, salimos logger.error("ERROR 01: EPISODIOS: La Web no responde o la URL es erronea" + item.url) itemlist.append(item.clone(action='', title=item.channel.capitalize() + ': ERROR 01: EPISODIOS:. La Web no responde o la URL es erronea. Si la Web está activa, reportar el error con el log')) return itemlist #Datos para crear el Post. Usado para documentales - total_capis = scrapertools.find_single_match(data, "") - tabla = scrapertools.find_single_match(data, "") - titulo_post = scrapertools.find_single_match(data, "") + total_capis = scrapertools.find_single_match(data_alt, "") + tabla = scrapertools.find_single_match(data_alt, "") + titulo_post = scrapertools.find_single_match(data_alt, "") # Selecciona en tramo que nos interesa - data = scrapertools.find_single_match(data, + data = scrapertools.find_single_match(data_alt, "(
.*?)
") # Prepara el patrón de búsqueda de: URL, título, fechas y dos valores mas sin uso @@ -836,9 +836,9 @@ def episodios(item): matches = re.compile(patron, re.DOTALL).findall(data) if not matches: #error - item = generictools.web_intervenida(item, data) #Verificamos que no haya sido clausurada + item = generictools.web_intervenida(item, data_alt) #Verificamos que no haya sido clausurada if item.intervencion: #Sí ha sido clausurada judicialmente - item, itemlist = generictools.post_tmdb_findvideos(item, itemlist) #Llamamos al método para el pintado del error + item, itemlist = generictools.post_tmdb_episodios(item, itemlist) #Llamamos al método para el pintado del error return itemlist #Salimos logger.error("ERROR 02: EPISODIOS: Ha cambiado la estructura de la Web " + " / PATRON: " + patron + " / DATA: " + data) diff --git a/plugin.video.alfa/channels/mejortorrent1.py b/plugin.video.alfa/channels/mejortorrent1.py index 8c82d512..cae2136d 100644 --- a/plugin.video.alfa/channels/mejortorrent1.py +++ b/plugin.video.alfa/channels/mejortorrent1.py @@ -529,10 +529,9 @@ def listado_busqueda(item): return itemlist #si no hay más datos, algo no funciona, pintamos lo que tenemos cnt_next += 1 - # busca series y Novedades - patron = '\(([^>]+)\)<\/a><\/td>' #título - patron += '([^>]+)<\/td><\/tr>' #calidad y tipo de contenido + patron = '\(([^>]+)?\)<\/a><\/td>' #calidad + patron += '([^>]+)<\/td><\/tr>' #tipo de contenido matches_alt = scrapertools.find_multiple_matches(data, patron) i = 0 @@ -846,8 +845,7 @@ def findvideos(item): def episodios(item): logger.info() itemlist = [] - - logger.debug(item) + # Obtener la información actualizada de la Serie. TMDB es imprescindible para Videoteca if not item.infoLabels['tmdb_id']: tmdb.set_infoLabels(item, True) diff --git a/plugin.video.alfa/lib/generictools.py b/plugin.video.alfa/lib/generictools.py index b67cb9a6..0142ea08 100644 --- a/plugin.video.alfa/lib/generictools.py +++ b/plugin.video.alfa/lib/generictools.py @@ -417,6 +417,8 @@ def post_tmdb_episodios(item, itemlist): del item.url_alt if item.title_from_channel: del item.title_from_channel + if item.ow_force: + del item.ow_force for item_local in itemlist: #Recorremos el Itemlist generado por el canal if item_local.add_videolibrary: @@ -443,6 +445,8 @@ def post_tmdb_episodios(item, itemlist): del item_local.channel_host if item_local.intervencion: del item_local.intervencion + if item_local.ow_force: + del item_local.ow_force #logger.debug(item_local) #Ajustamos el nombre de la categoría si es un clone de NewPct1 @@ -1036,10 +1040,10 @@ def redirect_clone_newpct1(item, head_nfo=None, it=None, overwrite=False, path=F - ow_force: indicador para la acción de "videolibrary_service.py". Puede crear la variable item.ow_force: - force: indica al canal que analize toda la serie y que videolibrary_service la reescriba - auto: indica a videolibrary_service que la reescriba - - no: no acción especial para videolibrary_service + - no: no acción para videolibrary_service, solo redirige en visionado de videolibrary ejemplo: ('1', 'mejortorrent', 'mejortorrent1', 'http://www.mejortorrent.com/', 'https://mejortorrent1.com/', 'auto') - La llamada recibe el parámetro Item, el .nfoy los devuleve actualizados, así como opcionalmente el parámetro "overwrite· que puede forzar la reescritura de todos los archivos de la serie + La llamada recibe el parámetro Item, el .nfo y los devuleve actualizados, así como opcionalmente el parámetro "overwrite· que puede forzar la reescritura de todos los archivos de la serie, y el parámetro "path" si viene de videolibrary_service """ if not it: @@ -1078,12 +1082,15 @@ def redirect_clone_newpct1(item, head_nfo=None, it=None, overwrite=False, path=F if item.contentType == "list": #Si viene de Videolibrary, le cambiamos ya el canal if item.channel != channel_py: item.channel = canal_des #Cambiamos el canal. Si es clone, lo hace el canal - if item.contentType not in content_inc: + continue #Salimos sin hacer nada más. item está casi vacío + if item.contentType not in content_inc and "*" not in content_inc: #Está el contenido el la lista de incluidos continue - if item.contentType in content_exc: #Es esta nuestra entrada? + if item.contentType in content_exc: #Está el contenido excluido? continue if channel_enabled and canal_org != canal_des: #Si el canal está activo, puede ser solo... continue #... una intervención que afecte solo a una región + if ow_force == 'no' and path != False: #Queremos que el canal solo visualice sin migración? + continue #Salimos sin tocas archivos item.url = item.url.replace(url_org, url_des) #reemplzamos una parte de url if patron1: #Hay expresión regex? url = scrapertools.find_single_match(item.url, patron1) #La aplicamos a url @@ -1117,6 +1124,7 @@ def redirect_clone_newpct1(item, head_nfo=None, it=None, overwrite=False, path=F if ow_force in ['force', 'auto']: #Sobreescribir la series? overwrite = ow_force_param #Sí, lo marcamos + if item.contentType in ['tvshow', 'season'] and it.library_urls: if path == False: TVSHOWS_PATH = item.path From d19588cf21ac73d180e337fcf0b494a15cba74d3 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 19 Jul 2018 19:16:20 +0200 Subject: [PATCH 05/10] =?UTF-8?q?NewPct1:=20actualizaci=C3=B3n=20de=20serv?= =?UTF-8?q?idores=20Ver=20Online?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/newpct1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json index 4a0c0cfd..b77296cf 100644 --- a/plugin.video.alfa/channels/newpct1.json +++ b/plugin.video.alfa/channels/newpct1.json @@ -11,6 +11,7 @@ "tvshow", "anime", "torrent", + "latino", "documentary", "vos", "direct" @@ -116,7 +117,7 @@ "id": "clonenewpct1_excluir1_enlaces_veronline", "type": "list", "label": "Excluir Servidores para Ver Online", - "default": 9, + "default": 22, "max_excl": 5, "enabled": true, "visible": "!eq(-3,'No')", From 946f17d8e376ddc5d18cdc41a8de17a03d5b8a3a Mon Sep 17 00:00:00 2001 From: pipcat Date: Thu, 19 Jul 2018 19:29:16 +0200 Subject: [PATCH 06/10] No mostrar en log error controlado --- plugin.video.alfa/platformcode/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin.video.alfa/platformcode/config.py b/plugin.video.alfa/platformcode/config.py index 04fc22c9..278bde5c 100644 --- a/plugin.video.alfa/platformcode/config.py +++ b/plugin.video.alfa/platformcode/config.py @@ -393,6 +393,7 @@ def verify_directories_created(): # Buscamos el archivo addon.xml del skin activo skindir = filetools.join(xbmc.translatePath("special://home"), 'addons', xbmc.getSkinDir(), 'addon.xml') + if not os.path.isdir(skindir): return # No hace falta mostrar error en el log si no existe la carpeta # Extraemos el nombre de la carpeta de resolución por defecto folder = "" data = filetools.read(skindir) From 93d792c1061bb50864df9e37180fd593be4134e4 Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Thu, 19 Jul 2018 19:30:38 +0200 Subject: [PATCH 07/10] =?UTF-8?q?Newpct1:=20arreglo=20categor=C3=ADa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/newpct1.json | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json index b77296cf..cff73741 100644 --- a/plugin.video.alfa/channels/newpct1.json +++ b/plugin.video.alfa/channels/newpct1.json @@ -11,7 +11,6 @@ "tvshow", "anime", "torrent", - "latino", "documentary", "vos", "direct" From c70287939de43cfd4a817208ad54c0116610446f Mon Sep 17 00:00:00 2001 From: Alfa <30527549+alfa-addon@users.noreply.github.com> Date: Thu, 19 Jul 2018 12:36:20 -0500 Subject: [PATCH 08/10] v2.5.28 --- plugin.video.alfa/addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index f83fb434..7d27e2ce 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@ - + From b7113a1a0a85322aced6af54d7ea502e6468342f Mon Sep 17 00:00:00 2001 From: pipcat Date: Thu, 19 Jul 2018 19:38:18 +0200 Subject: [PATCH 09/10] Correccion pelismagnet --- plugin.video.alfa/channels/pelismagnet.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugin.video.alfa/channels/pelismagnet.py b/plugin.video.alfa/channels/pelismagnet.py index d8440caa..9a6f08a1 100644 --- a/plugin.video.alfa/channels/pelismagnet.py +++ b/plugin.video.alfa/channels/pelismagnet.py @@ -119,6 +119,8 @@ def series(item): # response = httptools.downloadpage(url, post, follow_redirects=False).data # url = scrapertools.find_single_match(response, ' 0: data = data[pos:] lista = jsontools.load(data) logger.debug(lista) @@ -178,6 +180,8 @@ def episodios(item): # url = scrapertools.find_single_match(response, ' 0: data = data[pos:] data = jsontools.load(data) @@ -248,6 +252,8 @@ def pelis(item): # response = httptools.downloadpage(url, post, follow_redirects=False).data # url = scrapertools.find_single_match(response, ' 0: data = data[pos:] lista = jsontools.load(data) if item.extra == "next": From aa72291d2b90263dba41d1e7f68c8dfae74cf40f Mon Sep 17 00:00:00 2001 From: Alfa <30527549+alfa-addon@users.noreply.github.com> Date: Thu, 19 Jul 2018 12:45:15 -0500 Subject: [PATCH 10/10] verseriesonline: nuevo canal --- plugin.video.alfa/channels/veseriesonline.py | 244 ++++++++++++++++++ plugin.video.alfa/channels/veseriesonline.pyo | Bin 0 -> 8550 bytes 2 files changed, 244 insertions(+) create mode 100644 plugin.video.alfa/channels/veseriesonline.py create mode 100644 plugin.video.alfa/channels/veseriesonline.pyo diff --git a/plugin.video.alfa/channels/veseriesonline.py b/plugin.video.alfa/channels/veseriesonline.py new file mode 100644 index 00000000..b1ba3b7b --- /dev/null +++ b/plugin.video.alfa/channels/veseriesonline.py @@ -0,0 +1,244 @@ +# -*- coding: utf-8 -*- +# -*- Channel VeSeriesOnline -*- +# -*- Created for Alfa-addon -*- +# -*- By the Alfa Develop Group -*- + +import re + +from channels import autoplay +from channels import filtertools +from core import httptools +from core import scrapertools +from core import servertools +from core import tmdb +from core.item import Item +from platformcode import config, logger +from channelselector import get_thumb + +list_language = ['Lat', 'Cast', 'VOSE', 'VO'] +list_quality = [] +list_servers = ['openload', 'netutv', 'streamango', 'streamix', 'powvideo', 'gamovideo'] + +host = 'http://www.veseriesonline.com/' + +def mainlist(item): + logger.info() + + autoplay.init(item.channel, list_servers, list_quality) + + itemlist = [] + + itemlist.append(Item(channel=item.channel, + title="Todas", + action="list_all", + thumbnail=get_thumb('all', auto=True), + url=host + 'archivos/h1/', + )) + + itemlist.append(Item(channel=item.channel, + title="Buscar", + action="search", + url=host+'?s=', + thumbnail=get_thumb('search', auto=True))) + + itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality) + autoplay.show_option(item.channel, itemlist) + + return itemlist + +def get_source(url): + logger.info() + data = httptools.downloadpage(url).data + data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) + return data + + +def list_all(item): + logger.info() + + itemlist = [] + data = get_source(item.url) + patron = "
.*?href=(.*?) class.*?src=(.*?) style.*?

(.*?)

" + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumbnail, scrapedtitle in matches: + episode = '' + url = scrapedurl + thumbnail = scrapedthumbnail + if 'Temporada' in scrapedtitle: + episode = scrapertools.find_single_match(scrapedtitle, '.*?Temporada (\d+x\d+)') + scrapedtitle = scrapertools.find_single_match(scrapedtitle, '(.*?) Temporada') + + scrapedtitle = scrapedtitle.replace(' Online','') + contentSerieName = scrapedtitle + if episode != '': + title = '%s - %s' % (scrapedtitle, episode) + else: + title = scrapedtitle + + itemlist.append(Item(channel=item.channel, + action='seasons', + title=title, + url=url, + thumbnail=thumbnail, + contentTitle=scrapedtitle, + context=filtertools.context(item, list_language, list_quality), + contentSerieName=contentSerieName, + )) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + if itemlist != []: + next_page = scrapertools.find_single_match(data ,"›") + if next_page != '': + itemlist.append(Item(channel=item.channel, + action="list_all", + title='Siguiente >>>', + url=next_page, + thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', + )) + return itemlist + +def search(item, texto): + logger.info() + texto = texto.replace(" ", "+") + item.url = item.url + texto + if texto != '': + return list_all(item) + +def seasons(item): + logger.info() + + itemlist = [] + data = get_source(item.url) + patron = 'itemprop=season.*?.*?;>(.*?)<' + matches = re.compile(patron, re.DOTALL).findall(data) + if len(matches) == 0: + patron = '
.*?href=(.*?) class.*?src=(.*?) style.*?title=.*?(Temporada \d+) alt' + matches = re.compile(patron, re.DOTALL).findall(data) + for scrapedurl, scrapedthumb, scrapedtitle in matches: + infoLabels = item.infoLabels + infoLabels['season'] = scrapertools.find_single_match(scrapedtitle, 'Temporada (\d+)') + itemlist.append(Item(channel=item.channel, title=scrapedtitle, url=scrapedurl, action='episodesxseason', + thumbnail=scrapedthumb, infoLabels=infoLabels)) + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + itemlist = itemlist [::-1] + + 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", contentSerieName=item.contentSerieName, + extra1='library')) + + return itemlist + +def episodios(item): + logger.info() + itemlist = [] + templist = seasons(item) + for tempitem in templist: + itemlist += episodesxseason(tempitem) + return itemlist + +def episodesxseason(item): + logger.info() + + itemlist = [] + + data = get_source(item.url) + patron = '
  • ' in lang_data: + language.append('Lat') + if 'lang-spa>' in lang_data: + language.append('Cast') + if 'lang-engsub>' in lang_data: + language.append('VOSE') + if 'lang-eng>' in lang_data: + language.append('VO') + + title = '%sx%s - %s %s' % (infoLabels['season'], scrapedepi, scrapedtitle, language) + infoLabels['episode'] = scrapedepi + itemlist.append(Item(channel=item.channel, title=title, url=scrapedurl, action='findvideos', language=language, + infoLabels=infoLabels)) + + tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) + + itemlist = filtertools.get_links(itemlist, item, list_language) + return itemlist + +def findvideos(item): + logger.info() + itemlist = [] + + data = get_source(item.url) + video_id = scrapertools.find_single_match(data, 'getEnlaces\((\d+)\)') + links_url = '%s%s%s' % (host,'/link/repro.php/',video_id) + online_url = '%s%s%s' % (host, '/link/enlaces_online.php/', video_id) + + # listado de opciones links_url + + data = get_source(links_url) + patron = 'content >

    (.*?)

    .*?class=video.*?src=(.*?) scrolling' + matches = re.compile(patron, re.DOTALL).findall(data) + + for lang_data, scrapedurl in matches: + if 'Latino' in lang_data: + language = 'Lat' + elif 'Español' in lang_data: + language = 'Cast' + else: + language = 'VOSE' + hidden_url = scrapedurl.replace('/i/', '/r/') + data = get_source(hidden_url) + url = scrapertools.find_single_match(data, ':url content=(.*?)>') + title = '%s '+ '[%s]' % language + if url != '': + itemlist.append(Item(channel=item.channel, title=title, url=url, action='play', language=language, + infoLabels=item.infoLabels)) + + # listado de enlaces online_url + data = get_source(online_url) + patron = '.*?href=(.*?) ' + matches = re.compile(patron, re.DOTALL).findall(data) + scrapertools.printMatches(matches) + for lang_data, scrapedurl in matches: + if 'lat' in lang_data: + language = 'Lat' + elif 'spa' in lang_data: + language = 'Cast' + elif 'eng' in lang_data: + language = 'VOSE' + else: + language = 'VO' + video_id = scrapertools.find_single_match(scrapedurl, 'index.php/(\d+)/') + new_url = '%s%s%s%s' % (host, 'ext/index-include.php?id=', video_id, '&tipo=1') + data = get_source(new_url) + video_url = scrapertools.find_single_match(data, '
    ') + video_url = video_url.replace('enlace.php', 'r') + data = httptools.downloadpage(video_url, follow_redirects=False) + url = data.headers['location'] + title = '%s '+ '[%s]' % language + if url != '': + itemlist.append(Item(channel=item.channel, title=title, url=url, action='play', language=language, + infoLabels=item.infoLabels)) + + itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + + # Requerido para FilterTools + + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) + + return sorted(itemlist, key=lambda it: it.language) + + + diff --git a/plugin.video.alfa/channels/veseriesonline.pyo b/plugin.video.alfa/channels/veseriesonline.pyo new file mode 100644 index 0000000000000000000000000000000000000000..fb8d4a5c6c154669babb073ec0534cdda66fe4f6 GIT binary patch literal 8550 zcmcgxOK%(36~04KPwQpNlKhIp_$4}y#W-l=#+K+fc7mjF6OV#cA~^x*b;jjAW*ie?&6V%0DWZ8RZ|7%n{`um&{S+pODNk<-Z`A;}p(P=_I5T z{s%vcC5TL!K_p(sB<;w1WNQwfW-W|NkeVckw5=RM<+?HLJyj#9()HA9KhcqI>mYsb zL}dY$rsc2Nu~>S~1g%nz)jYy_60d~~$wo<|5v045HUd*K>z&rB$)n>f<Xb!_zkN z(e0(T4afQDwrnM72XT~mzKj(IrehwMVKi%#242gH8;NwY#c)#!?d0Ku&<_&BO*Xt% zA|*{pam!cA<%bU+&OHdQtuW9@9EEW(S5I2yIwi=-$MM|2qyLP=DAjb-j#3U5*37Fd zlncuAajQE}JskPAqqZE?9H97dDz=B8ql)?k<@YJSUtu-=fbs_w*1zL8{*W@zo?$h! zqxyCnc}SJ-f9qCj$Y5+4V{6ZPsQOkxpl6lzoRqDaImM;UuiFCHgrd7M;0 zspzDUre1kzeLZ}T=<@odvW)juN7ubnvN~X^=KI(5LW#0>sl_r<7_TKR3f)p@+`}w! zP+5r8O}$%jzvD%rd1P1JhWhv}H{enkWXL;dCy>l~qKzw;MwEO#d00!@vdz)%=n*um z<23@S+T2Nk-KrF`XSb&t2e^cAgx|+w{LpJtGbET3gbrg{lpKe zp6@5IuC}92BaG)nJLkM;&8udopsPb)br{-9P044vy;S1)Eb14Kp4zI$ zTh(-{YPQbBtGa!4YkoDYY*qCSUVCL5gF_rtDLF*7xV zPI$@kxZr9#C(Q-5m1EI?Otf-b;QQ2ezuE?7 z z3y76d8+n!fh4_R@)U4&y^!A8~`=!%}fZK>N;5n=V8yq7Z0lUC|TL2<-KoJ0gnlZit z{xjpMIl<26pfZQ3NMOXR1HjQiO5^@rb=OR)=3$NvqBK(kMWPZU$<;h|vTXoG@j6zF z@v#8A*2e;uUtJQ&6`KUJVoB(XKa6Yf_5NdrVj%2ITF+{gK|FVc!?OqQ5~QWwDdg=nIm#wpFYvAj zVsl3ToPDKY)0l~FJ~m5ay+yAT2&CvB*ti2G*O$>_-Yd$+XG`}!nO(VXel`=!EUs%9 zdxXYX4Q#nFTRE3%?|vt_I$!oGuHX?db17_eLM$LCRw@-ehZ+*D2IJ~Wug|rCw_&R> zSFe}fNH+Y=<@NQ=vhKbz*Nz)p%igeWvSRKnx=GbEdd0RJ;tCKDG@B{^F-$7; z2szm&0n=t};L)Tf%S96qR-GH5LBo43BKpxcz(!Chun|N@(9Nmz$K;)_nzeg6^6NYtB5C`C(cFBzi^h#)@7s@`~1b3+mpzvh-gu#AaB{ zHR)6{30P<~_0mUjA#op5Pw>w!C``2AqHIALFA4l+?>v`eTymiBi%U>*-(YeDiCCsl z5WC-HO`geBCa0N*b0ORzAhN)^Gfas1Vye@ulr3cosOe4{27-}AmUxYy;tjXLx@%0{ zL?YDQ31lOcQBvDIt4U%V@idj`vTiyQo`|aKfU1 z`5x5fD&6;x*apf*xL6Dw-bDINy#nv%K8f!GtmG$n#1$rrlMF{8tU7U=OwZdS;=v}L zBc7gDVI2tw1+aXXa9mK$J_?B$ge2fn064|zfJ;G~8l*3=`ELu#|5R0Ydg53Bi{Vo6 zGysP~6tV;}tbZ{i{>3k7)C0EZTv&($R--R{kKc6LFlp9?iEZ1Tx@`dJtWDuGV!!IE}^e6*ES@#5z7uB-P0q_2N6lMmnz>dCH_e=!=Idb zt1v*tmB0lRNO}cv1O9Wx72C1*E@~?-t#i%ftlrGr3VIgrqQ>QFpNa9Dkk+$}pUKVX z21G0r65LCZe0`9~i%fbp`?HYLz9u+(nw_5up1c?W=>$)@99j(W61Vnzv?L^2$P`&w z6C0!;fGNXq{WS(1+>h9oq_$5WKw$bg9!;1M49$%L2!?@_L(WmLnnxTOcfBWf46PTP zF(7IdfS|e8gNlE^Mt(Mu_Mjqz2CC<7HX1E>JVAn0I0WWB|sajRr`} zfdL8_gmC{4Nq|B^@VNX0hw03^?Bc^ufe+X&07GU%O#W-POR-`egl_;}o5vm5`=qnG z_aohHe&%F*f0d#AZ12Bg@HZ34v2Nub9V-V4g>DhVuVWv_Em~BCgYf z!~wl$)u-Ti@z>0ZYC=TfxS69_kkK4d&Er`mx;f^Aymn6cv+}0nER}dw7c~I~u<&+F z2VPf8g0I!{nqYEP^H=kt072u8GW`5BnQO1N%bMn?t;9D4zFNy-|I$i}E{mTOD^G@Y zfZaAeWJ9%2#DeN+5@90yu>+qo!Z@)&O+t%|~8q)%PlY zW>XI}W_i)L6e4-dW(6cn_X3Hsq`X25O;iEeaYZHOBF%Mix<6 z+~dT3%yHgiLZd_at%trJ#M18s8)%5g7UJNc3`XR1qdWdfN}2 zI*0%wNh+TM_r!Q#VrS9JmzjH&31fdQBXBNFHkV$UxR)ZQ-6N6QH~#H!zLof$D5wZ* iag8In37CqzzthfygjtUu$U1a%Xke&}=fu$9Q1QQ5O9G7m literal 0 HcmV?d00001