From 7b173c31049d592157d55131b433295a567cf78c Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 28 Sep 2017 13:46:03 -0300 Subject: [PATCH 1/3] =?UTF-8?q?otro=20peque=C3=B1o=20ajuste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/hdfull.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/channels/hdfull.py b/plugin.video.alfa/channels/hdfull.py index f09fa162..ab5317da 100644 --- a/plugin.video.alfa/channels/hdfull.py +++ b/plugin.video.alfa/channels/hdfull.py @@ -319,7 +319,7 @@ def fichas(item): contentTitle = scrapedtitle.strip() if scrapedlangs != ">": - textoidiomas = extrae_idiomas(scrapedlangs) + textoidiomas, language = extrae_idiomas(scrapedlangs) #Todo Quitar el idioma title += bbcode_kodi2html(" ( [COLOR teal][B]" + textoidiomas + "[/B][/COLOR])") @@ -351,7 +351,7 @@ def fichas(item): itemlist.append( Item(channel=item.channel, action=action, title=title, url=url, fulltitle=title, thumbnail=thumbnail, show=show, folder=True, contentType=contentType, contentTitle=contentTitle, - language =textoidiomas, infoLabels=infoLabels)) + language =language, infoLabels=infoLabels)) ## Paginación next_page_url = 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): From 739755d43e9167a9d774719730e425d6eb70f633 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 29 Sep 2017 15:51:32 -0300 Subject: [PATCH 2/3] ajustes a canales varios --- plugin.video.alfa/channels/allcalidad.py | 3 ++- plugin.video.alfa/channels/canalpelis.py | 10 +++++----- plugin.video.alfa/channels/cineasiaenlinea.py | 4 ++-- plugin.video.alfa/channels/cinefox.py | 4 ++-- plugin.video.alfa/channels/cinetux.py | 16 +++++++++------- plugin.video.alfa/channels/divxatope.py | 2 +- plugin.video.alfa/channels/maxipelis.py | 3 +-- plugin.video.alfa/channels/peliculasnu.py | 5 +++-- 8 files changed, 25 insertions(+), 22 deletions(-) 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, '