diff --git a/archivebox/archive.py b/archivebox/archive.py index efe23a9f..a1f6fdbb 100755 --- a/archivebox/archive.py +++ b/archivebox/archive.py @@ -72,9 +72,8 @@ def load_links(archive_path=OUTPUT_DIR, import_path=None): num_new_links = len(all_links) - len(existing_links) 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, - pretty_path(import_path), parser_name, )) diff --git a/archivebox/util.py b/archivebox/util.py index e369d0de..2a30fcb0 100644 --- a/archivebox/util.py +++ b/archivebox/util.py @@ -243,10 +243,11 @@ def download_url(url, timeout=TIMEOUT): 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'), url, - pretty_path(source_path), + ANSI['reset'], )) end = progress(TIMEOUT, prefix=' ') try: @@ -254,12 +255,18 @@ def download_url(url, timeout=TIMEOUT): end() except Exception as e: end() - print('[!] Failed to download {}\n'.format(url)) + print('{}[!] Failed to download {}{}\n'.format( + ANSI['red'], + url, + ANSI['reset'], + )) print(' ', e) raise SystemExit(1) with open(source_path, 'w', encoding='utf-8') as f: f.write(downloaded_xml) + + print(' > {}'.format(pretty_path(source_path))) return source_path