Merge pull request #401 from Intel11/master

Actualizados

plugin.video.alfa/servers/flashx.json

@@ -6,6 +6,10 @@
       {
         "pattern": "flashx.(?:tv|pw|ws|sx|to)/(?:embed.php\\?c=|embed-|playvid-|)([A-z0-9]+)",
         "url": "https://www.flashx.tv/\\1.html"
+      },
+      {
+        "pattern": "flashx.co/([A-z0-9]+).jsp",
+        "url": "https://www.flashx.to/\\1.jsp"
       }
     ]
   },

plugin.video.alfa/servers/flashx.py

@@ -17,15 +17,16 @@ def test_video_exists(page_url):
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    domain_fx = "(?:co|tv)"
     logger.info("url=" + page_url)
     pfxfx = ""
     data = httptools.downloadpage(page_url, cookies=False).data
     data = data.replace("\n","")
-    cgi_counter = scrapertools.find_single_match(data, """(?is)src=.(https://www.flashx.co/counter.cgi.*?[^(?:'|")]+)""")
+    cgi_counter = scrapertools.find_single_match(data, """(?is)src=.(https://www.flashx.%s/counter.cgi.*?[^(?:'|")]+)""" %domain_fx)
     cgi_counter = cgi_counter.replace("%0A","").replace("%22","")
-    playnow = scrapertools.find_single_match(data, 'https://www.flashx.co/dl[^"]+')
+    playnow = scrapertools.find_single_match(data, 'https://www.flashx.%s/dl[^"]+' %domain_fx)
     # Para obtener el f y el fxfx
-    js_fxfx = "https://www." + scrapertools.find_single_match(data.replace("//","/"), """(?is)(flashx.co/js\w+/c\w+.*?[^(?:'|")]+)""")
+    js_fxfx = "https://www." + scrapertools.find_single_match(data.replace("//","/"), """(?is)(flashx.%s/js\w+/c\w+.*?[^(?:'|")]+)""" %domain_fx)
     data_fxfx = httptools.downloadpage(js_fxfx).data
     mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","")
     matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)')
@@ -35,7 +36,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info("mfxfxfx2= %s" %pfxfx)
     if pfxfx == "":
         pfxfx = "ss=yes&f=fail&fxfx=6"
-    coding_url = 'https://www.flashx.co/flashx.php?%s' %pfxfx
+    coding_url = 'https://www.flashx.co/flashx.php?%s' %(pfxfx)
     # {f: 'y', fxfx: '6'}
     bloque = scrapertools.find_single_match(data, '(?s)Form method="POST" action(.*?)span')
     flashx_id = scrapertools.find_single_match(bloque, 'name="id" value="([^"]+)"')

plugin.video.alfa/servers/rapidvideo.py

@@ -35,8 +35,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     logger.info("url=" + page_url)
     video_urls = []
     data = httptools.downloadpage(page_url).data
+    post = "confirm.x=77&confirm.y=76&block=1"
     if "Please click on this button to open this video" in data:
-        post = "confirm.x=77&confirm.y=76&block=1"
         data = httptools.downloadpage(page_url, post=post).data
     patron = 'https://www.rapidvideo.com/e/[^"]+'
     match = scrapertools.find_multiple_matches(data, patron)
@@ -44,6 +44,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         for url1 in match:
            res = scrapertools.find_single_match(url1, '=(\w+)')
            data = httptools.downloadpage(url1).data
+           if "Please click on this button to open this video" in data:
+               data = httptools.downloadpage(url1, post=post).data
            url = scrapertools.find_single_match(data, 'source src="([^"]+)')
            ext = scrapertools.get_filename_from_url(url)[-4:]
            video_urls.append(['%s %s [rapidvideo]' % (ext, res), url])

plugin.video.alfa/servers/watchvideo.py

@@ -8,35 +8,23 @@ from platformcode import logger
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
-
     data = httptools.downloadpage(page_url).data
-
     if "Not Found" in data or "File was deleted" in data:
         return False, "[Watchvideo] El fichero no existe o ha sido borrado"
-
     return True, ""
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("url=" + page_url)
-
-    data = httptools.downloadpage(page_url).data
-    enc_data = scrapertools.find_single_match(data, "type='text/javascript'>(eval.*?)\s*</script>")
-    dec_data = jsunpack.unpack(enc_data)
-
     video_urls = []
-    media_urls = scrapertools.find_multiple_matches(dec_data, '\{file\s*:\s*"([^"]+)",label\s*:\s*"([^"]+)"\}')
-    for media_url, label in media_urls:
-        ext = scrapertools.get_filename_from_url(media_url)[-4:]
-        video_urls.append(["%s %sp [watchvideo]" % (ext, label), media_url])
-
+    data = httptools.downloadpage(page_url).data
+    media_urls = scrapertools.find_multiple_matches(data, 'file:"([^"]+)"')
+    for media_url in media_urls:
+        ext = "mp4"
+        if "m3u8" in media_url:
+            ext = "m3u8"
+        video_urls.append(["%s [watchvideo]" % (ext), media_url])
     video_urls.reverse()
-    m3u8 = scrapertools.find_single_match(dec_data, '\{file\:"(.*?.m3u8)"\}')
-    if m3u8:
-        title = video_urls[-1][0].split(" ", 1)[1]
-        video_urls.insert(0, [".m3u8 %s" % title, m3u8])
-
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))
-
     return video_urls