diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-11 01:04:09 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-10-11 01:04:09 +0200 |
| commit | c3b3f3ea5c813edbe3e6941c535c78ad494244ee (patch) | |
| tree | 6a76a01cdf3d5fe678e02618bdbe7d0c5ce8ca8c /module/plugins/internal/MultiHoster.py | |
| parent | Fix https://github.com/pyload/pyload/issues/2002 (diff) | |
| download | pyload-c3b3f3ea5c813edbe3e6941c535c78ad494244ee.tar.xz | |
Fix https://github.com/pyload/pyload/issues/1998
Fix https://github.com/pyload/pyload/issues/1999
Fix https://github.com/pyload/pyload/issues/2001
Diffstat (limited to 'module/plugins/internal/MultiHoster.py')
| -rw-r--r-- | module/plugins/internal/MultiHoster.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/module/plugins/internal/MultiHoster.py b/module/plugins/internal/MultiHoster.py index 314bc6f92..5655571b8 100644 --- a/module/plugins/internal/MultiHoster.py +++ b/module/plugins/internal/MultiHoster.py @@ -7,13 +7,14 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo, r class MultiHoster(SimpleHoster): - __name = "MultiHoster" + __name__ = "MultiHoster" __type__ = "hoster" __version__ = "0.53" __status__ = "testing" __pattern__ = r'^unmatchable$' - __config__ = [("use_premium" , "bool", "Use premium account if available" , True), + __config__ = [("activated" , "bool", "Activated" , True), + ("use_premium" , "bool", "Use premium account if available" , True), ("fallback_premium", "bool", "Fallback to free download if premium fails", True), ("chk_filesize" , "bool", "Check file size" , True), ("revertfailed" , "bool", "Revert to standard download if fails" , True)] @@ -30,7 +31,7 @@ class MultiHoster(SimpleHoster): def init(self): - self.PLUGIN_NAME = self.pyload.pluginManager.hosterPlugins[self.__name__]['name'] + self.PLUGIN_NAME = self.pyload.pluginManager.hosterPlugins[self.classname]['name'] def _log(self, level, plugintype, pluginname, messages): @@ -48,7 +49,7 @@ class MultiHoster(SimpleHoster): def prepare(self): #@TODO: Recheck in 0.4.10 - plugin = self.pyload.pluginManager.hosterPlugins[self.__name__] + plugin = self.pyload.pluginManager.hosterPlugins[self.classname] name = plugin['name'] module = plugin['module'] klass = getattr(module, name) @@ -56,7 +57,7 @@ class MultiHoster(SimpleHoster): self.get_info = klass.get_info if self.DIRECT_LINK is None: - direct_dl = self.__pattern != r'^unmatchable$' and re.match(self.__pattern, self.pyfile.url) + direct_dl = self.__pattern__ != r'^unmatchable$' and re.match(self.__pattern__, self.pyfile.url) else: direct_dl = self.DIRECT_LINK @@ -105,8 +106,8 @@ class MultiHoster(SimpleHoster): self.restart(premium=False) elif self.get_config("revertfailed", True) and \ - self.pyload.pluginManager.hosterPlugins[self.__name__].get('new_module'): - hdict = self.pyload.pluginManager.hosterPlugins[self.__name__] + self.pyload.pluginManager.hosterPlugins[self.classname].get('new_module'): + hdict = self.pyload.pluginManager.hosterPlugins[self.classname] tmp_module = hdict['new_module'] tmp_name = hdict['new_name'] |