forks/archivebox
1
0
Fork 0
Code Releases Activity

add node modules to path

Browse source
This commit is contained in:
Nick Sweeting 2020-08-18 18:14:56 -04:00
parent 1c0df87f78
commit f6484d8ddc
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
archivebox/config/__init__.py
View file

@ -525,6 +525,10 @@ def bin_path(binary: Optional[str]) -> Optional[str]:
if binary is None: if binary is None:
return None return None
node_modules_bin = Path('.') / 'node_modules' / '.bin' / binary
if node_modules_bin.exists():
return str(node_modules_bin.resolve())
return shutil.which(os.path.expanduser(binary)) or binary return shutil.which(os.path.expanduser(binary)) or binary
def bin_hash(binary: Optional[str]) -> Optional[str]: def bin_hash(binary: Optional[str]) -> Optional[str]:
@ -775,6 +779,10 @@ globals().update(CONFIG)
# Timezone set as UTC # Timezone set as UTC
os.environ["TZ"] = 'UTC' os.environ["TZ"] = 'UTC'
# add ./node_modules/.bin to $PATH so we can use node scripts in extractors
NODE_BIN_PATH = str((Path(CONFIG["OUTPUT_DIR"]) / 'node_modules' / '.bin').resolve())
sys.path.append(NODE_BIN_PATH)
############################## Importable Checkers ############################# ############################## Importable Checkers #############################
@ -816,16 +824,6 @@ 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 print_dependency_additional_info(dependency: str) -> None:
if dependency == "SINGLEFILE_BINARY":
hint(('npm install -g git+https://github.com/gildas-lormeau/SingleFile.git"',
'or set SAVE_SINGLEFILE=False to silence this warning',
''))
if dependency == "READABILITY_BINARY":
hint(('npm install -g git+https://github.com/pirate/readability-extractor.git"',
'or set SAVE_READABILITY=False to silence this warning',
''))
def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None: def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None:
invalid_dependencies = [ invalid_dependencies = [
@ -842,9 +840,10 @@ def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None:
info['version'] or 'unable to detect version', info['version'] or 'unable to detect version',
) )
) )
print_dependency_additional_info(dependency) # if dependency in ("SINGLEFILE_BINARY", "READABILITY_BINARY"):
stderr(' {lightred}Hint:{reset} To get more info on dependencies run:'.format(**ANSI)) # hint(('npm install --prefix . "git+https://github.com/pirate/ArchiveBox.git"',
stderr(' archivebox --version') # f'or set SAVE_{dependency.rsplit("_", 1)[0]}=False to silence this warning',
# ''))
stderr('') stderr('')
if config['TIMEOUT'] < 5: if config['TIMEOUT'] < 5:

2
package.json
View file

@ -10,7 +10,7 @@
"bin": { "bin": {
"archivebox-node": "./bin/archive", "archivebox-node": "./bin/archive",
"single-file": "./node_modules/.bin/single-file", "single-file": "./node_modules/.bin/single-file",
"readability-extractor": "./node_modules/.bin/single-file" "readability-extractor": "./node_modules/.bin/readability-extractor"
}, },
"dependencies": { "dependencies": {
"readability-extractor": "git+https://github.com/pirate/readability-extractor.git", "readability-extractor": "git+https://github.com/pirate/readability-extractor.git",