Changeset 1144:6f275136d765

Timestamp:

04/29/08 10:51:47 (4 months ago)

Author:

Ronny Pfannschmidt <Ronny.Pfannschmidt@…>

Message:

removed the need for Service.reg

Files:

• pida/core/features.py (modified) (1 diff)
• pida/core/service.py (modified) (6 diffs)
• pida/services/optionsmanager/optionsmanager.py (modified) (3 diffs)
• tests/core/test_services.py (modified) (1 diff)

pida/core/features.py

@@ -73 +73 @@
         return self._features.get_features(featurename)
 
+    #XXX: workaround for keeping svc.features(name)
+    __call__ = get_feature_providers
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

pida/core/service.py

@@ -34 +34 @@
         self.boss = boss
         self.log.debug('Loading Service')
-        self.reg = Registry()
 
     def create_all(self):
@@ -41 +40 @@
         {servicemanager.ServiceManager}
         """
-
-        self._register_options_config(self.options_config)
-        self._register_events_config(self.events_config)
-        self._register_commands_config(self.commands_config)
-        self._register_feature_config(self.features_config)
-        self._register_actions_config(self.actions_config)
+        
+        self.options = self.options_config(self)
+        self.events = self.events_config(self)
+        self.commands = self.commands_config(self)
+        self.features = self.features_config(self)
+        self.actions = self.actions_config(self)
 
     def subscribe_all(self):
@@ -81 +80 @@
 
     ##########
-    # Options
-
-    def _register_options_config(self, config_cls):
-        instance = config_cls(self)
-        self.reg.register_plugin(
-            instance=instance,
-            singletons=(IOptions,)
-        )
-
-    # Public Options API
-    def get_options(self):
-        return self.reg.get_singleton(IOptions)
-
+    # Options API
     def get_option(self, name):
-        return self.get_options().get_option(name)
+        return self.options.get_option(name)
 
     def opt(self, name):
-        return self.get_options().get_value(name)
+        return self.options.get_value(name)
 
     def set_opt(self, name, value):
-        return self.get_options().set_value(name, value)
-
-    ##########
-    # Commands
-
-    def _register_commands_config(self, config_cls):
-        self.reg.register_plugin(
-            instance = config_cls(self),
-            singletons=(ICommands,)
-        )
-
-    # Public Commands API
-
-    def _get_commands(self):
-        return self.reg.get_singleton(ICommands)
-
-    def cmd(self, commandname, *args, **kw):
-        if args:
-            raise TypeError(
-                    _('You must call command %(cmd)s in service %(svc)s with named arguments')
-                    % {'cmd':commandname, 'svc':self.get_name()})
-        else:
-            return self._get_commands().call(commandname, **kw)
+        return self.options.set_value(name, value)
+
+    ##########
+    # Commands API
+
+
+    def cmd(self, commandname, **kw):
+        return self.commands.call(commandname, **kw)
 
     ##########
@@ -129 +101 @@
 
     # Private Events API
-    def _register_events_config(self, config_cls):
-        self.reg.register_plugin(
-            instance = config_cls(self),
-            singletons=(IEvents,)
-        )
 
     def _subscribe_foreign_events(self):
-        self._get_events().subscribe_foreign_events()
+        self.events.subscribe_foreign_events()
 
     def _unsubscribe_foreign_events(self):
-        self._get_events().unsubscribe_foreign_events()
+        self.events.unsubscribe_foreign_events()
 
     # Public Events API
-    def _get_events(self):
-        return self.reg.get_singleton(IEvents)
-
     def get_event(self, name):
-        return self._get_events().get(name)
+        return self.events.get(name)
 
     def subscribe_foreign_event(self, servicename, name, callback):
@@ -155 +119 @@
 
     def subscribe_event(self, name, callback):
-        self._get_events().subscribe_event(name, callback)
+        self.events.subscribe_event(name, callback)
 
     def unsubscribe_event(self, name, callback):
-        self._get_events().unsubscribe_event(name, callback)
-        
+        self.events.unsubscribe_event(name, callback)
 
     def emit(self, name, **kw):
-        self._get_events().emit(name, **kw)
+        self.events.emit(name, **kw)
 
     ##########
     # Features
 
-    def _register_feature_config(self, config_cls):
-        self.reg.register_plugin(
-            instance = config_cls(self),
-            singletons=(IFeatures,)
-        )
 
     def _subscribe_foreign_features(self):
-        self._get_features().subscribe_foreign_features()
+        self.features.subscribe_foreign_features()
 
     def _unsubscribe_foreign_features(self):
-        self._get_features().unsubscribe_foreign_features()
-
-    def _get_features(self):
-        return self.reg.get_singleton(IFeatures)
+        self.features.unsubscribe_foreign_features()
 
     # Public Feature API
 
     def list_features(self):
-        return self._get_features().list_features()
+        return self.features.list_features()
 
     def has_foreign_feature(self, servicename, featurename):
-        return self._get_features().has_foreign_feature(servicename, featurename)
+        return self.features.has_foreign_feature(servicename, featurename)
 
     def subscribe_feature(self, feature, instance):
-        return self._get_features().subscribe_feature(feature, instance)
+        return self.features.subscribe_feature(feature, instance)
 
     def unsubscribe_feature(self, feature_object):
-        self._get_features().unsubscribe_feature(feature_object)
+        self.features.unsubscribe_feature(feature_object)
 
     def subscribe_foreign_feature(self, servicename, feature, instance):
@@ -202 +157 @@
         self.boss.unsubscribe_feature(servicename, feature_object)
 
-    def features(self, name):
-        return self._get_features().get_feature_providers(name)
-
     ##########
     # Actions
 
-    def _register_actions_config(self, config_cls):
-        self.reg.register_plugin(
-            instance = config_cls(self),
-            singletons=(IActions,)
-        )
-
     def _unregister_actions_config(self):
-        self._get_actions().remove_actions()
+        self.actions.remove_actions()
 
     def _subscribe_keyboard_shortcuts(self):
-        self._get_actions().subscribe_keyboard_shortcuts()
-
-    def _get_actions(self):
-        return self.reg.get_singleton(IActions)
+        self.actions.subscribe_keyboard_shortcuts()
+
 
     def get_action_group(self):
-        return self._get_actions().get_action_group()
+        return self.actions.get_action_group()
 
     def get_action(self, name):
-        return self._get_actions().get_action(name)
+        return self.actions.get_action(name)
 
     def get_keyboard_options(self):
-        return self._get_actions().get_keyboard_options()
+        return self.actions.get_keyboard_options()
 
     # Logging

pida/services/optionsmanager/optionsmanager.py

@@ -74 +74 @@
         self._services = []
         for svc in self.svc.boss.get_services():
-            if len(svc.get_options()):
+            if len(svc.options):
                 self._services.append(svc)
                 self._services_display.append(
@@ -109 +109 @@
         labelsizer = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
         widgetsizer = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
-        options = list(svc.get_options().iter_options())
+        options = list(svc.options.iter_options())
         options.sort()
         for opt in options:
@@ -192 +192 @@
 
     def plugin_changed(self, plugin):
-        if len(plugin.get_options()):
+        if len(plugin.options):
             self.svc.refresh_view()
 

tests/core/test_services.py

@@ -53 +53 @@
         svc.create_all()
         self.assertEqual(
-            svc.reg.get_singleton(IOptions).get_option('g1'),
+            svc.options.get_option('g1'),
             svc.o_test
         )