From df143e902d00903f16cf32174948f636bda56e4c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 8 Jan 2015 22:58:32 +0100 Subject: "New Year" Update: internal plugins --- module/plugins/internal/MultiHoster.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'module/plugins/internal/MultiHoster.py') diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 60320399a..ae06eaf4b 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.29" + __version__ = "0.30" __pattern__ = r'^unmatchable$' @@ -17,12 +17,14 @@ class MultiHoster(SimpleHoster): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] + CHECK_TRAFFIC = True LOGIN_ACCOUNT = True def setup(self): - self.chunkLimit = 1 - self.multiDL = self.premium + self.chunkLimit = 1 + self.multiDL = bool(self.account) + self.resumeDownload = self.premium def prepare(self): @@ -76,7 +78,8 @@ class MultiHoster(SimpleHoster): if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as premium download") self.handlePremium() - else: + + elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as free download") self.handleFree() @@ -84,11 +87,11 @@ class MultiHoster(SimpleHoster): self.checkFile() - def handlePremium(self, pyfile=None): + def handlePremium(self, pyfile): return self.handleFree(pyfile) - def handleFree(self, pyfile=None): + def handleFree(self, pyfile): if self.premium: raise NotImplementedError else: -- cgit v1.2.3 From ea2d07843d369d8b8fd2aa02930bf549ce94a661 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 9 Jan 2015 03:25:42 +0100 Subject: Spare fixes --- module/plugins/internal/MultiHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/MultiHoster.py') diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index ae06eaf4b..b6eaf34aa 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -77,11 +77,11 @@ class MultiHoster(SimpleHoster): if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as premium download") - self.handlePremium() + self.handlePremium(pyfile) elif not self.LOGIN_ACCOUNT or (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as free download") - self.handleFree() + self.handleFree(pyfile) self.downloadLink(self.link) self.checkFile() -- cgit v1.2.3 From 9414b30e931b5659786035972690d14788b49826 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 15:56:14 +0100 Subject: [MultiHoster] Fix filename recognition --- module/plugins/internal/MultiHoster.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'module/plugins/internal/MultiHoster.py') diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index b6eaf34aa..5011b88a3 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.30" + __version__ = "0.31" __pattern__ = r'^unmatchable$' @@ -52,28 +52,23 @@ class MultiHoster(SimpleHoster): def process(self, pyfile): self.prepare() - try: - module = self.core.pluginManager.hosterPlugins[self.__name__]['module'] - klass = getattr(module, self.__name__) + self.wait(5) - self.logDebug("File info (BEFORE): %s" % self.info) - self.info.update(klass.getInfo(self.pyfile.url, self.html)) - self.logDebug("File info (AFTER): %s" % self.info) + if self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, pyfile.url): + self.checkInfo() - except Exception: + elif not pyfile.name or pyfile.name == pyfile.url: self.checkNameSize() - else: - self.checkNameSize(getinfo=False) - self.checkStatus(getinfo=False) - if self.directDL: self.logDebug("Looking for direct download link...") self.handleDirect(pyfile) if not self.link and not self.lastDownload: self.preload() - self.checkInfo() + + self.checkErrors() + self.checkStatus(getinfo=False) if self.premium and (not self.CHECK_TRAFFIC or self.checkTrafficLeft()): self.logDebug("Handled as premium download") -- cgit v1.2.3 From 4b04c8d5761e77fc77207dcac7dc9a34b325877d Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 19:51:36 +0100 Subject: [MultiHoster] Use content-disposition --- module/plugins/internal/MultiHoster.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'module/plugins/internal/MultiHoster.py') diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 5011b88a3..eca7e9ecd 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): __name__ = "MultiHoster" __type__ = "hoster" - __version__ = "0.31" + __version__ = "0.32" __pattern__ = r'^unmatchable$' @@ -52,14 +52,9 @@ class MultiHoster(SimpleHoster): def process(self, pyfile): self.prepare() - self.wait(5) - if self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, pyfile.url): self.checkInfo() - elif not pyfile.name or pyfile.name == pyfile.url: - self.checkNameSize() - if self.directDL: self.logDebug("Looking for direct download link...") self.handleDirect(pyfile) @@ -81,6 +76,13 @@ class MultiHoster(SimpleHoster): self.downloadLink(self.link) self.checkFile() + + #@TODO: Remove in 0.4.10 + def downloadLink(self, link): + if link and isinstance(link, basestring): + self.correctCaptcha() + self.download(link, disposition=True) + def handlePremium(self, pyfile): return self.handleFree(pyfile) -- cgit v1.2.3 From aac6063859b9036612e86fb4029dc010d5c5d1e0 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 10 Jan 2015 19:53:09 +0100 Subject: Code cosmetics --- module/plugins/internal/MultiHoster.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/internal/MultiHoster.py') diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index eca7e9ecd..8ca4d427f 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -76,13 +76,13 @@ class MultiHoster(SimpleHoster): self.downloadLink(self.link) self.checkFile() - + #@TODO: Remove in 0.4.10 def downloadLink(self, link): if link and isinstance(link, basestring): self.correctCaptcha() self.download(link, disposition=True) - + def handlePremium(self, pyfile): return self.handleFree(pyfile) -- cgit v1.2.3