From a4efed250c56dc6dd656bafb572a1a56e034d254 Mon Sep 17 00:00:00 2001 From: Andrés Ambrois Date: Tue, 24 Aug 2010 06:00:26 +0000 Subject: Add creation_time property to the journal model. --- diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py index 79ed27d..3378350 100644 --- a/src/jarabe/journal/listmodel.py +++ b/src/jarabe/journal/listmodel.py @@ -51,11 +51,12 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource): COLUMN_ICON_COLOR = 3 COLUMN_TITLE = 4 COLUMN_TIMESTAMP = 5 - COLUMN_FILESIZE = 6 - COLUMN_PROGRESS = 7 - COLUMN_BUDDY_1 = 8 - COLUMN_BUDDY_2 = 9 - COLUMN_BUDDY_3 = 10 + COLUMN_CREATION_TIME = 6 + COLUMN_FILESIZE = 7 + COLUMN_PROGRESS = 8 + COLUMN_BUDDY_1 = 9 + COLUMN_BUDDY_2 = 10 + COLUMN_BUDDY_3 = 11 _COLUMN_TYPES = {COLUMN_UID: str, COLUMN_FAVORITE: bool, @@ -63,6 +64,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource): COLUMN_ICON_COLOR: object, COLUMN_TITLE: str, COLUMN_TIMESTAMP: str, + COLUMN_CREATION_TIME: str, COLUMN_FILESIZE: str, COLUMN_PROGRESS: int, COLUMN_BUDDY_1: object, @@ -145,12 +147,13 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource): timestamp = int(metadata.get('timestamp', 0)) self._cached_row.append(util.timestamp_to_elapsed_string(timestamp)) - creation_time = metadata.get('creation_time') - if creation_time is not None: - self._cached_row.append( - util.timestamp_to_elapsed_string(creation_time)) - else: + try: + creation_time = float(metadata.get('creation_time')) + except (TypeError, ValueError): self._cached_row.append(_('Unknown')) + else: + self._cached_row.append( + util.timestamp_to_elapsed_string(float(creation_time))) try: size = int(metadata.get('filesize')) diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index e76914e..81ca7d4 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -37,7 +37,7 @@ DS_DBUS_INTERFACE = 'org.laptop.sugar.DataStore' DS_DBUS_PATH = '/org/laptop/sugar/DataStore' # Properties the journal cares about. -PROPERTIES = ['uid', 'title', 'mtime', 'timestamp', 'filesize', +PROPERTIES = ['uid', 'title', 'mtime', 'timestamp', 'creation_time', 'filesize', 'keep', 'buddies', 'icon-color', 'mime_type', 'progress', 'activity', 'mountpoint', 'activity_id', 'bundle_id'] -- cgit v0.9.1