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/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/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())