Ticket #803: viewsourceopenwith

diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index b29b744..aa689a0 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -132,16 +132,17 @@ def _get_activities_for_mime(mime_type):
 
 def get_activities(metadata):
     activities = []
+    registry = bundleregistry.get_registry()
 
     bundle_id = metadata.get('activity', '')
     if bundle_id:
-        activity_info = bundleregistry.get_registry().get_bundle(bundle_id)
+        activity_info = registry.get_bundle(bundle_id)
         if activity_info:
             activities.append(activity_info)
 
     mime_type = metadata.get('mime_type', '')
     if mime_type:
-        activities_info = _get_activities_for_mime(mime_type)
+        activities_info = registry.get_activities_for_lineage(mime_type)
         for activity_info in activities_info:
             if activity_info not in activities:
                 activities.append(activity_info)
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 42d39b0..e687b75 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -29,6 +29,7 @@ from sugar.bundle.contentbundle import ContentBundle
 from sugar.bundle.bundle import MalformedBundleException, \
     AlreadyInstalledException, RegistrationException
 from sugar import env
+from sugar import mime
 
 from jarabe import config
 
@@ -241,6 +242,13 @@ class BundleRegistry(gobject.GObject):
         else:
             return None
 
+    def get_activities_for_lineage(self, mime_type):
+        result = self.get_activities_for_type(mime_type)
+        if not result:
+            for parent_mime in mime.get_mime_parents(mime_type):
+                result.extend(self.get_activities_for_type(parent_mime))
+        return result
+
     def _find_bundle(self, bundle_id, version):
         for bundle in self._bundles:
             if bundle.get_bundle_id() == bundle_id and \
diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py
index 870b176..9f71987 100644
--- a/src/jarabe/view/viewsource.py
+++ b/src/jarabe/view/viewsource.py
@@ -33,15 +33,71 @@ from sugar.graphics.xocolor import XoColor
 from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.bundle.activitybundle import ActivityBundle
+from sugar.graphics.menuitem import MenuItem
+from sugar.activity.bundlebuilder import XOPackager, Config, Builder
+from sugar import mime
+from sugar import profile
+from sugar.activity import activityfactory
+from sugar.activity.activity import SCOPE_PRIVATE
 from sugar.datastore import datastore
 from sugar import mime
+from sugar.bundle.activitybundle import ActivityBundle
+from jarabe.model import bundleregistry
+from tempfile import gettempdir
 
 _SOURCE_FONT = pango.FontDescription('Monospace %d' % style.FONT_SIZE)
 
 _logger = logging.getLogger('ViewSource')
 map_activity_to_window = {}
 
+ACTIVITY_MIME = "application/vnd.olpc-sugar"
+
+def _bundle_activity(path):
+    builder = XOPackager(Builder(Config(path, gettempdir(), None)))
+    builder.package()
+    
+    jobject = datastore.create()
+
+    metadata = {
+        'title': _('%s Bundle') % builder.config.activity_name,
+        'title_set_by_user': '1',
+        'suggested_filename': '%s-%d.xo' % (builder.config.bundle_name, 
+                                            builder.config.version),
+        'icon-color': profile.get_color().to_string(),
+        'mime_type': 'application/vnd.olpc-sugar',
+        'activity' : builder.config.bundle_id,
+        'share-scope' : SCOPE_PRIVATE,
+        'preview' : '',
+        'source' : path,
+        }
+    for k, v in metadata.items():
+        jobject.metadata[k] = v # dict.update method is missing =(
+    jobject.file_path = builder.package_path
+    datastore.write(jobject)
+    #jobject.destroy()
+    os.remove(builder.package_path)
+    return jobject.object_id
+    
+class DocumentData(dict):
+    """'version' should always be a key.
+    
+    if version is 1, other keys should be 
+        ('mime_type', 'title', 'path', 'human_readable')"""
+    def __init__(self, *args, **kwargs):
+        super(DocumentData, self).__init__(*args,**kwargs)
+        
+        required_keys = ('mime_type', 'title', 'path', 'human_readable')
+        
+        if self["version"] == 1:
+            if [1 for key in required_keys
+                    if (key not in self.keys())]:
+                logging.error("Activity returned misversioned data on "
+                              "current document")
+        else:
+            for key in required_keys:
+                self[key] = None
+            _logger.debug('Current document data in unknown version')
+
 def setup_view_source(activity):
     service = activity.get_service()
     if service is not None:
@@ -280,6 +336,10 @@ class Toolbar(gtk.Toolbar):
             self._add_separator()
 
         if bundle_path is not None and os.path.exists(bundle_path):
+            self._add_source(DocumentData(version=1, mime_type=ACTIVITY_MIME, 
+                                            title=title, path=bundle_path, 
+                                            human_readable=True),
+                             'printer') #TODO: get a better icon
             activity_button = RadioToolButton()
             icon = Icon(file=file_name,
                         icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR,
@@ -311,6 +371,53 @@ class Toolbar(gtk.Toolbar):
         self.insert(stop, -1)
         stop.show()
 
+    def _add_source(self, data, icon):
+        
+        button = RadioToolButton(named_icon=icon)
+        group = getattr(self, 'group', None)
+        if group:
+            button.props.group = group
+        else:
+            self.group = button
+            
+        if data["human_readable"]:
+            button.connect('toggled', self.__button_toggled_cb, data["path"])
+        
+        button.props.tooltip = data["title"]
+        self.insert(button, -1)
+        button.show()
+        
+        if data["mime_type"]:
+            registry = bundleregistry.get_registry()
+            activities = registry.get_activities_for_lineage(data["mime_type"])
+            if activities:
+                palette = button.get_palette()
+                
+                menuitem = gtk.SeparatorMenuItem()
+                palette.menu.append(menuitem)
+                menuitem.show()
+                
+                for activity in activities:
+                    menuitem = MenuItem(activity.get_name(), 
+                                        activity.get_icon())
+                    menuitem.connect('activate', self._launch_with, 
+                                     (activity,data["path"],data["mime_type"]))
+                    palette.menu.append(menuitem)
+                    menuitem.show()
+
+    def _launch_with(self, menuitem, options):
+        activity, path, mime_type = options
+        if mime_type == ACTIVITY_MIME:
+            object_id = _bundle_activity(path)
+        else:
+            object_id = self.activity_service.bundleSource(path, mime_type)
+        
+        if object_id:
+            activityfactory.create_with_object_id(activity, object_id)
+        else:
+            logging.error("Failed to rebundle activity for editing source."
+                          "Mime type:" + mime_type)
+        
     def _add_separator(self, expand=False):
         separator = gtk.SeparatorToolItem()
         separator.props.draw = False