Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

[mediagoblin.git] / mediagoblin / gmg_commands / migrate.py

diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index 3ce25701276af2af6802d0806a4b78e87011af49..94adc9e08434b6d3e04b27fe277857cc7c2f972c 100644 (file)
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -14,31 +14,58 @@
 # 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/>.
 
+import sys
 
+from mediagoblin.db import util as db_util
+from mediagoblin.db.open import setup_connection_and_db_from_config
+from mediagoblin.init.config import read_mediagoblin_config
+
+# This MUST be imported so as to set up the appropriate migrations!
 from mediagoblin.db import migrations
-from mediagoblin.gmg_commands import util as commands_util
 
 
 def migrate_parser_setup(subparser):
     subparser.add_argument(
         '-cf', '--conf_file', default='mediagoblin.ini',
         help="Config file used to set up environment")
-    subparser.add_argument(
-        '-cs', '--app_section', default='app:mediagoblin',
-        help="Section of the config file where the app config is stored.")
 
 
-def migrate(args):
-    mgoblin_app = commands_util.setup_app(args)
-    print "Applying migrations..."
+def _print_started_migration(migration_number, migration_func):
+    sys.stdout.write(
+        "Running migration %s, '%s'... " % (
+            migration_number, migration_func.func_name))
+    sys.stdout.flush()
+
 
-    for model_name in migrations.MIGRATE_CLASSES:
-        model = getattr(mgoblin_app.db, model_name)
+def _print_finished_migration(migration_number, migration_func):
+    sys.stdout.write("done.\n")
+    sys.stdout.flush()
 
-        if not hasattr(model, 'migration_handler') or not model.collection:
-            continue
 
-        migration = model.migration_handler(model)
-        migration.migrate_all(collection=model.collection)
+def migrate(args):
+    config, validation_result = read_mediagoblin_config(args.conf_file)
+    connection, db = setup_connection_and_db_from_config(
+        config['mediagoblin'], use_pymongo=True)
+    migration_manager = db_util.MigrationManager(db)
+
+    # Clear old indexes
+    print "== Clearing old indexes... =="
+    removed_indexes = db_util.remove_deprecated_indexes(db)
+
+    for collection, index_name in removed_indexes:
+        print "Removed index '%s' in collection '%s'" % (
+            index_name, collection)
+    
+    # Migrate
+    print "\n== Applying migrations... =="
+    migration_manager.migrate_new(
+        pre_callback=_print_started_migration,
+        post_callback=_print_finished_migration)
             
-    print "... done."
+    # Add new indexes
+    print "\n== Adding new indexes... =="
+    new_indexes = db_util.add_new_indexes(db)
+
+    for collection, index_name in new_indexes:
+        print "Added index '%s' to collection '%s'" % (
+            index_name, collection)