Merge pull request #434 from cdvv7788/hotfix/#427

docs: Improve message for missing singlefile binary
This commit is contained in:
Nick Sweeting 2020-08-10 10:30:20 -04:00 committed by GitHub
commit d6a7ba819b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -778,9 +778,16 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
stderr(' CHROME_USER_DATA_DIR="{}"'.format(config['CHROME_USER_DATA_DIR'].split('/Default')[0])) stderr(' CHROME_USER_DATA_DIR="{}"'.format(config['CHROME_USER_DATA_DIR'].split('/Default')[0]))
raise SystemExit(2) raise SystemExit(2)
def dependency_additional_info(dependency: str) -> str:
if dependency == "SINGLEFILE_BINARY":
return "Please follow the installation instructions at https://github.com/gildas-lormeau/SingleFile/tree/master/cli and set SINGLEFILE_BINARY or set USE_SINGLEFILE=false"
return ""
def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None: def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None:
invalid = [ invalid = [
'{}: {} ({})'.format(name, info['path'] or 'unable to find binary', info['version'] or 'unable to detect version') '{}: {} ({}). {}'.format(name, info['path'] or 'unable to find binary', info['version'] or 'unable to detect version',
dependency_additional_info(name))
for name, info in config['DEPENDENCIES'].items() for name, info in config['DEPENDENCIES'].items()
if info['enabled'] and not info['is_valid'] if info['enabled'] and not info['is_valid']
] ]