diff options
author | mkaay <mkaay@mkaay.de> | 2011-02-05 18:19:29 +0100 |
---|---|---|
committer | mkaay <mkaay@mkaay.de> | 2011-02-05 18:19:29 +0100 |
commit | b509aa764d41dbad336df30cdfa33ec5c84ae8ef (patch) | |
tree | 8fee1a64c3c2b2cd420cdd41962564aab03463f6 /module/plugins | |
parent | merge (diff) | |
download | pyload-b509aa764d41dbad336df30cdfa33ec5c84ae8ef.tar.xz |
fixes
Diffstat (limited to 'module/plugins')
-rw-r--r-- | module/plugins/Plugin.py | 3 | ||||
-rw-r--r-- | module/plugins/hoster/UploadedTo.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 1ecc3ded3..54900422c 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -385,7 +385,8 @@ class Plugin(object): f = open(self.lastDownload, "rb") content = f.read(read_size if read_size else -1) f.close() - self.log.debug("Content: %s" % content) + #produces encoding errors, better log to other file in the future? + #self.log.debug("Content: %s" % content) for name, rule in rules.iteritems(): if type(rule) in (str, unicode): if rule in content: diff --git a/module/plugins/hoster/UploadedTo.py b/module/plugins/hoster/UploadedTo.py index 4553f1dfd..aa595be2c 100644 --- a/module/plugins/hoster/UploadedTo.py +++ b/module/plugins/hoster/UploadedTo.py @@ -43,6 +43,8 @@ class UploadedTo(Hoster): def process(self, pyfile): + self.url = self.get_file_url() + self.req.cj.setCookie("uploaded.to", "lang", "en") self.download_html() if not self.file_exists(): @@ -67,9 +69,6 @@ class UploadedTo(Hoster): return True - - self.url = self.get_file_url() - wait = self.get_waiting_time() if wait: self.setWait(wait, True) @@ -88,6 +87,7 @@ class UploadedTo(Hoster): options = {"time": time, "time_secure": time_secure, "file_password": file_password} if challenge: + self.req.lastURL = str(self.url) re_captcha = ReCaptcha(self) challenge, result = re_captcha.challenge(challenge.group(1)) options["recaptcha_challenge_field"] = challenge |