From 59d2ad3541bf133ddd69fd3b7c633e7e226e4829 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Mon, 21 Sep 2015 01:08:35 +0200
Subject: Spare improvements and fixes

---
 module/plugins/internal/Extractor.py | 56 +++++++++++-------------------------
 1 file changed, 16 insertions(+), 40 deletions(-)

(limited to 'module/plugins/internal/Extractor.py')

diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 7f5212090..f21fe473c 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -22,7 +22,7 @@ class PasswordError(Exception):
 class Extractor(Plugin):
     __name__    = "Extractor"
     __type__    = "extractor"
-    __version__ = "0.33"
+    __version__ = "0.34"
     __status__  = "testing"
 
     __description__ = """Base extractor plugin"""
@@ -42,16 +42,10 @@ class Extractor(Plugin):
         return any(name.endswith(ext) for ext in cls.EXTENSIONS)
 
 
-    @classmethod
-    def is_multipart(cls, filename):
-        return False
-
-
     @classmethod
     def find(cls):
         """
         Check if system statisfy dependencies
-        :return: boolean
         """
         pass
 
@@ -72,9 +66,15 @@ class Extractor(Plugin):
                 if pname not in processed:
                     processed.append(pname)
                     targets.append((fname, id, fout))
+
         return targets
 
 
+    @property
+    def target(self):
+        return fs_encode(self.filename)
+
+
     def __init__(self, plugin, filename, out,
                  fullpath=True,
                  overwrite=False,
@@ -119,53 +119,29 @@ class Extractor(Plugin):
                                 (self.__name__,) + messages)
 
 
-    def check(self):
+    def verify(self, password=None):
         """
-        Quick Check by listing content of archive.
-        Raises error if password is needed, integrity is questionable or else.
-
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
+        Testing with Extractors built-in method
+        Raise error if password is needed, integrity is questionable or else
         """
-        raise NotImplementedError
-
-
-    def verify(self):
-        """
-        Testing with Extractors buildt-in method
-        Raises error if password is needed, integrity is questionable or else.
-
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
-        """
-        raise NotImplementedError
+        pass
 
 
     def repair(self):
-        return None
+        return False
 
 
     def extract(self, password=None):
         """
-        Extract the archive. Raise specific errors in case of failure.
-
-        :param progress: Progress function, call this to update status
-        :param password password to use
-        :raises PasswordError
-        :raises CRCError
-        :raises ArchiveError
-        :return:
+        Extract the archive
+        Raise specific errors in case of failure
         """
         raise NotImplementedError
 
 
-    def get_delete_files(self):
+    def items(self):
         """
-        Return list of files to delete, do *not* delete them here.
-
-        :return: List with paths of files to delete
+        Return list of archive parts
         """
         return [self.filename]
 
-- 
cgit v1.2.3