From cad7e96441c85f2f001c479bf01c42133acd3943 Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Wed, 18 Oct 2017 11:38:26 -0300
Subject: [PATCH 1/6] Correccion divxatope

---
 plugin.video.alfa/channels/divxatope.py | 31 ++++++++-----------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/plugin.video.alfa/channels/divxatope.py b/plugin.video.alfa/channels/divxatope.py
index 9e5d400c..71965fc9 100644
--- a/plugin.video.alfa/channels/divxatope.py
+++ b/plugin.video.alfa/channels/divxatope.py
@@ -157,11 +157,10 @@ def lista(item):
     # logger.info("data="+data)
 
     bloque = scrapertools.find_single_match(data, '(?:<ul class="pelilist">|<ul class="buscar-list">)(.*?)</ul>')
-    patron = '<li[^<]+'
-    patron += '<a href="([^"]+)".*?'
-    patron += 'src="([^"]+)".*?'
-    patron += '<h2[^>]*>(.*?)</h2.*?'
-    patron += '(?:<strong[^>]*>|<span[^>]*>)(.*?)(?:</strong>|</span>)'
+    patron = '<a href="([^"]+).*?'  # la url
+    patron += '<img src="([^"]+)"[^>]+>.*?'  # el thumbnail
+    patron += '<h2[^>]*>(.*?)</h2.*?' # el titulo
+    patron += '<span>([^<].*?)<'  # la calidad
 
     matches = re.compile(patron, re.DOTALL).findall(bloque)
     scrapertools.printMatches(matches)
@@ -175,7 +174,7 @@ def lista(item):
         thumbnail = urlparse.urljoin(item.url, scrapedthumbnail)
         plot = ""
         logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]")
-
+        year = scrapertools.find_single_match(scrapedthumbnail, r'-(\d{4})')
         contentTitle = scrapertools.htmlclean(scrapedtitle).strip()
         patron = '([^<]+)<br>'
         matches = re.compile(patron, re.DOTALL).findall(calidad + '<br>')
@@ -196,7 +195,7 @@ def lista(item):
             itemlist.append(Item(channel=item.channel, action="episodios", title=title, fulltitle=title, url=url,
                                  thumbnail=thumbnail, plot=plot, folder=True, contentTitle=contentTitle,
                                  language=idioma, contentSeason=int(temporada),
-                                 contentEpisodeNumber=int(episodio), contentQuality=calidad))
+                                 contentEpisodeNumber=int(episodio), quality=calidad))
 
         else:
             if len(matches) == 2:
@@ -205,7 +204,7 @@ def lista(item):
 
             itemlist.append(Item(channel=item.channel, action="findvideos", title=title, fulltitle=title, url=url,
                                  thumbnail=thumbnail, plot=plot, folder=True, contentTitle=contentTitle,
-                                 language=idioma, contentThumbnail=thumbnail, contentQuality=calidad))
+                                 language=idioma, contentThumbnail=thumbnail, quality=calidad))
 
     next_page_url = scrapertools.find_single_match(data, '<li><a href="([^"]+)">Next</a></li>')
     if next_page_url != "":
@@ -262,7 +261,7 @@ def findvideos(item):
     item.plot = scrapertools.htmlclean(item.plot).strip()
     item.contentPlot = item.plot
 
-    link = scrapertools.find_single_match(data, 'href.*?=.*?"http:\/\/(?:tumejorserie|tumejorjuego).*?link=([^"]+)"')
+    link = scrapertools.find_single_match(data, 'location\.href.*?=.*?"http:\/\/(?:tumejorserie|tumejorjuego).*?link=(.*?)"')
     if link != "":
         link = "http://www.divxatope1.com/" + link
         logger.info("torrent=" + link)
@@ -275,14 +274,7 @@ def findvideos(item):
     patron += '<\/div[^<]+<div class="box4">([^<]+)<\/div[^<]+<div class="box5"><a href=(.*?) rel.*?'
     patron += '<\/div[^<]+<div class="box6">([^<]+)<'
 
-    #patron = "<div class=\"box1\"[^<]+<img[^<]+</div[^<]+"
-    #patron += '<div class="box2">([^<]+)</div[^<]+'
-    #patron += '<div class="box3">([^<]+)</div[^<]+'
-    #patron += '<div class="box4">([^<]+)</div[^<]+'
-    #patron += '<div class="box5">(.*?)</div[^<]+'
-    #patron += '<div class="box6">([^<]+)<'
     matches = re.compile(patron, re.DOTALL).findall(data)
-    scrapertools.printMatches(matches)
 
     itemlist_ver = []
     itemlist_descargar = []
