Update Extractor (4)

3 files changed, 8 insertions, 8 deletions

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 2f4dc5565..96e664573 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.06"
+    __version__ = "0.07"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -138,7 +138,7 @@ class SevenZip(UnRar):
 
         #set a password
         if "password" in kwargs and kwargs["password"]:
-            args.append("-p%s" % kwargs["password"])
+            args.append("-p'%s'" % kwargs["password"])
         else:
             args.append("-p-")
 
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index d378bf167..c1cc0fa31 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.08"
+    __version__ = "1.09"
 
     __description__ = """Rar extractor plugin"""
     __license__     = "GPLv3"
@@ -213,14 +213,14 @@ class UnRar(Extractor):
                 args.append("-or")
 
         for word in self.excludefiles:
-            args.append("-x%s" % word.strip())
+            args.append("-x'%s'" % word.strip())
 
         # assume yes on all queries
         args.append("-y")
 
         # set a password
         if "password" in kwargs and kwargs['password']:
-            args.append("-p%s" % kwargs['password'])
+            args.append("-p'%s'" % kwargs['password'])
         else:
             args.append("-p-")
 
diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py
index 781c47d7b..f81c235c1 100644
--- a/module/plugins/internal/UnZip.py
+++ b/module/plugins/internal/UnZip.py
@@ -50,10 +50,10 @@ class UnZip(Extractor):
 
                 badfile = z.testzip()
 
-                if not badfile:
-                    z.extractall(self.out)
-                else:
+                if badfile:
                     raise CRCError(badfile)
+                else:
+                    z.extractall(self.out)
 
         except (zipfile.BadZipfile, zipfile.LargeZipFile), e:
             raise ArchiveError(e)