diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-06 17:29:14 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2010-08-06 17:29:14 +0200 |
| commit | aa01ccf613a95b7b9f6e7b95a1c851c9383ae095 (patch) | |
| tree | 0213d034f055a99ea0db686b760d20627cfd0f49 /module | |
| parent | Align tabs to the left (settings page) (diff) | |
| parent | container upload fix (diff) | |
| download | pyload-aa01ccf613a95b7b9f6e7b95a1c851c9383ae095.tar.xz | |
merge
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/Plugin.py | 3 | ||||
| -rw-r--r-- | module/web/ajax/views.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 549caba22..516a3b772 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -195,6 +195,9 @@ class Plugin(object): Ocr = self.core.pluginManager.getCaptchaPlugin(self.__name__) if Ocr: sleep(randint(3000, 5000) / 1000.0) + + if self.pyfile.abort: raise Abort + ocr = Ocr() result = ocr.get_captcha(temp.name) else: diff --git a/module/web/ajax/views.py b/module/web/ajax/views.py index b1fe2f676..588881eea 100644 --- a/module/web/ajax/views.py +++ b/module/web/ajax/views.py @@ -62,7 +62,7 @@ def add_package(request): if name == None or name == "": name = f.name - fpath = join(settings.DL_ROOT, f.name) + fpath = join(settings.PYLOAD.get_conf_val("general","download_folder"), "tmp_"+ f.name) destination = open(fpath, 'wb') for chunk in f.chunks(): destination.write(chunk) |