From 760deeb2a9eb3d840451823aa3b868b94c388f34 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-pgp@silbe.org>
Date: Sun, 17 Oct 2010 09:36:09 +0000
Subject: Journal details view: don't choke on invalid timestamp (SL#1590, SL#2208)

Metadata can get corrupted by crashes or malformed by buggy activities.
We should do our best to display the parts that are usable.

Acked-by: Simon Schampijer <simon@schampijer.de>
---
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 725c0f9..9775901 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -280,10 +280,15 @@ class ExpandedEntry(hippo.CanvasBox):
 
     def _format_date(self):
         if 'timestamp' in self._metadata:
-            timestamp = float(self._metadata['timestamp'])
-            return time.strftime('%x', time.localtime(timestamp))
-        else:
-            return _('No date')
+            try:
+                timestamp = float(self._metadata['timestamp'])
+            except (ValueError, TypeError):
+                logging.warning('Invalid timestamp for %r: %r',
+                                self._metadata['uid'],
+                                self._metadata['timestamp'])
+            else:
+                return time.strftime('%x', time.localtime(timestamp))
+        return _('No date')
 
     def _create_buddy_list(self):
 
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index d1188c1..70b0488 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -83,14 +83,24 @@ def get_icon_name(metadata):
 
 def get_date(metadata):
     """ Convert from a string in iso format to a more human-like format. """
-    if metadata.has_key('timestamp'):
-        timestamp = float(metadata['timestamp'])
-        return util.timestamp_to_elapsed_string(timestamp)
-    elif metadata.has_key('mtime'):
-        ti = time.strptime(metadata['mtime'], "%Y-%m-%dT%H:%M:%S")
-        return util.timestamp_to_elapsed_string(time.mktime(ti))
-    else:
-        return _('No date')
+    if 'timestamp' in metadata:
+        try:
+            timestamp = float(metadata['timestamp'])
+        except (TypeError, ValueError):
+            logging.warning('Invalid timestamp: %r', metadata['timestamp'])
+        else:
+            return util.timestamp_to_elapsed_string(timestamp)
+
+    if 'mtime' in metadata:
+        try:
+            ti = time.strptime(metadata['mtime'], '%Y-%m-%dT%H:%M:%S')
+        except (TypeError, ValueError):
+            logging.warning('Invalid mtime: %r', metadata['mtime'])
+        else:
+            return util.timestamp_to_elapsed_string(time.mktime(ti))
+
+    return _('No date')
+
 
 def get_bundle(metadata):
     try:
--
cgit v0.9.1