Merge pull request #544 from chivmalev/master

maxipelis24:mejoras

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':
+    data1 = scrapertools.find_single_match(data, '<div class=col-md-80 lado2(.*?)</div></div></div>')
-        if item.type == 'recomended':
+    patron = '<a class=poster href=(.*?) title=(.*?)> <img.*?src=(.*?) alt.*?'
-            class_type = 'list_mt'
+    matches = re.compile(patron, re.DOTALL).findall(data1)
-        else:
-            class_type = 'info'
-
-        patron = '<a class=poster href=(.*?) title=(.*?)> <img src=(.*?) alt.*?class=%s' % class_type
-    else:
-        patron = 'item> <a class=poster href=(.*?) title=(.*?)> <img src=(.*?) alt.*?class=info'
-
-
-    matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
         url = scrapedurl
@@ -82,7 +70,7 @@ def list_all(item):
 
     if itemlist != []:
         actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<li><a href=([^ ]+) ><span aria-hidden=true>&raquo;</span>')
+        next_page = scrapertools.find_single_match(data, '<li><a href=([^ ]+)><span aria-hidden=true>&raquo;</span>')
         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 = '<a href=([^>]+)><span.*?<i>(.*?)</i>'
+    patron = '<a href=([^>]+)><span.*?<i>(.*?)</i>.*?>(.*?)</b>'
     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:

plugin.video.alfa/channels/maxipelis24.json

@@ -1,12 +1,27 @@
 {
-"id": "maxipelis24",
+  "id": "maxipelis24",
   "name": "Maxipelis24",
   "active": true,
   "adult": false,
-  "language": ["lat"],
+  "language": ["cast", "lat", "vose"],
-  "thumbnail": "maxipelis24.png",
+  "thumbnail": "hmaxipelis24.png",
-  "banner": "",
   "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"
+      ]
+    }
   ]
 }

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,'<ul class="idTabs">.*?</ul></div>') 
+    patron = "li>.*?href=.*?>([^\s]+)"
+    matches1 = re.compile(patron, re.DOTALL).findall(data1)
+    for lang in matches1:
+        idioma = lang
+
     patron = '<div id="div.*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^&]+)&'
     matches = re.compile(patron, re.DOTALL).findall(data)
     for link in matches:
@@ -128,20 +135,19 @@ def findvideos(item):
                                                 follow_redirects=False)
             url = video_data.headers['location']
             title = '%s'
-            new_item = Item(channel=item.channel, title=title, url=url,
+
-                            action='play', language='', infoLabels=item.infoLabels)
+            
-            itemlist.append(new_item)
         else:
             patron = '<div id="div.*?<div class="movieplay".*?(?:iframe.*?src|IFRAME SRC)="([^"]+)"'
             matches = re.compile(patron, re.DOTALL).findall(data)
             for link in matches:
                 url = link
                 title = '%s'
-                new_item = Item(channel=item.channel, title=title, url=url,
+        new_item = Item(channel=item.channel, title=title, url=url,
-                                action='play', language='', infoLabels=item.infoLabels)
+                        action='play', language= IDIOMAS[idioma], infoLabels=item.infoLabels)
-                itemlist.append(new_item)
+        itemlist.append(new_item)
-    itemlist = servertools.get_servers_itemlist(
+    itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % '%s [%s]'%(i.server.capitalize(),i.language))
-        itemlist, lambda x: x.title % x.server.capitalize())
+    #itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
     if itemlist:
         if config.get_videolibrary_support():
             itemlist.append(Item(channel=item.channel, action=""))