Update Extractor plugin description, version and modify log levels

This commit is contained in:
Calum Lind 2013-03-26 19:39:47 +00:00
commit 937419bfcd
3 changed files with 31 additions and 11 deletions

View file

@ -42,6 +42,14 @@
would keep updating one call after the other. If the value changed, the would keep updating one call after the other. If the value changed, the
timer is now stopped and restarted using the new value. 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) === === Deluge 1.3.6 (25 Feburary 2013) ===
==== Core ==== ==== Core ====
* Catch & log KeyError when removing a torrent from the queued torrents set * Catch & log KeyError when removing a torrent from the queued torrents set
@ -118,6 +126,11 @@
==== Execute ==== ==== Execute ====
* Fix execute plugin not working with unicode torrent names * 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) === === Deluge 1.3.5 (09 April 2012) ===
==== GtkUI ==== ==== GtkUI ====
* Modified fix for #1957, keyerror with non-acsii columns * Modified fix for #1957, keyerror with non-acsii columns

View file

@ -101,7 +101,7 @@ else:
if not which(cmd): if not which(cmd):
for k,v in EXTRACT_COMMANDS.items(): for k,v in EXTRACT_COMMANDS.items():
if cmd in v[0]: 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] del EXTRACT_COMMANDS[k]
if not EXTRACT_COMMANDS: if not EXTRACT_COMMANDS:
@ -128,12 +128,11 @@ class Core(CorePluginBase):
tid_status = tid.get_status(["save_path", "move_completed", "name"]) tid_status = tid.get_status(["save_path", "move_completed", "name"])
if tid_status["move_completed"]: if tid_status["move_completed"]:
log.error("Cannot extract torrents with 'Move Completed' enabled") log.warning("Cannot extract torrents with 'Move Completed' enabled")
return return
files = tid.get_files() files = tid.get_files()
for f in files: for f in files:
cmd = ''
file_root, file_ext = os.path.splitext(f["path"]) file_root, file_ext = os.path.splitext(f["path"])
file_ext_sec = os.path.splitext(file_root)[1] file_ext_sec = os.path.splitext(file_root)[1]
if file_ext_sec and file_ext_sec + file_ext in EXTRACT_COMMANDS: if file_ext_sec and file_ext_sec + file_ext in EXTRACT_COMMANDS:
@ -169,7 +168,6 @@ class Core(CorePluginBase):
log.error("Extract failed: %s (%s)", fpath, torrent_id) log.error("Extract failed: %s (%s)", fpath, torrent_id)
# Run the command and add some callbacks # Run the command and add some callbacks
if cmd:
log.debug("Extracting %s with %s %s to %s", fpath, cmd[0], cmd[1], dest) 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 = getProcessValue(cmd[0], cmd[1].split() + [str(fpath)], {}, str(dest))
d.addCallback(on_extract_success, torrent_id, fpath) d.addCallback(on_extract_success, torrent_id, fpath)

View file

@ -42,11 +42,20 @@ from setuptools import setup, find_packages
__plugin_name__ = "Extractor" __plugin_name__ = "Extractor"
__author__ = "Andrew Resch" __author__ = "Andrew Resch"
__author_email__ = "andrewresch@gmail.com" __author_email__ = "andrewresch@gmail.com"
__version__ = "0.2" __version__ = "0.3"
__url__ = "http://deluge-torrent.org" __url__ = "http://deluge-torrent.org"
__license__ = "GPLv3" __license__ = "GPLv3"
__description__ = "Extract files upon completion" __description__ = "Extract files upon torrent completion"
__long_description__ = """""" __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/*"]} __pkg_data__ = {"deluge.plugins."+__plugin_name__.lower(): ["template/*", "data/*"]}
setup( setup(