From d9db40f595947a237de19121bf93905cad8f5f64 Mon Sep 17 00:00:00 2001
From: paezner <jsaezu@wanadoo.es>
Date: Wed, 10 Apr 2019 22:40:26 +0200
Subject: [PATCH] cambio de estructura

---
 plugin.video.alfa/channels/javtasty.py | 10 +++++++---
 plugin.video.alfa/channels/qwertty.py  | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/plugin.video.alfa/channels/javtasty.py b/plugin.video.alfa/channels/javtasty.py
index c35c1a6b..89d9fa2c 100755
--- a/plugin.video.alfa/channels/javtasty.py
+++ b/plugin.video.alfa/channels/javtasty.py
@@ -49,7 +49,8 @@ def lista(item):
     action = "play"
     if config.get_setting("menu_info", "javtasty"):
         action = "menu_info"
-    patron  = 'div class="video-item.*?href="([^"]+)".*?'
+    # PURGA los PRIVATE 
+    patron  = 'div class="video-item\s+".*?href="([^"]+)".*?'
     patron += 'data-original="([^"]+)" '
     patron += 'alt="([^"]+)"(.*?)fa fa-clock-o"></i>([^<]+)<'
     matches = scrapertools.find_multiple_matches(data, patron)
@@ -89,12 +90,15 @@ def play(item):
     logger.info()
     itemlist = []
     data = httptools.downloadpage(item.url).data
-    videourl = scrapertools.find_single_match(data, "video_url:\s*'([^']+)'")
+    videourl = scrapertools.find_single_match(data, "video_alt_url2:\s*'([^']+)'")
     if videourl:
-        itemlist.append(['.mp4 [directo]', videourl])
+        itemlist.append(['.mp4 HD [directo]', videourl])
     videourl = scrapertools.find_single_match(data, "video_alt_url:\s*'([^']+)'")
     if videourl:
         itemlist.append(['.mp4 HD [directo]', videourl])
+    videourl = scrapertools.find_single_match(data, "video_url:\s*'([^']+)'")
+    if videourl:
+        itemlist.append(['.mp4 [directo]', videourl])
     if item.extra == "play_menu":
         return itemlist, data
     return itemlist
diff --git a/plugin.video.alfa/channels/qwertty.py b/plugin.video.alfa/channels/qwertty.py
index 53a3c85e..35b3fe06 100644
--- a/plugin.video.alfa/channels/qwertty.py
+++ b/plugin.video.alfa/channels/qwertty.py
@@ -58,14 +58,17 @@ def lista(item):
     data = re.sub(r"\n|\r|\t|&nbsp;|<br>", "", data)
     patron = '<article id="post-\d+".*?'
     patron += '<a href="([^"]+)" title="([^"]+)">.*?'
-    patron += '<img data-src="(.*?)".*?'
+    patron += '<div class="post-thumbnail(.*?)<span class="views">.*?'
     patron += '<span class="duration"><i class="fa fa-clock-o"></i>([^<]+)</span>'
     matches = re.compile(patron,re.DOTALL).findall(data)
     for scrapedurl,scrapedtitle,scrapedthumbnail,duracion in matches:
         scrapedplot = ""
+        thumbnail = scrapertools.find_single_match(scrapedthumbnail, 'poster="([^"]+)"')
+        if thumbnail == "":
+            thumbnail = scrapertools.find_single_match(scrapedthumbnail, "data-thumbs='(.*?jpg)")
         title = "[COLOR yellow]" + duracion + "[/COLOR] " + scrapedtitle
         itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl,
-                              fanart=scrapedthumbnail, thumbnail=scrapedthumbnail, plot=scrapedplot) )
+                              fanart=thumbnail, thumbnail=thumbnail, plot=scrapedplot) )
     next_page = scrapertools.find_single_match(data,'<li><a href="([^"]+)">Next</a>')
     if next_page=="":
         next_page = scrapertools.find_single_match(data,'<li><a class="current">.*?<li><a href=\'([^\']+)\' class="inactive">')
@@ -82,7 +85,17 @@ def play(item):
     url = scrapertools.find_single_match(data,'<meta itemprop="embedURL" content="([^"]+)"')
     url = url.replace("pornhub.com/embed/", "pornhub.com/view_video.php?viewkey=")
     data = httptools.downloadpage(url).data
-    # https://www.spankwire.com/EmbedPlayer.aspx?ArticleId=14049072
+    if "spankwire" in url : 
+        data = httptools.downloadpage(item.url).data
+        data = scrapertools.get_match(data,'Copy Embed Code(.*?)For Desktop')
+        patron  = '<div class="shareDownload_container__item__dropdown">.*?<a href="([^"]+)"'
+        matches = scrapertools.find_multiple_matches(data, patron)
+        for scrapedurl  in matches:
+            url = scrapedurl
+            if url=="#":
+                scrapedurl = scrapertools.find_single_match(data,'playerData.cdnPath480         = \'([^\']+)\'')
+            itemlist.append(item.clone(action="play", title=scrapedurl, fulltitle = scrapedurl, url=scrapedurl))
+
     if "xvideos" in url : 
         scrapedurl  = scrapertools.find_single_match(data,'setVideoHLS\(\'([^\']+)\'')
     if "pornhub" in url :