Ticket #6014: sync_data.patch

lib/sugar/activity/activity.py

@@ -675 +675 @@
         if self.canvas and self.canvas.window:
             self._preview.take_screenshot(self.canvas.window)
 
+    def sync_data(self):
+        """Sync the activity data to the Journal.
+        
+        This method is called when we shutdown, reboot or suspend the laptop.
+        """
+        if self._jobject:
+            self.save()
+
     def save(self):
         """Request that the activity is saved to the Journal.
         

lib/sugar/activity/activityservice.py

@@ -68 +68 @@
     def TakeScreenshot(self):
         self._activity.take_screenshot()
 
+    @dbus.service.method(_ACTIVITY_INTERFACE)
+    def SyncData(self):
+        self._activity.sync_data()
+

shell/model/homemodel.py

@@ -147 +147 @@
         self._active_activity = home_activity
         self.emit('active-activity-changed', self._active_activity)
 
+    def sync_activity_data(self):        
+        """Sync all the running activities to the datastore
+
+        This is used to not loose any date when we shutdown or 
+        reboot the laptop.        
+        """
+        for act in self._activities:
+            if act.get_type() != 'org.laptop.JournalActivity':
+               if act:
+                   service = act.get_service()
+                   if service:
+                       service.SyncData()                
+
     def __iter__(self): 
         return iter(self._activities)
         

shell/shellservice.py

@@ -64 +64 @@
         dbus.service.Object.__init__(self, bus_name, _DBUS_PATH)
 
     @dbus.service.method(_DBUS_SHELL_IFACE,
+                         in_signature="", out_signature="")
+    def SyncActivityData(self):
+        self._home_model.sync_activity_data()
+
+    @dbus.service.method(_DBUS_SHELL_IFACE,
                          in_signature="s", out_signature="b")
     def ActivateActivity(self, activity_id):
         host = self._shell.get_activity(activity_id)

shell/view/home/HomeBox.py

@@ -183 +183 @@
         model = self._shell.get_model()
         model.props.state = ShellModel.STATE_SHUTDOWN
 
+        home_model = self._shell.get_model().get_home()
+        home_model.sync_activity_data()
+
         pm = self._get_power_manager()
 
         hw_manager = hardwaremanager.get_manager()
@@ -197 +200 @@
         model = self._shell.get_model()
         model.props.state = ShellModel.STATE_SHUTDOWN
 
+        home_model = self._shell.get_model().get_home()
+        home_model.sync_activity_data()
+
         pm = self._get_power_manager()
 
         hw_manager = hardwaremanager.get_manager()