CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-07-01 04:20:55 +12:00
Code Issues Projects Releases Wiki Activity

better remote file downloading cli output messages

Browse source
This commit is contained in:
Nick Sweeting 2019-02-21 17:52:25 -05:00
parent 44ed46b465
commit 328a59749b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archivebox/archive.py
View file

@ -72,9 +72,8 @@ def load_links(archive_path=OUTPUT_DIR, import_path=None):
num_new_links = len(all_links) - len(existing_links) num_new_links = len(all_links) - len(existing_links)
if import_path and parser_name: if import_path and parser_name:
print(' > Adding {} new links to index from {} (parsed as {} format)'.format( print(' > Adding {} new links to index (parsed import as {})'.format(
num_new_links, num_new_links,
pretty_path(import_path),
parser_name, parser_name,
)) ))

13
archivebox/util.py
View file

@ -243,10 +243,11 @@ def download_url(url, timeout=TIMEOUT):
source_path = os.path.join(SOURCES_DIR, '{}-{}.txt'.format(domain(url), ts)) source_path = os.path.join(SOURCES_DIR, '{}-{}.txt'.format(domain(url), ts))
print('[*] [{}] Downloading {} > {}'.format( print('{}[*] [{}] Downloading {}{}'.format(
ANSI['green'],
datetime.now().strftime('%Y-%m-%d %H:%M:%S'), datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
url, url,
pretty_path(source_path), ANSI['reset'],
)) ))
end = progress(TIMEOUT, prefix=' ') end = progress(TIMEOUT, prefix=' ')
try: try:
@ -254,13 +255,19 @@ def download_url(url, timeout=TIMEOUT):
end() end()
except Exception as e: except Exception as e:
end() end()
print('[!] Failed to download {}\n'.format(url)) print('{}[!] Failed to download {}{}\n'.format(
ANSI['red'],
url,
ANSI['reset'],
))
print(' ', e) print(' ', e)
raise SystemExit(1) raise SystemExit(1)
with open(source_path, 'w', encoding='utf-8') as f: with open(source_path, 'w', encoding='utf-8') as f:
f.write(downloaded_xml) f.write(downloaded_xml)
print(' > {}'.format(pretty_path(source_path)))
return source_path return source_path