summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2016-05-31 00:44:30 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2016-06-10 16:14:52 +0100
commit15a40232083ee25feff617c64c9ceec7e6043eaa (patch)
tree72866f3e0858366153ecbc496e17fe6379931107
parentcbb7415a1836acbe7127a603632da204853fe45d (diff)
downloaddeluge-15a40232083ee25feff617c64c9ceec7e6043eaa.tar.gz
deluge-15a40232083ee25feff617c64c9ceec7e6043eaa.tar.bz2
deluge-15a40232083ee25feff617c64c9ceec7e6043eaa.zip
[#2077] [Extractor] Ignore the remaining rar part files
* Bump version to 0.6
-rw-r--r--deluge/plugins/extractor/extractor/core.py5
-rw-r--r--deluge/plugins/extractor/setup.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/deluge/plugins/extractor/extractor/core.py b/deluge/plugins/extractor/extractor/core.py
index 6eefa707e..ad4e56a26 100644
--- a/deluge/plugins/extractor/extractor/core.py
+++ b/deluge/plugins/extractor/extractor/core.py
@@ -145,6 +145,11 @@ class Core(CorePluginBase):
elif file_ext not in EXTRACT_COMMANDS or file_ext_sec == '.tar':
log.debug("EXTRACTOR: Can't extract file with unknown file type: %s", f["path"])
continue
+ elif file_ext == ".rar" and "part" in file_ext_sec:
+ part_num = file_ext_sec.split("part")[1]
+ if part_num.isdigit() and int(part_num) != 1:
+ log.debug("Skipping remaining multi-part rar files: %s", f["path"])
+ continue
cmd = EXTRACT_COMMANDS[file_ext]
fpath = os.path.join(tid_status["save_path"], os.path.normpath(f["path"]))
diff --git a/deluge/plugins/extractor/setup.py b/deluge/plugins/extractor/setup.py
index 0ee4188e5..6bc9ceb06 100644
--- a/deluge/plugins/extractor/setup.py
+++ b/deluge/plugins/extractor/setup.py
@@ -42,7 +42,7 @@ from setuptools import setup
__plugin_name__ = "Extractor"
__author__ = "Andrew Resch"
__author_email__ = "andrewresch@gmail.com"
-__version__ = "0.5"
+__version__ = "0.6"
__url__ = "http://deluge-torrent.org"
__license__ = "GPLv3"
__description__ = "Extract files upon torrent completion"