diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/Plugin.py | 7 | ||||
| -rw-r--r-- | module/plugins/PluginManager.py | 2 | ||||
| -rw-r--r-- | module/plugins/hooks/SpeedManager.py | 38 |
3 files changed, 3 insertions, 44 deletions
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py index 6650562ea..3da6e5116 100644 --- a/module/plugins/Plugin.py +++ b/module/plugins/Plugin.py @@ -117,8 +117,8 @@ class Plugin(object): def getChunkCount(self): if self.chunkLimit <= 0: - return self.config["general"]["chunks"] - return min(self.config["general"]["chunks"], self.chunkLimit) + return self.config["download"]["chunks"] + return min(self.config["download"]["chunks"], self.chunkLimit) def __call__(self): return self.__name__ @@ -143,9 +143,6 @@ class Plugin(object): else: self.req.clearCookies() - if self.core.config["proxy"]["activated"]: - self.req.add_proxy(None, self.core.config["proxy"]["address"]) - self.pyfile.setStatus("starting") return self.process(self.pyfile) diff --git a/module/plugins/PluginManager.py b/module/plugins/PluginManager.py index 3f11c067b..52712f160 100644 --- a/module/plugins/PluginManager.py +++ b/module/plugins/PluginManager.py @@ -37,7 +37,7 @@ except ImportError: # python 2.5 from module.SafeEval import safe_eval as literal_eval -IGNORE = ["FreakshareNet"] +IGNORE = ["FreakshareNet", "SpeedManager"] #ignore this plugins in homefolder, add deleted plugins here class PluginManager(): diff --git a/module/plugins/hooks/SpeedManager.py b/module/plugins/hooks/SpeedManager.py deleted file mode 100644 index ed90773e8..000000000 --- a/module/plugins/hooks/SpeedManager.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- - -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: RaNaN - @interface-version: 0.1 -""" - -from module.plugins.Hook import Hook -from module.SpeedManager import SpeedManager as SpeedHandler - -class SpeedManager(Hook): - __name__ = "SpeedManager" - __version__ = "0.1" - __description__ = """Limiting the speed if needed""" - __config__ = [("activated", "bool", "Activated", "False"), - ("speed", "int", "Speedlimit in kb/s", "500"), - ("start", "str", "Start-time of speed limiting", "0:00"), - ("end", "str", "End-time of speed limiting", "0:00")] - __author_name__ = ("RaNaN") - __author_mail__ = ("ranan@pyload.org") - - def coreReady(self): - self.speedManager = SpeedHandler(self.core, self) - self.core.log.debug("SpeedManager started") - #@TODO start speed manager when needed
\ No newline at end of file |