summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/UloziskoSk.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/UloziskoSk.py')
-rw-r--r--module/plugins/hoster/UloziskoSk.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/module/plugins/hoster/UloziskoSk.py b/module/plugins/hoster/UloziskoSk.py
index 0267d4b61..ad809b47c 100644
--- a/module/plugins/hoster/UloziskoSk.py
+++ b/module/plugins/hoster/UloziskoSk.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import re
+import urlparse
from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
@@ -11,6 +12,7 @@ class UloziskoSk(SimpleHoster):
__version__ = "0.25"
__pattern__ = r'http://(?:www\.)?ulozisko\.sk/.+'
+ __config__ = [("use_premium", "bool", "Use premium account if available", True)]
__description__ = """Ulozisko.sk hoster plugin"""
__license__ = "GPLv3"
@@ -21,10 +23,10 @@ class UloziskoSk(SimpleHoster):
SIZE_PATTERN = ur'Veľkosť súboru: <strong>(?P<S>[\d.,]+) (?P<U>[\w^_]+)</strong><br />'
OFFLINE_PATTERN = ur'<span class = "red">Zadaný súbor neexistuje z jedného z nasledujúcich dôvodov:</span>'
- LINK_FREE_PATTERN = r'<form name = "formular" action = "([^"]+)" method = "post">'
- ID_PATTERN = r'<input type = "hidden" name = "id" value = "([^"]+)" />'
- CAPTCHA_PATTERN = r'<img src="(/obrazky/obrazky\.php\?fid=[^"]+)" alt="" />'
- IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "([^"]+)">'
+ LINK_FREE_PATTERN = r'<form name = "formular" action = "(.+?)" method = "post">'
+ ID_PATTERN = r'<input type = "hidden" name = "id" value = "(.+?)" />'
+ CAPTCHA_PATTERN = r'<img src="(/obrazky/obrazky\.php\?fid=.+?)" alt="" />'
+ IMG_PATTERN = ur'<strong>PRE ZVÄČŠENIE KLIKNITE NA OBRÁZOK</strong><br /><a href = "(.+?)">'
def process(self, pyfile):
@@ -33,8 +35,7 @@ class UloziskoSk(SimpleHoster):
m = re.search(self.IMG_PATTERN, self.html)
if m:
- url = "http://ulozisko.sk" + m.group(1)
- self.download(url)
+ self.link = "http://ulozisko.sk" + m.group(1)
else:
self.handleFree(pyfile)
@@ -55,8 +56,8 @@ class UloziskoSk(SimpleHoster):
m = re.search(self.CAPTCHA_PATTERN, self.html)
if m is None:
self.error(_("CAPTCHA_PATTERN not found"))
- captcha_url = 'http://www.ulozisko.sk' + m.group(1)
+ captcha_url = urlparse.urljoin("http://www.ulozisko.sk", m.group(1))
captcha = self.decryptCaptcha(captcha_url, cookies=True)
self.logDebug("CAPTCHA_URL:" + captcha_url + ' CAPTCHA:' + captcha)