mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-18 00:54:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix SAVE_SINGLEFILE setting to depend on chrome

Browse source
This commit is contained in:
Nick Sweeting 2020-08-06 23:07:25 -04:00
parent c8e3aed647
commit 19aa5c3e94
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
archivebox/config/__init__.py
View file

@ -252,9 +252,8 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = {
'SAVE_WGET': {'default': lambda c: c['USE_WGET'] and c['SAVE_WGET']}, 'SAVE_WGET': {'default': lambda c: c['USE_WGET'] and c['SAVE_WGET']},
'SAVE_WARC': {'default': lambda c: c['USE_WGET'] and c['SAVE_WARC']}, '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}, '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']}, '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}, '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_PDF': {'default': lambda c: c['USE_CHROME'] and c['SAVE_PDF']},
'SAVE_SCREENSHOT': {'default': lambda c: c['USE_CHROME'] and c['SAVE_SCREENSHOT']}, '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_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)}, 'DEPENDENCIES': {'default': lambda c: get_dependency_info(c)},
'CODE_LOCATIONS': {'default': lambda c: get_code_locations(c)}, 'CODE_LOCATIONS': {'default': lambda c: get_code_locations(c)},

3
archivebox/config/stubs.py
View file

@ -53,6 +53,7 @@ class ConfigDict(BaseConfig, total=False):
SAVE_PDF: bool SAVE_PDF: bool
SAVE_SCREENSHOT: bool SAVE_SCREENSHOT: bool
SAVE_DOM: bool SAVE_DOM: bool
SAVE_SINGLEFILE: bool
SAVE_WARC: bool SAVE_WARC: bool
SAVE_GIT: bool SAVE_GIT: bool
SAVE_MEDIA: bool SAVE_MEDIA: bool
@ -75,12 +76,14 @@ class ConfigDict(BaseConfig, total=False):
USE_GIT: bool USE_GIT: bool
USE_CHROME: bool USE_CHROME: bool
USE_YOUTUBEDL: bool USE_YOUTUBEDL: bool
USE_SINGLEFILE: bool
CURL_BINARY: Optional[str] CURL_BINARY: Optional[str]
GIT_BINARY: Optional[str] GIT_BINARY: Optional[str]
WGET_BINARY: Optional[str] WGET_BINARY: Optional[str]
YOUTUBEDL_BINARY: Optional[str] YOUTUBEDL_BINARY: Optional[str]
CHROME_BINARY: Optional[str] CHROME_BINARY: Optional[str]
SINGLEFILE_BINARY: Optional[str]
TERM_WIDTH: Callable[[], int] TERM_WIDTH: Callable[[], int]
USER: str USER: str

2
docs

@ -1 +1 @@
Subproject commit f23f5e4701dc275e9cd413343754d52f7ec06106 Subproject commit 6bea9eb017ecf09072ea3ef0afa406d25f58f219