From 3c335f7cea7503336dba1723d2e3a6094efb7eaf Mon Sep 17 00:00:00 2001
From: DiegoT <tellodiego@yahoo.com>
Date: Tue, 23 Oct 2018 21:21:16 +0000
Subject: [PATCH 1/2] xhamster y playpornx fueron corregidos, listado,
 busqueda, etc.

---
 plugin.video.alfa/channels/playpornx.py |  38 +++----
 plugin.video.alfa/channels/xhamster.py  | 139 ++++++++++--------------
 2 files changed, 74 insertions(+), 103 deletions(-)

diff --git a/plugin.video.alfa/channels/playpornx.py b/plugin.video.alfa/channels/playpornx.py
index 91d726f3..0eb75040 100644
--- a/plugin.video.alfa/channels/playpornx.py
+++ b/plugin.video.alfa/channels/playpornx.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+import urlparse
 
 from core import httptools
 from core import scrapertools
@@ -12,10 +13,12 @@ host = "https://watchfreexxx.net/"
 
 def mainlist(item):
     itemlist = []
-    itemlist.append(Item(channel=item.channel, title="Todas", action="lista",
-                         thumbnail='https://s18.postimg.cc/fwvaeo6qh/todas.png',
-                         fanart='https://s18.postimg.cc/fwvaeo6qh/todas.png',
-                         url =host))
+
+    itemlist.append(Item(channel=item.channel, title="Movies", action="lista",
+                         url = urlparse.urljoin(host, "category/porn-movies/")))
+
+    itemlist.append(Item(channel=item.channel, title="Scenes", action="lista",
+                         url = urlparse.urljoin(host, "category/xxx-scenes/")))
 
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
                          thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png',
@@ -29,34 +32,27 @@ def lista(item):
 
     itemlist = []
     if item.url == '': item.url = host
+
     data = httptools.downloadpage(item.url).data
