summaryrefslogtreecommitdiffstats
path: root/module/plugins/internal
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/internal')
-rw-r--r--module/plugins/internal/CaptchaService.py6
-rw-r--r--module/plugins/internal/Extractor.py4
-rw-r--r--module/plugins/internal/SevenZip.py2
-rw-r--r--module/plugins/internal/UnRar.py2
4 files changed, 9 insertions, 5 deletions
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 6f2c8e06d..fcb8f0095 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -14,6 +14,7 @@ from module.plugins.Plugin import Base
#@TODO: Extend (new) Plugin class; remove all `html` args
class CaptchaService(Base):
__name__ = "CaptchaService"
+ __type__ = "captcha"
__version__ = "0.25"
__description__ = """Base captcha service plugin"""
@@ -43,6 +44,7 @@ class CaptchaService(Base):
class ReCaptcha(CaptchaService):
__name__ = "ReCaptcha"
+ __type__ = "captcha"
__version__ = "0.14"
__description__ = """ReCaptcha captcha service plugin"""
@@ -239,9 +241,9 @@ class ReCaptcha(CaptchaService):
return result, None
-
class AdsCaptcha(CaptchaService):
__name__ = "AdsCaptcha"
+ __type__ = "captcha"
__version__ = "0.08"
__description__ = """AdsCaptcha captcha service plugin"""
@@ -314,6 +316,7 @@ class AdsCaptcha(CaptchaService):
class SolveMedia(CaptchaService):
__name__ = "SolveMedia"
+ __type__ = "captcha"
__version__ = "0.12"
__description__ = """SolveMedia captcha service plugin"""
@@ -422,6 +425,7 @@ class SolveMedia(CaptchaService):
class AdYouLike(CaptchaService):
__name__ = "AdYouLike"
+ __type__ = "captcha"
__version__ = "0.05"
__description__ = """AdYouLike captcha service plugin"""
diff --git a/module/plugins/internal/Extractor.py b/module/plugins/internal/Extractor.py
index 8bf1875cf..ee62ebcb7 100644
--- a/module/plugins/internal/Extractor.py
+++ b/module/plugins/internal/Extractor.py
@@ -99,11 +99,11 @@ class Extractor:
:raises ArchiveError
"""
raise NotImplementedError
-
+
def test(self):
"""Testing with Extractors buildt-in method
Raises error if password is needed, integrity is questionable or else.
-
+
:raises PasswordError
:raises CRCError
:raises ArchiveError
diff --git a/module/plugins/internal/SevenZip.py b/module/plugins/internal/SevenZip.py
index 8a3c67f0e..a3df52559 100644
--- a/module/plugins/internal/SevenZip.py
+++ b/module/plugins/internal/SevenZip.py
@@ -46,7 +46,7 @@ class SevenZip(UnRar):
else:
p = Popen([cls.CMD], stdout=PIPE, stderr=PIPE)
out, err = p.communicate()
-
+
m = cls.re_version.search(out)
cls.VERSION = m.group(1) if m else '(version unknown)'
diff --git a/module/plugins/internal/UnRar.py b/module/plugins/internal/UnRar.py
index 7a02ba6bd..eb969bb60 100644
--- a/module/plugins/internal/UnRar.py
+++ b/module/plugins/internal/UnRar.py
@@ -90,7 +90,7 @@ class UnRar(Extractor):
p = self.call_cmd("t", "-v", fs_encode(self.filename), password=password)
self._progress(p)
err = p.stderr.read().strip()
-
+
if self.re_wrongpwd.search(err):
raise PasswordError