From a0ba9928cb3559c0d3b17e28f741170e645871e1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 23 Feb 2022 10:57:48 +0100 Subject: Geodata redesign: fix operation migration --- ishtar_common/management/commands/migrate_to_geo_v4.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ishtar_common/management') diff --git a/ishtar_common/management/commands/migrate_to_geo_v4.py b/ishtar_common/management/commands/migrate_to_geo_v4.py index 64ab25c16..8daf921d9 100644 --- a/ishtar_common/management/commands/migrate_to_geo_v4.py +++ b/ishtar_common/management/commands/migrate_to_geo_v4.py @@ -13,7 +13,7 @@ from django.core.management.base import BaseCommand from ishtar_common.utils import ugettext_lazy as _ from ishtar_common import models_common, models -from archaeological_operations.models import Operation +from archaeological_operations.models import Operation, ArchaeologicalSite log_path = os.sep.join([settings.ROOT_PATH, "logs"]) @@ -55,6 +55,9 @@ def migrate(quiet=False, log=True): changed.append(["geovectordata", data.name, data.pk, "Création commune"]) town.main_geodata = data town.save() + if not quiet and nb: + sys.stdout.write(f"\r[{get_time()}] Towns migrated\n") + sys.stdout.flush() # manage operation vector sources operation_content_type = ContentType.objects.get( @@ -130,10 +133,13 @@ def migrate(quiet=False, log=True): operation.save() changed.append( ["geovectordata", data.name, data.pk, "Point opération"]) + if not quiet and nb: + sys.stdout.write(f"\r[{get_time()}] Operation migrated\n") + sys.stdout.flush() if log and changed: - filename = f"geo_migration-created-{get_time().replace(':', '')}.txt" + filename = f"geo_migration-created-{get_time().replace(':', '')}.csv" path = os.sep.join([log_path, filename]) with open(path, "w+") as fle: writer = csv.writer(fle) @@ -141,9 +147,7 @@ def migrate(quiet=False, log=True): for change in changed: writer.writerow(change) if not quiet: - sys.stdout.write(f"log: {path} written.") - if not quiet: - sys.stdout.write("\n") + sys.stdout.write(f"[{get_time()}] Log: {path} written\n") def percent(current, total): -- cgit v1.2.3