diff options
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/Extractor.py (renamed from module/plugins/internal/AbstractExtractor.py) | 9 | ||||
| -rw-r--r-- | module/plugins/internal/UnRar.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/UnZip.py | 6 |
4 files changed, 12 insertions, 13 deletions
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index 8b3b4e310..af78ffc93 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -51,14 +51,14 @@ if os.name != "nt": from pwd import getpwnam from module.plugins.Hook import Hook, threaded, Expose -from module.plugins.internal.AbstractExtractor import ArchiveError, CRCError, PasswordError +from module.plugins.internal.Extractor import ArchiveError, CRCError, PasswordError from module.utils import save_join, uniqify class ExtractArchive(Hook): __name__ = "ExtractArchive" __type__ = "hook" - __version__ = "1.01" + __version__ = "1.02" __config__ = [("activated" , "bool" , "Activated" , True ), ("fullpath" , "bool" , "Extract full path" , True ), diff --git a/module/plugins/internal/AbstractExtractor.py b/module/plugins/internal/Extractor.py index 310897d4e..0b2462dac 100644 --- a/module/plugins/internal/AbstractExtractor.py +++ b/module/plugins/internal/Extractor.py @@ -12,11 +12,11 @@ class PasswordError(Exception): pass -class AbtractExtractor: - __name__ = "AbtractExtractor" - __version__ = "0.12" +class Extractor: + __name__ = "Extractor" + __version__ = "0.13" - __description__ = """Abtract extractor plugin""" + __description__ = """Base extractor plugin""" __license__ = "GPLv3" __authors__ = [("RaNaN", "ranan@pyload.org"), ("Walter Purcaro", "vuolter@gmail.com")] @@ -124,7 +124,6 @@ class AbtractExtractor: :raises ArchiveError :return: """ - self.setPassword(password) raise NotImplementedError diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py index b70bf3257..572fe95b9 100644 --- a/module/plugins/internal/UnRar.py +++ b/module/plugins/internal/UnRar.py @@ -8,7 +8,7 @@ from os.path import basename, dirname, join from string import digits from subprocess import Popen, PIPE -from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError +from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError from module.utils import save_join, decode @@ -20,9 +20,9 @@ def renice(pid, value): print "Renice failed" -class UnRar(AbtractExtractor): +class UnRar(Extractor): __name__ = "UnRar" - __version__ = "1.00" + __version__ = "1.01" __description__ = """Rar extractor plugin""" __license__ = "GPLv3" diff --git a/module/plugins/internal/UnZip.py b/module/plugins/internal/UnZip.py index 875a0ec09..5ec56cbdf 100644 --- a/module/plugins/internal/UnZip.py +++ b/module/plugins/internal/UnZip.py @@ -5,12 +5,12 @@ from __future__ import with_statement import sys import zipfile -from module.plugins.internal.AbstractExtractor import AbtractExtractor, ArchiveError, CRCError, PasswordError +from module.plugins.internal.Extractor import Extractor, ArchiveError, CRCError, PasswordError -class UnZip(AbtractExtractor): +class UnZip(Extractor): __name__ = "UnZip" - __version__ = "1.00" + __version__ = "1.01" __description__ = """Zip extractor plugin""" __license__ = "GPLv3" |