diff --git a/modules/archive/__init__.py b/modules/archive/__init__.py index f5b2e2a0..1c6b3b3a 100644 --- a/modules/archive/__init__.py +++ b/modules/archive/__init__.py @@ -17,7 +17,7 @@ from wrolpi.db import optional_session, get_db_session from wrolpi.downloader import Downloader, Download, DownloadResult from wrolpi.errors import UnrecoverableDownloadError from wrolpi.files.models import FileGroup -from wrolpi.vars import PYTEST, DOCKERIZED, USER_AGENT +from wrolpi.vars import PYTEST, DOCKERIZED, DOWNLOAD_USER_AGENT from . import lib from .api import archive_bp # noqa from .errors import InvalidArchive @@ -76,7 +76,7 @@ class ArchiveDownloader(Downloader, ABC): str(SINGLE_FILE_BIN), '--browser-executable-path', CHROMIUM, '--browser-args', '["--no-sandbox"]', - '--user-agent', USER_AGENT, + '--user-agent', DOWNLOAD_USER_AGENT, '--dump-content', '--load-deferred-images-dispatch-scroll-event', download.url, diff --git a/wrolpi/vars.py b/wrolpi/vars.py index db5d1ec9..8d0b5682 100644 --- a/wrolpi/vars.py +++ b/wrolpi/vars.py @@ -99,10 +99,11 @@ VIDEO_COMMENTS_FETCH_COUNT = int(os.environ.get('VIDEO_COMMENTS_FETCH_COUNT', 80 YTDLP_CACHE_DIR = os.environ.get('YTDLP_CACHE_DIR', '/tmp/ytdlp_cache') VIDEO_INFO_JSON_KEYS_TO_CLEAN = list_var('DELETED_VIDEO_KEYS', 'automatic_captions,formats,thumbnails') -USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.366' +default_user_agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36' +DOWNLOAD_USER_AGENT = os.environ.get('DOWNLOAD_USER_AGENT', default_user_agent) DEFAULT_HTTP_HEADERS = { - 'User-Agent': USER_AGENT, + 'User-Agent': DOWNLOAD_USER_AGENT, } RPI_DEVICE_PATH = pathlib.Path('/proc/device-tree/model')