CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-06-28 19:10:33 +12:00
Code Issues Projects Releases Wiki Activity

fix invalid old config vars

Browse source
This commit is contained in:
Nick Sweeting 2019-01-12 03:13:55 -05:00
parent b650c663a0
commit 6189b1a8af
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
archivebox/archive_methods.py
View file

@ -23,8 +23,6 @@ from config import (
RESOLUTION, RESOLUTION,
CHECK_SSL_VALIDITY, CHECK_SSL_VALIDITY,
SUBMIT_ARCHIVE_DOT_ORG, SUBMIT_ARCHIVE_DOT_ORG,
FETCH_AUDIO,
FETCH_VIDEO,
FETCH_FAVICON, FETCH_FAVICON,
WGET_USER_AGENT, WGET_USER_AGENT,
CHROME_USER_DATA_DIR, CHROME_USER_DATA_DIR,
@ -113,12 +111,6 @@ def archive_link(link_dir, link, overwrite=True):
if SUBMIT_ARCHIVE_DOT_ORG: if SUBMIT_ARCHIVE_DOT_ORG:
link = archive_dot_org(link_dir, link, overwrite=overwrite) 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: if FETCH_GIT:
link = fetch_git(link_dir, link, overwrite=overwrite) 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) write_link_index(link_dir, link)
# print()
return link return link

5
archivebox/util.py
View file

@ -28,8 +28,7 @@ from config import (
FETCH_SCREENSHOT, FETCH_SCREENSHOT,
FETCH_DOM, FETCH_DOM,
FETCH_FAVICON, FETCH_FAVICON,
FETCH_AUDIO, FETCH_MEDIA,
FETCH_VIDEO,
SUBMIT_ARCHIVE_DOT_ORG, SUBMIT_ARCHIVE_DOT_ORG,
) )
@ -93,7 +92,7 @@ def check_dependencies():
print(' See https://github.com/pirate/ArchiveBox for help.') print(' See https://github.com/pirate/ArchiveBox for help.')
raise SystemExit(1) 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: 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('{red}[X] Missing dependency: youtube-dl{reset}'.format(**ANSI))
print(' Run ./setup.sh, then confirm it was installed with: {} --version'.format('youtube-dl')) print(' Run ./setup.sh, then confirm it was installed with: {} --version'.format('youtube-dl'))