From 54b4bad0b3287555a5c9678c6cb237b27ab867d4 Mon Sep 17 00:00:00 2001 From: chivmalev Date: Sat, 1 Sep 2018 15:58:06 -0300 Subject: [PATCH 1/4] cumlouder:fix --- plugin.video.alfa/channels/cumlouder.py | 30 ++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) mode change 100755 => 100644 plugin.video.alfa/channels/cumlouder.py diff --git a/plugin.video.alfa/channels/cumlouder.py b/plugin.video.alfa/channels/cumlouder.py old mode 100755 new mode 100644 index 76b13e79..81a26a7f --- a/plugin.video.alfa/channels/cumlouder.py +++ b/plugin.video.alfa/channels/cumlouder.py @@ -18,6 +18,7 @@ def mainlist(item): itemlist.append(item.clone(title="Últimos videos", action="videos", url="https://www.cumlouder.com/")) itemlist.append(item.clone(title="Categorias", action="categorias", url="https://www.cumlouder.com/categories/")) itemlist.append(item.clone(title="Pornstars", action="pornstars_list", url="https://www.cumlouder.com/girls/")) + itemlist.append(item.clone(title="Listas", action="series", url="https://www.cumlouder.com/series/")) itemlist.append(item.clone(title="Buscar", action="search", url="https://www.cumlouder.com/search?q=%s")) return itemlist @@ -82,10 +83,8 @@ def categorias(item): itemlist = [] data = get_data(item.url) - # logger.info("channels.cumlouder data="+data) - patron = '[^<]+' - patron += '([^"]+)' - + data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) + patron = '([^<]+)' matches = re.compile(patron, re.DOTALL).findall(data) for url, title, thumbnail, count in matches: if "go.php?" in url: @@ -109,6 +108,28 @@ def categorias(item): return itemlist +def series(item): + logger.info() + itemlist = [] + + data = get_data(item.url) + data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) + patron = '([^<]+).*?p>([^<]+)

' + matches = re.compile(patron, re.DOTALL).findall(data) + for url, thumbnail, title, count in matches: + itemlist.append( + item.clone(title="%s (%s) " % (title, count), url=urlparse.urljoin(item.url, url), action="videos", thumbnail=thumbnail)) + + # Paginador + matches = re.compile('Next[^<]+', re.DOTALL).findall(data) + if matches: + if "go.php?" in matches[0]: + url = urllib.unquote(matches[0].split("/go.php?u=")[1].split("&")[0]) + else: + url = urlparse.urljoin(item.url, matches[0]) + itemlist.append(item.clone(title="Pagina Siguiente", url=url)) + + return itemlist def videos(item): logger.info() @@ -116,7 +137,6 @@ def videos(item): data = get_data(item.url) patron = ' ([^<]+)' - matches = re.compile(patron, re.DOTALL).findall(data) for url, title, thumbnail, duration in matches: if "go.php?" in url: From 9931d2864f0c70201467cddad8b4e3b8415331b5 Mon Sep 17 00:00:00 2001 From: chivmalev Date: Sat, 1 Sep 2018 17:02:17 -0300 Subject: [PATCH 2/4] porntrex: correcciones --- plugin.video.alfa/channels/porntrex.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100755 => 100644 plugin.video.alfa/channels/porntrex.py diff --git a/plugin.video.alfa/channels/porntrex.py b/plugin.video.alfa/channels/porntrex.py old mode 100755 new mode 100644 index 38f59a3b..096c4eb7 --- a/plugin.video.alfa/channels/porntrex.py +++ b/plugin.video.alfa/channels/porntrex.py @@ -73,12 +73,14 @@ def lista(item): scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail) else: scrapedurl = urlparse.urljoin(host, scrapedurl) + if not scrapedthumbnail.startswith("https"): + scrapedthumbnail = "https:%s" % scrapedthumbnail if duration: scrapedtitle = "%s - %s" % (duration, scrapedtitle) if '>HD<' in quality: scrapedtitle += " [COLOR red][HD][/COLOR]" - itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, + itemlist.append(item.clone(action=action, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, contentThumbnail=scrapedthumbnail, fanart=scrapedthumbnail)) # Extrae la marca de siguiente página @@ -128,6 +130,8 @@ def categorias(item): scrapedthumbnail = urllib.unquote(scrapedthumbnail.split("/go.php?u=")[1].split("&")[0]) else: scrapedurl = urlparse.urljoin(host, scrapedurl) + if not scrapedthumbnail.startswith("https"): + scrapedthumbnail = "https:%s" % scrapedthumbnail if videos: scrapedtitle = "%s (%s)" % (scrapedtitle, videos) itemlist.append(item.clone(action="lista", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, @@ -161,6 +165,8 @@ def playlists(item): scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail) else: scrapedurl = urlparse.urljoin(host, scrapedurl) + if not scrapedthumbnail.startswith("https"): + scrapedthumbnail = "https:%s" % scrapedthumbnail if videos: scrapedtitle = "%s (%s)" % (scrapedtitle, videos) itemlist.append(item.clone(action="videos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, From 5667f89587b06a6874a6cc81e9bcd867549ac76d Mon Sep 17 00:00:00 2001 From: chivmalev Date: Mon, 3 Sep 2018 20:24:52 -0300 Subject: [PATCH 3/4] porntrex fix --- plugin.video.alfa/channels/porntrex.py | 40 ++++++++++---------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/plugin.video.alfa/channels/porntrex.py b/plugin.video.alfa/channels/porntrex.py index 096c4eb7..b4d4803c 100644 --- a/plugin.video.alfa/channels/porntrex.py +++ b/plugin.video.alfa/channels/porntrex.py @@ -152,10 +152,8 @@ def categorias(item): def playlists(item): logger.info() itemlist = [] - # Descarga la pagina data = get_data(item.url) - # Extrae las entradas patron = '
([^<]+)<' matches = scrapertools.find_multiple_matches(data, patron) @@ -168,11 +166,10 @@ def playlists(item): if not scrapedthumbnail.startswith("https"): scrapedthumbnail = "https:%s" % scrapedthumbnail if videos: - scrapedtitle = "%s (%s)" % (scrapedtitle, videos) + scrapedtitle = "%s [COLOR red](%s)[/COLOR]" % (scrapedtitle, videos) itemlist.append(item.clone(action="videos", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, fanart=scrapedthumbnail)) - - # Extrae la marca de siguiente página + #Extrae la marca de siguiente página next_page = scrapertools.find_single_match(data, '