1
0
mirror of https://github.com/pirate/ArchiveBox.git synced 2025-08-17 20:01:44 +02:00

Add SINGLEFILE_ARGS to control single-file arguments

This commit is contained in:
renaisun
2022-06-09 14:35:48 +08:00
parent d586a8babc
commit 8899fe0b92
2 changed files with 4 additions and 0 deletions

View File

@@ -177,6 +177,7 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
'--compressed' '--compressed'
]}, ]},
'GIT_ARGS': {'type': list, 'default': ['--recursive']}, 'GIT_ARGS': {'type': list, 'default': ['--recursive']},
'SINGLEFILE_ARGS': {'type': list, 'default' : None}
}, },
'SEARCH_BACKEND_CONFIG' : { 'SEARCH_BACKEND_CONFIG' : {
@@ -391,6 +392,7 @@ DYNAMIC_CONFIG_SCHEMA: ConfigDefaultDict = {
'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},
'SINGLEFILE_ARGS': {'default': lambda c: c['SINGLEFILE_ARGS'] or []},
'USE_READABILITY': {'default': lambda c: c['USE_READABILITY'] and c['SAVE_READABILITY']}, 'USE_READABILITY': {'default': lambda c: c['USE_READABILITY'] and c['SAVE_READABILITY']},
'READABILITY_VERSION': {'default': lambda c: bin_version(c['READABILITY_BINARY']) if c['USE_READABILITY'] else None}, 'READABILITY_VERSION': {'default': lambda c: bin_version(c['READABILITY_BINARY']) if c['USE_READABILITY'] else None},

View File

@@ -17,6 +17,7 @@ from ..config import (
SAVE_SINGLEFILE, SAVE_SINGLEFILE,
DEPENDENCIES, DEPENDENCIES,
SINGLEFILE_VERSION, SINGLEFILE_VERSION,
SINGLEFILE_ARGS,
CHROME_BINARY, CHROME_BINARY,
) )
from ..logging_util import TimedProgress from ..logging_util import TimedProgress
@@ -47,6 +48,7 @@ def save_singlefile(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEO
browser_args = '--browser-args={}'.format(json.dumps(browser_args[1:])) browser_args = '--browser-args={}'.format(json.dumps(browser_args[1:]))
cmd = [ cmd = [
DEPENDENCIES['SINGLEFILE_BINARY']['path'], DEPENDENCIES['SINGLEFILE_BINARY']['path'],
*SINGLEFILE_ARGS,
'--browser-executable-path={}'.format(CHROME_BINARY), '--browser-executable-path={}'.format(CHROME_BINARY),
browser_args, browser_args,
link.url, link.url,