Refactor the bundle registry. Move it inside

the shell and expose the parts that should be
public to the shell dbus service.

shell/model/Makefile.am

@@ -4,6 +4,7 @@ sugardir = $(pkgdatadir)/shell/model
 sugar_PYTHON =			\
 	__init__.py		\
 	accesspointmodel.py	\
+	bundleregistry.py	\
 	BuddyModel.py		\
 	Friends.py		\
 	Invites.py		\

shell/model/MeshModel.py

@@ -18,7 +18,8 @@ import gobject
 
 from sugar.graphics.xocolor import XoColor
 from sugar.presence import presenceservice
-from sugar.activity import bundleregistry
+
+from model import bundleregistry
 from model.BuddyModel import BuddyModel
 from model.accesspointmodel import AccessPointModel
 from hardware import hardwaremanager

shell/model/bundleregistry.py

@@ -0,0 +1,118 @@
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+
+import gobject
+
+from sugar.activity.bundle import Bundle
+from sugar import env
+from sugar import util
+
+# http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html
+def _get_data_dirs():
+    if os.environ.has_key('XDG_DATA_DIRS'):
+        return os.environ['XDG_DATA_DIRS'].split(':')
+    else:
+        return [ '/usr/local/share/', '/usr/share/' ]
+
+class _ServiceManager(object):
+    """Internal class responsible for creating dbus service files
+    
+    DBUS services are defined in files which bind a service name 
+    to the name of an executable which provides the service name.
+    
+    In Sugar, the service files are automatically generated from 
+    the activity registry (by this class).  When an activity's 
+    dbus launch service is requested, dbus will launch the 
+    specified executable in order to allow it to provide the 
+    requested activity-launching service.
+    
+    In the case of activities which provide a "class", instead of 
+    an "exec" attribute in their activity.info, the 
+    sugar-activity-factory script is used with an appropriate 
+    argument to service that bundle.
+    """
+    SERVICE_DIRECTORY = '~/.local/share/dbus-1/services'
+    def __init__(self):
+        service_dir = os.path.expanduser(self.SERVICE_DIRECTORY)
+        if not os.path.isdir(service_dir):
+            os.makedirs(service_dir)
+
+        self._path = service_dir
+
+    def add(self, bundle):
+        util.write_service(bundle.get_service_name(),
+                           bundle.get_exec(), self._path)
+
+class BundleRegistry(gobject.GObject):
+    """Service that tracks the available activity bundles"""
+
+    __gsignals__ = {
+        'bundle-added': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+                        ([gobject.TYPE_PYOBJECT]))
+    }
+
+    def __init__(self):
+        gobject.GObject.__init__(self)
+        
+        self._bundles = {}
+        self._search_path = []
+        self._service_manager = _ServiceManager()
+
+    def get_bundle(self, service_name):
+        """Returns an bundle given his service name"""
+        if self._bundles.has_key(service_name):
+            return self._bundles[service_name]
+        else:
+            return None
+
+    def add_search_path(self, path):
+        """Add a directory to the bundles search path"""
+        self._search_path.append(path)
+        self._scan_directory(path)
+    
+    def __iter__(self):
+        return self._bundles.values().__iter__()
+
+    def _scan_directory(self, path):
+        if os.path.isdir(path):
+            for f in os.listdir(path):
+                bundle_dir = os.path.join(path, f)
+                if os.path.isdir(bundle_dir) and \
+                   bundle_dir.endswith('.activity'):
+                    self.add_bundle(bundle_dir)
+
+    def add_bundle(self, bundle_path):
+        bundle = Bundle(bundle_path)
+        if bundle.is_valid():
+            self._bundles[bundle.get_service_name()] = bundle
+            self._service_manager.add(bundle)
+            self.emit('bundle-added', bundle)
+            return True
+        else:
+            return False
+
+def get_registry():
+    return _bundle_registry
+
+_bundle_registry = BundleRegistry()
+
+for path in _get_data_dirs():
+    bundles_path = os.path.join(path, 'activities')
+    _bundle_registry.add_search_path(bundles_path)
+
+_bundle_registry.add_search_path(env.get_user_activities_path())

shell/model/homemodel.py

@@ -22,7 +22,7 @@ import dbus
 
 from model.homeactivity import HomeActivity
 from model.homerawwindow import HomeRawWindow
-from sugar.activity import bundleregistry
+from model import bundleregistry
 
 _SERVICE_NAME = "org.laptop.Activity"
 _SERVICE_PATH = "/org/laptop/Activity"