diff --git a/plugin.video.alfa/channels/inkaseries.py b/plugin.video.alfa/channels/inkaseries.py index 1fbab100..8c4159f7 100644 --- a/plugin.video.alfa/channels/inkaseries.py +++ b/plugin.video.alfa/channels/inkaseries.py @@ -38,9 +38,6 @@ def mainlist(item): thumbnail=get_thumb('all', auto=True))) itemlist.append(Item(channel= item.channel, title="Generos", action="genres", url=host + 'ultimas-series-agregadas/', thumbnail=get_thumb('genres', auto=True))) - itemlist.append(Item(channel= item.channel, title="Recomendadas", action="list_all", - url=host + 'ultimas-series-agregadas/', type='recomended', - thumbnail=get_thumb('recomended', auto=True))) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=', thumbnail=get_thumb('search', auto=True))) @@ -54,18 +51,9 @@ def list_all(item): itemlist = [] data = get_source(item.url) - if item.type != 'search': - if item.type == 'recomended': - class_type = 'list_mt' - else: - class_type = 'info' - - patron = ' ') + patron = ' ') + next_page = scrapertools.find_single_match(data, '
  • ') if next_page != '': itemlist.append(Item(channel=item.channel, action="list_all", title='Siguiente >>>', url=next_page, thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png')) @@ -160,13 +148,13 @@ def genres(item): itemlist = [] norep = [] data = get_source(item.url) - patron = ']+)>(.*?)' + patron = ']+)>(.*?).*?>(.*?)' matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedurl, scrapedtitle in matches: + for scrapedurl, scrapedtitle, cantidad in matches: url = scrapedurl - title = scrapedtitle.capitalize() + title = "%s - %s" % (scrapedtitle.capitalize(), cantidad) itemactual = Item(channel=item.channel, action='list_all', title=title, url=url) if title not in norep: diff --git a/plugin.video.alfa/channels/maxipelis24.json b/plugin.video.alfa/channels/maxipelis24.json index 5c93a817..f967cbfc 100644 --- a/plugin.video.alfa/channels/maxipelis24.json +++ b/plugin.video.alfa/channels/maxipelis24.json @@ -1,12 +1,27 @@ { -"id": "maxipelis24", + "id": "maxipelis24", "name": "Maxipelis24", "active": true, "adult": false, - "language": ["lat"], - "thumbnail": "maxipelis24.png", - "banner": "", + "language": ["cast", "lat", "vose"], + "thumbnail": "hmaxipelis24.png", "categories": [ "movie" + ], + "settings": [ + { + "id": "filter_languages", + "type": "list", + "label": "Mostrar enlaces en idioma...", + "default": 0, + "enabled": true, + "visible": true, + "lvalues": [ + "No filtrar", + "Latino", + "CAST", + "VOSE" + ] + } ] } diff --git a/plugin.video.alfa/channels/maxipelis24.py b/plugin.video.alfa/channels/maxipelis24.py index 1f0a07f3..f0e71d21 100644 --- a/plugin.video.alfa/channels/maxipelis24.py +++ b/plugin.video.alfa/channels/maxipelis24.py @@ -14,7 +14,8 @@ from channelselector import get_thumb host = "https://maxipelis24.tv" -list_language = [] +IDIOMAS = {'Latino': 'Latino', 'Subtitulado': 'VOSE', 'EspaƱol': 'CAST'} +list_language = IDIOMAS.values() list_quality = [] list_servers = ['rapidvideo', 'vidoza', 'openload', 'streamango'] @@ -112,6 +113,12 @@ 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,'
      .*?
    ') + patron = "li>.*?href=.*?>([^\s]+)" + matches1 = re.compile(patron, re.DOTALL).findall(data1) + for lang in matches1: + idioma = lang + patron = '