diff options
| author |  mkaay <mkaay@mkaay.de>
| 2011-02-03 16:56:58 +0100 |
|---|---|---|
| committer | mkaay <mkaay@mkaay.de>
| 2011-02-03 16:56:58 +0100 |
| commit | 5a55baef0362a2f2bb2395940c734d5faf553759 (patch) | |
| tree | 07f7d9005d7c237ac12e93dda5041e87cbd58630 /module/plugins/hooks | |
| parent | SO fix try (diff) | |
| parent | unrar destination fix (diff) | |
| download | pyload-5a55baef0362a2f2bb2395940c734d5faf553759.tar.xz | |
merge
Diffstat (limited to 'module/plugins/hooks')
| -rw-r--r-- | module/plugins/hooks/UnRar.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/hooks/UnRar.py b/module/plugins/hooks/UnRar.py index 3a9e0b276..751c03987 100644 --- a/module/plugins/hooks/UnRar.py +++ b/module/plugins/hooks/UnRar.py @@ -131,16 +131,16 @@ class UnRar(Hook): else: folder = download_folder - destination = None + destination = folder if self.getConfig("unrar_destination") and not self.getConfig("unrar_destination").lower() == "none": destination = self.getConfig("unrar_destination") sub = "." if self.core.config['general']['folder_per_package']: sub = pack.folder.decode(sys.getfilesystemencoding()) - if not isabs(destination): - destination = join(folder, destination, sub) - else: + if isabs(destination): destination = join(destination, sub) + else: + destination = join(folder, destination, sub) u = Unrar(join(folder, fname), tmpdir=join(folder, "tmp"), ramSize=(self.ram if self.getConfig("ramwarning") else 0), cpu=self.getConfig("renice")) try: |