summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-25 23:13:23 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2015-02-25 23:13:23 +0100
commit80be0191a2390924162c12812f656c90d6b3cf85 (patch)
tree53073ba0419d8ddd16cee891fdafa6875f971f03
parentMerge pull request #1212 from immenz/stable (diff)
parent* [ExtractArchive] fixes 'Could not activate UnRar' (diff)
downloadpyload-80be0191a2390924162c12812f656c90d6b3cf85.tar.xz
Merge pull request #1213 from immenz/dev_extract
[ExtractArchive] fixes 'Could not activate UnRar'
-rw-r--r--module/plugins/internal/SevenZip.py5
-rw-r--r--module/plugins/internal/UnRar.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index bfa7f3943..8a3c67f0e 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -11,7 +11,7 @@ from module.utils import fs_encode, save_join
class SevenZip(UnRar):
__name__ = "SevenZip"
- __version__ = "0.09"
+ __version__ = "0.10"
__description__ = """7-Zip extractor plugin"""
__license__ = "GPLv3"
@@ -47,7 +47,8 @@ class SevenZip(UnRar):
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
out, err = p.communicate()
- cls.VERSION = cls.re_version.search(out).group(1)
+ m = cls.re_version.search(out)
+ cls.VERSION = m.group(1) if m else '(version unknown)'
return True
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index ca8fdd326..7a02ba6bd 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -22,7 +22,7 @@ def renice(pid, value):
class UnRar(Extractor):
__name__ = "UnRar"
- __version__ = "1.14"
+ __version__ = "1.15"
__description__ = """Rar extractor plugin"""
__license__ = "GPLv3"
@@ -70,7 +70,8 @@ class UnRar(Extractor):
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
out, err = p.communicate()
- cls.VERSION = cls.re_version.search(out).group(1)
+ m = cls.re_version.search(out)
+ cls.VERSION = m.group(1) if m else '(version unknown)'
return True