@@ -308,11 +300,8 @@ def findvideos(item):
             else:
                 itemlist_descargar.append(new_item)
 
-    for new_item in itemlist_ver:
-        itemlist.append(new_item)
-
-    for new_item in itemlist_descargar:
-        itemlist.append(new_item)
+    itemlist.extend(itemlist_ver)
+    itemlist.extend(itemlist_descargar)
 
     return itemlist
 

From f01da0ddcb31a9818e7b6d416574ac5df0babe57 Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Wed, 18 Oct 2017 13:03:56 -0300
Subject: [PATCH 2/6] Corregido Gamovideo

---
 plugin.video.alfa/servers/gamovideo.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py
index cffc4a86..0c21c218 100755
--- a/plugin.video.alfa/servers/gamovideo.py
+++ b/plugin.video.alfa/servers/gamovideo.py
@@ -7,7 +7,8 @@ from core import scrapertools
 from lib import jsunpack
 from platformcode import logger
 
-headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 Firefox/40.0'}
+headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20100101 ' \
+                                             'Firefox/40.0'}
 
 
 def test_video_exists(page_url):
@@ -24,8 +25,8 @@ def test_video_exists(page_url):
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
-    data = httptools.downloadpage(page_url, add_referer = True, headers=headers).data
-
+    data = httptools.downloadpage(page_url, headers=headers).data
+    logger.debug(data)
     packer = scrapertools.find_single_match(data,
                                             "<script type='text/javascript'>(eval.function.p,a,c,k,e,d..*?)</script>")
     if packer != "":

From 4aa7ff5bc70abec4a6d7bb9f5ba4a1a18c95f043 Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Fri, 20 Oct 2017 11:31:16 -0300
Subject: [PATCH 3/6] Correccion a Playmax

---
 plugin.video.alfa/channels/playmax.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin.video.alfa/channels/playmax.py b/plugin.video.alfa/channels/playmax.py
index 3313fd46..b84e4161 100644
--- a/plugin.video.alfa/channels/playmax.py
+++ b/plugin.video.alfa/channels/playmax.py
@@ -712,6 +712,7 @@ def acciones_fichas(item, sid, ficha, season=False):
 
 def acciones_cuenta(item):
     logger.info()
+    logger.debug("item es %s" % item.tostring("\n"))
     itemlist = []
 
     if "Tus fichas" in item.title:
@@ -771,13 +772,14 @@ def acciones_cuenta(item):
 
     data = httptools.downloadpage("https://playmax.mx/tusfichas.php").data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<br>", "", data)
+    logger.debug("data %s" % data)
 
     bloque = scrapertools.find_single_match(data, item.url + '">(.*?)(?:<div class="tf_blocks|<div class="tf_o_move">)')
     matches = scrapertools.find_multiple_matches(bloque, '<div class="tf_menu_mini">([^<]+)<(.*?)<cb></cb></div>')
     for category, contenido in matches:
         itemlist.append(item.clone(action="", title=category, text_color=color3))
 
-        patron = '<div class="c_fichas_image"[^>]*>[^<]*<[^>]+href="\.([^"]+)".*?src="\.([^"]+)".*?serie="([^"]*)".*?' \
+        patron = '<div class="c_fichas_image"[^>]*>[^<]*<[^>]+href="\.([^"]+)".*?src="([^"]+)".*?serie="([^"]*)".*?' \
                  '<div class="c_fichas_title">(?:<div class="c_fichas_episode">([^<]+)</div>|)([^<]+)</div>'
         entradas = scrapertools.find_multiple_matches(contenido, patron)
         for scrapedurl, scrapedthumbnail, serie, episodio, scrapedtitle in entradas:

From 5afb770271f9f620c8d9e4a472058c2d0f777e5d Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Fri, 20 Oct 2017 13:15:14 -0300
Subject: [PATCH 4/6] Correccion a verpeliculasnuevas

---
 plugin.video.alfa/channels/verpeliculasnuevas.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.py b/plugin.video.alfa/channels/verpeliculasnuevas.py
index cadb95dc..691c39b0 100755
--- a/plugin.video.alfa/channels/verpeliculasnuevas.py
+++ b/plugin.video.alfa/channels/verpeliculasnuevas.py
@@ -266,7 +266,6 @@ def lista(item):
                  contentTitle=scrapedtitle,
                  extra=item.extra,
                  infoLabels={'year': year},
-                 show=scrapedtitle,
                  list_language=list_language,
                  context=autoplay.context
                  ))

From 1f2cadb689dbdd3c880452c3ddbd79a6a5f5ceec Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Fri, 20 Oct 2017 15:36:10 -0300
Subject: [PATCH 5/6] limpieza de codigo

