First try at restoring removable devices support in the journal

1 files changed, 11 insertions, 16 deletions

diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py
index b3efe92..5d4086c 100644
--- a/src/jarabe/journal/journalentrybundle.py
+++ b/src/jarabe/journal/journalentrybundle.py
@@ -19,11 +19,12 @@ import tempfile
 import shutil
 
 import cjson
-
 import dbus
-from sugar.datastore import datastore
+
 from sugar.bundle.bundle import Bundle, MalformedBundleException
 
+from jarabe.journal import model
+
 class JournalEntryBundle(Bundle):
     """A Journal entry bundle
 
@@ -50,20 +51,14 @@ class JournalEntryBundle(Bundle):
         self._unzip(install_dir)
         try:
             metadata = self._read_metadata(bundle_dir)
-            jobject = datastore.create()
-            try:
-                for key, value in metadata.iteritems():
-                    jobject.metadata[key] = value
-
-                preview = self._read_preview(uid, bundle_dir)
-                if preview is not None:
-                    jobject.metadata['preview'] = dbus.ByteArray(preview)
-
-                jobject.metadata['uid'] = ''
-                jobject.file_path = os.path.join(bundle_dir, uid)
-                datastore.write(jobject)
-            finally:
-                jobject.destroy()
+            metadata['uid'] = ''
+
+            preview = self._read_preview(uid, bundle_dir)
+            if preview is not None:
+                metadata['preview'] = dbus.ByteArray(preview)
+
+            file_path = os.path.join(bundle_dir, uid)
+            model.write(metadata, file_path)
         finally:
             shutil.rmtree(bundle_dir, ignore_errors=True)