Ticket #1408: sugar-1408.patch

src/jarabe/journal/listmodel.py

@@ -15 +15 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import logging
+from gettext import gettext as _
 
 import cjson
 import gobject
@@ -135 +136 @@
             xo_color = misc.get_icon_color(metadata)
         self._cached_row.append(xo_color)
 
-        title = gobject.markup_escape_text(metadata.get('title', None))
+        title = gobject.markup_escape_text(metadata.get('title', ''))
+        if not title:
+            title = _('Untitled')
         self._cached_row.append('<b>%s</b>' % title)
 
-        timestamp = int(metadata.get('timestamp', 0))
+        try:
+            timestamp = int(metadata.get('timestamp', 0))
+        except ValueError:
+            timestamp = 0
         self._cached_row.append(util.timestamp_to_elapsed_string(timestamp))
 
-        self._cached_row.append(int(metadata.get('progress', 100)))
+        try:
+            progress = int(metadata.get('progress', 100))
+        except ValueError:
+            progress = 100
+        self._cached_row.append(progress)
 
         if metadata.get('buddies', ''):
             buddies = cjson.decode(metadata['buddies']).values()

src/jarabe/journal/model.py

@@ -30 +30 @@
 from sugar import dispatch
 from sugar import mime
 from sugar import util
+from sugar.graphics import style
 
 DS_DBUS_SERVICE = 'org.laptop.sugar.DataStore'
 DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore'
@@ -349 +350 @@
             except Exception:
                 logging.exception('Error reading file %r', full_path)
 
+def _get_none_metadata():
+    return {'uid': '',
+            'title': '',
+            'timestamp': 0,
+            'mime_type': 'application/octet-stream',
+            'activity': '',
+            'activity_id': '',
+            'icon-color': '%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(),
+                                     style.COLOR_TRANSPARENT.get_svg()),
+            'description': ''}
+
 def _get_file_metadata(path, stat):
     client = gconf.client_get_default()
     return {'uid': path,
@@ -411 +423 @@
 def get(object_id):
     """Returns the metadata for an object
     """
-    if os.path.exists(object_id):
-        stat = os.stat(object_id)
-        metadata = _get_file_metadata(object_id, stat)
-        metadata['mountpoint'] = _get_mount_point(object_id)
+    if not object_id:
+        metadata = _get_none_metadata()
+        metadata['mountpoint'] = '/dummy/path/to/mark/it/non-ds'
+    elif object_id.startswith('/'):
+        if os.path.exists(object_id):
+            stat = os.stat(object_id)
+            metadata = _get_file_metadata(object_id, stat)
+            metadata['mountpoint'] = _get_mount_point(object_id)
+        else:
+            metadata = _get_none_metadata()
     else:
         metadata = _get_datastore().get_properties(object_id, byte_arrays=True)
         metadata['mountpoint'] = '/'
@@ -423 +441 @@
 def get_file(object_id):
     """Returns the file for an object
     """
-    if os.path.exists(object_id):
+    if not object_id:
+        return None
+    elif object_id.startswith('/'):
         logging.debug('get_file asked for file with path %r', object_id)
-        return object_id
+        if os.path.exists(object_id):
+            return object_id
+        else:
+            return None
     else:
         logging.debug('get_file asked for entry with id %r', object_id)
         file_path = _get_datastore().get_filename(object_id)
@@ -438 +461 @@
     """Return the file size for an object
     """
     logging.debug('get_file_size %r', object_id)
-    if os.path.exists(object_id):
-        return os.stat(object_id).st_size
+    if object_id.startswith('/'):
+        if os.path.exists(object_id):
+            return os.stat(object_id).st_size
+        else:
+            return 0
 
     file_path = _get_datastore().get_filename(object_id)
     if file_path:
@@ -458 +484 @@
 def delete(object_id):
     """Removes an object from persistent storage
     """
-    if os.path.exists(object_id):
-        os.unlink(object_id)
-        deleted.send(None, object_id=object_id)
+    if not object_id:
+        pass
+    elif object_id.startswith('/'):
+        if os.path.exists(object_id):
+            os.unlink(object_id)
+            deleted.send(None, object_id=object_id)
+        else:
+            logging.error('Can not find file %s to delete', object_id)
     else:
         _get_datastore().delete(object_id)
 

src/jarabe/journal/palettes.py

@@ -53 +53 @@
         activity_icon.props.file = misc.get_icon_name(metadata)
         activity_icon.props.xo_color = misc.get_icon_color(metadata)
 
-        if metadata.has_key('title'):
-            title = gobject.markup_escape_text(metadata['title'])
-        else:
+        title = gobject.markup_escape_text(metadata.get('title', ''))
+        if not title:
             title = _('Untitled')
 
         Palette.__init__(self, primary_text=title,