Update Extractor (3)

1 files changed, 13 insertions, 29 deletions

diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 126958829..2f4dc5565 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.05"
+    __version__ = "0.06"
 
     __description__ = """7-Zip extractor plugin"""
     __license__     = "GPLv3"
@@ -89,40 +89,24 @@ class SevenZip(UnRar):
 
         renice(p.pid, self.renice)
 
-        progressstring = ""
-        while True:
-            c = p.stdout.read(1)
-            # quit loop on eof
-            if not c:
-                break
-            # reading a percentage sign -> set progress and restart
-            if c == '%':
-                self.notifyProgress(int(progressstring))
-                progressstring = ""
-            # not reading a digit -> therefore restart
-            elif c not in digits:
-                progressstring = ""
-            # add digit to progressstring
-            else:
-                progressstring += c
-
-        # retrieve stderr
-        err = p.stderr.read()
-
-        if self.re_wrongpwd.search(err):
-            raise PasswordError
+        # communicate and retrieve stderr
+        self._progress(p)
+        err = p.stderr.read().strip()
 
-        elif self.re_wrongcrc.search(err):
-            raise CRCError(err)
+        if err:
+            if self.re_wrongpwd.search(err):
+                raise PasswordError
+
+            elif self.re_wrongcrc.search(err):
+                raise CRCError(err)
 
-        elif err.strip():  #: raise error if anything is on stderr
-            raise ArchiveError(err)
+            else:  #: raise error if anything is on stderr
+                raise ArchiveError(err)
 
         if p.returncode > 1:
             raise ArchiveError(_("Process return code: %d") % p.returncode)
 
-        if not self.files:
-            self.files = self.list(password)
+        self.files = self.list(password)
 
 
     def list(self, password=None):