diff options
| author |  Jeix <devnull@localhost>
| 2010-11-25 14:33:15 +0100 |
|---|---|---|
| committer | Jeix <devnull@localhost>
| 2010-11-25 14:33:15 +0100 |
| commit | 0e6a798342985f1e4074896e45363c3f5acceacc (patch) | |
| tree | 9a8aca09fe18c958f221cda480222fe26709410b | |
| parent | gui: reverse tab order (diff) | |
| download | pyload-0e6a798342985f1e4074896e45363c3f5acceacc.tar.xz | |
depositfiles, fileserve free fixes
| -rw-r--r-- | module/plugins/accounts/FileserveCom.py | 6 | ||||
| -rw-r--r-- | module/plugins/hoster/DepositfilesCom.py | 2 | ||||
| -rw-r--r-- | module/plugins/hoster/FileserveCom.py | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/module/plugins/accounts/FileserveCom.py b/module/plugins/accounts/FileserveCom.py index 793d240cc..7754de253 100644 --- a/module/plugins/accounts/FileserveCom.py +++ b/module/plugins/accounts/FileserveCom.py @@ -44,8 +44,12 @@ class FileserveCom(Account): def login(self, user, data, req): - req.load("http://fileserve.com/login.php", + html = req.load("http://fileserve.com/login.php", post={"loginUserName": user, "loginUserPassword": data["password"], "autoLogin": "on", "loginFormSubmit": "Login"}, cookies=True) + + if r'Please Enter a valid user name.' in html: + self.wrongPassword() + req.load("http://fileserve.com/dashboard.php", cookies=True) diff --git a/module/plugins/hoster/DepositfilesCom.py b/module/plugins/hoster/DepositfilesCom.py index d3d31a9b8..c07178dc9 100644 --- a/module/plugins/hoster/DepositfilesCom.py +++ b/module/plugins/hoster/DepositfilesCom.py @@ -57,7 +57,7 @@ class DepositfilesCom(Hoster): self.html = self.load(tmp_url, post={"gateway_result":"1"}) - m = re.search(r'Attention! You used up your limit for file downloading! Please try in\s+(\d+) minute', self.html) + m = re.search(r'Attention! You used up your limit for file downloading! Please try in\s+(\d+)', self.html) if m is not None: wait_time = int( m.group(1) ) self.log.info( "%s: Traffic used up. Waiting %d minutes." % (self.__name__, wait_time) ) diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py index 161aad739..39430aef6 100644 --- a/module/plugins/hoster/FileserveCom.py +++ b/module/plugins/hoster/FileserveCom.py @@ -80,7 +80,11 @@ class FileserveCom(Hoster): self.retry()
wait = self.load(self.pyfile.url, post={"downloadLink":"wait"})
- self.setWait(int(wait)+3)
+ try:
+ self.setWait(int(wait)+3)
+ except:
+ # response looks strange like: wait = '\xef\xbb\xbf35'
+ self.setWait(int(wait[-2:]))
self.wait()
# show download link
|