diff options
| author |  Jeix <devnull@localhost>
| 2010-11-05 16:13:51 +0100 |
|---|---|---|
| committer | Jeix <devnull@localhost>
| 2010-11-05 16:13:51 +0100 |
| commit | 77d436bb07eb4cf8ede5a9ec3c3bbdb4f2186602 (patch) | |
| tree | 581071381ac07229c3abd19d2cc4d90c4f043b9e /module/plugins/hoster | |
| parent | files.mail.ru improvement (diff) | |
| download | pyload-77d436bb07eb4cf8ede5a9ec3c3bbdb4f2186602.tar.xz | |
small fixes: progess view in gui,xdcc,shareonline
Diffstat (limited to 'module/plugins/hoster')
| -rw-r--r-- | module/plugins/hoster/ShareonlineBiz.py | 8 | ||||
| -rw-r--r-- | module/plugins/hoster/Xdcc.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 95cedc140..1204c1ed8 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -76,22 +76,22 @@ class ShareonlineBiz(Hoster): def downloadHTML(self): self.html = self.load(self.pyfile.url, cookies=True) if not self.account: - html = self.load("%s/free/" % self.pyfile.url, post={"dl_free":"1"}, cookies=True) + self.html = self.load("%s/free/" % self.pyfile.url, post={"dl_free":"1"}, cookies=True) if re.search(r"/failure/full/1", self.req.lastEffectiveURL): self.setWait(120) self.log.info("%s: no free slots, waiting 120 seconds" % (self.__name__)) self.wait() self.retry() - if "Captcha number error or expired" in html: + if "Captcha number error or expired" in self.html: captcha = self.decryptCaptcha("http://www.share-online.biz/captcha.php", get={"rand":"0.%s" % random.randint(10**15,10**16)}, cookies=True) self.log.debug("%s Captcha: %s" % (self.__name__, captcha)) sleep(3) - html = self.load(self.pyfile.url, post={"captchacode": captcha}, cookies=True) + self.html = self.load(self.pyfile.url, post={"captchacode": captcha}, cookies=True) - if r"Der Download ist Ihnen zu langsam" not in html and r"The download is too slow for you" not in html: + if r"Der Download ist Ihnen zu langsam" not in self.html and r"The download is too slow for you" not in self.html: self.fail("Plugin defect. Save dumps and report.") m = re.search("var timeout='(\d+)';", self.html[1]) diff --git a/module/plugins/hoster/Xdcc.py b/module/plugins/hoster/Xdcc.py index e0f5c38cc..3e68c7289 100644 --- a/module/plugins/hoster/Xdcc.py +++ b/module/plugins/hoster/Xdcc.py @@ -204,14 +204,14 @@ class Xdcc(Hoster): self.req.dl_size = int(m.group(4))
self.pyfile.name = packname
- self.log.debug("XDCC: Downloading %s from %s:%d" % (packname, ip, port))
+ self.log.info("XDCC: Downloading %s from %s:%d" % (packname, ip, port))
self.pyfile.setStatus("downloading")
- newname = self.req.download(host, port, location, packname)
+ newname = self.req.download(ip, port, location, packname)
self.pyfile.size = self.req.dl_size
# kill IRC socket
- sock.send("QUIT :byebye\r\n")
+ # sock.send("QUIT :byebye\r\n")
sock.close()
if newname:
|