Merge pull request #2500 from robbi/fix/#2168

ExtractArchive Fix/#2168

1 files changed, 7 insertions, 4 deletions

diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 3b1d7b290..18416a4fe 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -12,7 +12,7 @@ from module.plugins.internal.misc import decode, encode, fsjoin, renice
 class UnRar(Extractor):
     __name__    = "UnRar"
     __type__    = "extractor"
-    __version__ = "1.31"
+    __version__ = "1.32"
     __status__  = "testing"
 
     __description__ = """RAR extractor plugin"""
@@ -123,7 +123,7 @@ class UnRar(Extractor):
                 break
             #: Reading a percentage sign -> set progress and restart
             if c == "%":
-                self.notifyprogress(int(s))
+                self.pyfile.setProgress(int(s))
                 s = ""
             #: Not reading a digit -> therefore restart
             elif c not in string.digits:
@@ -155,6 +155,8 @@ class UnRar(Extractor):
         if p.returncode:
             raise ArchiveError(_("Process return code: %d") % p.returncode)
 
+        return self.list(password)
+
 
     def chunks(self):
         dir, name = os.path.split(self.filename)
@@ -192,7 +194,8 @@ class UnRar(Extractor):
             for f in decode(out).splitlines():
                 result.add(fsjoin(self.dest, f.strip()))
 
-        return list(result)
+        self.files = list(result)
+        return self.files
 
 
     def call_cmd(self, command, *xargs, **kwargs):
@@ -206,7 +209,7 @@ 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")