summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
authorGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-11-13 03:28:26 +0100
committerGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-11-13 03:28:26 +0100
commit32045d7ec0e6ad368b548f4322015001f6c9759f (patch)
treeee58b86ac3cba841dc14fd82bfed418fb18297c3 /module/plugins/hoster
parentMove getFileInfo to SimpleHoster.py; update Mediafire (diff)
downloadpyload-32045d7ec0e6ad368b548f4322015001f6c9759f.tar.xz
fix Depositfiles, UlozTo
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/DepositfilesCom.py2
-rw-r--r--module/plugins/hoster/UlozTo.py19
2 files changed, 13 insertions, 8 deletions
diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py
index b02445005..13a8abe03 100644
--- a/module/plugins/hoster/DepositfilesCom.py
+++ b/module/plugins/hoster/DepositfilesCom.py
@@ -48,6 +48,8 @@ class DepositfilesCom(SimpleHoster):
self.handleFree()
def handleFree(self):
+ self.html = self.load(self.pyfile.url, post={"gateway_result":"1"})
+ if re.search(self.FILE_OFFLINE_PATTERN, self.html): self.offline()
if re.search(r'File is checked, please try again in a minute.', self.html) is not None:
self.log.info("DepositFiles.com: The file is being checked. Waiting 1 minute.")
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index b9ec4c5d7..ffb09a655 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -24,12 +24,9 @@ def getInfo(urls):
result = []
for url in urls:
- try:
- file_info = parseFileInfo(IfileIt, url, getURL(url, decode=True))
- result.append(file_info)
- except Exception, e:
- self.logError(e)
- result.append((url, 0, 1, url))
+ file_info = parseFileInfo(UlozTo, url, getURL(url, decode=True))
+ print file_info
+ result.append(file_info)
yield result
@@ -37,7 +34,7 @@ class UlozTo(SimpleHoster):
__name__ = "UlozTo"
__type__ = "hoster"
__pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/.*"
- __version__ = "0.71"
+ __version__ = "0.73"
__description__ = """uloz.to"""
__config__ = [("reuseCaptcha", "bool", "Reuse captcha", "True"),
("captchaUser", "str", "captcha_user", ""),
@@ -59,8 +56,14 @@ class UlozTo(SimpleHoster):
self.multiDL = False
def process(self, pyfile):
+ header = self.load(pyfile.url, just_header=True)
+ if "location" in header and "utm_source=old" in header['location']:
+ self.offline()
+
self.html = self.load(pyfile.url, decode=True)
- self.getFileInfo()
+
+ if self.PASSWD_PATTERN in self.html:
+ self.fail("Password protected link")
if re.search(self.VIPLINK_PATTERN, self.html):
self.html = self.load(pyfile.url, get={"disclaimer": "1"})