From 5a1b687b1b0682f0b88e196c991275c8fa1b360f Mon Sep 17 00:00:00 2001
From: paezner <jsaezu@wanadoo.es>
Date: Wed, 2 Jan 2019 19:05:11 +0100
Subject: [PATCH] reparados

---
 plugin.video.alfa/channels/TXXX.py            | 27 +++++++++++++------
 plugin.video.alfa/channels/alsoporn.py        |  2 +-
 plugin.video.alfa/channels/pornrewind.py      |  2 +-
 plugin.video.alfa/channels/spankwire.json     |  2 +-
 plugin.video.alfa/channels/streamingporn.json |  2 +-
 plugin.video.alfa/channels/streamingporn.py   | 14 ++++++----
 plugin.video.alfa/channels/streamporno.json   |  2 +-
 plugin.video.alfa/channels/tnaflix.py         |  7 ++---
 plugin.video.alfa/channels/xdvideos.json      |  2 +-
 9 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/plugin.video.alfa/channels/TXXX.py b/plugin.video.alfa/channels/TXXX.py
index 976d1d4c..3ade3fb3 100644
--- a/plugin.video.alfa/channels/TXXX.py
+++ b/plugin.video.alfa/channels/TXXX.py
@@ -50,11 +50,13 @@ def catalogo(item):
         scrapedplot = ""
         scrapedurl = host + scrapedurl
         title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel , action="catalogo" , title="Página Siguiente >>" , 
+                        text_color="blue", url=next_page_url , folder=True) )
     return itemlist
 
 
@@ -62,12 +64,17 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron  = '<div class="c-thumb">.*?<a href="([^"]+)".*?<img src="([^"]+)".*?<div class="c-thumb--overlay c-thumb--overlay-title">([^"]+)</div>.*?<span>(.*?)</span>'
+    patron = '<a class="categories-list__link" href="([^"]+)">.*?'
+    patron += '<span class="categories-list__name cat-icon" data-title="([^"]+)">.*?'
+    patron += '<span class="categories-list__badge">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
-    for scrapedurl,scrapedthumbnail,scrapedtitle,num in matches:
+    for scrapedurl,scrapedtitle,num in matches:
+        url = urlparse.urljoin(item.url,scrapedurl)
+        scrapedthumbnail = ""
         scrapedplot = ""
         title = scrapedtitle + "[COLOR yellow]  " + num + "[/COLOR]"
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=title , url=url , 
+                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     return itemlist
 
 
@@ -76,7 +83,9 @@ def peliculas(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = 'data-video-id="\d+">.*?<a href="([^"]+)".*?<img src="([^"]+)" alt="([^"]+)".*?<span class="thumb__duration">(.*?)</span>'
+    patron = 'data-video-id="\d+">.*?<a href="([^"]+)".*?'
+    patron += '<img src="([^"]+)" alt="([^"]+)".*?'
+    patron += '<span class="thumb__duration">(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,time in matches:
         contentTitle = scrapedtitle
@@ -84,11 +93,13 @@ def peliculas(item):
         thumbnail = scrapedthumbnail
         plot = ""
         year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=scrapedurl, thumbnail=thumbnail, 
+                        plot=plot, contentTitle=contentTitle, infoLabels={'year':year} ))
     next_page_url = scrapertools.find_single_match(data,'<a class=" btn btn--size--l btn--next" href="([^"]+)" title="Next Page"')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , 
+                        text_color="blue", url=next_page_url , folder=True) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/alsoporn.py b/plugin.video.alfa/channels/alsoporn.py
index d388775b..66b14f3a 100644
--- a/plugin.video.alfa/channels/alsoporn.py
+++ b/plugin.video.alfa/channels/alsoporn.py
@@ -10,7 +10,7 @@ from core import httptools
 from core import tmdb
 from core import jsontools
 
-host = 'http://www.alsoporn.com/en'
+host = 'http://www.alsoporn.com'
 
 def mainlist(item):
     logger.info()
