Skip to content

Commit 7261574

Browse files
committed
fix: Improve manage.py output
1 parent 909d620 commit 7261574

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

backend/app/jobs/jobs.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ChallengePasswordReset,
1212
OIDCRequest,
1313
)
14-
from app.service.delete_unused import deleteEmptyHouseholds
14+
from app.service.delete_unused import deleteEmptyHouseholds, deleteUnusedFiles
1515
from .item_ordering import findItemOrdering
1616
from .item_suggestions import findItemSuggestions
1717
from .cluster_shoppings import clusterShoppings
@@ -21,7 +21,7 @@
2121

2222
if scheduler is not None:
2323

24-
@scheduler.task("cron", id="everyMonth", day="1", hour="0", minute="0")
24+
@scheduler.task("cron", id="everyMonth", day="2", hour="0", minute="0")
2525
def setup_monthly():
2626
with app.app_context():
2727
monthly()
@@ -67,14 +67,15 @@ def setup_periodic_tasks(sender, **kwargs):
6767
)
6868

6969
sender.add_periodic_task(
70-
crontab(day_of_month="1", hour=0, minute=0),
70+
crontab(day_of_month="2", hour=0, minute=0),
7171
monthlyTask,
7272
name="everyMonth",
7373
)
7474

7575

7676
def monthly():
7777
deleteEmptyHouseholds()
78+
deleteUnusedFiles()
7879

7980

8081
def daily():

backend/app/service/delete_unused.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1+
from tqdm import tqdm
12
from app.models import Household, File
23
from app import app
34

45

56
def deleteUnusedFiles() -> int:
67
filesToDelete = [f for f in File.query.all() if f.isUnused()]
7-
for f in filesToDelete:
8+
for f in tqdm(
9+
filesToDelete,
10+
desc="Deleting unused files",
11+
):
812
f.delete()
913
app.logger.info(f"Deleted {len(filesToDelete)} unused files")
1014
return len(filesToDelete)
1115

1216

1317
def deleteEmptyHouseholds() -> int:
1418
householdsToDelete = [h for h in Household.all() if len(h.member) == 0]
15-
for h in householdsToDelete:
19+
for h in tqdm(
20+
householdsToDelete,
21+
desc="Deleting empty households",
22+
):
1623
h.delete()
1724
app.logger.info(f"Deleted {len(householdsToDelete)} empty households")
1825
return len(householdsToDelete)

0 commit comments

Comments
 (0)