Changeset 7ddb5d

Timestamp:

06/10/2009 06:15:52 PM (16 years ago)

Author:

Andrew Resch <andrewresch@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

c274da9

Parents:

853138

Message:

Fix the set functions so that you are able to register more than one per config key
Likewise for the config change callbacks

File:

• deluge/config.py (modified) (6 diffs)

deluge/config.py

@@ -103 +103 @@
         self.__config = {}
         self.__set_functions = {}
-        self.__change_callback = None
+        self.__change_callbacks = []
 
         # These hold the version numbers and they will be set when loaded
@@ -178 +178 @@
             pass
         try:
-            reactor.callLater(0, self.__change_callback, key, value)
+            def do_change_callbacks(key, value):
+                for func in self.__change_callbacks:
+                    func(key, value)
+            reactor.callLater(0, do_change_callbacks, key, value)
         except:
             pass
@@ -226 +229 @@
 
         """
-        self.__change_callback = callback
+        self.__change_callbacks.append(callback)
 
     def register_set_function(self, key, function, apply_now=True):
@@ -247 +250 @@
         """
         log.debug("Registering function for %s key..", key)
-        self.__set_functions[key] = function
+        if key not in self.__set_functions:
+            self.__set_functions[key] = []
+
+        self.__set_functions[key].append(function)
+
         # Run the function now if apply_now is set
         if apply_now:
-            self.__set_functions[key](key, self.__config[key])
+            function(key, self.__config[key])
         return
 
@@ -270 +277 @@
         log.debug("Calling all set functions..")
         for key, value in self.__set_functions.iteritems():
-            value(key, self.__config[key])
+            for func in value:
+                func(key, self.__config[key])
 
     def apply_set_functions(self, key):
@@ -281 +289 @@
         log.debug("Calling set functions for key %s..", key)
         if key in self.__set_functions:
-            self.__set_functions[key](key, self.__config[key])
+            for func in self.__set_functions[key]:
+                func(key, self.__config[key])
 
     def load(self, filename=None):