diff --git a/plugin.video.alfa/addon.xml b/plugin.video.alfa/addon.xml index e14bbc34..b8de206d 100755 --- a/plugin.video.alfa/addon.xml +++ b/plugin.video.alfa/addon.xml @@ -1,5 +1,5 @@ - + @@ -19,15 +19,9 @@ [B]Estos son los cambios para esta versión:[/B] [COLOR green][B]Arreglos[/B][/COLOR] - ¤ danimados ¤ animeshd ¤ pelisplus - ¤ NewPct1 ¤ DivxTotal ¤ Todopeliculas - ¤ pelismundo ¤ repelis ¤ DoomTv - ¤ FanPelis ¤ Goovie ¤ InkaPelis - ¤ PeliculonHD ¤ PelisFox ¤ PelisGratis - ¤ RetroseriesTV ¤ Inkaseries ¤ Maxipelis24 - ¤ gmobi ¤ chzechvideos - [COLOR green][B]Novedades[/B][/COLOR] - ¤ Legalmente Gratis + ¤ maxipelis24 ¤ thevid ¤ gamovideo + ¤ pack +18 + Agradecimientos a @chivmalev por colaborar en ésta versión diff --git a/plugin.video.alfa/channels/maxipelis24.py b/plugin.video.alfa/channels/maxipelis24.py index f0e71d21..674e8417 100644 --- a/plugin.video.alfa/channels/maxipelis24.py +++ b/plugin.video.alfa/channels/maxipelis24.py @@ -28,11 +28,11 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Peliculas", action="movies", url=host, page=0, thumbnail=get_thumb('movies', auto=True))) itemlist.append(Item(channel=item.channel, action="category", title="Año de Estreno", - url=host, cat='year', page=0, thumbnail=get_thumb('year', auto=True))) + url=host, cat='year', thumbnail=get_thumb('year', auto=True))) itemlist.append(Item(channel=item.channel, action="category", title="Géneros", - url=host, cat='genre', page=0, thumbnail=get_thumb('genres', auto=True))) + url=host, cat='genre', thumbnail=get_thumb('genres', auto=True))) itemlist.append(Item(channel=item.channel, action="category", title="Calidad", - url=host, cat='quality', page=0, thumbnail=get_thumb("quality", auto=True))) + url=host, cat='quality', thumbnail=get_thumb("quality", auto=True))) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + "?s=", page=0, thumbnail=get_thumb("search", auto=True))) @@ -53,17 +53,18 @@ def category(item): itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) + if item.cat == 'genre': data = scrapertools.find_single_match( data, '

Géneros .*?') - patron = '
  • ([^<]+)<' + patron = '
  • ([^<]+)<' elif item.cat == 'year': data = scrapertools.find_single_match( data, '

    Año de estreno.*?') - patron = 'li>([^<]+).*?<' + patron = 'li>([^<]+).*?<' elif item.cat == 'quality': data = scrapertools.find_single_match(data, '

    Calidad.*?') - patron = 'li>([^<]+)<' + patron = 'li>([^<]+)<' matches = re.compile(patron, re.DOTALL).findall(data) for scrapedurl, scrapedtitle in matches: itemlist.append(Item(channel=item.channel, action='movies', @@ -81,7 +82,7 @@ def movies(item): patron += '([^<]+).*?' patron += 'class="year">([^<]+).+?class="calidad2">([^<]+)<' matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedurl, img, scrapedtitle, resto, year, quality in matches[item.page:item.page + 30]: + for scrapedurl, img, scrapedtitle, resto, year, quality in matches[item.page:item.page + 20]: scrapedtitle = re.sub(r' \((\d+)\)', '', scrapedtitle) plot = scrapertools.htmlclean(resto).strip() title = ' %s [COLOR red][%s][/COLOR]' % (scrapedtitle, quality) @@ -97,14 +98,15 @@ def movies(item): infoLabels={'year': year})) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) # Paginacion - if item.page + 30 < len(matches): - itemlist.append(item.clone(page=item.page + 30, title=">> Siguiente")) + if item.page + 20 < len(matches): + itemlist.append(item.clone(page=item.page + 20, title=">> Siguiente")) else: next_page = scrapertools.find_single_match( - data, 'class="respo_pag">
    Siguiente<') + data, '') if next_page: - itemlist.append(item.clone( - url=next_page, page=0, title=">> Siguiente")) + itemlist.append(item.clone(url=next_page, page=0, + title=" Siguiente »")) + return itemlist @@ -113,7 +115,8 @@ def findvideos(item): itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - data1= scrapertools.find_single_match(data,'
      .*?
    ') + data1 = scrapertools.find_single_match( + data, '
      .*?
    ') patron = "li>.*?href=.*?>([^\s]+)" matches1 = re.compile(patron, re.DOTALL).findall(data1) for lang in matches1: @@ -136,7 +139,6 @@ def findvideos(item): url = video_data.headers['location'] title = '%s' - else: patron = '
    Studios(.*?)') data = re.sub(r"\n|\r|\t| |
    ", "", data) - patron = '
  • ([^<]+)' + patron = '([^<]+)' matches = re.compile(patron,re.DOTALL).findall(data) for scrapedurl,scrapedtitle in matches: scrapedplot = "" @@ -58,17 +58,19 @@ def lista(item): logger.info() itemlist = [] data = scrapertools.cachePage(item.url) - patron = '
  • 1
  • + next_page = scrapertools.find_single_match(data,'
  • .*?href=\'([^\']+)\'>') if next_page =="": next_page = scrapertools.find_single_match(data,'Next »') if next_page!="": diff --git a/plugin.video.alfa/channels/pornboss.py b/plugin.video.alfa/channels/pornboss.py index c5f06431..d0886ca6 100644 --- a/plugin.video.alfa/channels/pornboss.py +++ b/plugin.video.alfa/channels/pornboss.py @@ -19,7 +19,7 @@ def mainlist(item): itemlist.append( Item(channel=item.channel, title=" categorias" , action="categorias", url=host + "/category/movies/")) itemlist.append( Item(channel=item.channel, title="Videos" , action="lista", url=host + "/category/clips/")) - itemlist.append( Item(channel=item.channel, title=" categorias" , action="lista", url=host + "/category/clips/")) + itemlist.append( Item(channel=item.channel, title=" categorias" , action="categorias", url=host + "/category/clips/")) return itemlist @@ -41,11 +41,11 @@ def categorias(item): itemlist = [] data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t| |
    ", "", data) - if item.url == host + "/category/movies/": + if "/category/movies/" in item.url: data = scrapertools.get_match(data,'>Movies(.*?)') else: data = scrapertools.get_match(data,'>Clips(.*?)') - patron = '([^"]+)' + patron = '([^"]+)' matches = re.compile(patron,re.DOTALL).findall(data) scrapertools.printMatches(matches) for scrapedurl,scrapedtitle in matches: @@ -60,20 +60,21 @@ def lista(item): logger.info() itemlist = [] data = scrapertools.cachePage(item.url) - patron = '