Actualizados

allcalidad: fix listado
descargacineclasico: agregado sección: Listado alfabético
porntrex: fix listado
rexpelis: desactivado, web no funciona
seriesmetro: fix listado
youporn: aparecía en listado general de canales
vidup: fix enlaces

plugin.video.alfa/channels/allcalidad.py

@@ -124,12 +124,12 @@ def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '(?s)short_overlay.*?<a href="([^"]+)'
-    patron += '.*?img.*?src="([^"]+)'
-    patron += '.*?title="([^"]+).*?'
-    patron += 'data-postid="([^"]+)'
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for url, thumbnail, titulo, datapostid in matches:
+    matches = scrapertools.find_multiple_matches(data, '(?s)shortstory cf(.*?)rate_post')
+    for datos in matches:
+        url = scrapertools.find_single_match(datos, 'href="([^"]+)')
+        titulo = scrapertools.find_single_match(datos, 'short_header">([^<]+)').strip()
+        datapostid = scrapertools.find_single_match(datos, 'data-postid="([^"]+)')
+        thumbnail = scrapertools.find_single_match(datos, 'img w.*?src="([^"]+)')
         post = 'action=get_movie_details&postID=%s' %datapostid
         data1 = httptools.downloadpage(host + "wp-admin/admin-ajax.php", post=post).data
         idioma = "Latino"

plugin.video.alfa/channels/descargacineclasico.py

@@ -11,27 +11,28 @@ from lib import unshortenit
 
 host = "http://www.descargacineclasico.net"
 
-
-def agrupa_datos(data):
-    # Agrupa los datos
-    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|<!--.*?-->', '', data)
-    data = re.sub(r'\s+', ' ', data)
-    data = re.sub(r'>\s<', '><', data)
-    return data
-
-
 def mainlist(item):
     logger.info()
     itemlist = []
     itemlist.append(Item(channel=item.channel, title="Últimas agregadas", action="agregadas",
-                         url=host, viewmode="movie_with_plot",
-                               thumbnail=get_thumb('last', auto=True)))
+                         url=host, viewmode="movie_with_plot", thumbnail=get_thumb('last', auto=True)))
     itemlist.append(Item(channel=item.channel, title="Listado por género", action="porGenero",
-                         url=host,
-                               thumbnail=get_thumb('genres', auto=True)))
-    itemlist.append(
-        Item(channel=item.channel, title="Buscar", action="search", url=host,
-                               thumbnail=get_thumb('search', auto=True)))
+                         url=host, thumbnail=get_thumb('genres', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Listado alfabetico", action="porLetra",
+                         url=host + "/cine-online/", thumbnail=get_thumb('alphabet', auto=True)))
+    itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host,
+                         thumbnail=get_thumb('search', auto=True)))
+    return itemlist
+
+
+def porLetra(item):
+    logger.info()
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    patron = 'noindex,nofollow" href="([^"]+)">(\w+)<'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for url, titulo in matches:
+        itemlist.append( Item(channel=item.channel , action="agregadas" , title=titulo, url=url, viewmode="movie_with_plot"))
     return itemlist
 
 
@@ -43,7 +44,9 @@ def porGenero(item):
     data = re.compile(patron,re.DOTALL).findall(data)
     patron = '<li.*?>.*?href="([^"]+).*?>([^<]+)'                                            
     matches = re.compile(patron,re.DOTALL).findall(data[0])
-    for url,genero in matches:
+    for url, genero in matches:
+        if genero == "Erótico" and config.get_setting("adult_mode") == 0:
+            continue
         itemlist.append( Item(channel=item.channel , action="agregadas" , title=genero,url=url, viewmode="movie_with_plot"))
     return itemlist
 
@@ -129,7 +132,6 @@ def findvideos(item):
                                      contentTitle = item.contentTitle
                                      ))
     return itemlist
-    return itemlist
 
 
 def play(item):

plugin.video.alfa/channels/porntrex.py

@@ -66,16 +66,21 @@ def lista(item):
         action = "menu_info"
 
     # Extrae las entradas
