From 6189b1a8afb28022a54853b983f11aa9680d4320 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Sat, 12 Jan 2019 03:13:55 -0500 Subject: [PATCH] fix invalid old config vars --- archivebox/archive_methods.py | 9 --------- archivebox/util.py | 5 ++--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/archivebox/archive_methods.py b/archivebox/archive_methods.py index 65cac4da..fe2ef94a 100644 --- a/archivebox/archive_methods.py +++ b/archivebox/archive_methods.py @@ -23,8 +23,6 @@ from config import ( RESOLUTION, CHECK_SSL_VALIDITY, SUBMIT_ARCHIVE_DOT_ORG, - FETCH_AUDIO, - FETCH_VIDEO, FETCH_FAVICON, WGET_USER_AGENT, CHROME_USER_DATA_DIR, @@ -113,12 +111,6 @@ def archive_link(link_dir, link, overwrite=True): if SUBMIT_ARCHIVE_DOT_ORG: link = archive_dot_org(link_dir, link, overwrite=overwrite) - # if FETCH_AUDIO: - # link = fetch_audio(link_dir, link, overwrite=overwrite) - - # if FETCH_VIDEO: - # link = fetch_video(link_dir, link, overwrite=overwrite) - if FETCH_GIT: link = fetch_git(link_dir, link, overwrite=overwrite) @@ -127,7 +119,6 @@ def archive_link(link_dir, link, overwrite=True): write_link_index(link_dir, link) - # print() return link diff --git a/archivebox/util.py b/archivebox/util.py index 265815ff..2fb4c463 100644 --- a/archivebox/util.py +++ b/archivebox/util.py @@ -28,8 +28,7 @@ from config import ( FETCH_SCREENSHOT, FETCH_DOM, FETCH_FAVICON, - FETCH_AUDIO, - FETCH_VIDEO, + FETCH_MEDIA, SUBMIT_ARCHIVE_DOT_ORG, ) @@ -93,7 +92,7 @@ def check_dependencies(): print(' See https://github.com/pirate/ArchiveBox for help.') raise SystemExit(1) - if FETCH_AUDIO or FETCH_VIDEO: + if FETCH_MEDIA: if run(['which', 'youtube-dl'], stdout=DEVNULL).returncode or run(['youtube-dl', '--version'], stdout=DEVNULL).returncode: print('{red}[X] Missing dependency: youtube-dl{reset}'.format(**ANSI)) print(' Run ./setup.sh, then confirm it was installed with: {} --version'.format('youtube-dl'))