Ticket #1842: 0001-Journal-Provide-error-message-on-write-errors-1842.patch

src/jarabe/journal/journalactivity.py

@@ -27 +27 @@
 import os
 
 from sugar.graphics.window import Window
+from sugar.graphics.alert import Alert
+from sugar.graphics.icon import Icon
+
 from sugar.bundle.bundle import ZipExtractException, RegistrationException
 from sugar import env
 from sugar.activity import activityfactory
@@ -138 +141 @@
         self._critical_space_alert = None
         self._check_available_space()
 
+    def __volume_error_cb(self, gobject, strerror, severity):
+        self._add_alert(strerror, severity)
+
+    def _add_alert(self, strerror, severity):
+        alert = Alert(title=severity, msg=strerror)
+        icon = Icon(icon_name='dialog-ok')
+        alert.add_button(gtk.RESPONSE_OK, _('Ok'), icon)
+        icon.show()
+        alert.connect('response', self.__alert_response_cb)
+        self.add_alert(alert)
+        alert.show()
+
+    def __alert_response_cb(self, alert, response_id):
+        self.remove_alert(alert)
+
     def __realize_cb(self, window):
         wm.set_bundle_id(window.window, _BUNDLE_ID)
         activity_id = activityfactory.create_activity_id()
@@ -161 +179 @@
         self._volumes_toolbar = VolumesToolbar()
         self._volumes_toolbar.connect('volume-changed',
                                       self.__volume_changed_cb)
+        self._volumes_toolbar.connect('volume-error',
+                                      self.__volume_error_cb)
         self._main_view.pack_start(self._volumes_toolbar, expand=False)
 
         search_toolbar = self._main_toolbox.search_toolbar
@@ -171 +191 @@
         self._secondary_view = gtk.VBox()
 
         self._detail_toolbox = DetailToolbox()
-        entry_toolbar = self._detail_toolbox.entry_toolbar
-
+        self._detail_toolbox.entry_toolbar.connect('volume-error',
+                                                   self.__volume_error_cb)
         self._detail_view = DetailView()
         self._detail_view.connect('go-back-clicked', self.__go_back_clicked_cb)
         self._secondary_view.pack_end(self._detail_view)

src/jarabe/journal/journaltoolbox.py

@@ -325 +325 @@
         self.entry_toolbar.show()
 
 class EntryToolbar(gtk.Toolbar):
+    __gsignals__ = {
+        'volume-error': (gobject.SIGNAL_RUN_FIRST,
+                         gobject.TYPE_NONE,
+                         ([str, str]))
+        }
     def __init__(self):
         gtk.Toolbar.__init__(self)
 
@@ -394 +399 @@
         misc.resume(self._metadata, service_name)
 
     def _copy_menu_item_activate_cb(self, menu_item, mount):
-        model.copy(self._metadata, mount.get_root().get_path())
+        file_path = model.get_file(self._metadata['uid'])
+        
+        if not file_path or not os.path.exists(file_path):
+            logging.warn('Entries without a file cannot be copied.')
+            self.emit('volume-error', _('Entries without a file cannot'
+                                        ' be copied'), _('Warning'))
+            return
+
+        try:
+            model.copy(self._metadata, mount.get_root().get_path())
+        except IOError:
+            logging.exception('Error while copying the file.')
+            self.emit('volume-error', _('Error while copying the file.'),
+                      _('Error'))
 
     def _refresh_copy_palette(self):
         palette = self._copy.get_palette()

src/jarabe/journal/volumestoolbar.py

@@ -15 +15 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import logging
+import os
 from gettext import gettext as _
 
 import gobject
@@ -35 +36 @@
     __gsignals__ = {
         'volume-changed': (gobject.SIGNAL_RUN_FIRST,
                            gobject.TYPE_NONE,
-                           ([str]))
+                           ([str])),
+        'volume-error': (gobject.SIGNAL_RUN_FIRST,
+                         gobject.TYPE_NONE,
+                         ([str, str]))
     }
 
     def __init__(self):
@@ -81 +85 @@
         button = VolumeButton(mount)
         button.props.group = self._volume_buttons[0]
         button.connect('toggled', self._button_toggled_cb)
+        button.connect('volume-error', self.__volume_error_cb)
         position = self.get_item_index(self._volume_buttons[-1]) + 1
         self.insert(button, position)
         button.show()
@@ -90 +95 @@
         if len(self.get_children()) > 1:
             self.show()
 
+    def __volume_error_cb(self, button, strerror, severity):
+        self.emit('volume-error', strerror, severity)
+
     def _button_toggled_cb(self, button):
         if button.props.active:
             self.emit('volume-changed', button.mount_point)
@@ -123 +131 @@
         button.props.active = True
 
 class BaseButton(RadioToolButton):
+    __gsignals__ = {
+        'volume-error': (gobject.SIGNAL_RUN_FIRST,
+                         gobject.TYPE_NONE,
+                         ([str, str]))
+        }
+    
     def __init__(self, mount_point):
         RadioToolButton.__init__(self)
 
@@ -137 +151 @@
                                info, timestamp):
         object_id = selection_data.data
         metadata = model.get(object_id)
-        model.copy(metadata, self.mount_point)
+        file_path = model.get_file(metadata['uid'])
+        
+        if not file_path or not os.path.exists(file_path):
+            logging.warn('Entries without a file cannot be copied.')
+            self.emit('volume-error', _('Entries without a file cannot'
+                                        ' be copied'), _('Warning'))
+            return
+
+        try:
+            model.copy(metadata, self.mount_point)
+        except IOError:
+            logging.exception('Error while copying the file.')
+            self.emit('volume-error', _('Error while copying the file.'),
+                      _('Error'))
 
 class VolumeButton(BaseButton):
     def __init__(self, mount):