diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-26 08:09:55 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-26 08:09:55 (GMT) |
commit | 2a197bb8b863a0f2a71e40a501fe5f2e8e07f371 (patch) | |
tree | c7f2f088b5c628aaa61ec31284121fb790d18f97 /sugar | |
parent | 55baffea32b3754ca120a75ce1b1ebd76ba613f8 (diff) | |
parent | 8ff6cbab1ea5f2b45064c278fbf77e4a1931f5c2 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/bundle/activitybundle.py | 50 | ||||
-rw-r--r-- | sugar/bundle/bundle.py | 4 |
2 files changed, 43 insertions, 11 deletions
diff --git a/sugar/bundle/activitybundle.py b/sugar/bundle/activitybundle.py index 07a5255..f77bdb7 100644 --- a/sugar/bundle/activitybundle.py +++ b/sugar/bundle/activitybundle.py @@ -213,8 +213,6 @@ class ActivityBundle(Bundle): self._unzip(install_dir) install_path = os.path.join(install_dir, self._zip_root_dir) - if not activity.get_registry().add_bundle(install_path): - raise RegistrationException xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.expanduser('~/.local/share')) @@ -229,20 +227,54 @@ class ActivityBundle(Bundle): os.spawnlp(os.P_WAIT, 'update-mime-database', 'update-mime-database', mime_dir) - icons_dir = os.path.join(install_path, 'activity', 'mime-icons') - if os.path.isdir(icons_dir): - installed_icons_dir = os.path.join(xdg_data_home, 'icons/sugar/scalable/mimetypes') + mime_types = self.get_mime_types() + if mime_types is not None: + installed_icons_dir = os.path.join(xdg_data_home, + 'icons/sugar/scalable/mimetypes') if not os.path.isdir(installed_icons_dir): os.makedirs(installed_icons_dir) - for file in os.listdir(icons_dir): - if file.endswith('.svg') or file.endswith('.icon'): - os.symlink(os.path.join(icons_dir, file), - os.path.join(installed_icons_dir, file)) + + for mime_type in mime_types: + mime_icon_base = os.path.join(install_path, 'activity', + mime_type.replace('/', '-')) + svg_file = mime_icon_base + '.svg' + info_file = mime_icon_base + '.icon' + if os.path.isfile(svg_file): + os.symlink(svg_file, + os.path.join(installed_icons_dir, + os.path.basename(svg_file))) + if os.path.isfile(info_file): + os.symlink(info_file, + os.path.join(installed_icons_dir, + os.path.basename(info_file))) + + if not activity.get_registry().add_bundle(install_path): + raise RegistrationException def uninstall(self): if not self.is_installed(): raise NotInstalledException + xdg_data_home = os.getenv('XDG_DATA_HOME', os.path.expanduser('~/.local/share')) + + mime_dir = os.path.join(xdg_data_home, 'mime') + installed_mime_path = os.path.join(mime_dir, 'packages', '%s.xml' % self._service_name) + if os.path.exists(installed_mime_path): + os.remove(installed_mime_path) + os.spawnlp(os.P_WAIT, 'update-mime-database', + 'update-mime-database', mime_dir) + + mime_types = self.get_mime_types() + if mime_types is not None: + installed_icons_dir = os.path.join(xdg_data_home, + 'icons/sugar/scalable/mimetypes') + for file in os.listdir(installed_icons_dir): + path = os.path.join(installed_icons_dir, file) + if os.path.islink(path) and \ + os.readlink(path).startswith(self._path): + os.remove(path) + self._uninstall() + # FIXME: notify shell diff --git a/sugar/bundle/bundle.py b/sugar/bundle/bundle.py index a2e9076..75b4b38 100644 --- a/sugar/bundle/bundle.py +++ b/sugar/bundle/bundle.py @@ -127,7 +127,7 @@ class Bundle: zip.write(filename, os.path.join(base_dir, filename)) zip.close() - def remove(self): + def _uninstall(self): ext = os.path.splitext(self._path)[1] if self._unpacked: if not os.path.isdir(self._path) or ext != self._unzipped_extension: @@ -137,7 +137,7 @@ class Bundle: os.remove(os.path.join(root, name)) for name in dirs: os.rmdir(os.path.join(root, name)) - os.rmdir(root) + os.rmdir(self._path) else: if not os.path.isfile(self._path) or ext != self._zipped_extension: raise InvalidPathException |