From 411d8031c3ce4547b9f165761f74f0067bea7e7b Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 8 Jun 2016 08:26:04 +0200 Subject: [ExtractArchive] Fix --- module/plugins/internal/UnRar.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/plugins/internal/UnRar.py') diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index 3b1d7b290..b91f2455b 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -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,9 @@ class UnRar(Extractor): if p.returncode: raise ArchiveError(_("Process return code: %d") % p.returncode) + self.files = self.list(password) + return self.files + def chunks(self): dir, name = os.path.split(self.filename) -- cgit v1.2.3 From 8d550644b7547114327752aa840f032352a661f1 Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 8 Jun 2016 08:37:39 +0200 Subject: [ExtractArchive] Maintain archive.files property --- module/plugins/internal/UnRar.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'module/plugins/internal/UnRar.py') diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index b91f2455b..1d2e79d58 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -155,8 +155,7 @@ class UnRar(Extractor): if p.returncode: raise ArchiveError(_("Process return code: %d") % p.returncode) - self.files = self.list(password) - return self.files + return self.list(password) def chunks(self): @@ -195,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): -- cgit v1.2.3 From 78e1af94a999dc007f80749cf550654c8f625a23 Mon Sep 17 00:00:00 2001 From: Olivier Date: Sat, 11 Jun 2016 21:09:29 +0200 Subject: Increment version number --- module/plugins/internal/UnRar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/UnRar.py') diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index 1d2e79d58..e22120e94 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""" -- cgit v1.2.3 From 9049742ba685fba578eb7e63bfea39c318bdc2b2 Mon Sep 17 00:00:00 2001 From: Olivier Date: Wed, 15 Jun 2016 08:31:10 +0200 Subject: UnRar FIX file exclusion not working --- module/plugins/internal/UnRar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/internal/UnRar.py') diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index e22120e94..18416a4fe 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -209,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") -- cgit v1.2.3