codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#2784] [Execute] Escape ampersand in args for Windows 

Due to the nature of passing a command and args to cmd.exe and then
to a batch file in Windows any ampersands in execute args need to be
double-escaped so prefixing with tripe-caret (^^^&) is the fix for this.
This commit is contained in:
Calum Lind 2016-06-29 23:12:55 +01:00
parent 34e12fcb38
commit 5f92810f76
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deluge/plugins/execute/execute/core.py
View File

@ -44,7 +44,7 @@ import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
from deluge.core.rpcserver import export from deluge.core.rpcserver import export
from deluge.event import DelugeEvent from deluge.event import DelugeEvent
from deluge.common import utf8_encoded from deluge.common import utf8_encoded, windows_check
DEFAULT_CONFIG = { DEFAULT_CONFIG = {
@ -140,9 +140,15 @@ class Core(CorePluginBase):
if command[EXECUTE_EVENT] == event: if command[EXECUTE_EVENT] == event:
command = os.path.expandvars(command[EXECUTE_COMMAND]) command = os.path.expandvars(command[EXECUTE_COMMAND])
command = os.path.expanduser(command) command = os.path.expanduser(command)
cmd_args = [torrent_id, torrent_name, save_path]
if windows_check:
# Escape ampersand on windows (see #2784)
cmd_args = [arg.replace("&", "^^^&") for arg in cmd_args]
if os.path.isfile(command) and os.access(command, os.X_OK): if os.path.isfile(command) and os.access(command, os.X_OK):
log.debug("[execute] Running %s", command) log.debug("[execute] Running %s with args: %s", command, cmd_args)
d = getProcessOutputAndValue(command, (torrent_id, torrent_name, save_path), env=os.environ) d = getProcessOutputAndValue(command, cmd_args, env=os.environ)
d.addCallback(log_error, command) d.addCallback(log_error, command)
else: else:
log.error("[execute] Execute script not found or not executable") log.error("[execute] Execute script not found or not executable")