From 07a23778558f4543875436e4c08f5a67337bea30 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 13 Jun 2018 09:41:13 -0500 Subject: [PATCH 1/7] cinecalidad: fix --- plugin.video.alfa/channels/cinecalidad.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/cinecalidad.py b/plugin.video.alfa/channels/cinecalidad.py index 374ba008..7fa980df 100644 --- a/plugin.video.alfa/channels/cinecalidad.py +++ b/plugin.video.alfa/channels/cinecalidad.py @@ -67,7 +67,7 @@ def mainlist(item): itemlist.append( item.clone(title="CineCalidad Portugues", action="submenu", - host="http://cinemaqualidade.to/", + host="http://www.cinemaqualidade.to/", thumbnail=thumbbr, extra="filmes", )) @@ -81,7 +81,7 @@ def submenu(item): idioma = 'peliculas' idioma2 = "destacada" host = item.host - if item.host == "http://cinemaqualidade.to/": + if item.host == "http://www.cinemaqualidade.to/": idioma = "filmes" idioma2 = "destacado" logger.info() From 5360c0129de28eee990abc99659e0d1fa3d2cac6 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 13 Jun 2018 09:42:27 -0500 Subject: [PATCH 2/7] animemovil: fix --- plugin.video.alfa/channels/animemovil.py | 91 +++++++++--------------- 1 file changed, 33 insertions(+), 58 deletions(-) diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py index f5347e4e..5c4031fc 100644 --- a/plugin.video.alfa/channels/animemovil.py +++ b/plugin.video.alfa/channels/animemovil.py @@ -11,6 +11,7 @@ from core.item import Item from platformcode import platformtools, config, logger + __modo_grafico__ = config.get_setting('modo_grafico', 'animemovil') __perfil__ = '' @@ -28,6 +29,7 @@ host = "http://animemovil.com" def mainlist(item): logger.info() + itemlist = [] itemlist.append(Item(channel=item.channel, action="recientes", title="Episodios Recientes", thumbnail=item.thumbnail, @@ -48,6 +50,8 @@ def mainlist(item): itemlist.append(item.clone(title="Configurar canal", action="openconfig", text_color=color5, folder=False)) if renumbertools.context: itemlist = renumbertools.show_option(item.channel, itemlist) + + return itemlist @@ -280,71 +284,42 @@ def findvideos(item): data = httptools.downloadpage(item.url).data data = re.sub(r'\n|\s{2,}', '', data) + strm_id = scrapertools.find_single_match(data, '"id": (.*?),') + streams = scrapertools.find_single_match(data, '"stream": (.*?)};') + dict_strm = jsontools.load(streams) - akiba_url = scrapertools.find_single_match(data, '
Date: Wed, 13 Jun 2018 09:43:26 -0500 Subject: [PATCH 3/7] seriesverde: fix --- plugin.video.alfa/channels/seriesverde.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/seriesverde.py b/plugin.video.alfa/channels/seriesverde.py index c35eb109..c986e8ee 100644 --- a/plugin.video.alfa/channels/seriesverde.py +++ b/plugin.video.alfa/channels/seriesverde.py @@ -162,14 +162,14 @@ def seasons(item): title='[COLOR yellow]Añadir esta serie a la videoteca[/COLOR]', url=item.url, action="add_serie_to_library", - extra="all_episodes", + extra="episodios", contentSerieName=item.contentSerieName, )) return itemlist -def epidodios(item): +def episodios(item): logger.info() itemlist = [] templist = seasons(item) From 8a717aa8ea7099efeb913ef96aca4aee8ef6403c Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 13 Jun 2018 09:45:26 -0500 Subject: [PATCH 4/7] lacajita: desactivado, dominio no funciona --- plugin.video.alfa/channels/lacajita.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/lacajita.json b/plugin.video.alfa/channels/lacajita.json index 3a45314b..99e170e9 100755 --- a/plugin.video.alfa/channels/lacajita.json +++ b/plugin.video.alfa/channels/lacajita.json @@ -2,7 +2,7 @@ "id": "lacajita", "name": "LaCajita", "language": ["cast", "lat"], - "active": true, + "active": false, "adult": false, "thumbnail": "http://i.imgur.com/LVdupxc.png", "categories": [ @@ -66,4 +66,4 @@ "visible": true } ] -} \ No newline at end of file +} From 7b186b22ec2d23dd9ba4410b231dc725a68d58eb Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 13 Jun 2018 10:08:44 -0500 Subject: [PATCH 5/7] animejl: nuevo canal --- plugin.video.alfa/channels/animejl.json | 30 ++++ plugin.video.alfa/channels/animejl.py | 198 ++++++++++++++++++++++++ 2 files changed, 228 insertions(+) create mode 100644 plugin.video.alfa/channels/animejl.json create mode 100644 plugin.video.alfa/channels/animejl.py diff --git a/plugin.video.alfa/channels/animejl.json b/plugin.video.alfa/channels/animejl.json new file mode 100644 index 00000000..aae006fd --- /dev/null +++ b/plugin.video.alfa/channels/animejl.json @@ -0,0 +1,30 @@ +{ + "id": "animejl", + "name": "AnimeJL", + "active": true, + "adult": false, + "language": ["cast", "lat"], + "thumbnail": "https://www.animejl.net/img/Logo.png", + "banner": "", + "categories": [ + "anime" + ], + "settings": [ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": false, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_anime", + "type": "bool", + "label": "Incluir en Novedades - Episodios de anime", + "default": true, + "enabled": true, + "visible": true + } + ] +} \ No newline at end of file diff --git a/plugin.video.alfa/channels/animejl.py b/plugin.video.alfa/channels/animejl.py new file mode 100644 index 00000000..b02569b7 --- /dev/null +++ b/plugin.video.alfa/channels/animejl.py @@ -0,0 +1,198 @@ +# -*- coding: utf-8 -*- +# -*- Channel AnimeJL -*- +# -*- Created for Alfa-addon -*- +# -*- By the Alfa Develop Group -*- + +import re + +from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger +from channelselector import get_thumb + + +host = 'https://www.animejl.net/' + +def mainlist(item): + logger.info() + + itemlist = [] + + itemlist.append(Item(channel=item.channel, title="Nuevos Episodios", action="new_episodes", + thumbnail=get_thumb('new_episodes', auto=True), url=host)) + + itemlist.append(Item(channel=item.channel, title="Todas", action="list_all", thumbnail=get_thumb('all', auto=True), + url=host + 'animes')) + + itemlist.append(Item(channel=item.channel, title="Series", action="list_all", + thumbnail=get_thumb('tvshows', auto=True), url=host+'animes?type%5B%5D=1&order=default')) + + itemlist.append(Item(channel=item.channel, title="Películas", action="list_all", + thumbnail=get_thumb('movies',auto=True), url=host + 'animes?type%5B%5D=2&order=default')) + + itemlist.append( + Item(channel=item.channel, title="Buscar", action="search", thumbnail=get_thumb('search', auto=True), + url=host + 'animes?q=')) + + 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 new_episodes(item): + logger.info() + + itemlist = [] + + data = get_source(item.url) + data = scrapertools.find_single_match(data, "

