diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py index 933214b9..a7ff95b7 100644 --- a/archivebox/logging_util.py +++ b/archivebox/logging_util.py @@ -494,12 +494,12 @@ def log_removal_started(links: List["Link"], yes: bool, delete: bool): if delete: file_counts = [link.num_outputs for link in links if Path(link.link_dir).exists()] print( - f' {len(links)} Links will be de-listed from the main index, and their archived content folders will be deleted from disk.\n' + f' {len(links)} Links will be de-listed from the main index, and their archived content folders will be deleted from disk.\n' + f' ({len(file_counts)} data folders with {sum(file_counts)} archived files will be deleted!)' ) else: print( - ' Matching links will be de-listed from the main index, but their archived content folders will remain in place on disk.\n' + ' Matching links will be de-listed from the main index, but their archived content folders will remain in place on disk.\n' + ' (Pass --delete if you also want to permanently delete the data folders)' ) @@ -638,17 +638,15 @@ def printable_folder_status(name: str, folder: Dict) -> str: @enforce_types def printable_dependency_version(name: str, dependency: Dict) -> str: - version = None + color, symbol, note, version = 'red', 'X', 'invalid', '?' + if dependency['enabled']: if dependency['is_valid']: - color, symbol, note, version = 'green', '√', 'valid', '' + color, symbol, note = 'green', '√', 'valid' parsed_version_num = re.search(r'[\d\.]+', dependency['version']) if parsed_version_num: version = f'v{parsed_version_num[0]}' - - if not version: - color, symbol, note, version = 'red', 'X', 'invalid', '?' else: color, symbol, note, version = 'lightyellow', '-', 'disabled', '-'