Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/misc.py
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2010-10-17 09:36:09 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-10-23 11:06:41 (GMT)
commit518f7c478fd9ea4d8bbfd6218ae699f7e14d7061 (patch)
treebb20c1254279c9d9bca72e429fe16eac27d531e1 /src/jarabe/journal/misc.py
parentcdbab7d921b57c9dcf52a60db997854024fc148f (diff)
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.
Diffstat (limited to 'src/jarabe/journal/misc.py')
-rw-r--r--src/jarabe/journal/misc.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 619fe43..4fcfc60 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -87,12 +87,20 @@ def get_icon_name(metadata):
def get_date(metadata):
""" Convert from a string in iso format to a more human-like format. """
if 'timestamp' in metadata:
- timestamp = float(metadata['timestamp'])
- return util.timestamp_to_elapsed_string(timestamp)
+ 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:
- ti = time.strptime(metadata['mtime'], '%Y-%m-%dT%H:%M:%S')
- return util.timestamp_to_elapsed_string(time.mktime(ti))
+ 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')