Skip to content

Commit 8cf6fb4

Browse files
committed
Add progress bar while importing data from importers
1 parent eb52414 commit 8cf6fb4

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

vulnerabilities/import_runner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
from typing import Set
3131
from typing import Tuple
3232
from typing import Optional
33+
from tqdm import tqdm
3334

3435
import packageurl
3536
from django.db import DataError
@@ -118,8 +119,8 @@ def process_advisories(data_source: DataSource) -> None:
118119
# Treat updated_advisories and added_advisories as same. Eventually
119120
# we want to refactor all data sources to provide advisories via a
120121
# single method.
121-
advisory_batches = chain(data_source.updated_advisories(), data_source.added_advisories())
122-
for batch in advisory_batches:
122+
advisory_batches = list(chain(data_source.updated_advisories(), data_source.added_advisories()))
123+
for batch in tqdm(advisory_batches):
123124
for advisory in batch:
124125
try:
125126
vuln, vuln_created = _get_or_create_vulnerability(advisory)

vulnerabilities/management/commands/import.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def _import_data(self, importers, cutoff_date):
104104
failed_importers = []
105105

106106
for importer in importers:
107-
self.stdout.write(f"Importing data from {importer.name}")
107+
self.stdout.write(f"Importing data from {importer.name}...")
108108
batch_size = int(getattr(self, "batch_size", 10))
109109
try:
110110
ImportRunner(importer, batch_size).run(cutoff_date=cutoff_date)
@@ -119,3 +119,7 @@ def _import_data(self, importers, cutoff_date):
119119
)
120120
if failed_importers:
121121
raise CommandError(f"{len(failed_importers)} failed!: {','.join(failed_importers)}")
122+
else:
123+
self.stdout.write(
124+
self.style.SUCCESS("\n\nAll done! vulnerability data has been successfully fetched.")
125+
)

0 commit comments

Comments
 (0)