-    patron = '<div class="video-item.*?href="([^"]+)" title="([^"]+)".*?data-original="([^"]+)"(.*?)<div class="durations">.*?</i>([^<]+)<'
+    patron  = '<div class="video-item.*?href="([^"]+)" '
+    patron += 'title="([^"]+)".*?'
+    patron += 'data-src="([^"]+)"'
+    patron += '(.*?)<div class="durations">.*?'
+    patron += '</i>([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl, scrapedtitle, scrapedthumbnail, quality, duration in matches:
         if "go.php?" in scrapedurl:
             scrapedurl = urllib.unquote(scrapedurl.split("/go.php?u=")[1].split("&")[0])
-            scrapedthumbnail = urlparse.urljoin(host, scrapedthumbnail)
+            if not scrapedthumbnail.startswith("https"):
+                scrapedthumbnail = "https:%s" % scrapedthumbnail
         else:
             scrapedurl = urlparse.urljoin(host, scrapedurl)
             if not scrapedthumbnail.startswith("https"):
-                scrapedthumbnail = host + "%s" % scrapedthumbnail
+                scrapedthumbnail = "https:%s" % scrapedthumbnail
         if duration:
             scrapedtitle = "%s - %s" % (duration, scrapedtitle)
         if '>HD<' in quality:
@@ -110,7 +115,6 @@ def lista(item):
                     next_page = "%s?mode=async&function=get_block&block_id=list_videos_common_videos_list&sort_by=post_date&from=%s" % (
                         item.url, next_page)
                 itemlist.append(item.clone(action="lista", title=">> Página Siguiente", url=next_page))
-
     return itemlist
 
 
@@ -225,7 +229,6 @@ def play(item):
     itemlist = []
 
     data = get_data(item.url)
-
     patron = '(?:video_url|video_alt_url[0-9]*)\s*:\s*\'([^\']+)\'.*?(?:video_url_text|video_alt_url[0-9]*_text)\s*:\s*\'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
     if not matches:

plugin.video.alfa/channels/rexpelis.json

@@ -1,7 +1,7 @@
 {
   "id": "rexpelis",
   "name": "Rexpelis",
-  "active": true,
+  "active": false,
   "adult": false,
   "language": ["lat","cast"],
   "thumbnail": "https://i.postimg.cc/MMJ5g9Y1/rexpelis1.png",

plugin.video.alfa/channels/seriesmetro.py

@@ -59,7 +59,7 @@ def list_all(item):
     itemlist = []
 
     data = get_source(item.url)
-    patron = '<div class="post-thumbnail"><a href="([^"]+)" title="([^"]+)">.*?data-src="([^"]+)"'
+    patron = '<div class="post-thumbnail"><a href="([^"]+)" title="([^"]+)">.*?data-lazy-src="([^"]+)"'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for scrapedurl, scrapedtitle, scrapedthumbnail in matches:

plugin.video.alfa/channels/youporn.json

@@ -2,7 +2,7 @@
   "id": "youporn",
   "name": "youporn",
   "active": true,
-  "adult": false,
+  "adult": true,
   "language": ["*"],
   "thumbnail": "https://fs.ypncdn.com/cb/bundles/youpornwebfront/images/l_youporn_black.png",
   "banner": "",

plugin.video.alfa/servers/vidup.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "vidup.(?:me|tv)/(?:embed-|)([A-z0-9]+)",
+        "pattern": "vidup.(?:me|tv|io)/(?:embed-|)([A-z0-9]+)",
         "url": "http://vidup.tv/embed-\\1.html"
       }
     ]

plugin.video.alfa/servers/vidup.py

@@ -20,8 +20,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     video_urls = []
     post= {}
     post = urllib.urlencode(post)
-    url = httptools.downloadpage(page_url, follow_redirects=False, only_headers=True).headers.get("location", "")
-    data = httptools.downloadpage("https://vidup.io/api/serve/video/" + scrapertools.find_single_match(url, "embed/([A-z0-9]+)"), post=post).data
+    headers = {"Referer":page_url}
+    url = httptools.downloadpage(page_url, follow_redirects=False, headers=headers, only_headers=True).headers.get("location", "")
+    data = httptools.downloadpage("https://vidup.io/api/serve/video/" + scrapertools.find_single_match(url, "embed.([A-z0-9]+)"), post=post).data
     bloque = scrapertools.find_single_match(data, 'qualities":\{(.*?)\}')
     matches = scrapertools.find_multiple_matches(bloque, '"([^"]+)":"([^"]+)')
     for res, media_url in matches: