From b81ffd6d239071d51084165567b3696478ba02e7 Mon Sep 17 00:00:00 2001 From: devalls <30657322+devalls@users.noreply.github.com> Date: Mon, 7 Aug 2017 16:22:45 +0200 Subject: [PATCH 01/12] Fixed to Bajui2 --- plugin.video.alfa/channels/bajui.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugin.video.alfa/channels/bajui.py b/plugin.video.alfa/channels/bajui.py index 6d3cf32a..b091797a 100755 --- a/plugin.video.alfa/channels/bajui.py +++ b/plugin.video.alfa/channels/bajui.py @@ -13,7 +13,7 @@ def mainlist(item): logger.info() itemlist = [] itemlist.append(Item(channel=item.channel, title="Películas", action="menupeliculas", - url="http://www.bajui.com/descargas/categoria/2/peliculas", + url="http://www.bajui2.com/descargas/categoria/2/peliculas", fanart=item.fanart)) itemlist.append(Item(channel=item.channel, title="Series", action="menuseries", fanart=item.fanart)) @@ -51,13 +51,13 @@ def menuseries(item): logger.info() itemlist = [] itemlist.append(Item(channel=item.channel, title="Series - Novedades", action="peliculas", - url="http://www.bajui.com/descargas/categoria/3/series", + url="http://www.bajui2.com/descargas/categoria/3/series", fanart=item.fanart, viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Series - A-Z", action="peliculas", - url="http://www.bajui.com/descargas/categoria/3/series/orden:nombre", + url="http://www.bajui2.com/descargas/categoria/3/series/orden:nombre", fanart=item.fanart, viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Series - HD", action="peliculas", - url="http://www.bajui.com/descargas/subcategoria/11/hd/orden:nombre", + url="http://www.bajui2.com/descargas/subcategoria/11/hd/orden:nombre", fanart=item.fanart, viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="", fanart=item.fanart)) @@ -68,10 +68,10 @@ def menudocumentales(item): logger.info() itemlist = [] itemlist.append(Item(channel=item.channel, title="Documentales - Novedades", action="peliculas", - url="http://www.bajui.com/descargas/categoria/7/docus-y-tv", + url="http://www.bajui2.com/descargas/categoria/7/docus-y-tv", fanart=item.fanart, viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Documentales - A-Z", action="peliculas", - url="http://www.bajui.com/descargas/categoria/7/docus-y-tv/orden:nombre", + url="http://www.bajui2.com/descargas/categoria/7/docus-y-tv/orden:nombre", fanart=item.fanart, viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url="", fanart=item.fanart)) @@ -86,7 +86,7 @@ def search(item, texto, categoria=""): texto = texto.replace(" ", "+") logger.info("categoria: " + categoria + " url: " + url) try: - item.url = "http://www.bajui.com/descargas/busqueda/%s" + item.url = "http://www.bajui2.com/descargas/busqueda/%s" item.url = item.url % texto itemlist.extend(peliculas(item)) return itemlist @@ -118,7 +118,7 @@ def peliculas(item, paginacion=True): scrapedtitle = title scrapedplot = clean_plot(plot) scrapedurl = urlparse.urljoin(item.url, url) - scrapedthumbnail = urlparse.urljoin("http://www.bajui.com/", thumbnail.replace("_m.jpg", "_g.jpg")) + scrapedthumbnail = urlparse.urljoin("http://www.bajui2.com/", thumbnail.replace("_m.jpg", "_g.jpg")) logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]") # Añade al listado de XBMC @@ -133,7 +133,7 @@ def peliculas(item, paginacion=True): scrapertools.printMatches(matches) if len(matches) > 0: - scrapedurl = urlparse.urljoin("http://www.bajui.com/", matches[0]) + scrapedurl = urlparse.urljoin("http://www.bajui2.com/", matches[0]) pagitem = Item(channel=item.channel, action="peliculas", title=">> Página siguiente", url=scrapedurl, fanart=item.fanart, viewmode="movie_with_plot") if not paginacion: @@ -197,7 +197,7 @@ def enlaces(item): try: item.thumbnail = scrapertools.get_match(data, '
Date: Mon, 7 Aug 2017 16:32:27 +0200 Subject: [PATCH 02/12] Fix URL HOST changed to Bajui2 --- plugin.video.alfa/channels/bajui.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/bajui.json b/plugin.video.alfa/channels/bajui.json index 05969545..cf047d63 100755 --- a/plugin.video.alfa/channels/bajui.json +++ b/plugin.video.alfa/channels/bajui.json @@ -1,14 +1,18 @@ { "id": "bajui", - "name": "Bajui", + "name": "Bajui2", "active": true, "adult": false, "language": "es", "thumbnail": "bajui.png", "banner": "bajui.png", "fanart": "bajui.png", - "version": 1, + "version": 2, "changes": [ + { + "date": "07/08/2017", + "description": "Fix URL HOST changed to Bajui2" + }, { "date": "15/03/2017", "description": "limpieza código" @@ -34,4 +38,4 @@ "visible": true } ] -} \ No newline at end of file +} From c1e13d809a998ec65fb62eca81c24ab5d28b7358 Mon Sep 17 00:00:00 2001 From: Intel1 Date: Mon, 7 Aug 2017 11:58:32 -0500 Subject: [PATCH 03/12] cinetux: Cambio de estructura Cambio de estructura --- plugin.video.alfa/channels/cinetux.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py index be54cd12..f73f2a2f 100644 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -324,8 +324,8 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item): bloque2 = bloque2.replace("\t","").replace("\r","") patron = '(?s)optn" href="([^"]+)' patron += '.*?title="([^"]+)' - patron += '.*?src.*?src="[^>]+"\s/>([^<]+)' - patron += '.*?src="[^>]+"\s/>([^<]+)' + patron += '.*?src.*?src="[^>]+"?/>([^<]+)' + patron += '.*?src="[^>]+"?/>([^<]+)' patron += '.*?/span>([^<]+)' matches.extend(scrapertools.find_multiple_matches(bloque2, patron)) filtrados = [] From 47142703e33701fda8979550b243c034059c6ffa Mon Sep 17 00:00:00 2001 From: Intel1 Date: Mon, 7 Aug 2017 11:59:29 -0500 Subject: [PATCH 04/12] Add files via upload --- plugin.video.alfa/channels/yaske.json | 67 +++++++ plugin.video.alfa/channels/yaske.py | 256 ++++++++++++++++++++++++++ 2 files changed, 323 insertions(+) create mode 100644 plugin.video.alfa/channels/yaske.json create mode 100644 plugin.video.alfa/channels/yaske.py diff --git a/plugin.video.alfa/channels/yaske.json b/plugin.video.alfa/channels/yaske.json new file mode 100644 index 00000000..4f460979 --- /dev/null +++ b/plugin.video.alfa/channels/yaske.json @@ -0,0 +1,67 @@ +{ + "id": "yaske", + "name": "Yaske", + "active": true, + "adult": false, + "language": "es", + "banner": "yaske.png", + "fanart": "https://github.com/master-1970/resources/raw/master/images/fanart/yaske.png", + "thumbnail": "yaske.png", + "version": 1, + "changes": [ + { + "date": "27/06/17", + "description": "Desactivar por falta de contenidos" + }, + { + "date": "04/06/17", + "description": "Desactivar por falta de contenidos" + }, + { + "date": "15/03/2017", + "description": "limpieza código" + }, + { + "date": "01/02/17", + "description": "Añadir imagenes, sinopsis, etc..." + }, + { + "date": "18/01/17", + "description": "Uso de httptools" + }, + { + "date": "12/12/16", + "description": "Cambios en la web" + }, + { + "date": "01/07/16", + "description": "Eliminado código innecesario." + }, + { + "date": "29/04/16", + "description": "Adaptar a Novedades Peliculas e Infantiles" + } + ], + "categories": [ + "latino", + "movie" + ], + "settings": [ + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": false, + "enabled": true, + "visible": true + } + ] +} \ No newline at end of file diff --git a/plugin.video.alfa/channels/yaske.py b/plugin.video.alfa/channels/yaske.py new file mode 100644 index 00000000..99e3d9aa --- /dev/null +++ b/plugin.video.alfa/channels/yaske.py @@ -0,0 +1,256 @@ +# -*- coding: utf-8 -*- + +import re + +from core import channeltools +from core import config +from core import httptools +from core import logger +from core import scrapertoolsV2 +from core import servertools +from core import tmdb +from core.item import Item + +HOST = 'http://www.yaske.ro' +parameters = channeltools.get_channel_parameters('yaske') +fanart_host = parameters['fanart'] +thumbnail_host = parameters['thumbnail'] +color1, color2, color3 = ['0xFFA5F6AF', '0xFF5FDA6D', '0xFF11811E'] + + +def mainlist(item): + logger.info() + itemlist = [] + item.url = HOST + item.text_color = color2 + item.fanart = fanart_host + thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png" + + itemlist.append(item.clone(title="Novedades", action="peliculas", text_bold=True, viewcontent='movies', + url=HOST + "/ultimas-y-actualizadas", + thumbnail=thumbnail % 'novedades', viewmode="movie_with_plot")) + itemlist.append(item.clone(title="Estrenos", action="peliculas", text_bold=True, + url=HOST + "/genre/premieres", thumbnail=thumbnail % 'estrenos')) + itemlist.append(item.clone(title="", folder=False)) + + itemlist.append(Item(channel=item.channel, title="Filtrar por:", fanart=fanart_host, folder=False, + text_color=color3, text_bold=True, thumbnail=thumbnail_host)) + itemlist.append(item.clone(title=" Género", action="menu_buscar_contenido", text_color=color1, text_italic=True, + extra="genre", thumbnail=thumbnail % 'generos', viewmode="thumbnails")) + itemlist.append(item.clone(title=" Idioma", action="menu_buscar_contenido", text_color=color1, text_italic=True, + extra="audio", thumbnail=thumbnail % 'idiomas')) + itemlist.append(item.clone(title=" Calidad", action="menu_buscar_contenido", text_color=color1, text_italic=True, + extra="quality", thumbnail=thumbnail % 'calidad')) + itemlist.append(item.clone(title=" Año", action="menu_buscar_contenido", text_color=color1, text_italic=True, + extra="year", thumbnail=thumbnail % 'year')) + + itemlist.append(item.clone(title="", folder=False)) + itemlist.append(item.clone(title="Buscar por título", action="search", thumbnail=thumbnail % 'buscar')) + + return itemlist + + +def search(item, texto): + logger.info() + itemlist = [] + + try: + # http://www.yaske.ro/search/?q=los+pitufos + item.url = HOST + "/search/?q=" + texto.replace(' ', '+') + item.extra = "" + itemlist.extend(peliculas(item)) + if itemlist[-1].title == ">> Página siguiente": + item_pag = itemlist[-1] + itemlist = sorted(itemlist[:-1], key=lambda Item: Item.contentTitle) + itemlist.append(item_pag) + else: + itemlist = sorted(itemlist, key=lambda Item: Item.contentTitle) + + return itemlist + + except: + import sys + for line in sys.exc_info(): + logger.error("%s" % line) + return [] + + +def newest(categoria): + logger.info() + item = Item() + try: + if categoria == 'peliculas': + item.url = HOST + "/ultimas-y-actualizadas" + elif categoria == 'infantiles': + item.url = HOST + "/search/?q=&genre%5B%5D=animation" + else: + return [] + + itemlist = peliculas(item) + if itemlist[-1].title == ">> Página siguiente": + itemlist.pop() + + # Se captura la excepción, para no interrumpir al canal novedades si un canal falla + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + + return itemlist + + +def peliculas(item): + logger.info() + itemlist = [] + url_next_page = "" + + data = httptools.downloadpage(item.url).data + data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) + + patron = '
30: + url_next_page = item.url + matches = matches[:30] + next_page = 'b' + else: + matches = matches[30:] + next_page = 'a' + patron_next_page = 'Anteriores 0: + url_next_page = matches_next_page[0] + + for scrapedurl, scrapedthumbnail, idiomas, year, scrapedtitle in matches: + patronidiomas = "' + data = scrapertoolsV2.get_match(data, patron) + + # Extrae las entradas + patron = "" + matches = re.compile(patron, re.DOTALL).findall(data) + + itemlist = [] + for scrapedvalue, scrapedtitle in matches: + thumbnail = "" + + if item.extra == 'genre': + if scrapedtitle.strip() in ['Documental', 'Short', 'News']: + continue + + url = HOST + "/search/?q=&genre%5B%5D=" + scrapedvalue + filename = scrapedtitle.lower().replace(' ', '%20') + if filename == "ciencia%20ficción": + filename = "ciencia%20ficcion" + thumbnail = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/4/verdes/%s.png" \ + % filename + + elif item.extra == 'year': + url = HOST + "/search/?q=&year=" + scrapedvalue + thumbnail = item.thumbnail + else: + # http://www.yaske.ro/search/?q=&quality%5B%5D=c9 + # http://www.yaske.ro/search/?q=&audio%5B%5D=es + url = HOST + "/search/?q=&" + item.extra + "%5B%5D=" + scrapedvalue + thumbnail = item.thumbnail + + itemlist.append(Item(channel=item.channel, action="peliculas", title=scrapedtitle, url=url, text_color=color1, + thumbnail=thumbnail, contentType='movie', folder=True, viewmode="movie_with_plot")) + + if item.extra in ['genre', 'audio', 'year']: + return sorted(itemlist, key=lambda i: i.title.lower(), reverse=item.extra == 'year') + else: + return itemlist + + +def findvideos(item): + logger.info() + itemlist = list() + sublist = list() + + # Descarga la página + data = httptools.downloadpage(item.url).data + + if not item.plot: + item.plot = scrapertoolsV2.find_single_match(data, '>Sinopsis
([^<]+)
') + item.plot = scrapertoolsV2.decodeHtmlentities(item.plot) + + patron = '