summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoadin <tbkizle@gmail.com>2014-09-23 14:23:42 -0400
committerCalum Lind <calumlind+deluge@gmail.com>2014-09-24 22:44:18 +0100
commit294ad9fae1e7657829bb18066e2978360f5dd53b (patch)
tree69bc9ef3a2b3ed8e5ba91270a3672d4124da487c
parentf1fe593fd6a059fc18539c57f0b4ef995d6f91f1 (diff)
downloaddeluge-294ad9fae1e7657829bb18066e2978360f5dd53b.tar.gz
deluge-294ad9fae1e7657829bb18066e2978360f5dd53b.tar.bz2
deluge-294ad9fae1e7657829bb18066e2978360f5dd53b.zip
[Extractor] Add Finding Win 7z Path via Registry
-rw-r--r--deluge/plugins/extractor/extractor/core.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/deluge/plugins/extractor/extractor/core.py b/deluge/plugins/extractor/extractor/core.py
index ff654b819..d3c0e047d 100644
--- a/deluge/plugins/extractor/extractor/core.py
+++ b/deluge/plugins/extractor/extractor/core.py
@@ -60,6 +60,17 @@ if windows_check():
'C:\\Program Files\\7-Zip\\7z.exe',
'C:\\Program Files (x86)\\7-Zip\\7z.exe',
]
+
+ import _winreg
+ try:
+ hkey = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, "Software\\7-Zip")
+ except WindowsError:
+ pass
+ else:
+ win_7z_path = os.path.join(_winreg.QueryValueEx(hkey, "Path")[0], "7z.exe")
+ _winreg.CloseKey(hkey)
+ win_7z_exes.insert(1, win_7z_path)
+
switch_7z = "x -y"
## Future suport:
## 7-zip cannot extract tar.* with single command.