-    data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    if item.extra != 'Buscar':
-        patron = '<div class=item>.*?href=(.*?)><div.*?<img src=(.*?) alt=(.*?) width'
-    else:
-        patron = '<div class=movie>.*?<img src=(.*?) alt=(.*?) \/>.*?href=(.*?)\/>'
+    data = re.sub(r'\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
+
+    patron = '<article id=.*?<a href="([^"]+)".*?<img data-src="([^"]+)" alt="([^"]+)"'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
     for data_1, data_2, data_3 in matches:
-        if item.extra != 'Buscar':
-            url = data_1
-            thumbnail = data_2
-            title = data_3
-        else:
-            url = data_3
-            thumbnail = data_1
-            title = data_2
-
+        url = data_1
+        thumbnail = data_2
+        title = data_3
         itemlist.append(Item(channel=item.channel, action='findvideos', title=title, url=url, thumbnail=thumbnail))
 
-    # #Paginacion
-
+    #Paginacion
     if itemlist != []:
         actual_page_url = item.url
-        next_page = scrapertools.find_single_match(data, '<link rel=next href=(.*?) \/>')
+        next_page = scrapertools.find_single_match(data, '<a href="([^"]+)">Next</a>')
         if next_page != '':
             itemlist.append(Item(channel=item.channel, action="lista", title='Siguiente >>>', url=next_page,
                                  thumbnail='https://s16.postimg.cc/9okdu7hhx/siguiente.png', extra=item.extra))
+    
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/xhamster.py b/plugin.video.alfa/channels/xhamster.py
index b65f8feb..afa45db4 100755
--- a/plugin.video.alfa/channels/xhamster.py
+++ b/plugin.video.alfa/channels/xhamster.py
@@ -1,29 +1,32 @@
 # -*- coding: utf-8 -*-
 
 import re
+import sys
+import urlparse
 
+from platformcode import logger
 from core import scrapertools
 from core.item import Item
-from platformcode import logger
 
+HOST = "http://es.xhamster.com/"
 
 def mainlist(item):
     logger.info()
+
     itemlist = []
-    itemlist.append(Item(channel=item.channel, action="videos", title="Útimos vídeos", url="http://es.xhamster.com/",
-                         viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="categorias", title="Categorías"))
-    itemlist.append(Item(channel=item.channel, action="votados", title="Más votados"))
-    itemlist.append(Item(channel=item.channel, action="search", title="Buscar",
-                         url="http://xhamster.com/search.php?q=%s&qcat=video"))
+    itemlist.append( Item(channel=item.channel, action="videos"      , title="Útimos videos" , url=HOST, viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="categorias"    , title="Categorías", url=HOST))
+    itemlist.append( Item(channel=item.channel, action="votados"    , title="Lo mejor"))
+    itemlist.append( Item(channel=item.channel, action="vistos"    , title="Los mas vistos"))
+    itemlist.append( Item(channel=item.channel, action="videos"    , title="Recomendados", url=urlparse.urljoin(HOST,"/videos/recommended")))
+    itemlist.append( Item(channel=item.channel, action="search"    , title="Buscar", url=urlparse.urljoin(HOST,"/search?q=%s")))
+
     return itemlist
 
-
 # REALMENTE PASA LA DIRECCION DE BUSQUEDA
-
-def search(item, texto):
+def search(item,texto):
     logger.info()
-    tecleado = texto.replace(" ", "+")
+    tecleado = texto.replace( " ", "+" )
     item.url = item.url % tecleado
     item.extra = "buscar"
     try:
@@ -34,8 +37,6 @@ def search(item, texto):
         for line in sys.exc_info():
             logger.error("%s" % line)
         return []
-
-
 # SECCION ENCARGADA DE BUSCAR
 
 def videos(item):
@@ -43,93 +44,66 @@ def videos(item):
     data = scrapertools.cache_page(item.url)
     itemlist = []
 
-    data = scrapertools.get_match(data, '<div class="boxC videoList clearfix">(.*?)<div id="footer">')
+    data = scrapertools.get_match(data,'<article.+?>(.*?)</article>')
+    
+    #Patron
+    patron = '(?s)<div class="thumb-list__item.*?href="([^"]+)".*?src="([^"]+)".*?alt="([^"]+)">.*?'
+    patron += '<div class="thumb-image-container__duration">(.+?)</div>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
 
-    # Patron #1
-    patron = '<div class="video"><a href="([^"]+)" class="hRotator">' + "<img src='([^']+)' class='thumb'" + ' alt="([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                 folder=True))
+    for scrapedurl,scrapedthumbnail,scrapedtitle,duration in matches:
+        #logger.debug("title=["+scrapedtitle+"], url=["+scrapedurl+"], thumbnail=["+scrapedthumbnail+"]")
+        fullTitle = scrapedtitle.strip() + " [" + duration + "]"
+        itemlist.append( Item(channel=item.channel, action="play" , title=fullTitle , url=scrapedurl, thumbnail=scrapedthumbnail, folder=True))     
 
-    # Patron #2
-    patron = '<a href="([^"]+)"  data-click="[^"]+" class="hRotator"><img src=\'([^\']+)\' class=\'thumb\' alt="([^"]+)"/>'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
-        logger.debug("title=[" + scrapedtitle + "], url=[" + scrapedurl + "], thumbnail=[" + scrapedthumbnail + "]")
-        itemlist.append(
-            Item(channel=item.channel, action="play", title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail,
-                 folder=True))
-
-    # Paginador
-    patron = "<a href='([^']+)' class='last colR'><div class='icon iconPagerNextHover'></div>Próximo</a>"
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    if len(matches) > 0:
-        itemlist.append(
-            Item(channel=item.channel, action="videos", title="Página Siguiente", url=matches[0], thumbnail="",
-                 folder=True, viewmode="movie"))
+    #Paginador
+    patron = '(?s)<div class="pager-container".*?<li class="next">.*?href="([^"]+)"'
+    matches = re.compile(patron,re.DOTALL).findall(data)  
+    if len(matches) >0:
+      itemlist.append( Item(channel=item.channel, action="videos", title="Página Siguiente" , url=matches[0] , thumbnail="" , folder=True, viewmode="movie") )
 
     return itemlist
 
-
 # SECCION ENCARGADA DE VOLCAR EL LISTADO DE CATEGORIAS CON EL LINK CORRESPONDIENTE A CADA PAGINA
-
+    
 def categorias(item):
     logger.info()
     itemlist = []
 
-    itemlist.append(
-        Item(channel=item.channel, action="lista", title="Heterosexual", url="http://es.xhamster.com/channels.php"))
-    itemlist.append(
-        Item(channel=item.channel, action="lista", title="Transexuales", url="http://es.xhamster.com/channels.php"))
-    itemlist.append(Item(channel=item.channel, action="lista", title="Gays", url="http://es.xhamster.com/channels.php"))
-    return itemlist
 
+    data = scrapertools.cache_page(item.url)
+
+    data = scrapertools.get_match(data,'(?s)<div class="all-categories">(.*?)</aside>')    
+
+    patron = '(?s)<li>.*?<a href="([^"]+)".*?>([^<]+).*?</a></li>'
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    for scrapedurl,scrapedtitle in matches:
+        fullTitle = scrapedtitle.strip()
+        itemlist.append( Item(channel=item.channel, action="videos" , title=fullTitle , url=scrapedurl))     
+
+
+    return itemlist
 
 def votados(item):
     logger.info()
     itemlist = []
 
-    itemlist.append(Item(channel=item.channel, action="videos", title="Día",
-                         url="http://es.xhamster.com/rankings/daily-top-videos.html", viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Semana",
-                         url="http://es.xhamster.com/rankings/weekly-top-videos.html", viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="Mes",
-                         url="http://es.xhamster.com/rankings/monthly-top-videos.html", viewmode="movie"))
-    itemlist.append(Item(channel=item.channel, action="videos", title="De siempre",
-                         url="http://es.xhamster.com/rankings/alltime-top-videos.html", viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Día", url=urlparse.urljoin(HOST,"/best/daily"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Semana"  , url=urlparse.urljoin(HOST,"/best/weekly"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Mes"  , url=urlparse.urljoin(HOST,"/best/monthly"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="De siempre"  , url=urlparse.urljoin(HOST,"/best/"), viewmode="movie"))
     return itemlist
 
-
-def lista(item):
+def vistos(item):
     logger.info()
     itemlist = []
-    data = scrapertools.downloadpageGzip(item.url)
-    # data = data.replace("\n","")
-    # data = data.replace("\t","")
 
-    if item.title == "Gays":
-        data = scrapertools.get_match(data,
-                                      '<div class="title">' + item.title + '</div>.*?<div class="list">(.*?)<div id="footer">')
-    else:
-        data = scrapertools.get_match(data,
-                                      '<div class="title">' + item.title + '</div>.*?<div class="list">(.*?)<div class="catName">')
-    patron = '(<div.*?</div>)'
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for match in matches:
-        data = data.replace(match, "")
-    patron = 'href="([^"]+)">(.*?)</a>'
-    data = ' '.join(data.split())
-    logger.info(data)
-    matches = re.compile(patron, re.DOTALL).findall(data)
-    for scrapedurl, scrapedtitle in matches:
-        itemlist.append(Item(channel=item.channel, action="videos", title=scrapedtitle, url=scrapedurl, folder=True,
-                             viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Día", url=urlparse.urljoin(HOST,"/most-viewed/daily"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Semana"  , url=urlparse.urljoin(HOST,"/most-viewed/weekly"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="Mes"  , url=urlparse.urljoin(HOST,"/most-viewed/monthly"), viewmode="movie"))
+    itemlist.append( Item(channel=item.channel, action="videos" , title="De siempre"  , url=urlparse.urljoin(HOST,"/most-viewed/"), viewmode="movie"))
 
-    sorted_itemlist = sorted(itemlist, key=lambda Item: Item.title)
-    return sorted_itemlist
+    return itemlist
 
 
 # OBTIENE LOS ENLACES SEGUN LOS PATRONES DEL VIDEO Y LOS UNE CON EL SERVIDOR
@@ -141,10 +115,11 @@ def play(item):
     logger.debug(data)
 
     patron = '"([0-9]+p)":"([^"]+)"'
-    matches = re.compile(patron, re.DOTALL).findall(data)
+    matches = re.compile(patron,re.DOTALL).findall(data)
+    
     for res, url in matches:
         url = url.replace("\\", "")
-        logger.debug("url=" + url)
-        itemlist.append(["%s %s [directo]" % (res, scrapertools.get_filename_from_url(url)[-4:]), url])
-
+        logger.debug("url="+url)
+        itemlist.append(["%s %s [directo]" % (res, scrapertools.get_filename_from_url(url)[-4:]), url])  
+        
     return itemlist

From f113ffe3c1c18c8d969ce308b02f0d39c85d2421 Mon Sep 17 00:00:00 2001
From: DiegoT <tellodiego@yahoo.com>
Date: Tue, 23 Oct 2018 22:23:21 +0000
Subject: [PATCH 2/2] Cambio menor en menues

---
 plugin.video.alfa/channels/playpornx.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.video.alfa/channels/playpornx.py b/plugin.video.alfa/channels/playpornx.py
index 0eb75040..20b0ce97 100644
--- a/plugin.video.alfa/channels/playpornx.py
+++ b/plugin.video.alfa/channels/playpornx.py
@@ -14,10 +14,10 @@ host = "https://watchfreexxx.net/"
 def mainlist(item):
     itemlist = []
 
-    itemlist.append(Item(channel=item.channel, title="Movies", action="lista",
+    itemlist.append(Item(channel=item.channel, title="Peliculas", action="lista",
                          url = urlparse.urljoin(host, "category/porn-movies/")))
 
-    itemlist.append(Item(channel=item.channel, title="Scenes", action="lista",
+    itemlist.append(Item(channel=item.channel, title="Escenas", action="lista",
                          url = urlparse.urljoin(host, "category/xxx-scenes/")))
 
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',