fix server import

servers/cloudvideo.py

@@ -3,8 +3,7 @@
 
 from core import httptools
 from core import scrapertools
-from lib import jsunpack
+from platformcode import logger, config
-from platformcode import logger
 
 
 def test_video_exists(page_url):

servers/dailymotion.py

@@ -2,14 +2,14 @@
 
 from core import httptools
 from core import scrapertools
-from platformcode import logger
+from platformcode import logger, config
 
 
 def test_video_exists(page_url):
     logger.info("(page_url='%s')" % page_url)
     response = httptools.downloadpage(page_url)
     if "Contenido rechazado" in response.data:
-        return False, "[Dailymotion] El archivo no existe o ha sido borrado"
+        return False, config.get_localized_string(70449) % "dailymotion"
     if response.code == 404:
         return False, config.get_localized_string(70449) % "dailymotion"
     return True, ""

servers/deltabit.py

@@ -4,7 +4,7 @@ import urllib
 import time
 from core import httptools
 from core import scrapertools
-from platformcode import logger
+from platformcode import logger, config
 from lib import jsunpack
 
 def test_video_exists(page_url):

servers/gounlimited.py

@@ -8,7 +8,7 @@ import re
 from core import httptools
 from core import scrapertools
 from lib import jsunpack
-from platformcode import logger
+from platformcode import logger, config
 
 
 def test_video_exists(page_url):

servers/javwhores.py

@@ -4,11 +4,8 @@
 # --------------------------------------------------------
 import re
 from core import httptools
-from core import scrapertools
 from platformcode import logger
 
-from lib.kt_player import decode
-
 def test_video_exists(page_url):
 
     response = httptools.downloadpage(page_url)

servers/nowvideo.py

