From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/hooks/MultiHome.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index a26d139c0..af68fe2bc 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -2,13 +2,13 @@ import time -from module.plugins.Hook import Hook +from module.plugins.internal.Hook import Hook class MultiHome(Hook): __name__ = "MultiHome" __type__ = "hook" - __version__ = "0.12" + __version__ = "0.13" __config__ = [("interfaces", "str", "Interfaces", "None")] -- cgit v1.2.3 From c9144f451b74e4d3cc67935b9e73c662ac870c6e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 15 Jun 2015 07:18:39 +0200 Subject: Hook plugin code cosmetics (2) --- module/plugins/hooks/MultiHome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index af68fe2bc..63c1fee05 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -43,7 +43,7 @@ class MultiHome(Hook): self.interfaces.append(Interface(interface)) - def coreReady(self): + def activate(self): requestFactory = self.core.requestFactory oldGetRequest = requestFactory.getRequest -- cgit v1.2.3 From 5a139055ae658d3a05cbb658cbd66aeae0d01db5 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 15 Jun 2015 21:06:10 +0200 Subject: Spare code cosmetics --- module/plugins/hooks/MultiHome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 63c1fee05..fe7f39a12 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -28,7 +28,7 @@ class MultiHome(Hook): self.parseInterfaces(self.getConfig('interfaces').split(";")) if not self.interfaces: - self.parseInterfaces([self.config['download']['interface']]) + self.parseInterfaces([self.core.config['download']['interface']]) self.setConfig("interfaces", self.toConfig()) -- cgit v1.2.3 From 164512b6a74c94a731fcee7435dce1ccfa2f71e7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 17 Jun 2015 18:29:50 +0200 Subject: Spare code cosmetics --- module/plugins/hooks/MultiHome.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index fe7f39a12..790d5dab3 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -12,7 +12,7 @@ class MultiHome(Hook): __config__ = [("interfaces", "str", "Interfaces", "None")] - __description__ = """Ip address changer""" + __description__ = """IP address changer""" __license__ = "GPLv3" __authors__ = [("mkaay", "mkaay@mkaay.de")] @@ -28,7 +28,7 @@ class MultiHome(Hook): self.parseInterfaces(self.getConfig('interfaces').split(";")) if not self.interfaces: - self.parseInterfaces([self.core.config['download']['interface']]) + self.parseInterfaces([self.core.config.get("download", "interface")]) self.setConfig("interfaces", self.toConfig()) -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/hooks/MultiHome.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 790d5dab3..12a65c601 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -8,7 +8,7 @@ from module.plugins.internal.Hook import Hook class MultiHome(Hook): __name__ = "MultiHome" __type__ = "hook" - __version__ = "0.13" + __version__ = "0.14" __config__ = [("interfaces", "str", "Interfaces", "None")] @@ -25,18 +25,18 @@ class MultiHome(Hook): self.register = {} self.interfaces = [] - self.parseInterfaces(self.getConfig('interfaces').split(";")) + self.parse_interfaces(self.get_config('interfaces').split(";")) if not self.interfaces: - self.parseInterfaces([self.core.config.get("download", "interface")]) - self.setConfig("interfaces", self.toConfig()) + self.parse_interfaces([self.core.config.get("download", "interface")]) + self.set_config("interfaces", self.to_config()) - def toConfig(self): + def to_config(self): return ";".join(i.adress for i in self.interfaces) - def parseInterfaces(self, interfaces): + def parse_interfaces(self, interfaces): for interface in interfaces: if not interface or str(interface).lower() == "none": continue @@ -48,18 +48,18 @@ class MultiHome(Hook): oldGetRequest = requestFactory.getRequest - def getRequest(pluginName, account=None): - iface = self.bestInterface(pluginName, account) + def get_request(pluginName, account=None): + iface = self.best_interface(pluginName, account) if iface: iface.useFor(pluginName, account) requestFactory.iface = lambda: iface.adress - self.logDebug("Using address", iface.adress) + self.log_debug("Using address", iface.adress) return oldGetRequest(pluginName, account) requestFactory.getRequest = getRequest - def bestInterface(self, pluginName, account): + def best_interface(self, pluginName, account): best = None for interface in self.interfaces: if not best or interface.lastPluginAccess(pluginName, account) < best.lastPluginAccess(pluginName, account): @@ -74,13 +74,13 @@ class Interface(object): self.history = {} - def lastPluginAccess(self, pluginName, account): + def last_plugin_access(self, pluginName, account): if (pluginName, account) in self.history: return self.history[(pluginName, account)] return 0 - def useFor(self, pluginName, account): + def use_for(self, pluginName, account): self.history[(pluginName, account)] = time.time() -- cgit v1.2.3 From 9e5d813d7721e351ac02ba72bdc473a7d77ba6b7 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 18 Jul 2015 20:04:36 +0200 Subject: Code cosmetics --- module/plugins/hooks/MultiHome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 12a65c601..7e4b5e583 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -56,7 +56,7 @@ class MultiHome(Hook): self.log_debug("Using address", iface.adress) return oldGetRequest(pluginName, account) - requestFactory.getRequest = getRequest + requestFactory.getRequest = get_request def best_interface(self, pluginName, account): -- cgit v1.2.3 From 502517f37c7540b0bddb092e69386d9d6f08800c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 09:42:34 +0200 Subject: Fix addons --- module/plugins/hooks/MultiHome.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 7e4b5e583..bfb420aea 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -2,10 +2,10 @@ import time -from module.plugins.internal.Hook import Hook +from module.plugins.internal.Addon import Addon -class MultiHome(Hook): +class MultiHome(Addon): __name__ = "MultiHome" __type__ = "hook" __version__ = "0.14" @@ -17,11 +17,7 @@ class MultiHome(Hook): __authors__ = [("mkaay", "mkaay@mkaay.de")] - interval = 0 #@TODO: Remove in 0.4.10 - - - def setup(self): - self.info = {} #@TODO: Remove in 0.4.10 + def init(self): self.register = {} self.interfaces = [] -- cgit v1.2.3 From 56389e28ba5d2f5658278bc7f486d73be747f135 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 11:44:49 +0200 Subject: Rename self.core to self.pyload (plugins only) --- module/plugins/hooks/MultiHome.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index bfb420aea..05fd5de1e 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -24,7 +24,7 @@ class MultiHome(Addon): self.parse_interfaces(self.get_config('interfaces').split(";")) if not self.interfaces: - self.parse_interfaces([self.core.config.get("download", "interface")]) + self.parse_interfaces([self.pyload.config.get("download", "interface")]) self.set_config("interfaces", self.to_config()) @@ -40,7 +40,7 @@ class MultiHome(Addon): def activate(self): - requestFactory = self.core.requestFactory + requestFactory = self.pyload.requestFactory oldGetRequest = requestFactory.getRequest -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/hooks/MultiHome.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 05fd5de1e..4a70726e4 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -9,6 +9,7 @@ class MultiHome(Addon): __name__ = "MultiHome" __type__ = "hook" __version__ = "0.14" + __status__ = "stable" __config__ = [("interfaces", "str", "Interfaces", "None")] -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/hooks/MultiHome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/hooks/MultiHome.py') diff --git a/module/plugins/hooks/MultiHome.py b/module/plugins/hooks/MultiHome.py index 4a70726e4..929ab9a25 100644 --- a/module/plugins/hooks/MultiHome.py +++ b/module/plugins/hooks/MultiHome.py @@ -9,7 +9,7 @@ class MultiHome(Addon): __name__ = "MultiHome" __type__ = "hook" __version__ = "0.14" - __status__ = "stable" + __status__ = "testing" __config__ = [("interfaces", "str", "Interfaces", "None")] -- cgit v1.2.3