mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-12 22:25:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replaced os.path in logging_util.py

Browse source
This commit is contained in:
Angel Rey 2020-09-30 15:05:03 -05:00 • committed by Cristian Vargas
parent 25ac18c8b7
commit 01461a98a7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
archivebox/logging_util.py
View file

@ -390,7 +390,7 @@ def log_list_finished(links):
def log_removal_started(links: List["Link"], yes: bool, delete: bool): def log_removal_started(links: List["Link"], yes: bool, delete: bool):
print('{lightyellow}[i] Found {} matching URLs to remove.{reset}'.format(len(links), **ANSI)) print('{lightyellow}[i] Found {} matching URLs to remove.{reset}'.format(len(links), **ANSI))
if delete: if delete:
file_counts = [link.num_outputs for link in links if os.path.exists(link.link_dir)] file_counts = [link.num_outputs for link in links if Path(link.link_dir).exists()]
print( 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!)' f' ({len(file_counts)} data folders with {sum(file_counts)} archived files will be deleted!)'
@ -445,9 +445,9 @@ def log_shell_welcome_msg():
@enforce_types @enforce_types
def pretty_path(path: Union[Path, str]) -> str: def pretty_path(path: Union[Path, str]) -> str:
"""convert paths like .../ArchiveBox/archivebox/../output/abc into output/abc""" """convert paths like .../ArchiveBox/archivebox/../output/abc into output/abc"""
pwd = os.path.abspath('.') pwd = Path('.').resolve()
# parent = os.path.abspath(os.path.join(pwd, os.path.pardir)) # parent = os.path.abspath(os.path.join(pwd, os.path.pardir))
return str(path).replace(pwd + '/', './') return str(path).replace(str(pwd) + '/', './')
@enforce_types @enforce_types
@ -518,11 +518,11 @@ def printable_folder_status(name: str, folder: Dict) -> str:
color, symbol, note, num_files = 'lightyellow', '-', 'disabled', '-' color, symbol, note, num_files = 'lightyellow', '-', 'disabled', '-'
if folder['path']: if folder['path']:
if os.path.exists(folder['path']): if Path(folder['path']).exists():
num_files = ( num_files = (
f'{len(os.listdir(folder["path"]))} files' f'{len(os.listdir(folder["path"]))} files'
if os.path.isdir(folder['path']) else if Path(folder['path']).is_dir() else
printable_filesize(os.path.getsize(folder['path'])) printable_filesize(Path(folder['path']).stat().st_size)
) )
else: else:
num_files = 'missing' num_files = 'missing'