diff --git a/ChangeLog b/ChangeLog index c608d9194..039b1e80b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +=== 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 @@ -75,6 +83,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) === ==== Core ==== * Fix not properly detecting when torrent is at end of queue diff --git a/deluge/plugins/extractor/extractor/core.py b/deluge/plugins/extractor/extractor/core.py index a07a60ed7..b8d4284ba 100644 --- a/deluge/plugins/extractor/extractor/core.py +++ b/deluge/plugins/extractor/extractor/core.py @@ -99,7 +99,7 @@ else: if not which(cmd): for k,v in EXTRACT_COMMANDS.items(): if cmd in v[0]: - log.error("EXTRACTOR: %s not found, disabling support for %s", cmd, k) + log.warning("EXTRACTOR: %s not found, disabling support for %s", cmd, k) del EXTRACT_COMMANDS[k] if not EXTRACT_COMMANDS: @@ -126,12 +126,11 @@ class Core(CorePluginBase): tid_status = tid.get_status(["save_path", "move_completed", "name"]) if tid_status["move_completed"]: - log.error("EXTRACTOR: Cannot extract torrents with 'Move Completed' enabled") + log.warning("EXTRACTOR: 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: @@ -167,11 +166,10 @@ class Core(CorePluginBase): log.error("EXTRACTOR: Extract failed: %s (%s)", fpath, torrent_id) # Run the command and add some callbacks - if cmd: - log.debug("EXTRACTOR: 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("EXTRACTOR: 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 dd3c79fc4..465777bd8 100644 --- a/deluge/plugins/extractor/setup.py +++ b/deluge/plugins/extractor/setup.py @@ -42,11 +42,20 @@ from setuptools import setup __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__ = {__plugin_name__.lower(): ["template/*", "data/*"]} setup(