diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 06d38c85..14e5af26 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -9,17 +9,32 @@ Sumario en Español - [B]Estos son los cambios para esta versión:[/B][CR] - [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - [I]- Elitetorrent - - Seriespapaya - - Newpct1 -- [COLOR red]Momentáneamente búsqueda deshabilitada[/COLOR][/I][CR] + + icon.png + fanart.jpg + resources/media/general/ss/1.jpg + resources/media/general/ss/2.jpg + resources/media/general/ss/3.jpg + resources/media/general/ss/4.jpg + + [B]Estos son los cambios para esta versión:[/B] + [COLOR green][B]Arreglos de canales[/B][/COLOR] + [I]- Seriespapaya + - Playmax - Gracias a d3v3l0p1n + - Seriesblanco - Posible error en versiones anteriores a kodi 16 por https + - AnimesHD + - Cinetux[/I] + [COLOR green][B]Servidor Nuevo[/B][/COLOR] + [I]- Vidlox [COLOR green][B]Arreglos internos[/B][/COLOR] - [I]- videolibrary_service -- ahora no actualiza una serie de un canal, si está desactivado[/I] + [I]- platformtools - posible solución de favoritos + - videolibrarytools - solución a añadir películas de varios canales[/I] + [COLOR blue]Gracias a devalls por su cooperación en esta release.[/COLOR] Descripción en Español English summary English description + [COLOR red]The owners and submitters to this addon do not host or distribute any of the content displayed by these addons nor do they have any affiliation with the content providers.[/COLOR] all GNU GPL v3 foro diff --git a/plugin.video.alfa/channels/animeshd.py b/plugin.video.alfa/channels/animeshd.py index f185938c..ebbf050c 100755 --- a/plugin.video.alfa/channels/animeshd.py +++ b/plugin.video.alfa/channels/animeshd.py @@ -1,190 +1,185 @@ -# -*- coding: utf-8 -*- - -import re -import urllib - -from core import httptools -from core import logger -from core import scrapertools -from core.item import Item - -tgenero = {"Comedia": "https://s7.postimg.org/ne9g9zgwb/comedia.png", - "Drama": "https://s16.postimg.org/94sia332d/drama.png", - "Acción": "https://s3.postimg.org/y6o9puflv/accion.png", - "Aventura": "https://s10.postimg.org/6su40czih/aventura.png", - "Romance": "https://s15.postimg.org/fb5j8cl63/romance.png", - "Ciencia ficción": "https://s9.postimg.org/diu70s7j3/cienciaficcion.png", - "Terror": "https://s7.postimg.org/yi0gij3gb/terror.png", - "Fantasía": "https://s13.postimg.org/65ylohgvb/fantasia.png", - "Misterio": "https://s1.postimg.org/w7fdgf2vj/misterio.png", - "Crimen": "https://s4.postimg.org/6z27zhirx/crimen.png", - "Hentai": "https://s29.postimg.org/aamrngu2f/hentai.png", - "Magia": "https://s9.postimg.org/nhkfzqffj/magia.png", - "Psicológico": "https://s13.postimg.org/m9ghzr86f/psicologico.png", - "Sobrenatural": "https://s9.postimg.org/6hxbvd4ov/sobrenatural.png", - "Torneo": "https://s2.postimg.org/ajoxkk9ih/torneo.png", - "Thriller": "https://s22.postimg.org/5y9g0jsu9/thriller.png", - "Otros": "https://s30.postimg.org/uj5tslenl/otros.png"} - -host = "http://www.animeshd.tv" - -headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], - ['Referer', host]] - - -def mainlist(item): - logger.info() - itemlist = [] - - itemlist.append(item.clone(title="Ultimas", - action="lista", - thumbnail='https://s22.postimg.org/cb7nmhwv5/ultimas.png', - fanart='https://s22.postimg.org/cb7nmhwv5/ultimas.png', - url=host + '/ultimos' - )) - - itemlist.append(item.clone(title="Todas", - action="lista", - thumbnail='https://s18.postimg.org/fwvaeo6qh/todas.png', - fanart='https://s18.postimg.org/fwvaeo6qh/todas.png', - url=host + '/buscar?t=todos&q=' - )) - - itemlist.append(item.clone(title="Generos", - action="generos", - url=host, - thumbnail='https://s3.postimg.org/5s9jg2wtf/generos.png', - fanart='https://s3.postimg.org/5s9jg2wtf/generos.png' - )) - - itemlist.append(item.clone(title="Buscar", - action="search", - url=host + '/buscar?t=todos&q=', - thumbnail='https://s30.postimg.org/pei7txpa9/buscar.png', - fanart='https://s30.postimg.org/pei7txpa9/buscar.png' - )) - - 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 lista(item): - logger.info() - - itemlist = [] - - post = '' - if item.extra in ['episodios']: - post = {'tipo': 'episodios', '_token': 'rAqVX74O9HVHFFigST3M9lMa5VL7seIO7fT8PBkl'} - post = urllib.urlencode(post) - data = get_source(item.url) - patron = 'class=anime>
.*?

(.*?)<\/h2><\/a><\/div>' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedthumbnail, scrapedurl, scrapedtitle in matches: - url = scrapedurl - thumbnail = host + scrapedthumbnail - title = scrapedtitle - itemlist.append(item.clone(action='episodios', - title=title, - url=url, - thumbnail=thumbnail, - contentSerieName=title - )) - - # Paginacion - next_page = scrapertools.find_single_match(data, - '
  • .*?<\/span><\/li>
  • .*?<\/a><\/li>') - next_page_url = scrapertools.decodeHtmlentities(next_page) - if next_page_url != "": - itemlist.append(Item(channel=item.channel, - action="lista", - title=">> Página siguiente", - url=next_page_url, - thumbnail='https://s16.postimg.org/9okdu7hhx/siguiente.png' - )) - - return itemlist - - -def search(item, texto): - logger.info() - texto = texto.replace(" ", "+") - item.url = item.url + texto - try: - if texto != '': - return lista(item) - else: - return [] - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - -def generos(item): - logger.info() - itemlist = [] - - data = get_source(item.url) - patron = '
  • (.*?)<\/a><\/li>' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedtitle in matches: - title = scrapertools.decodeHtmlentities(scrapedtitle) - if title == 'Recuentos de la vida': - title = 'Otros' - genero = scrapertools.decodeHtmlentities(scrapedurl) - thumbnail = '' - if title in tgenero: - thumbnail = tgenero[title] - - url = 'http://www.animeshd.tv/genero/%s' % genero - itemlist.append(item.clone(action='lista', title=title, url=url, thumbnail=thumbnail)) - return itemlist - - -def episodios(item): - logger.info() - itemlist = [] - - data = get_source(item.url) - patron = '
  • <\/span>(.*?)<\/li>' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedlang, scrapedtitle in matches: - language = scrapedlang - title = scrapedtitle + ' (%s)' % language - url = scrapedurl - itemlist.append(item.clone(title=title, url=url, action='findvideos', language=language)) - return itemlist - - -def findvideos(item): - logger.info() - itemlist = [] - - data = get_source(item.url) - patron = '|\s{2,}|"|\(|\)', "", data) + return data + + +def lista(item): + logger.info() + + itemlist = [] + + post = '' + if item.extra in ['episodios']: + post = {'tipo': 'episodios', '_token': 'rAqVX74O9HVHFFigST3M9lMa5VL7seIO7fT8PBkl'} + post = urllib.urlencode(post) + data = get_source(item.url) + patron = 'class=anime>
    .*?

    (.*?)<\/h2><\/a><\/div>' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedthumbnail, scrapedurl, scrapedtitle in matches: + url = scrapedurl + thumbnail = host + scrapedthumbnail + title = scrapedtitle + itemlist.append(item.clone(action='episodios', + title=title, + url=url, + thumbnail=thumbnail, + contentSerieName=title + )) + + # Paginacion + next_page = scrapertools.find_single_match(data, + '
  • .*?<\/span><\/li>
  • .*?<\/a><\/li>') + next_page_url = scrapertools.decodeHtmlentities(next_page) + if next_page_url != "": + itemlist.append(Item(channel=item.channel, + action="lista", + title=">> Página siguiente", + url=next_page_url, + thumbnail='https://s16.postimg.org/9okdu7hhx/siguiente.png' + )) + + return itemlist + + +def search(item, texto): + logger.info() + texto = texto.replace(" ", "+") + item.url = item.url + texto + try: + if texto != '': + return lista(item) + else: + return [] + except: + import sys + for line in sys.exc_info(): + logger.error("%s" % line) + return [] + + +def generos(item): + logger.info() + itemlist = [] + + data = get_source(item.url) + patron = '
  • (.*?)<\/a><\/li>' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedtitle in matches: + title = scrapertools.decodeHtmlentities(scrapedtitle) + if title == 'Recuentos de la vida': + title = 'Otros' + genero = scrapertools.decodeHtmlentities(scrapedurl) + thumbnail = '' + if title in tgenero: + thumbnail = tgenero[title] + + url = 'http://www.animeshd.tv/genero/%s' % genero + itemlist.append(item.clone(action='lista', title=title, url=url, thumbnail=thumbnail)) + return itemlist + + +def episodios(item): + logger.info() + itemlist = [] + + data = get_source(item.url) + patron = '
  • <\/span>(.*?)<\/li>' + matches = re.compile(patron, re.DOTALL).findall(data) + + for scrapedurl, scrapedlang, scrapedtitle in matches: + language = scrapedlang + title = scrapedtitle + ' (%s)' % language + url = scrapedurl + itemlist.append(item.clone(title=title, url=url, action='findvideos', language=language)) + return itemlist + + +def findvideos(item): + logger.info() + itemlist = [] + + data = get_source(item.url) + itemlist.extend(servertools.find_video_items(data=data)) + + for videoitem in itemlist: + title = item.title+' (%s)'%videoitem.server + videoitem.channel = item.channel + videoitem.title = title + videoitem.action = 'play' + + + return itemlist diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py old mode 100755 new mode 100644 index c0d0b3c3..afe793c5 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -211,7 +211,7 @@ def generos(item): data = httptools.downloadpage(item.url).data bloque = scrapertools.find_single_match(data, '(?s)dos_columnas">(.*?)') # Extrae las entradas - patron = '
  • (.*?)
    • ' + patron = '
  • (.*?)
    • ' matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedurl, scrapedtitle in matches: scrapedurl = CHANNEL_HOST + scrapedurl @@ -312,11 +312,13 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item): if "lazy" in bloque1: lazy = "lazy-" patron = '(?s)id="%s".*?metaframe.*?%ssrc="([^"]+)' %(scrapedoption, lazy) - #logger.info("Intel22 %s" %patron) url = scrapertools.find_single_match(bloque1, patron) if "goo.gl" in url: url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location","") - server = servertools.get_server_from_url(url) + if "www.cinetux.me" in url: + server = scrapertools.find_single_match(url, "player/(.*?)\.") + else: + server = servertools.get_server_from_url(url) matches.append([url, server, "", language.strip(), t_tipo]) bloque2 = scrapertools.find_single_match(data, '(?s)box_links.*?dt_social_single') bloque2 = bloque2.replace("\t","").replace("\r","") @@ -367,12 +369,17 @@ def play(item): id = scrapertools.find_single_match(data, 'img src="[^#]+#(.*?)"') item.url = "https://youtube.googleapis.com/embed/?status=ok&hl=es&allow_embed=1&ps=docs&partnerid=30&hd=1&autoplay=0&cc_load_policy=1&showinfo=0&docid=" + id itemlist = servertools.find_video_items(data = item.url) - elif "links" in item.url: + elif "links" in item.url or "www.cinetux.me" in item.url: data = httptools.downloadpage(item.url).data scrapedurl = scrapertools.find_single_match(data, '    ') - - for match in bloque: - calidades = scrapertools.find_multiple_matches(match, '