diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index 3fc4a4f1..c290d918 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@  - + @@ -19,11 +19,16 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Canales agregados y arreglos[/B][/COLOR] - » canalpelis » hdfull - » xdvideos » playmax - » cinetux » gnula - » flashx » rapidvideo + » canalpelis » allcalidad + » cinefox » cineasiaenlinea + » cinetux » divxatope + » maxipelis » pedropolis + » doomtv » animeshd + » hdfull » ultrapelishd + » pelisplus » cinecalidad + » peliculasnu » allpeliculas ¤ arreglos internos + [COLOR green]Gracias a [COLOR yellow]prpeaprendiz[/COLOR] por su colaboración en esta versión[/COLOR] Navega con Kodi por páginas web para ver sus videos de manera fácil. Browse web pages using Kodi diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index c4ca9513..0894a0a5 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -91,7 +91,8 @@ def peliculas(item): thumbnail = thumbnail, url = url, contentTitle = titulo, - contentType="movie" + contentType="movie", + language = idioma ) if year: new_item.infoLabels['year'] = int(year) diff --git a/plugin.video.alfa/channels/animeshd.py b/plugin.video.alfa/channels/animeshd.py index f592b1bb..bfa87adf 100644 --- a/plugin.video.alfa/channels/animeshd.py +++ b/plugin.video.alfa/channels/animeshd.py @@ -6,8 +6,9 @@ import urllib from core import httptools from core import scrapertools from core import servertools +from core import tmdb from core.item import Item -from platformcode import logger +from platformcode import logger, config tgenero = {"Comedia": "https://s7.postimg.org/ne9g9zgwb/comedia.png", "Drama": "https://s16.postimg.org/94sia332d/drama.png", @@ -110,7 +111,7 @@ def lista(item): url=next_page_url, thumbnail='https://s16.postimg.org/9okdu7hhx/siguiente.png' )) - + tmdb.set_infoLabels(itemlist) return itemlist @@ -157,29 +158,16 @@ def episodios(item): itemlist = [] data = get_source(item.url) - patron = '
  • <\/span>(.*?)<\/li>' + patron = '
  • <\/span>(.*?) (\d+)<\/li>' matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedurl, scrapedlang, scrapedtitle in matches: + for scrapedurl, scrapedlang, scrapedtitle, episode in matches: language = scrapedlang - title = scrapedtitle + title = scrapedtitle + " " + "1x" + episode 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 - videoitem.channel = item.channel - videoitem.title = title - videoitem.action = 'play' - - + + if config.get_videolibrary_support(): + itemlist.append(Item(channel=item.channel, title="Añadir serie a la biblioteca", url=item.url, action="add_serie_to_library", extra="episodios", fanart=item.thumbnail, thumbnail=item.thumbnail, contentTitle=item.show, show=item.show)) + return itemlist diff --git a/plugin.video.alfa/channels/canalpelis.py b/plugin.video.alfa/channels/canalpelis.py index 19604c52..15fce9a1 100644 --- a/plugin.video.alfa/channels/canalpelis.py +++ b/plugin.video.alfa/channels/canalpelis.py @@ -137,18 +137,18 @@ def peliculas(item): matches = scrapertools.find_multiple_matches(data, patron) - for scrapedthumbnail, scrapedtitle, rating, calidad, scrapedurl, year in matches[item.page:item.page + 20]: - if 'Próximamente' not in calidad and '-XXX.jpg' not in scrapedthumbnail: + for scrapedthumbnail, scrapedtitle, rating, quality, scrapedurl, year in matches[item.page:item.page + 20]: + if 'Próximamente' not in quality and '-XXX.jpg' not in scrapedthumbnail: scrapedtitle = scrapedtitle.replace('Ver ', '').strip() contentTitle = scrapedtitle.partition(':')[0].partition(',')[0] title = "%s [COLOR green][%s][/COLOR] [COLOR yellow][%s][/COLOR]" % ( - scrapedtitle, year, calidad) + scrapedtitle, year, quality) itemlist.append(item.clone(channel=__channel__, action="findvideos", text_color=color3, url=scrapedurl, infoLabels={'year': year, 'rating': rating}, contentTitle=contentTitle, thumbnail=scrapedthumbnail, - title=title, context="buscar_trailer")) + title=title, context="buscar_trailer", quality = quality)) tmdb.set_infoLabels(itemlist, __modo_grafico__) tmdb.set_infoLabels(itemlist, __modo_grafico__) @@ -367,7 +367,7 @@ def findvideos(item): server = servertools.get_server_from_url(url) title = "%s [COLOR yellow](%s) (%s)[/COLOR]" % (item.contentTitle, server.title(), lang) itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, - server=server, text_color=color3)) + server=server, language = lang, text_color=color3)) itemlist.append(Item(channel=item.channel, title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', diff --git a/plugin.video.alfa/channels/cineasiaenlinea.py b/plugin.video.alfa/channels/cineasiaenlinea.py index 5dab9193..17a25c83 100755 --- a/plugin.video.alfa/channels/cineasiaenlinea.py +++ b/plugin.video.alfa/channels/cineasiaenlinea.py @@ -108,9 +108,9 @@ def peliculas(item): infolab = {'year': year} itemlist.append(item.clone(action="findvideos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, infoLabels=infolab, - contentTitle=title, contentType="movie")) + contentTitle=title, contentType="movie", quality=calidad)) - next_page = scrapertools.find_single_match(data, '
    .raquo;') @@ -797,16 +797,17 @@ def agrupa_datos(data): def extrae_idiomas(bloqueidiomas): logger.info("idiomas=" + bloqueidiomas) - # Todo cambiar por lista - #textoidiomas=[] + language=[] textoidiomas = '' patronidiomas = '([a-z0-9]+).png"' idiomas = re.compile(patronidiomas, re.DOTALL).findall(bloqueidiomas) for idioma in idiomas: + # TODO quitar esto textoidiomas = textoidiomas + idioma +" " - #textoidiomas.append(idioma.upper()) + # TODO y dejar esto + language.append(idioma) - return textoidiomas + return textoidiomas, language def bbcode_kodi2html(text): diff --git a/plugin.video.alfa/channels/maxipelis.py b/plugin.video.alfa/channels/maxipelis.py index eb5968b1..ce8c7f8d 100644 --- a/plugin.video.alfa/channels/maxipelis.py +++ b/plugin.video.alfa/channels/maxipelis.py @@ -127,9 +127,8 @@ def findvideos(item): matches = scrapertools.find_multiple_matches(data, patron) for url, server, calidad, idioma in matches: - title = item.contentTitle server = servertools.get_server_from_url(url) - + title = '%s [%s] [%s] [%s]' % (item.contentTitle, server, calidad, idioma) itemlist.append(item.clone(action="play", title=title, fulltitle = item.title, url=url, language = idioma, contentTitle = item.contentTitle, quality = calidad, server = server)) diff --git a/plugin.video.alfa/channels/pedropolis.py b/plugin.video.alfa/channels/pedropolis.py index c5a01871..3bfec694 100644 --- a/plugin.video.alfa/channels/pedropolis.py +++ b/plugin.video.alfa/channels/pedropolis.py @@ -99,10 +99,10 @@ def peliculas(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}| ", "", data) - patron = '
    ([^.*?' # img, title + patron = '
    ([^.*?' # img, title patron += '
    ([^<]+).*?' # rating patron += '([^<]+).*?' # calidad, url - patron += '([^<]+)' # year + patron += '([^<]+)' # year matches = scrapertools.find_multiple_matches(data, patron) @@ -271,7 +271,7 @@ def series(item): data = re.sub(r"\n|\r|\t| |
    ", "", data) # logger.info(data) - patron = '
    ([^.*?' + patron = '
    ([^.*?' # img, title, url matches = scrapertools.find_multiple_matches(data, patron) @@ -323,8 +323,8 @@ def temporadas(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
    ", "", data) # logger.info(data) - patron = '([^<]+).*?' # numeros de temporadas - patron += '
    ' # capítulos + patron = '([^<]+).*?' # season + patron += '
    ' # img matches = scrapertools.find_multiple_matches(data, patron) if len(matches) > 1: @@ -365,9 +365,9 @@ def episodios(item): data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
    ", "", data) # logger.info(data) - patron = '
    .*?' # url cap, img - patron += '
    (.*?)
    .*?' # numerando cap - patron += '    ([^<]+)' # title de episodios + patron = '
    .*?' # url + patron += '
    (.*?)
    .*?' # numerando cap + patron += '    ([^<]+)' # title de episodios matches = scrapertools.find_multiple_matches(data, patron) @@ -390,7 +390,6 @@ def episodios(item): new_item.infoLabels['episode'] = episode.zfill(2) itemlist.append(new_item) - tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) # TODO no hacer esto si estamos añadiendo a la videoteca if not item.extra: @@ -407,6 +406,8 @@ def episodios(item): itemlist.sort(key=lambda it: int(it.infoLabels['episode']), reverse=config.get_setting('orden_episodios', __channel__)) + tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) + # Opción "Añadir esta serie a la videoteca" if config.get_videolibrary_support() and len(itemlist) > 0: itemlist.append(Item(channel=__channel__, title="Añadir esta serie a la videoteca", url=item.url, @@ -427,12 +428,13 @@ def findvideos(item): matches = re.compile(patron, re.DOTALL).findall(data) for option, url in matches: - lang = scrapertools.find_single_match(data, '
  • .*?.*?-->(\w+)' % option) + lang = lang.lower() + idioma = {'latino': '[COLOR cornflowerblue](LAT)[/COLOR]', + 'drive': '[COLOR cornflowerblue](LAT)[/COLOR]', + 'castellano': '[COLOR green](CAST)[/COLOR]', + 'subtitulado': '[COLOR red](VOS)[/COLOR]', + 'ingles': '[COLOR red](VOS)[/COLOR]'} if lang in idioma: lang = idioma[lang] @@ -455,10 +457,8 @@ def findvideos(item): x.server.title(), x.quality, x.language) if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'serie': - itemlist.append(Item(channel=__channel__, + itemlist.append(Item(channel=__channel__, url=item.url, action="add_pelicula_to_library", extra="findvideos", title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', - url=item.url, action="add_pelicula_to_library", - thumbnail=get_thumb("videolibrary_movie.png"), - extra="findvideos", contentTitle=item.contentTitle)) + thumbnail=get_thumb("videolibrary_movie.png"), contentTitle=item.contentTitle)) return itemlist diff --git a/plugin.video.alfa/channels/peliculasnu.py b/plugin.video.alfa/channels/peliculasnu.py index edfe851f..8d8a5a5e 100644 --- a/plugin.video.alfa/channels/peliculasnu.py +++ b/plugin.video.alfa/channels/peliculasnu.py @@ -213,9 +213,10 @@ def findvideos(item): if 'openload' in url: url = url + '|' + item.url - + extra_info = title.split(' - ') title = "%s - %s" % ('%s', title) - itemlist.append(Item(channel=item.channel, action="play", url=url, title=title, text_color=color3)) + itemlist.append(Item(channel=item.channel, action="play", url=url, title=title, language=extra_info[0], + quality=extra_info[1],text_color=color3)) itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) diff --git a/plugin.video.alfa/channels/pelisplus.py b/plugin.video.alfa/channels/pelisplus.py index f3b424c2..e42aedc7 100644 --- a/plugin.video.alfa/channels/pelisplus.py +++ b/plugin.video.alfa/channels/pelisplus.py @@ -470,7 +470,7 @@ def findvideos(item): videoitem.quality = 'default' videoitem.language = 'Latino' if videoitem.server != '': - videoitem.thumbnail = item.contentThumbnail + videoitem.thumbnail = item.thumbnail else: videoitem.thumbnail = item.thumbnail videoitem.server = 'directo' diff --git a/plugin.video.alfa/channels/ultrapeliculashd.py b/plugin.video.alfa/channels/ultrapeliculashd.py index 6edd1ea3..e84b5dfe 100755 --- a/plugin.video.alfa/channels/ultrapeliculashd.py +++ b/plugin.video.alfa/channels/ultrapeliculashd.py @@ -217,7 +217,7 @@ def findvideos(item): for videoitem in itemlist: videoitem.channel = item.channel videoitem.action = 'play' - videoitem.thumbnail = servertools.guess_server_thumbnail(videoitem.server) + videoitem.thumbnail = item.thumbnail videoitem.infoLabels = item.infoLabels videoitem.title = item.contentTitle + ' (' + videoitem.server + ')' if 'youtube' in videoitem.url: