(Este archivo no existe)'
- matches = re.compile(patron, re.DOTALL).findall(data)
- if len(matches) > 0:
- return False, matches[0]
-
+ data = httptools.downloadpage(page_url).data
+ if "Este archivo no existe" in data:
+ return False, "Archivo no existe"
return True, ""
diff --git a/plugin.video.alfa/servers/gigasize.py b/plugin.video.alfa/servers/gigasize.py
index 07852e8b..7f45bf45 100755
--- a/plugin.video.alfa/servers/gigasize.py
+++ b/plugin.video.alfa/servers/gigasize.py
@@ -1,19 +1,16 @@
# -*- coding: utf-8 -*-
+from core import httptools
from core import scrapertools
from platformcode import logger
def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url)
-
- # Vídeo borrado: http://www.gigasize.com/get/097fadecgh7pf
- # Video erróneo:
- data = scrapertools.cache_page(page_url)
+ data = httptools.downloadpage(page_url).data
if '
o ha sido borrado de gigasize"
- else:
- return True, ""
+ return True, ""
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
diff --git a/plugin.video.alfa/servers/googlevideo.py b/plugin.video.alfa/servers/googlevideo.py
index 6b78661e..0addf958 100755
--- a/plugin.video.alfa/servers/googlevideo.py
+++ b/plugin.video.alfa/servers/googlevideo.py
@@ -2,23 +2,21 @@
import re
+from core import httptools
from core import scrapertools
from platformcode import logger
-# Returns an array of possible video url's from the page_url
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url)
-
video_urls = []
-
# Lo extrae a partir de flashvideodownloader.org
if page_url.startswith("http://"):
url = 'http://www.flashvideodownloader.org/download.php?u=' + page_url
else:
url = 'http://www.flashvideodownloader.org/download.php?u=http://video.google.com/videoplay?docid=' + page_url
logger.info("url=" + url)
- data = scrapertools.cache_page(url)
+ data = httptools.downloadpage(url).data
# Extrae el vídeo
newpatron = '.*?
'
diff --git a/plugin.video.alfa/servers/hugefiles.py b/plugin.video.alfa/servers/hugefiles.py
index f9cdd99c..fe255e7e 100755
--- a/plugin.video.alfa/servers/hugefiles.py
+++ b/plugin.video.alfa/servers/hugefiles.py
@@ -3,6 +3,7 @@
import re
import urllib
+from core import httptools
from core import scrapertools
from lib import jsunpack
from platformcode import logger
@@ -10,17 +11,13 @@ from platformcode import logger
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url)
-
- data = scrapertools.cache_page(page_url)
-
- # Submit
+ data = httptools.downloadpage(page_url).data
post = {}
r = re.findall(r'type="hidden" name="(.+?)"\s* value="?(.+?)">', data)
for name, value in r:
post[name] = value
post.update({'method_free': 'Free Download'})
- data = scrapertools.cache_page(page_url, post=urllib.urlencode(post))
-
+ data = httptools.downloadpage(page_url, post=urllib.urlencode(post)).data
# Get link
sPattern = '''.*?'''
r = re.findall(sPattern, data, re.DOTALL | re.I)
diff --git a/plugin.video.alfa/servers/onefichier.py b/plugin.video.alfa/servers/onefichier.py
index a3727c3b..7d11df80 100755
--- a/plugin.video.alfa/servers/onefichier.py
+++ b/plugin.video.alfa/servers/onefichier.py
@@ -2,6 +2,7 @@
import urllib
+from core import httptools
from core import scrapertools
from platformcode import config, logger
@@ -12,18 +13,16 @@ 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)
-
if config.get_setting("premium", server="onefichier"):
user = config.get_setting("user", server="onefichier")
password = config.get_setting("password", server="onefichier")
-
url = "https://1fichier.com/login.pl"
logger.info("url=" + url)
post_parameters = {"mail": user, "pass": password, "lt": "on", "purge": "on", "valider": "Send"}
post = urllib.urlencode(post_parameters)
logger.info("post=" + post)
- data = scrapertools.cache_page(url, post=post)
+ data = httptools.downloadpage(url, post=post).data
# logger.info("data="+data)
cookies = config.get_cookie_data()
diff --git a/plugin.video.alfa/servers/streamcloud.py b/plugin.video.alfa/servers/streamcloud.py
index 350b6dc5..e4802e50 100755
--- a/plugin.video.alfa/servers/streamcloud.py
+++ b/plugin.video.alfa/servers/streamcloud.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
+from core import httptools
from core import scrapertools
from platformcode import logger
def test_video_exists(page_url):
logger.info("page_url='%s')" % page_url)
-
- data = scrapertools.cache_page(url=page_url)
+ data = httptools.downloadpage(url=page_url).data
if "
404 Not Found
" in data:
return False, "El archivo no existe
en streamcloud o ha sido borrado."
elif "File Not Found
" in data:
@@ -20,52 +20,40 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("url=" + page_url)
-
# Lo pide una vez
headers = [
['User-Agent', 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14']]
- data = scrapertools.cache_page(page_url, headers=headers)
-
+ data = httptools.downloadpage(page_url, headers=headers).data
try:
- media_url = scrapertools.get_match(data, 'file\: "([^"]+)"')
+ media_url = scrapertools.find_single_match(data, 'file\: "([^"]+)"')
except:
post = ""
matches = scrapertools.find_multiple_matches(data, '')
for inputname, inputvalue in matches:
post += inputname + "=" + inputvalue + "&"
post = post.replace("op=download1", "op=download2")
- data = scrapertools.cache_page(page_url, post=post)
-
+ data = httptools.downloadpage(page_url, post=post).data
if 'id="justanotice"' in data:
logger.info("data=" + data)
logger.info("Ha saltado el detector de adblock")
return []
-
# Extrae la URL
- media_url = scrapertools.get_match(data, 'file\: "([^"]+)"')
-
+ media_url = scrapertools.find_single_match(data, 'file\: "([^"]+)"')
video_urls = []
video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [streamcloud]", media_url+"|Referer="+page_url])
-
-
for video_url in video_urls:
logger.info("%s - %s" % (video_url[0], video_url[1]))
-
return video_urls
if __name__ == "__main__":
import getopt
import sys
-
options, arguments = getopt.getopt(sys.argv[1:], "", ["video_url=", "login=", "password="])
-
video_url = ""
login = ""
password = ""
-
logger.info("%s %s" % (str(options), str(arguments)))
-
for option, argument in options:
print option, argument
if option == "--video_url":
@@ -76,15 +64,12 @@ if __name__ == "__main__":
password = argument
else:
assert False, "Opcion desconocida"
-
if video_url == "":
print "ejemplo de invocacion"
print "streamcloud --video_url http://xxx --login usuario --password secreto"
else:
-
if login != "":
premium = True
else:
premium = False
-
print get_video_url(video_url, premium, login, password)
diff --git a/plugin.video.alfa/servers/vidtodo.py b/plugin.video.alfa/servers/vidtodo.py
index e361f47b..e156091c 100755
--- a/plugin.video.alfa/servers/vidtodo.py
+++ b/plugin.video.alfa/servers/vidtodo.py
@@ -1,48 +1,39 @@
# -*- coding: utf-8 -*-
-from core.scrapertools import *
+import urllib
+
+from core import httptools
+from core import scrapertools
-host = "http://vidtodo.com"
id_server = "vidtodo"
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url)
-
- data = cache_page(page_url).replace('"', "'")
-
+ video_urls = []
+ data = httptools.downloadpage(page_url).data
+ data = data.replace('"', "'")
page_url_post = find_single_match(data, "