@@ -1,74 +1,73 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-import urllib
+import urllib
-import urlparse
+from core import httptools
-from core import httptools
+from core import scrapertools
-from core import scrapertools
+from platformcode import logger, config
-from platformcode import logger#, config
+
-
+headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0']]
-headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0']]
+
-
+def test_video_exists(page_url):
-def test_video_exists(page_url):
+    logger.info("(page_url='%s')" % page_url)
-    logger.info("(page_url='%s')" % page_url)
+    data = httptools.downloadpage(page_url).data
-    data = httptools.downloadpage(page_url).data
+    if "Not Found" in data or "File was deleted" in data or "The file is being converted" in data or "Please try again later" in data:
-    if "Not Found" in data or "File was deleted" in data or "The file is being converted" in data or "Please try again later" in data:
+        return False, config.get_localized_string(70293) % "NowVideo"
-        return False, config.get_localized_string(70293) % "NowVideo"
+    elif "no longer exists" in data:
-    elif "no longer exists" in data:
+        return False, config.get_localized_string(70292) % "NowVideo"
-        return False, config.get_localized_string(70292) % "NowVideo"
+    return True, ""
-    return True, ""
+
-
+
-
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+    host = 'http://nowvideo.club'
-    host = 'http://nowvideo.club'
+    logger.info("(nowvideo page_url='%s')" % page_url)
-    logger.info("(nowvideo page_url='%s')" % page_url)
+    video_urls = []
-    video_urls = []
+    data = httptools.downloadpage(page_url).data
-    data = httptools.downloadpage(page_url).data
+    page_url_post = scrapertools.find_single_match(data, '<Form id="[^"]+" method="POST" action="([^"]+)">')
-    page_url_post = scrapertools.find_single_match(data, '<Form id="[^"]+" method="POST" action="([^"]+)">')
+    page_url_post = page_url_post.replace('..', '')
-    page_url_post = page_url_post.replace('..', '')
+    imhuman = '&imhuman=' + scrapertools.find_single_match(data, 'name="imhuman" value="([^"]+)"').replace(" ", "+")
-    imhuman = '&imhuman=' + scrapertools.find_single_match(data, 'name="imhuman" value="([^"]+)"').replace(" ", "+")
+    post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, 'name="([^"]+)" value="([^"]*)"')}) + imhuman
-    post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, 'name="([^"]+)" value="([^"]*)"')}) + imhuman
+    data = httptools.downloadpage(host + page_url_post, post=post).data
-    data = httptools.downloadpage(host + page_url_post, post=post).data
+    logger.info("nowvideo data page_url2 ='%s'" % data)
-    logger.info("nowvideo data page_url2 ='%s'" % data)
+
-
+    headers.append(['Referer', page_url])
-    headers.append(['Referer', page_url])
+    post_data = scrapertools.find_single_match(data,"</div>\s*<script>(eval.function.p,a,c,k,e,.*?)\s*</script>")
-    post_data = scrapertools.find_single_match(data,"</div>\s*<script>(eval.function.p,a,c,k,e,.*?)\s*</script>")
+    if post_data != "":
-    if post_data != "":
+        from lib import jsunpack
-        from lib import jsunpack
+        data = jsunpack.unpack(post_data)
-        data = jsunpack.unpack(post_data)
+
-
+    block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]')
-    block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]')
+    if block: data = block
-    if block: data = block
+
-
+    media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)')
-    media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)')
+    _headers = urllib.urlencode(dict(headers))
-    _headers = urllib.urlencode(dict(headers))
+
-
+    for media_url in media_urls:
-    for media_url in media_urls:
+        #logger.info("nowvideo data page_url2 ='%s'" % media_url)
-        #logger.info("nowvideo data page_url2 ='%s'" % media_url)
+        video_urls.append([" mp4 [nowvideo] ", media_url + '|' + _headers])
-        video_urls.append([" mp4 [nowvideo] ", media_url + '|' + _headers])
+
-
+    for video_url in media_urls:
-    for video_url in media_urls:
+        logger.info("[nowvideo.py] %s - %s" % (video_url[0], video_url[1]))
-        logger.info("[nowvideo.py] %s - %s" % (video_url[0], video_url[1]))
+    
-    
+    return video_urls
-    return video_urls
+
-
+
-
+def find_videos(data):
-def find_videos(data):
+    encontrados = set()
-    encontrados = set()
+    devuelve = []
-    devuelve = []
+
-
+    patronvideos = r"nowvideo.club/(?:play|videos)?([a-z0-9A-Z]+)"
-    patronvideos = r"nowvideo.club/(?:play|videos)?([a-z0-9A-Z]+)"
+    logger.info("[nowvideo.py] find_videos #" + patronvideos + "#")
-    logger.info("[nowvideo.py] find_videos #" + patronvideos + "#")
+    matches = re.compile(patronvideos, re.DOTALL).findall(data)
-    matches = re.compile(patronvideos, re.DOTALL).findall(data)
+
-
+    for match in matches:
-    for match in matches:
+        titulo = "[nowvideo]"
-        titulo = "[nowvideo]"
+        url = 'http://nowvideo.club/%s' % match
-        url = 'http://nowvideo.club/%s' % match
+
-
+        if url not in encontrados:
-        if url not in encontrados:
+            logger.info("  url=" + url)
-            logger.info("  url=" + url)
+            devuelve.append([titulo, url, 'nowvideo'])
-            devuelve.append([titulo, url, 'nowvideo'])
+            encontrados.add(url)
-            encontrados.add(url)
+        else:
-        else:
+            logger.info("  url duplicada=" + url)
-            logger.info("  url duplicada=" + url)
+
-
+    return devuelve
-    return devuelve

servers/turbovid.py

@@ -4,7 +4,7 @@ import urllib
 import time
 from core import httptools
 from core import scrapertools
-from platformcode import logger
+from platformcode import logger, config
 
 
 def test_video_exists(page_url):

servers/vidoza.py

@@ -3,7 +3,7 @@
 from core import httptools
 from core import jsontools
 from core import scrapertools
-from platformcode import logger
+from platformcode import logger, config
 
 
 def test_video_exists(page_url):