Últimos episodios

.*?") + patron = "
  • (.*?)" + + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedepi in matches: + url = host+scrapedurl + thumbnail = host+scrapedthumbnail + title = '%s %s' % (scrapedtitle, scrapedepi) + itemlist.append(Item(channel=item.channel, action='findvideos', + title=title, + url=url, + thumbnail=thumbnail, + contentSerieName=scrapedtitle, + )) + + return itemlist + +def list_all(item): + logger.info() + + itemlist = [] + + data = get_source(item.url) + patron = "
    .*?class=.*?(.*?)" + patron +="(.*?).*?star.*?

    (.*?)

    " + + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedthumbnail, scrapedtitle, type, plot in matches: + url = host + scrapedurl + thumbnail = host+scrapedthumbnail + title = scrapedtitle + type = type + season = '' + if 'season' in scrapedtitle.lower(): + season = scrapertools.find_single_match(scrapedtitle, 'season (\d+)') + scrapedtitle = scrapertools.find_single_match(scrapedtitle, '(.*?) season') + + new_item = Item(channel=item.channel, action='episodios', + title=title, + url=url, + thumbnail=thumbnail, + contentSerieName=scrapedtitle, + plot=plot, + type=item.type, + infoLabels={} + ) + if type.lower() == 'anime': + new_item.contentSerieName = scrapedtitle + new_item.contentSeasonNumber = season + else: + new_item.contentTitle = scrapedtitle + + itemlist.append(new_item) + + # Paginacion + next_page = scrapertools.find_single_match(data, + "
  • »
    • ") + if next_page != '': + itemlist.append(Item(channel=item.channel, + action="list_all", + title=">> Página siguiente", + url=host+next_page, + thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png' + )) + + return itemlist + +def episodios(item): + logger.info() + itemlist = [] + + base_data = get_source(item.url) + data = scrapertools.find_single_match(base_data, '
    Lista de episodios
    .*?') + if data == '': + data = scrapertools.find_single_match(base_data, '
    Formatos disponibles
    .*?') + + if 'listepisodes' in data.lower(): + patron = "
  • (.*?)
    • " + elif 'listcaps' in data.lower(): + patron = ".*?alt=(.*?)>" + matches = re.compile(patron, re.DOTALL).findall(data) + for scrapedurl, scrapedtitle in matches: + title = scrapedtitle.strip() + n=0 + for char in title[::-1]: + n += 1 + if char == ' ': + break + episode = title[-n:] + episode = scrapertools.find_single_match(episode, r' (\d+)') + + url = host + scrapedurl + itemlist.append(Item(channel=item.channel, title='Episodio %s' % episode, thumbnail=item.thumbnail, url=url, + action='findvideos')) + if item.type.lower != 'anime' and len(itemlist)==1: + return findvideos(itemlist[0]) + else: + return itemlist[::-1] + +def findvideos(item): + logger.info() + + itemlist = [] + data = get_source(item.url) + itemlist.extend(servertools.find_video_items(data=data)) + + for videoitem in itemlist: + videoitem.title = '[%s]' % videoitem.server.capitalize() + + return itemlist + +def search(item, texto): + logger.info() + texto = texto.replace(" ", "+") + item.url = item.url + texto + try: + if texto != '': + return list_all(item) + else: + return [] + except: + import sys + for line in sys.exc_info(): + logger.error("%s" % line) + return [] + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'anime': + item.url = host + itemlist = new_episodes(item) + if itemlist[-1].title == '>> Página siguiente': + itemlist.pop() + return itemlist + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] From 34ec400e82731fa0a0b3ae8a5c34f6c1ef730ff8 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 14 Jun 2018 08:36:02 -0500 Subject: [PATCH 6/7] Varios fix pelisipad gmobi inkapelis pelisgratis --- plugin.video.alfa/channels/gmobi.json | 7 +-- plugin.video.alfa/channels/gmobi.py | 21 ++++--- plugin.video.alfa/channels/inkapelis.json | 32 ++++++++++- plugin.video.alfa/channels/inkapelis.py | 69 ++++++++++++++++++++--- plugin.video.alfa/channels/pelisgratis.py | 51 ++++------------- plugin.video.alfa/channels/pelisipad.py | 5 +- 6 files changed, 124 insertions(+), 61 deletions(-) diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json index 7407eb83..8db02207 100644 --- a/plugin.video.alfa/channels/gmobi.json +++ b/plugin.video.alfa/channels/gmobi.json @@ -1,14 +1,13 @@ { "id": "gmobi", - "name": "gmobi", + "name": "GNULA.mobi", "active": true, "adult": false, "language": ["cast", "lat"], - "thumbnail": "http://gnula.mobi/wp-content/uploads/2016/08/Untitled-6.png", + "thumbnail": "http://www.gnula.mobi/wp-content/uploads/2018/05/Captura-1.png?%3E", "banner": "", "categories": [ - "movie", - "adult" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py index bbf3a0c9..f1d6b58d 100644 --- a/plugin.video.alfa/channels/gmobi.py +++ b/plugin.video.alfa/channels/gmobi.py @@ -12,7 +12,7 @@ from core import tmdb from core.item import Item from platformcode import logger -host = 'http://gnula.mobi/' +host = 'http://www.gnula.mobi/' def mainlist(item): logger.info() itemlist = list() @@ -68,17 +68,24 @@ def peliculas(item): itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
    ", "", data) - patron = '
    .*?href="(.*?)" title="(.*?)".*?under-title">(.*?)<.*?src="(.*?)"' + patron = '
    .*?href="(.*?)" title="(.*?)".*?<.*?src="(.*?)"' matches = scrapertools.find_multiple_matches(data, patron) - for scrapedurl, scrapedyear, scrapedtitle, scrapedthumbnail in matches: - year = scrapertools.find_single_match(scrapedyear, r'.*?\((\d{4})\)') - itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, fulltitle = scrapedtitle, url=scrapedurl, - thumbnail=scrapedthumbnail, infoLabels={'year': year})) + for scrapedurl, scrapedtitle, scrapedthumbnail in matches: + filter_thumb = scrapedthumbnail.replace("http://image.tmdb.org/t/p/w300", "") + filter_list = {"poster_path": filter_thumb} + filter_list = filter_list.items() + itemlist.append(Item(channel=item.channel, + action="findvideos", + title=scrapedtitle, + fulltitle = scrapedtitle, + url=scrapedurl, + thumbnail=scrapedthumbnail, + infoLabels={'filtro': filter_list})) tmdb.set_infoLabels(itemlist, True) next_page_url = scrapertools.find_single_match(data, '([^<]+)<' % id_embed) title = "%s [%s][%s]" % (title.capitalize(), idioma, calidad) - itemlist.append(item.clone(action="play", title=title, url=url, language = idioma, quality = calidad, - server = server)) + itemlist.append(item.clone(action="play", title=title, url=url, language=idioma, quality=calidad, + server=server)) + # Requerido para FilterTools + + itemlist = filtertools.get_links(itemlist, item, list_language) + + # Requerido para AutoPlay + + autoplay.start(itemlist, item) if itemlist: if not config.get_setting('menu_trailer', item.channel): @@ -402,4 +452,7 @@ def play(item): else: itemlist = servertools.find_video_items(data=item.url) + for videoitem in itemlist: + videoitem.infoLabels=item.infoLabels + return itemlist diff --git a/plugin.video.alfa/channels/pelisgratis.py b/plugin.video.alfa/channels/pelisgratis.py index 86469305..0acbf862 100755 --- a/plugin.video.alfa/channels/pelisgratis.py +++ b/plugin.video.alfa/channels/pelisgratis.py @@ -10,26 +10,8 @@ from core import tmdb from core import jsontools from core.item import Item from platformcode import config, logger +from channelselector import get_thumb -tgenero = {"Comedia": "https://s7.postimg.cc/ne9g9zgwb/comedia.png", - "Suspense": "https://s13.postimg.cc/wmw6vl1cn/suspenso.png", - "Drama": "https://s16.postimg.cc/94sia332d/drama.png", - "Acción": "https://s3.postimg.cc/y6o9puflv/accion.png", - "Aventura": "https://s10.postimg.cc/6su40czih/aventura.png", - "Romance": "https://s15.postimg.cc/fb5j8cl63/romance.png", - "Animación": "https://s13.postimg.cc/5on877l87/animacion.png", - "Ciencia ficción": "https://s9.postimg.cc/diu70s7j3/cienciaficcion.png", - "Terror": "https://s7.postimg.cc/yi0gij3gb/terror.png", - "Documental": "https://s16.postimg.cc/7xjj4bmol/documental.png", - "Música": "https://s29.postimg.cc/bbxmdh9c7/musical.png", - "Fantasía": "https://s13.postimg.cc/65ylohgvb/fantasia.png", - "Misterio": "https://s1.postimg.cc/w7fdgf2vj/misterio.png", - "Crimen": "https://s4.postimg.cc/6z27zhirx/crimen.png", - "Familia": "https://s7.postimg.cc/6s7vdhqrf/familiar.png", - "Guerra": "https://s4.postimg.cc/n1h2jp2jh/guerra.png", - "Western": "https://s23.postimg.cc/lzyfbjzhn/western.png", - "Historia": "https://s15.postimg.cc/fmc050h1n/historia.png" - } thumbletras = {'#': 'https://s32.postimg.cc/drojt686d/image.png', 'a': 'https://s32.postimg.cc/llp5ekfz9/image.png', @@ -73,53 +55,46 @@ def mainlist(item): itemlist.append(item.clone(title="Estrenos", action="lista", - thumbnail='https://s21.postimg.cc/fy69wzm93/estrenos.png', - fanart='https://s21.postimg.cc/fy69wzm93/estrenos.png', + thumbnail=get_thumb('premieres', auto=True), url=host + 'estrenos' )) itemlist.append(item.clone(title="Todas", action="lista", - thumbnail='https://s18.postimg.cc/fwvaeo6qh/todas.png', - fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png', + thumbnail=get_thumb('all', auto=True), url=host )) itemlist.append(item.clone(title="Generos", action="seccion", url=host, - thumbnail='https://s3.postimg.cc/5s9jg2wtf/generos.png', - fanart='https://s3.postimg.cc/5s9jg2wtf/generos.png', + thumbnail=get_thumb('genres', auto=True), extra='generos' )) itemlist.append(item.clone(title="Alfabetico", action="seccion", url=host, - thumbnail='https://s17.postimg.cc/fwi1y99en/a-z.png', - fanart='https://s17.postimg.cc/fwi1y99en/a-z.png', + thumbnail=get_thumb('alphabet', auto=True), extra='a-z' )) itemlist.append(item.clone(title="Mas Vistas", action="lista", - thumbnail='https://s9.postimg.cc/wmhzu9d7z/vistas.png', - fanart='https://s9.postimg.cc/wmhzu9d7z/vistas.png', + thumbnail=get_thumb('more watched', auto=True), url=host + 'peliculas-mas-vistas' )) itemlist.append(item.clone(title="Mas Votadas", action="lista", - thumbnail='https://s7.postimg.cc/9kg1nthzf/votadas.png', - fanart='https://s7.postimg.cc/9kg1nthzf/votadas.png', + thumbnail=get_thumb('more voted', auto=True), url=host + 'peliculas-mas-votadas' )) itemlist.append(item.clone(title="Buscar", action="search", url=host + '?s=', - thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png', - fanart='https://s30.postimg.cc/pei7txpa9/buscar.png' + thumbnail=get_thumb('search', auto=True) )) return itemlist @@ -178,7 +153,7 @@ def seccion(item): itemlist = [] data = get_source(item.url) if item.extra == 'generos': - patron = '
  • (.*?)<\/li>' + patron = '
  • (.*?)<\/li>' elif item.extra == 'a-z': patron = '
  • (\w|#)<\/a><\/li>' matches = re.compile(patron, re.DOTALL).findall(data) @@ -187,12 +162,8 @@ def seccion(item): url = scrapedurl thumbnail = '' if item.extra == 'generos': - title = re.sub(r'<\/a> \(\d+\)', '', scrapedtitle) - cantidad = re.findall(r'.*?<\/a> \((\d+)\)', scrapedtitle) - th_title = title - title = title + ' (' + cantidad[0] + ')' - if th_title in tgenero: - thumbnail = tgenero[th_title] + #cantidad = re.findall(r'.*?<\/a> \((\d+)\)', scrapedtitle) + title = scrapedtitle else: title = scrapedtitle if title.lower() in thumbletras: diff --git a/plugin.video.alfa/channels/pelisipad.py b/plugin.video.alfa/channels/pelisipad.py index f6425fcd..3d317d76 100755 --- a/plugin.video.alfa/channels/pelisipad.py +++ b/plugin.video.alfa/channels/pelisipad.py @@ -434,6 +434,7 @@ def nuevos_cap(item): data = httptools.downloadpage(item.url).data data = jsontools.load(data) + logger.debug(data) capitulos = [] if "Nuevas" in item.title: for child in data["b"]: @@ -455,13 +456,15 @@ def nuevos_cap(item): infoLabels['season'] = int(season) except: infoLabels['season'] = 0 - if "Nuevos" in item.title: if not child['episode']: episode = scrapertools.find_single_match(child['name'], '\d+x(\d+)') if not episode: episode = "0" infoLabels['episode'] = int(episode) + elif "al" in child['episode']: + episode = "0" + infoLabels['episode'] = int(episode) else: infoLabels['episode'] = int(child['episode']) infoLabels['mediatype'] = "episode" From b62aecde50200747cbc2ab2a5350c4583b21c76a Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 14 Jun 2018 08:46:01 -0500 Subject: [PATCH 7/7] bajui: web no funciona --- plugin.video.alfa/channels/bajui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/bajui.json b/plugin.video.alfa/channels/bajui.json index 3d4890d0..98d9be1f 100644 --- a/plugin.video.alfa/channels/bajui.json +++ b/plugin.video.alfa/channels/bajui.json @@ -1,7 +1,7 @@ { "id": "bajui", "name": "Bajui", - "active": true, + "active": false, "adult": false, "language": ["cast"], "thumbnail": "bajui.png",