diff options
| -rw-r--r-- | module/plugins/hooks/ClickAndLoad.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/ExtractArchive.py | 12 | ||||
| -rw-r--r-- | module/plugins/hooks/FreeWayMe.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/JustPremium.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/CaptchaService.py | 6 | ||||
| -rw-r--r-- | module/plugins/internal/Extractor.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/SevenZip.py | 2 | ||||
| -rw-r--r-- | module/plugins/internal/UnRar.py | 2 |
8 files changed, 18 insertions, 14 deletions
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py index 6691bb1fe..5b21aec96 100644 --- a/module/plugins/hooks/ClickAndLoad.py +++ b/module/plugins/hooks/ClickAndLoad.py @@ -53,7 +53,7 @@ class ClickAndLoad(Hook): @threaded def proxy(self, ip, webport, cnlport): - self.logInfo(_("Proxy listening on %s:%s") % (ip, cnlport)) + self.logInfo(_("Proxy listening on %s:%s") % (ip or "0.0.0.0", cnlport)) self.manager.startThread(self._server, ip, webport, cnlport) lock = Lock() lock.acquire() diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py index dc0ee3f41..c9e43eaaf 100644 --- a/module/plugins/hooks/ExtractArchive.py +++ b/module/plugins/hooks/ExtractArchive.py @@ -327,10 +327,10 @@ class ExtractArchive(Hook): if recursive and os.path.isfile(file): new_files_ids.append((filename, fid, os.path.dirname(filename))) # append as new target - + pyfile = self.core.files.getFile(fid) self.manager.dispatchEvent("archive_extracted", pyfile, archive.out, archive.filename, new_files) - + files_ids = new_files_ids # also check extracted files if matched: @@ -381,7 +381,7 @@ class ExtractArchive(Hook): pyfile.setProgress(100) else: archive.check(pw) - + self.addPassword(pw) break @@ -389,7 +389,7 @@ class ExtractArchive(Hook): if not encrypted: self.logInfo(name, _("Password protected")) encrypted = True - + except CRCError, e: self.logDebug(name, e) self.logInfo(name, _("CRC Error")) @@ -407,9 +407,9 @@ class ExtractArchive(Hook): self.addPassword(pw) break - + raise CRCError("Archive damaged") - + except ArchiveError, e: raise ArchiveError(e) diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMe.py index f819f730d..4e79783bb 100644 --- a/module/plugins/hooks/FreeWayMe.py +++ b/module/plugins/hooks/FreeWayMe.py @@ -29,6 +29,6 @@ class FreeWayMe(MultiHook): self.logDebug("AccountInfo available - Get HosterList with User Pass") (user, data) = self.account.selectAccount() hostis = self.getURL("https://www.free-way.me/ajax/jd.php", get={"id": 3, "user": user, "pass": data['password']}).replace("\"", "").strip() - + self.logDebug("hosters: %s" % hostis) return [x.strip() for x in hostis.split(",") if x.strip()] diff --git a/module/plugins/hooks/JustPremium.py b/module/plugins/hooks/JustPremium.py index b70d8dd2c..30a72c70f 100644 --- a/module/plugins/hooks/JustPremium.py +++ b/module/plugins/hooks/JustPremium.py @@ -12,7 +12,7 @@ class JustPremium(Hook): __config__ = [("excluded", "str", "Exclude hosters (comma separated)", "")] - __description__ = """Remove all not premium links from urls added""" + __description__ = """Remove not-premium links from added urls""" __license__ = "GPLv3" __authors__ = [("mazleu", "mazleica@gmail.com"), ("Walter Purcaro", "vuolter@gmail.com"), 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 |