diff --git a/plugin.video.alfa/channels/canalporno.py b/plugin.video.alfa/channels/canalporno.py index ab706d74..08d6b436 100755 --- a/plugin.video.alfa/channels/canalporno.py +++ b/plugin.video.alfa/channels/canalporno.py @@ -43,7 +43,7 @@ def findvideos(item): for thumbnail, title, url, time in matches: scrapedtitle = time + " - " + title scrapedurl = host + url - scrapedthumbnail = "http:" + thumbnail + scrapedthumbnail = thumbnail itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail)) @@ -80,7 +80,7 @@ def play(item): itemlist = [] data = httptools.downloadpage(item.url).data - url = "http:" + scrapertools.find_single_match(data, '|') - patron = '') @@ -196,7 +195,7 @@ def lista(item): itemlist.append(Item(channel=item.channel, action="episodios", title=title, fulltitle=title, url=url, thumbnail=thumbnail, plot=plot, folder=True, contentTitle=contentTitle, language=idioma, contentSeason=int(temporada), - contentEpisodeNumber=int(episodio), contentQuality=calidad)) + contentEpisodeNumber=int(episodio), quality=calidad)) else: if len(matches) == 2: @@ -205,7 +204,7 @@ def lista(item): itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url, thumbnail=thumbnail, plot=plot, folder=True, contentTitle=contentTitle, - language=idioma, contentThumbnail=thumbnail, contentQuality=calidad)) + language=idioma, contentThumbnail=thumbnail, quality=calidad)) next_page_url = scrapertools.find_single_match(data, '
  • Next
  • ') if next_page_url != "": @@ -262,7 +261,7 @@ def findvideos(item): item.plot = scrapertools.htmlclean(item.plot).strip() item.contentPlot = item.plot - link = scrapertools.find_single_match(data, 'href.*?=.*?"http:\/\/(?:tumejorserie|tumejorjuego).*?link=([^"]+)"') + link = scrapertools.find_single_match(data, 'location\.href.*?=.*?"http:\/\/(?:tumejorserie|tumejorjuego).*?link=(.*?)"') if link != "": link = "http://www.divxatope1.com/" + link logger.info("torrent=" + link) @@ -275,14 +274,7 @@ def findvideos(item): patron += '<\/div[^<]+
    ([^<]+)<\/div[^<]+' entradas = scrapertools.find_multiple_matches(contenido, patron) for scrapedurl, scrapedthumbnail, serie, episodio, scrapedtitle in entradas: diff --git a/plugin.video.alfa/channels/playpornx.py b/plugin.video.alfa/channels/playpornx.py index ba72db1d..84931128 100644 --- a/plugin.video.alfa/channels/playpornx.py +++ b/plugin.video.alfa/channels/playpornx.py @@ -7,7 +7,7 @@ from core import scrapertools from core.item import Item from platformcode import logger -host = "http://www.playpornx.net/list-movies/" +host = "http://www.playpornx.net/" def mainlist(item): @@ -15,7 +15,7 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Todas", action="lista", thumbnail='https://s18.postimg.org/fwvaeo6qh/todas.png', fanart='https://s18.postimg.org/fwvaeo6qh/todas.png', - url ='https://www.playpornx.net/category/porn-movies/?filter=date')) + url =host)) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url='http://www.playpornx.net/?s=', thumbnail='https://s30.postimg.org/pei7txpa9/buscar.png', @@ -31,10 +31,10 @@ def lista(item): if item.url == '': item.url = host data = httptools.downloadpage(item.url).data data = re.sub(r'"|\n|\r|\t| |
    |\s{2,}', "", data) - patron = 'role=article>
    .*?src=(.*?) class' + patron = '
    .*?href=(.*?)>(.*?)<\/h2>' matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedurl, scrapedtitle, scrapedthumbnail in matches: + for scrapedurl, scrapedthumbnail, scrapedtitle in matches: url = scrapedurl thumbnail = scrapedthumbnail title = scrapedtitle diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.py b/plugin.video.alfa/channels/verpeliculasnuevas.py index cadb95dc..691c39b0 100755 --- a/plugin.video.alfa/channels/verpeliculasnuevas.py +++ b/plugin.video.alfa/channels/verpeliculasnuevas.py @@ -266,7 +266,6 @@ def lista(item): contentTitle=scrapedtitle, extra=item.extra, infoLabels={'year': year}, - show=scrapedtitle, list_language=list_language, context=autoplay.context )) diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py index cffc4a86..0c21c218 100755 --- a/plugin.video.alfa/servers/gamovideo.py +++ b/plugin.video.alfa/servers/gamovideo.py @@ -7,7 +7,8 @@ from core import scrapertools from lib import jsunpack from platformcode import logger -headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0'} +headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 ' \ + 'Firefox/40.0'} def test_video_exists(page_url): @@ -24,8 +25,8 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url, add_referer = True, headers=headers).data - + data = httptools.downloadpage(page_url, headers=headers).data + logger.debug(data) packer = scrapertools.find_single_match(data, "") if packer != "":