diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index 826f9824..f6e8e80d 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -252,9 +252,8 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'SAVE_WGET': {'default': lambda c: c['USE_WGET'] and c['SAVE_WGET']}, 'SAVE_WARC': {'default': lambda c: c['USE_WGET'] and c['SAVE_WARC']}, - 'USE_SINGLEFILE': {'default': lambda c: c['USE_SINGLEFILE'] and (c['SAVE_SINGLEFILE'])}, + 'USE_SINGLEFILE': {'default': lambda c: c['USE_SINGLEFILE'] and c['SAVE_SINGLEFILE']}, 'SINGLEFILE_VERSION': {'default': lambda c: bin_version(c['SINGLEFILE_BINARY']) if c['USE_SINGLEFILE'] else None}, - 'SAVE_SINGLEFILE': {'default': lambda c: c['USE_SINGLEFILE'] and c['SAVE_SINGLEFILE']}, 'USE_GIT': {'default': lambda c: c['USE_GIT'] and c['SAVE_GIT']}, 'GIT_VERSION': {'default': lambda c: bin_version(c['GIT_BINARY']) if c['USE_GIT'] else None}, @@ -271,6 +270,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'SAVE_PDF': {'default': lambda c: c['USE_CHROME'] and c['SAVE_PDF']}, 'SAVE_SCREENSHOT': {'default': lambda c: c['USE_CHROME'] and c['SAVE_SCREENSHOT']}, 'SAVE_DOM': {'default': lambda c: c['USE_CHROME'] and c['SAVE_DOM']}, + 'SAVE_SINGLEFILE': {'default': lambda c: c['USE_CHROME'] and c['USE_SINGLEFILE']}, 'DEPENDENCIES': {'default': lambda c: get_dependency_info(c)}, 'CODE_LOCATIONS': {'default': lambda c: get_code_locations(c)}, diff --git a/archivebox/config/stubs.py b/archivebox/config/stubs.py index 438f7d8a..6df90396 100644 --- a/archivebox/config/stubs.py +++ b/archivebox/config/stubs.py @@ -53,6 +53,7 @@ class ConfigDict(BaseConfig, total=False): SAVE_PDF: bool SAVE_SCREENSHOT: bool SAVE_DOM: bool + SAVE_SINGLEFILE: bool SAVE_WARC: bool SAVE_GIT: bool SAVE_MEDIA: bool @@ -75,12 +76,14 @@ class ConfigDict(BaseConfig, total=False): USE_GIT: bool USE_CHROME: bool USE_YOUTUBEDL: bool + USE_SINGLEFILE: bool CURL_BINARY: Optional[str] GIT_BINARY: Optional[str] WGET_BINARY: Optional[str] YOUTUBEDL_BINARY: Optional[str] CHROME_BINARY: Optional[str] + SINGLEFILE_BINARY: Optional[str] TERM_WIDTH: Callable[[], int] USER: str diff --git a/docs b/docs index f23f5e47..6bea9eb0 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit f23f5e4701dc275e9cd413343754d52f7ec06106 +Subproject commit 6bea9eb017ecf09072ea3ef0afa406d25f58f219