From acf59faa06b286168343cda7cbffe07ed92308ff Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 6 Jul 2017 16:51:41 -0500 Subject: [PATCH] add custom WGET_USER_AGENT override option --- config.py | 1 + fetch.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/config.py b/config.py index 6c60562c..8ee92e41 100644 --- a/config.py +++ b/config.py @@ -28,6 +28,7 @@ RESOLUTION = os.getenv('RESOLUTION', '1440,900' ARCHIVE_PERMISSIONS = os.getenv('ARCHIVE_PERMISSIONS', '755' ) CHROME_BINARY = os.getenv('CHROME_BINARY', 'chromium-browser' ) # change to google-chrome browser if using google-chrome WGET_BINARY = os.getenv('WGET_BINARY', 'wget' ) +WGET_USER_AGENT = os.getenv('WGET_USER_AGENT', None) TIMEOUT = int(os.getenv('TIMEOUT', '60')) INDEX_TEMPLATE = os.getenv('INDEX_TEMPLATE', 'templates/index.html') INDEX_ROW_TEMPLATE = os.getenv('INDEX_ROW_TEMPLATE', 'templates/index_row.html') diff --git a/fetch.py b/fetch.py index 9775617d..16c5dd4d 100644 --- a/fetch.py +++ b/fetch.py @@ -17,6 +17,7 @@ from config import ( FETCH_AUDIO, FETCH_VIDEO, FETCH_FAVICON, + WGET_USER_AGENT, TIMEOUT, ANSI, progress, @@ -32,6 +33,7 @@ def fetch_wget(out_dir, link, overwrite=False, requisites=True, timeout=TIMEOUT) CMD = [ *'wget --timestamping --adjust-extension --no-parent'.split(' '), # Docs: https://www.gnu.org/software/wget/manual/wget.html *(('--page-requisites', '--convert-links') if requisites else ()), + *(('--user-agent="{}"'.format(WGET_USER_AGENT)) if WGET_USER_AGENT else ()), link['url'], ] end = progress(timeout, prefix=' ')