diff --git a/plugin.video.alfa/channels/pornrewind.py b/plugin.video.alfa/channels/pornrewind.py
index 629a4920..e9d659dc 100644
--- a/plugin.video.alfa/channels/pornrewind.py
+++ b/plugin.video.alfa/channels/pornrewind.py
@@ -57,7 +57,7 @@ def peliculas(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    patron = '<a class="thumb" href="([^"]+)" title="([^"]+)">.*?'
+    patron = '<a class="thumb" href="([^"]+)" title="([^"]+)".*?'
     patron += '<img class="lazyload" data-src="([^"]+)".*?'
     patron += '<span>(.*?)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
diff --git a/plugin.video.alfa/channels/spankwire.json b/plugin.video.alfa/channels/spankwire.json
index 2c339930..bb80d7a9 100644
--- a/plugin.video.alfa/channels/spankwire.json
+++ b/plugin.video.alfa/channels/spankwire.json
@@ -2,7 +2,7 @@
   "id": "spankwire",
   "name": "spankwire",
   "active": true,
-  "adult": false,
+  "adult": true,
   "language": ["*"],
   "thumbnail": "https://cdn1-static-spankwire.spankcdn.net/apple-touch-icon-precomposed.png",
   "banner": "",
diff --git a/plugin.video.alfa/channels/streamingporn.json b/plugin.video.alfa/channels/streamingporn.json
index 238c5ec9..0f7929a5 100644
--- a/plugin.video.alfa/channels/streamingporn.json
+++ b/plugin.video.alfa/channels/streamingporn.json
@@ -2,7 +2,7 @@
   "id": "streamingporn",
   "name": "streamingporn",
   "active": true,
-  "adult": false,
+  "adult": true,
   "language": ["*"],
   "thumbnail": "http://streamingporn.xyz/wp-content/uploads/2017/06/streamingporn.png",
   "banner": "",
diff --git a/plugin.video.alfa/channels/streamingporn.py b/plugin.video.alfa/channels/streamingporn.py
index b60ae8e1..0334b185 100644
--- a/plugin.video.alfa/channels/streamingporn.py
+++ b/plugin.video.alfa/channels/streamingporn.py
@@ -48,7 +48,8 @@ def catalogo(item):
     for scrapedurl,scrapedtitle in matches:
         scrapedplot = ""
         scrapedthumbnail = ""
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     return itemlist
 
 
@@ -56,7 +57,7 @@ def categorias(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    data = scrapertools.get_match(data,'<a href="#">Categories</a>(.*?)<li id="menu-item-30919')
+    data = scrapertools.get_match(data,'<a href="#">Categories</a>(.*?)</ul>')
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron  = '<li id="menu-item-\d+".*?<a href="([^"]+)">([^"]+)</a>'
     matches = re.compile(patron,re.DOTALL).findall(data)
@@ -66,7 +67,8 @@ def categorias(item):
         scrapedthumbnail = ""
         scrapedtitle = scrapedtitle
         scrapedurl = urlparse.urljoin(item.url,scrapedurl)
-        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
+        itemlist.append( Item(channel=item.channel, action="peliculas", title=scrapedtitle , url=scrapedurl , 
+                        thumbnail=scrapedthumbnail , plot=scrapedplot , folder=True) )
     return itemlist
 
 
@@ -84,11 +86,13 @@ def peliculas(item):
         thumbnail = scrapedthumbnail
         plot = ""
         year = ""
-        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
+        itemlist.append( Item(channel=item.channel, action="play" , title=title , url=url, thumbnail=thumbnail, 
+                        plot=plot, contentTitle = contentTitle, infoLabels={'year':year} ))
     next_page_url = scrapertools.find_single_match(data,'<div class="loadMoreInfinite"><a href="(.*?)" >Load More')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
-        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , text_color="blue", url=next_page_url , folder=True) )
+        itemlist.append( Item(channel=item.channel , action="peliculas" , title="Página Siguiente >>" , 
+                        text_color="blue", url=next_page_url , folder=True) )
     return itemlist
 
 
diff --git a/plugin.video.alfa/channels/streamporno.json b/plugin.video.alfa/channels/streamporno.json
index b84eac03..437adbbe 100644
--- a/plugin.video.alfa/channels/streamporno.json
+++ b/plugin.video.alfa/channels/streamporno.json
@@ -2,7 +2,7 @@
   "id": "streamporno",
   "name": "streamporno",
   "active": true,
-  "adult": false,
+  "adult": true,
   "language": ["*"],
   "thumbnail": "http://pornstreams.eu/wp-content/uploads/2015/12/faviiconeporn.png",
   "banner": "",
diff --git a/plugin.video.alfa/channels/tnaflix.py b/plugin.video.alfa/channels/tnaflix.py
index 44207516..199996df 100644
--- a/plugin.video.alfa/channels/tnaflix.py
+++ b/plugin.video.alfa/channels/tnaflix.py
@@ -15,8 +15,8 @@ host = 'https://www.tnaflix.com'
 def mainlist(item):
     logger.info()
     itemlist = []
-    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/new/1"))
-    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/?period=month&d=all"))
+    itemlist.append( Item(channel=item.channel, title="Nuevas" , action="peliculas", url=host + "/new/?d=all&period=all"))
+    itemlist.append( Item(channel=item.channel, title="Popular" , action="peliculas", url=host + "/popular/?d=all&period=all"))
     itemlist.append( Item(channel=item.channel, title="Mejor valorado" , action="peliculas", url=host + "/toprated/?d=all&period=month"))
     itemlist.append( Item(channel=item.channel, title="Canal" , action="catalogo", url=host + "/channels/all/top-rated/1/all"))
     itemlist.append( Item(channel=item.channel, title="PornStars" , action="categorias", url=host + "/pornstars"))
@@ -86,7 +86,8 @@ def peliculas(item):
     itemlist = []
     data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
-    patron  = '<a class=\'thumb no_ajax\' href=\'(.*?)\'.*?data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>'
+    patron = '<a class=\'thumb no_ajax\' href=\'(.*?)\'.*?'
+    patron += 'data-original=\'(.*?)\' alt="([^"]+)"><div class=\'videoDuration\'>([^<]+)</div>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = urlparse.urljoin(item.url,scrapedurl)
diff --git a/plugin.video.alfa/channels/xdvideos.json b/plugin.video.alfa/channels/xdvideos.json
index 2aa4ab6c..e5905bb2 100755
--- a/plugin.video.alfa/channels/xdvideos.json
+++ b/plugin.video.alfa/channels/xdvideos.json
@@ -2,7 +2,7 @@
   "id": "xdvideos",
   "name": "XDVideos",
   "active": true,
-  "adult": false,
+  "adult": true,
   "language": ["lat"],
   "thumbnail": "http://i.imgur.com/vKcZxXS.png",
   "categories": [