---
 plugin.video.alfa/channels/playmax.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugin.video.alfa/channels/playmax.py b/plugin.video.alfa/channels/playmax.py
index b84e4161..64481b86 100644
--- a/plugin.video.alfa/channels/playmax.py
+++ b/plugin.video.alfa/channels/playmax.py
@@ -712,7 +712,6 @@ def acciones_fichas(item, sid, ficha, season=False):
 
 def acciones_cuenta(item):
     logger.info()
-    logger.debug("item es %s" % item.tostring("\n"))
     itemlist = []
 
     if "Tus fichas" in item.title:
@@ -772,7 +771,6 @@ def acciones_cuenta(item):
 
     data = httptools.downloadpage("https://playmax.mx/tusfichas.php").data
     data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;|<br>", "", data)
-    logger.debug("data %s" % data)
 
     bloque = scrapertools.find_single_match(data, item.url + '">(.*?)(?:<div class="tf_blocks|<div class="tf_o_move">)')
     matches = scrapertools.find_multiple_matches(bloque, '<div class="tf_menu_mini">([^<]+)<(.*?)<cb></cb></div>')

From d07ae8e62baa34216da16f0ccd4a087b8d449ee2 Mon Sep 17 00:00:00 2001
From: Unknown <Delta_minion@protonmail.com>
Date: Fri, 20 Oct 2017 16:47:39 -0300
Subject: [PATCH 6/6] Correcciones

---
 plugin.video.alfa/channels/canalporno.py | 4 ++--
 plugin.video.alfa/channels/playpornx.py  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugin.video.alfa/channels/canalporno.py b/plugin.video.alfa/channels/canalporno.py
index ab706d74..08d6b436 100755
--- a/plugin.video.alfa/channels/canalporno.py
+++ b/plugin.video.alfa/channels/canalporno.py
@@ -43,7 +43,7 @@ def findvideos(item):
     for thumbnail, title, url, time in matches:
         scrapedtitle = time + " - " + title
         scrapedurl = host + url
-        scrapedthumbnail = "http:" + thumbnail
+        scrapedthumbnail = thumbnail
         itemlist.append(item.clone(action="play", title=scrapedtitle, url=scrapedurl,
                                    thumbnail=scrapedthumbnail))
 
@@ -80,7 +80,7 @@ def play(item):
     itemlist = []
 
     data = httptools.downloadpage(item.url).data
-    url = "http:" + scrapertools.find_single_match(data, '<source src="([^"]+)"')
+    url = scrapertools.find_single_match(data, '<source src="([^"]+)"')
     itemlist.append(item.clone(url=url, server="directo"))
 
     return itemlist
diff --git a/plugin.video.alfa/channels/playpornx.py b/plugin.video.alfa/channels/playpornx.py
index ba72db1d..84931128 100644
--- a/plugin.video.alfa/channels/playpornx.py
+++ b/plugin.video.alfa/channels/playpornx.py
@@ -7,7 +7,7 @@ from core import scrapertools
 from core.item import Item
 from platformcode import logger
 
-host = "http://www.playpornx.net/list-movies/"
+host = "http://www.playpornx.net/"
 
 
 def mainlist(item):
@@ -15,7 +15,7 @@ def mainlist(item):
     itemlist.append(Item(channel=item.channel, title="Todas", action="lista",
                          thumbnail='https://s18.postimg.org/fwvaeo6qh/todas.png',
                          fanart='https://s18.postimg.org/fwvaeo6qh/todas.png',
-                         url ='https://www.playpornx.net/category/porn-movies/?filter=date'))
+                         url =host))
 
     itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url='http://www.playpornx.net/?s=',
                          thumbnail='https://s30.postimg.org/pei7txpa9/buscar.png',
@@ -31,10 +31,10 @@ def lista(item):
     if item.url == '': item.url = host
     data = httptools.downloadpage(item.url).data
     data = re.sub(r'"|\n|\r|\t|&nbsp;|<br>|\s{2,}', "", data)
-    patron = 'role=article><a href=(.*?) rel=bookmark title=(.*?)>.*?src=(.*?) class'
+    patron = '<div class=item>.*?href=(.*?)><div.*?<img src=(.*?) alt.*?<h2>(.*?)<\/h2>'
     matches = re.compile(patron, re.DOTALL).findall(data)
 
-    for scrapedurl, scrapedtitle, scrapedthumbnail in matches:
+    for scrapedurl, scrapedthumbnail, scrapedtitle in matches:
         url = scrapedurl
         thumbnail = scrapedthumbnail
         title = scrapedtitle