From e20b32b7e96af6ed065f369aec3008aa22712c31 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Tue, 17 Oct 2017 16:58:57 -0500 Subject: [PATCH 01/20] pelismundo: codigo mejorado MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pelismundo: código mejorado --- plugin.video.alfa/channels/pelismundo.py | 44 ++++++------------------ 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py index 2e89c06e..b7126ca1 100644 --- a/plugin.video.alfa/channels/pelismundo.py +++ b/plugin.video.alfa/channels/pelismundo.py @@ -12,15 +12,8 @@ from core import tmdb from core.item import Item from platformcode import config, logger -__channel__='allcalidad' - -host = "http://www.pelismundo.com/" - -try: - __modo_grafico__ = config.get_setting('modo_grafico', __channel__) -except: - __modo_grafico__ = True - +host = "http://www.pelismundo.com" +idiomas = [["Castellano","ESP"],["Subtitulad","VOSE"],["Latino","LAT"]] def mainlist(item): logger.info() @@ -80,10 +73,9 @@ def sub_search(item): patron = '(?s)href="([^"]+)".*?' patron += 'title="([^"]+)".*?' patron += 'src="([^"]+)".*?' - patron += 'Idioma.*?tag">([^<]+).*?' - patron += 'Calidad(.*?<)\/' + patron += 'Idioma(.*?)Cal' + patron += 'idad(.*?<)\/' match = scrapertools.find_multiple_matches(bloque, patron) - scrapertools.printMatches(match) for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedlanguages, scrapedquality in match: year = scrapertools.find_single_match(scrapedtitle, '[0-9]{4}') scrapedquality = scrapertools.find_single_match(scrapedquality, 'rel="tag">([^<]+)<') @@ -93,21 +85,14 @@ def sub_search(item): scrapedtitle = scrapedtitle.replace(st, "") title = scrapedtitle if year: - title += " (" + year + ")" + title += "(" + year + ")" if scrapedquality: title += " (" + scrapedquality + ")" - patronidiomas = '' idiomas_disponibles = [] - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Castellano') - if matchidioma: - idiomas_disponibles.append("ESP") - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Subtitulado') - if matchidioma: - idiomas_disponibles.append("VOSE") - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Latino') - if matchidioma: - idiomas_disponibles.append("LAT") idiomas_disponibles1 = "" + for lang in range(len(idiomas)): + if idiomas[lang][0] in scrapedlanguages: + idiomas_disponibles.append(idiomas[lang][1]) if idiomas_disponibles: idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" title += " %s" %idiomas_disponibles1 @@ -171,18 +156,11 @@ def peliculas(item): title += " (" + year + ")" if scrapedquality: title += " (" + scrapedquality + ")" - patronidiomas = '' idiomas_disponibles = [] - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Castellano') - if matchidioma: - idiomas_disponibles.append("ESP") - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Subtitulado') - if matchidioma: - idiomas_disponibles.append("VOSE") - matchidioma = scrapertools.find_single_match(scrapedlanguages, 'Latino') - if matchidioma: - idiomas_disponibles.append("LAT") idiomas_disponibles1 = "" + for lang in range(len(idiomas)): + if idiomas[lang][0] in scrapedlanguages: + idiomas_disponibles.append(idiomas[lang][1]) if idiomas_disponibles: idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" title += " %s" %idiomas_disponibles1 From 0e7c8d22ef567722181c165e206bcfb2d6026759 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 18 Oct 2017 09:19:57 -0500 Subject: [PATCH 02/20] Update pelismundo.py --- plugin.video.alfa/channels/pelismundo.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py index b7126ca1..d40d4e43 100644 --- a/plugin.video.alfa/channels/pelismundo.py +++ b/plugin.video.alfa/channels/pelismundo.py @@ -13,7 +13,7 @@ from core.item import Item from platformcode import config, logger host = "http://www.pelismundo.com" -idiomas = [["Castellano","ESP"],["Subtitulad","VOSE"],["Latino","LAT"]] +idiomas = {"Castellano":"CAST","Subtitulad":"VOSE","Latino":"LAT"} def mainlist(item): logger.info() @@ -90,9 +90,9 @@ def sub_search(item): title += " (" + scrapedquality + ")" idiomas_disponibles = [] idiomas_disponibles1 = "" - for lang in range(len(idiomas)): - if idiomas[lang][0] in scrapedlanguages: - idiomas_disponibles.append(idiomas[lang][1]) + for lang in idiomas.keys(): + if lang in scrapedlanguages: + idiomas_disponibles.append(idiomas[lang]) if idiomas_disponibles: idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" title += " %s" %idiomas_disponibles1 @@ -157,10 +157,10 @@ def peliculas(item): if scrapedquality: title += " (" + scrapedquality + ")" idiomas_disponibles = [] + for lang in idiomas.keys(): + if lang in scrapedlanguages: + idiomas_disponibles.append(idiomas[lang]) idiomas_disponibles1 = "" - for lang in range(len(idiomas)): - if idiomas[lang][0] in scrapedlanguages: - idiomas_disponibles.append(idiomas[lang][1]) if idiomas_disponibles: idiomas_disponibles1 = "[" + "/".join(idiomas_disponibles) + "]" title += " %s" %idiomas_disponibles1 From 341953539eaeba7af52928212808ed62a98471d3 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Wed, 18 Oct 2017 09:29:02 -0500 Subject: [PATCH 03/20] Update pelismundo.py --- plugin.video.alfa/channels/pelismundo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py index d40d4e43..c87f783f 100644 --- a/plugin.video.alfa/channels/pelismundo.py +++ b/plugin.video.alfa/channels/pelismundo.py @@ -197,7 +197,7 @@ def findvideos(item): title = "Ver en: %s " + "(" + scrapedlanguage + ")" itemlist.append(item.clone(action = "play", title = title, - language = item.language, + language = scrapedlanguage, quality = item.quality, url = scrapedurl )) From cad7e96441c85f2f001c479bf01c42133acd3943 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 18 Oct 2017 11:38:26 -0300 Subject: [PATCH 04/20] Correccion divxatope --- plugin.video.alfa/channels/divxatope.py | 31 ++++++++----------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/plugin.video.alfa/channels/divxatope.py b/plugin.video.alfa/channels/divxatope.py index 9e5d400c..71965fc9 100644 --- a/plugin.video.alfa/channels/divxatope.py +++ b/plugin.video.alfa/channels/divxatope.py @@ -157,11 +157,10 @@ def lista(item): # logger.info("data="+data) bloque = scrapertools.find_single_match(data, '(?: