From d4dd40ccac1adab3b5f6dfb7af8e3c64f3abd6b8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 8 Jan 2023 20:28:18 -0500 Subject: [PATCH] improve cleanup commands --- catalog/management/commands/catalog.py | 4 ++-- catalog/management/commands/index.py | 4 ++-- journal/management/commands/journal.py | 13 ++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/catalog/management/commands/catalog.py b/catalog/management/commands/catalog.py index 398d55d9..90e9d7d2 100644 --- a/catalog/management/commands/catalog.py +++ b/catalog/management/commands/catalog.py @@ -4,13 +4,13 @@ from catalog.models import * class Command(BaseCommand): - help = "Scrape a catalog item from external resource (and save it)" + help = "catalog app utilities" def add_arguments(self, parser): parser.add_argument( "--cleanup", action="store_true", - help="purge invalid data", + help="purge invalid data (is_deleted=true)", ) def handle(self, *args, **options): diff --git a/catalog/management/commands/index.py b/catalog/management/commands/index.py index a9dc84a5..91351677 100644 --- a/catalog/management/commands/index.py +++ b/catalog/management/commands/index.py @@ -51,8 +51,8 @@ class Command(BaseCommand): self.stdout.write("Please wait for previous updates") # Indexer.update_settings() # self.stdout.write(self.style.SUCCESS('Index settings updated.')) - qs = ( - Item.objects.all() + qs = Item.objects.filter( + is_deleted=False ) # if h == 0 else c.objects.filter(edited_time__gt=timezone.now() - timedelta(hours=h)) pg = Paginator(qs.order_by("id"), BATCH_SIZE) for p in tqdm(pg.page_range): diff --git a/journal/management/commands/journal.py b/journal/management/commands/journal.py index 9b80df2d..4e32bbc3 100644 --- a/journal/management/commands/journal.py +++ b/journal/management/commands/journal.py @@ -4,21 +4,20 @@ from journal.models import * class Command(BaseCommand): - help = "Scrape a catalog item from external resource (and save it)" + help = "journal app utilities" def add_arguments(self, parser): parser.add_argument( "--cleanup", action="store_true", - help="purge invalid data", + help="purge invalid data (visibility=99)", ) def handle(self, *args, **options): if options["cleanup"]: - self.stdout.write(f"Cleaning up Rating...") - Rating.objects.filter(grade=0).delete() - for cls in ListMember.__subclasses__(): - self.stdout.write(f"Cleaning up {cls}...") - cls.objects.filter(visibility=99).delete() + for pcls in [Content, ListMember]: + for cls in pcls.__subclasses__(): + self.stdout.write(f"Cleaning up {cls}...") + cls.objects.filter(visibility=99).delete() self.stdout.write(self.style.SUCCESS(f"Done."))