Cleanup mongo->sql converter.

1. No need to drop media_data['exif'], we only have and
   want media_data['exif_all'].

2. Use media['_id'] instead of media._id (better not use
   dot-notation on mongo objects in such a low level tool).

diff --git a/mediagoblin/db/sql/convert.py b/mediagoblin/db/sql/convert.py
index 232e424fe1ff198a6769f310b6c84dca83701bec..ebf3037c750887b569ac5e02b60cdad664c4b525 100644 (file)
--- a/mediagoblin/db/sql/convert.py
+++ b/mediagoblin/db/sql/convert.py
@@ -115,12 +115,9 @@ def convert_image(mk_db):
             {'media_type': 'mediagoblin.media_types.image'}).sort('created'):
         media_data = copy(media.media_data)
 
-        # TODO: Fix after exif is migrated
-        media_data.pop('exif', None)
-
         if len(media_data):
             media_data_row = ImageData(**media_data)
-            media_data_row.media_entry = obj_id_table[media._id]
+            media_data_row.media_entry = obj_id_table[media['_id']]
             session.add(media_data_row)
 
     session.commit()
@@ -133,7 +130,7 @@ def convert_video(mk_db):
     for media in mk_db.MediaEntry.find(
             {'media_type': 'mediagoblin.media_types.video'}).sort('created'):
         media_data_row = VideoData(**media.media_data)
-        media_data_row.media_entry = obj_id_table[media._id]
+        media_data_row.media_entry = obj_id_table[media['_id']]
         session.add(media_data_row)
 
     session.commit()