From 96f8eba9b031f17d4557b5f666320dce9d76387f Mon Sep 17 00:00:00 2001
From: paezner <jsaezu@wanadoo.es>
Date: Fri, 15 Mar 2019 14:22:22 +0100
Subject: [PATCH] Adultos correcccion codigo

---
 plugin.video.alfa/channels/eroticage.py    |  6 ++----
 plugin.video.alfa/channels/fetishshrine.py | 11 +++++------
 plugin.video.alfa/channels/filmoviXXX.py   |  4 ++--
 plugin.video.alfa/channels/mundopelis.json |  5 +++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugin.video.alfa/channels/eroticage.py b/plugin.video.alfa/channels/eroticage.py
index 3c18a5d4..32b9d77c 100644
--- a/plugin.video.alfa/channels/eroticage.py
+++ b/plugin.video.alfa/channels/eroticage.py
@@ -59,9 +59,8 @@ def lista(item):
         title = scrapedtitle
         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} ))
+                               plot=plot, fanart=scrapedthumbnail, contentTitle=contentTitle ))
     next_page = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
@@ -71,11 +70,10 @@ def lista(item):
 
 def play(item):
     logger.info()
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
-        videoitem.fulltitle = item.fulltitle
         videoitem.thumbnail = item.thumbnail
         videochannel=item.channel
     return itemlist
diff --git a/plugin.video.alfa/channels/fetishshrine.py b/plugin.video.alfa/channels/fetishshrine.py
index 8b6943a1..d57820a9 100644
--- a/plugin.video.alfa/channels/fetishshrine.py
+++ b/plugin.video.alfa/channels/fetishshrine.py
@@ -55,7 +55,7 @@ def categorias(item):
 def lista(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<a href="([^"]+)" itemprop="url">.*?'
     patron += '<img src="([^"]+)" alt="([^"]+)">.*?'
@@ -64,12 +64,11 @@ def lista(item):
     for scrapedurl,scrapedthumbnail,scrapedtitle,duracion  in matches:
         url = scrapedurl
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
-        contentTitle = title
+        contentTitle = scrapedtitle
         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} ))
+                               plot=plot, fanart=scrapedthumbnail, contentTitle = contentTitle ))
     next_page = scrapertools.find_single_match(data,'<li><a data=\'\d+\' href="([^"]+)" title="Next">')
     if next_page!="":
         next_page = urlparse.urljoin(item.url,next_page)
@@ -80,11 +79,11 @@ def lista(item):
 def play(item):
     logger.info()
     itemlist = []
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     patron  = 'video_url: \'([^\']+)\''
     matches = scrapertools.find_multiple_matches(data, patron)
     for scrapedurl  in matches:
-        itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl,
+        itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl,
                             thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False))
     return itemlist
 
diff --git a/plugin.video.alfa/channels/filmoviXXX.py b/plugin.video.alfa/channels/filmoviXXX.py
index 7308fb67..650f9335 100644
--- a/plugin.video.alfa/channels/filmoviXXX.py
+++ b/plugin.video.alfa/channels/filmoviXXX.py
@@ -26,7 +26,7 @@ def mainlist(item):
         thumbnail = scrapedthumbnail
         plot = ""
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                               thumbnail=thumbnail, plot=plot, contentTitle=contentTitle))
+                               thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle=contentTitle))
     next_page_url = scrapertools.find_single_match(data,'<a class="nextpostslink" rel="next" href="([^"]+)">')
     if next_page_url!="":
         next_page_url = urlparse.urljoin(item.url,next_page_url)
@@ -36,7 +36,7 @@ def mainlist(item):
     
 def play(item):
     logger.info()
-    data = scrapertools.cachePage(item.url)
+    data = httptools.downloadpage(item.url).data
     itemlist = servertools.find_video_items(data=data)
     for videoitem in itemlist:
         videoitem.title = item.title
diff --git a/plugin.video.alfa/channels/mundopelis.json b/plugin.video.alfa/channels/mundopelis.json
index c5d39098..a39c05cb 100644
--- a/plugin.video.alfa/channels/mundopelis.json
+++ b/plugin.video.alfa/channels/mundopelis.json
@@ -3,11 +3,12 @@
   "name": "mundopelis",
   "active": true,
   "adult": false,
-  "language": ["cast", "lat"],
+  "language": ["vos"],
   "thumbnail": "https://mundopelis.xyz/images/logo.png",
   "banner": "",
   "categories": [
-    "movie"
+    "movie",
+    "vos"
   ],
   "settings": [
     {