summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2013-03-26 19:39:47 +0000
committerCalum Lind <calumlind+deluge@gmail.com>2013-03-26 19:45:29 +0000
commit937419bfcd15cc3e2919f607db267a7b94c9ff63 (patch)
treec625a9aa299587aef06f63584aa27dd43a07b752
parent9b3ff8f1b80308505d3417c1512772836b6778ab (diff)
downloaddeluge-937419bfcd15cc3e2919f607db267a7b94c9ff63.tar.gz
deluge-937419bfcd15cc3e2919f607db267a7b94c9ff63.tar.bz2
deluge-937419bfcd15cc3e2919f607db267a7b94c9ff63.zip
Update Extractor plugin description, version and modify log levels
-rw-r--r--ChangeLog13
-rw-r--r--deluge/plugins/Extractor/deluge/plugins/extractor/core.py14
-rw-r--r--deluge/plugins/Extractor/setup.py15
3 files changed, 31 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f36cc09f..dff77e531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,14 @@
would keep updating one call after the other. If the value changed, the
timer is now stopped and restarted using the new value.
+=== Deluge 1.3.7 (In Development) ===
+==== GtkUI ====
+ * Fix issue with Plugins that add Tab to torrentdetails
+ * Fix the scalable icon install directory
+
+==== Extractor ====
+ * #2290: Fix dotted filenames being rejected
+
=== Deluge 1.3.6 (25 Feburary 2013) ===
==== Core ====
* Catch & log KeyError when removing a torrent from the queued torrents set
@@ -118,6 +126,11 @@
==== Execute ====
* Fix execute plugin not working with unicode torrent names
+==== Extractor ====
+ * Add Windows support, using 7-zip
+ * Added support for more extensions
+ * Disabled extracting 'Move Completed' torrents due to race condition
+
=== Deluge 1.3.5 (09 April 2012) ===
==== GtkUI ====
* Modified fix for #1957, keyerror with non-acsii columns
diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/core.py b/deluge/plugins/Extractor/deluge/plugins/extractor/core.py
index e2ae8c821..9ba4e0e19 100644
--- a/deluge/plugins/Extractor/deluge/plugins/extractor/core.py
+++ b/deluge/plugins/Extractor/deluge/plugins/extractor/core.py
@@ -101,7 +101,7 @@ else:
if not which(cmd):
for k,v in EXTRACT_COMMANDS.items():
if cmd in v[0]:
- log.error("%s not found, disabling support for %s", cmd, k)
+ log.warning("%s not found, disabling support for %s", cmd, k)
del EXTRACT_COMMANDS[k]
if not EXTRACT_COMMANDS:
@@ -128,12 +128,11 @@ class Core(CorePluginBase):
tid_status = tid.get_status(["save_path", "move_completed", "name"])
if tid_status["move_completed"]:
- log.error("Cannot extract torrents with 'Move Completed' enabled")
+ log.warning("Cannot extract torrents with 'Move Completed' enabled")
return
files = tid.get_files()
for f in files:
- cmd = ''
file_root, file_ext = os.path.splitext(f["path"])
file_ext_sec = os.path.splitext(file_root)[1]
if file_ext_sec and file_ext_sec + file_ext in EXTRACT_COMMANDS:
@@ -169,11 +168,10 @@ class Core(CorePluginBase):
log.error("Extract failed: %s (%s)", fpath, torrent_id)
# Run the command and add some callbacks
- if cmd:
- log.debug("Extracting %s with %s %s to %s", fpath, cmd[0], cmd[1], dest)
- d = getProcessValue(cmd[0], cmd[1].split() + [str(fpath)], {}, str(dest))
- d.addCallback(on_extract_success, torrent_id, fpath)
- d.addErrback(on_extract_failed, torrent_id, fpath)
+ log.debug("Extracting %s with %s %s to %s", fpath, cmd[0], cmd[1], dest)
+ d = getProcessValue(cmd[0], cmd[1].split() + [str(fpath)], {}, str(dest))
+ d.addCallback(on_extract_success, torrent_id, fpath)
+ d.addErrback(on_extract_failed, torrent_id, fpath)
@export
def set_config(self, config):
diff --git a/deluge/plugins/Extractor/setup.py b/deluge/plugins/Extractor/setup.py
index 09e01dbc3..0a2beedc9 100644
--- a/deluge/plugins/Extractor/setup.py
+++ b/deluge/plugins/Extractor/setup.py
@@ -42,11 +42,20 @@ from setuptools import setup, find_packages
__plugin_name__ = "Extractor"
__author__ = "Andrew Resch"
__author_email__ = "andrewresch@gmail.com"
-__version__ = "0.2"
+__version__ = "0.3"
__url__ = "http://deluge-torrent.org"
__license__ = "GPLv3"
-__description__ = "Extract files upon completion"
-__long_description__ = """"""
+__description__ = "Extract files upon torrent completion"
+__long_description__ = """
+Extract files upon torrent completion
+
+Supports: .rar, .tar, .zip, .7z .tar.gz, .tgz, .tar.bz2, .tbz .tar.lzma, .tlz, .tar.xz, .txz
+
+Windows support: .rar, .zip, .tar, .7z, .xz, .lzma
+( Requires 7-zip installed: http://www.7-zip.org/ )
+
+Note: Will not extract with 'Move Completed' enabled
+"""
__pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
setup(