From 1ac99621abf083d2e8cbf4075c4a88d4019ecb6b Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Wed, 1 May 2019 02:28:26 -0400 Subject: [PATCH] show progress during validate_links --- archivebox/index/__init__.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index e86d3336..aa437b6c 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -122,18 +122,13 @@ def merge_links(a: Link, b: Link) -> Link: @enforce_types def validate_links(links: Iterable[Link]) -> List[Link]: - links = archivable_links(links) # remove chrome://, about:, mailto: etc. - links = sorted_links(links) # deterministically sort the links based on timstamp, url - links = uniquefied_links(links) # merge/dedupe duplicate timestamps & urls - - if not links: - stderr('{red}[X] No links found in index.{reset}'.format(**ANSI)) - stderr(' To add a link to your archive, run:') - stderr(" archivebox add 'https://example.com'") - stderr() - stderr(' For more usage and examples, run:') - stderr(' archivebox help') - raise SystemExit(1) + timer = TimedProgress(TIMEOUT * 4) + try: + links = archivable_links(links) # remove chrome://, about:, mailto: etc. + links = sorted_links(links) # deterministically sort the links based on timstamp, url + links = uniquefied_links(links) # merge/dedupe duplicate timestamps & urls + finally: + timer.end() return list(links)