From 08bf8535f4121666de9ea7226cbc3b4e49b810a6 Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Tue, 24 Aug 2010 17:37:30 +0000 Subject: Reviewer comments #1915 --- diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py index ac3d42d..46cf5fd 100644 --- a/src/carquinyol/datastore.py +++ b/src/carquinyol/datastore.py @@ -130,9 +130,13 @@ class DataStore(dbus.service.Object): update_metadata = True if 'creation_time' not in props: if 'ctime' in props: - props['creation_time'] = time.mktime(time.strptime( - props['ctime'], migration.DATE_FORMAT)) - else: + try: + props['creation_time'] = time.mktime( + time.strptime(props['ctime'], + migration.DATE_FORMAT)) + except (TypeError, ValueError): + pass + if 'creation_time' not in props: props['creation_time'] = props['timestamp'] update_metadata = True if update_metadata: @@ -183,7 +187,7 @@ class DataStore(dbus.service.Object): pass if 'creation_time' not in props: - props['creation_time'] = time.time() + props['creation_time'] = props['timestamp'] if os.path.exists(file_path): stat = os.stat(file_path) @@ -236,7 +240,7 @@ class DataStore(dbus.service.Object): pass if 'creation_time' not in props: - props['creation_time'] = time.time() + props['creation_time'] = props['timestamp'] if os.path.exists(file_path): stat = os.stat(file_path) diff --git a/src/carquinyol/migration.py b/src/carquinyol/migration.py index 4d19af6..686902f 100644 --- a/src/carquinyol/migration.py +++ b/src/carquinyol/migration.py @@ -64,6 +64,7 @@ def migrate_from_0(): def _migrate_metadata(root_path, old_root_path, uid): + metadata_path = layoutmanager.get_instance().get_metadata_path(uid) old_metadata_path = os.path.join(old_root_path, uid + '.metadata') metadata = cjson.decode(open(old_metadata_path, 'r').read()) -- cgit v0.9.1