diff --git a/archivebox.egg-info/PKG-INFO b/archivebox.egg-info/PKG-INFO index 4eea75b2..1d528824 100644 --- a/archivebox.egg-info/PKG-INFO +++ b/archivebox.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: archivebox -Version: 0.4.23 +Version: 0.4.24 Summary: The self-hosted internet archive. Home-page: https://github.com/ArchiveBox/ArchiveBox Author: Nick Sweeting diff --git a/archivebox.egg-info/requires.txt b/archivebox.egg-info/requires.txt index 083c3cdd..457f64e5 100644 --- a/archivebox.egg-info/requires.txt +++ b/archivebox.egg-info/requires.txt @@ -1,25 +1,25 @@ -atomicwrites==1.4.0 -croniter==0.3.34 -dateparser -django-extensions==3.0.3 -django==3.0.8 -ipython -mypy-extensions==0.4.3 -python-crontab==2.5.1 requests==2.24.0 -w3lib==1.22.0 +atomicwrites==1.4.0 +mypy-extensions==0.4.3 +django==3.0.8 +django-extensions==3.0.3 +dateparser +ipython youtube-dl +python-crontab==2.5.1 +croniter==0.3.34 +w3lib==1.22.0 [dev] -bottle -django-stubs +setuptools +twine flake8 ipdb mypy -pytest -recommonmark -setuptools +django-stubs sphinx sphinx-rtd-theme +recommonmark +pytest +bottle stdeb -twine diff --git a/archivebox/config.py b/archivebox/config.py index d321dd72..dc50679d 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -157,6 +157,7 @@ CONFIG_DEFAULTS: Dict[str, ConfigDefaultDict] = { 'READABILITY_BINARY': {'type': str, 'default': 'readability-extractor'}, 'MERCURY_BINARY': {'type': str, 'default': 'mercury-parser'}, 'YOUTUBEDL_BINARY': {'type': str, 'default': 'youtube-dl'}, + 'NODE_BINARY': {'type': str, 'default': 'node'}, 'CHROME_BINARY': {'type': str, 'default': None}, }, } @@ -296,6 +297,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'SAVE_WARC': {'default': lambda c: c['USE_WGET'] and c['SAVE_WARC']}, 'WGET_ARGS': {'default': lambda c: c['WGET_ARGS'] or []}, + '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}, @@ -318,6 +320,8 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = { 'CHROME_BINARY': {'default': lambda c: c['CHROME_BINARY'] if c['CHROME_BINARY'] else find_chrome_binary()}, 'CHROME_VERSION': {'default': lambda c: bin_version(c['CHROME_BINARY']) if c['USE_CHROME'] else None}, 'USE_NODE': {'default': lambda c: c['USE_NODE'] and (c['SAVE_READABILITY'] or c['SAVE_SINGLEFILE'])}, + 'NODE_VERSION': {'default': lambda c: bin_version(c['NODE_BINARY']) if c['USE_NODE'] else None}, + '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']}, @@ -665,6 +669,11 @@ def get_code_locations(config: ConfigDict) -> SimpleConfigValueDict: 'enabled': True, 'is_valid': (config['TEMPLATES_DIR'] / 'static').exists(), }, + # 'NODE_MODULES_DIR': { + # 'path': , + # 'enabled': , + # 'is_valid': (...).exists(), + # }, } def get_external_locations(config: ConfigDict) -> ConfigValue: @@ -718,6 +727,13 @@ def get_data_locations(config: ConfigDict) -> ConfigValue: def get_dependency_info(config: ConfigDict) -> ConfigValue: return { + 'ARCHIVEBOX_BINARY': { + 'path': bin_path(config['ARCHIVEBOX_BINARY']), + 'version': config['VERSION'], + 'hash': bin_hash(config['ARCHIVEBOX_BINARY']), + 'enabled': True, + 'is_valid': True, + }, 'PYTHON_BINARY': { 'path': bin_path(config['PYTHON_BINARY']), 'version': config['PYTHON_VERSION'], @@ -746,6 +762,13 @@ def get_dependency_info(config: ConfigDict) -> ConfigValue: 'enabled': config['USE_WGET'], 'is_valid': bool(config['WGET_VERSION']), }, + 'NODE_BINARY': { + 'path': bin_path(config['NODE_BINARY']), + 'version': config['NODE_VERSION'], + 'hash': bin_hash(config['NODE_BINARY']), + 'enabled': config['USE_NODE'], + 'is_valid': bool(config['SINGLEFILE_VERSION']), + }, 'SINGLEFILE_BINARY': { 'path': bin_path(config['SINGLEFILE_BINARY']), 'version': config['SINGLEFILE_VERSION'], diff --git a/package.json b/package.json index 243f68e6..c7a61c1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "archivebox", - "version": "0.4.23", + "version": "0.4.24", "description": "ArchiveBox: The self-hosted internet archive", "author": "Nick Sweeting ", "license": "MIT",