1 files changed, 32 insertions, 47 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 712f8ab4..6a8ebcf9 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -14,56 +14,41 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from mediagoblin.db.util import RegisterMigration
 from mediagoblin.util import cleaned_markdown_conversion
 
-from mongokit import DocumentMigration
 
+# Please see mediagoblin/tests/test_migrations.py for some examples of
+# basic migrations.
 
-class MediaEntryMigration(DocumentMigration):
-    def allmigration01_uploader_to_reference(self):
-        """
-        Old MediaEntry['uploader'] accidentally embedded the User instead
-        of referencing it.  Fix that!
-        """
-        # uploader is an associative array
-        self.target = {'uploader': {'$type': 3}}
-        if not self.status:
-            for doc in self.collection.find(self.target):
-                self.update = {
-                    '$set': {
-                        'uploader': doc['uploader']['_id']}}
-                self.collection.update(
-                    self.target, self.update, multi=True, safe=True)
 
-    def allmigration02_add_description_html(self):
-        """
-        Now that we can have rich descriptions via Markdown, we should
-        update all existing entries to record the rich description versions.
-        """
-        self.target = {'description_html': {'$exists': False},
-                       'description': {'$exists': True}}
+@RegisterMigration(1)
+def user_add_bio_html(database):
+    """
+    Users now have richtext bios via Markdown, reflect appropriately.
+    """
+    collection = database['users']
 
-        if not self.status:
-            for doc in self.collection.find(self.target):
-                self.update = {
-                    '$set': {
-                        'description_html': cleaned_markdown_conversion(
-                            doc['description'])}}
-        
-class UserMigration(DocumentMigration):
-    def allmigration01_add_bio_and_url_profile(self):
-        """
-        User can elaborate profile with home page and biography
-        """
-        self.target = {'url': {'$exists': False},
-                       'bio': {'$exists': False}}
-        if not self.status:
-            for doc in self.collection.find(self.target):
-                self.update = {
-                    '$set': {'url': '', 
-                             'bio': ''}}
-                self.collection.update(
-                    self.target, self.update, multi=True, safe=True)
-                        
-                        
-MIGRATE_CLASSES = ['MediaEntry', 'User']
+    target = collection.find(
+        {'bio_html': {'$exists': False}})
+
+    for document in target:
+        document['bio_html'] = cleaned_markdown_conversion(
+            document['bio'])
+        collection.save(document)
+
+
+@RegisterMigration(2)
+def mediaentry_mediafiles_main_to_original(database):
+    """
+    Rename "main" media file to "original".
+    """
+    collection = database['media_entries']
+    target = collection.find(
+        {'media_files.main': {'$exists': True}})
+
+    for document in target:
+        original = document['media_files'].pop('main')
+        document['media_files']['original'] = original
+
+        collection.save(document)