fix user agent quoting

This commit is contained in:
Nick Sweeting 2019-01-11 19:53:47 -05:00
parent 33942d37cb
commit b77476cb83

View file

@ -212,7 +212,7 @@ def fetch_wget(link_dir, link, requisites=FETCH_WGET_REQUISITES, timeout=TIMEOUT
# WGET CLI Docs: https://www.gnu.org/software/wget/manual/wget.html # WGET CLI Docs: https://www.gnu.org/software/wget/manual/wget.html
*'wget -N -E -np -x -H -k -K -S --restrict-file-names=unix'.split(' '), *'wget -N -E -np -x -H -k -K -S --restrict-file-names=unix'.split(' '),
*(('-p',) if FETCH_WGET_REQUISITES else ()), *(('-p',) if FETCH_WGET_REQUISITES else ()),
*(('--user-agent={}'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()), *(('--user-agent="{}"'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()),
*((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))), *((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))),
link['url'], link['url'],
] ]
@ -547,7 +547,7 @@ def fetch_warc(link_dir, link, timeout=TIMEOUT):
CMD = [ CMD = [
'wget', 'wget',
'--warc-file={}'.format(int(datetime.now().timestamp())), '--warc-file={}'.format(int(datetime.now().timestamp())),
*(('--user-agent={}'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()), *(('--user-agent="{}"'.format(WGET_USER_AGENT),) if WGET_USER_AGENT else ()),
*((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))), *((() if CHECK_SSL_VALIDITY else ('--no-check-certificate',))),
link['url'], link['url'],
] ]