From b2f77cc6050f043a7bc1bcbafdc35e51e55a048d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 24 Jul 2024 00:13:22 +0200 Subject: 🐛 commands: fix ishtar_import script - add verbose display MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/management/commands/ishtar_import.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'ishtar_common/management') diff --git a/ishtar_common/management/commands/ishtar_import.py b/ishtar_common/management/commands/ishtar_import.py index 011af2f8c..3698cfa98 100644 --- a/ishtar_common/management/commands/ishtar_import.py +++ b/ishtar_common/management/commands/ishtar_import.py @@ -4,6 +4,7 @@ from django.core.management.base import BaseCommand, CommandError from ishtar_common import models, models_imports +from ishtar_common.utils import BColors class Command(BaseCommand): @@ -16,10 +17,14 @@ class Command(BaseCommand): parser.add_argument('command', choices=["list", "analyse", "import", "archive"]) parser.add_argument('import_id', nargs='?', default=None) + parser.add_argument( + "--quiet", dest="quiet", action="store_true", help="Quiet output" + ) def handle(self, *args, **options): command = options['command'] import_id = options['import_id'] + quiet = options.get("quiet", False) if command != "list" and not import_id: raise CommandError("With {} is mandatory".format( command)) @@ -39,7 +44,7 @@ class Command(BaseCommand): self.stdout.flush() return try: - imp = models.Import.objects.get(pk=args[1]) + imp = models.Import.objects.get(pk=import_id) except (ValueError, models.Import.DoesNotExist): raise CommandError("{} is not a valid import ID".format(args[0])) if command == 'analyse': @@ -47,9 +52,11 @@ class Command(BaseCommand): self.stdout.write("* {} analysed\n".format(imp)) self.stdout.flush() elif command == 'import': - self.stdout.write("* import {}\n".format(imp)) - imp.importation() - self.stdout.write("* {} imported\n".format(imp)) + if not quiet: + self.stdout.write(BColors.OKGREEN + f"* import {imp}{BColors.ENDC}\n") + imp.importation(verbose=not quiet) + if not quiet: + self.stdout.write(BColors.OKGREEN + f"* {imp} imported{BColors.ENDC}\n") self.stdout.flush() elif command == 'archive': imp.archive() -- cgit v1.2.3