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

update singlefile plugin to use new npm binprovider and support installing

Browse source
This commit is contained in:
Nick Sweeting 2024-09-21 01:52:56 -07:00
parent dd6d7e4975
commit 6c39d27ccb
No known key found for this signature in database
1 changed files with 50 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

73
archivebox/builtin_plugins/singlefile/apps.py
View file

@ -1,11 +1,14 @@
__package__ = 'archivebox.builtin_plugins.singlefile'
from pathlib import Path from pathlib import Path
from typing import List, Dict, Optional from typing import List, Dict, Optional
from typing_extensions import Self
from django.conf import settings from django.conf import settings
# Depends on other PyPI/vendor packages: # Depends on other PyPI/vendor packages:
from pydantic import InstanceOf, Field from pydantic import InstanceOf, Field, validate_call
from pydantic_pkgr import BinProvider, BinProviderName, ProviderLookupDict, BinName from pydantic_pkgr import BinProvider, BinProviderName, ProviderLookupDict, BinName, bin_abspath
# Depends on other Django apps: # Depends on other Django apps:
from plugantic.base_plugin import BasePlugin from plugantic.base_plugin import BasePlugin
@ -14,10 +17,9 @@ from plugantic.base_binary import BaseBinary, env
from plugantic.base_extractor import BaseExtractor from plugantic.base_extractor import BaseExtractor
from plugantic.base_queue import BaseQueue from plugantic.base_queue import BaseQueue
from plugantic.base_hook import BaseHook from plugantic.base_hook import BaseHook
from plugantic.ansible_utils import run_playbook
# Depends on Other Plugins: # Depends on Other Plugins:
from builtin_plugins.npm.apps import npm from builtin_plugins.npm.apps import SYS_NPM_BINPROVIDER, LIB_NPM_BINPROVIDER
###################### Config ########################## ###################### Config ##########################
@ -60,38 +62,57 @@ DEFAULT_GLOBAL_CONFIG = {
SINGLEFILE_CONFIG = SinglefileConfigs(**DEFAULT_GLOBAL_CONFIG) SINGLEFILE_CONFIG = SinglefileConfigs(**DEFAULT_GLOBAL_CONFIG)
INSTALL_BIN = './install_singlefile.yml' SINGLEFILE_MIN_VERSION = '1.1.54'
SINGLEFILE_MAX_VERSION = '1.1.60'
class SinglefileBinary(BaseBinary): class SinglefileBinary(BaseBinary):
name: BinName = 'single-file' name: BinName = 'single-file'
binproviders_supported: List[InstanceOf[BinProvider]] = [npm, env] binproviders_supported: List[InstanceOf[BinProvider]] = [LIB_NPM_BINPROVIDER, SYS_NPM_BINPROVIDER, env]
provider_overrides: Dict[BinProviderName, ProviderLookupDict] ={ provider_overrides: Dict[BinProviderName, ProviderLookupDict] = {
# 'env': { env.name: {
# 'abspath': lambda: bin_abspath('single-file-node.js', PATH=env.PATH) or bin_abspath('single-file', PATH=env.PATH), 'abspath': lambda:
# }, bin_abspath('single-file', PATH=env.PATH) or bin_abspath('single-file-node.js', PATH=env.PATH),
# 'npm': { },
# 'abspath': lambda: bin_abspath('single-file', PATH=npm.PATH) or bin_abspath('single-file-node.js', PATH=npm.PATH), LIB_NPM_BINPROVIDER.name: {
# 'packages': lambda: f'single-file-cli@>={min_version} <{max_version}', "abspath": lambda:
# }, bin_abspath("single-file", PATH=LIB_NPM_BINPROVIDER.PATH) or bin_abspath("single-file-node.js", PATH=LIB_NPM_BINPROVIDER.PATH),
"packages": lambda:
[f"single-file-cli@>={SINGLEFILE_MIN_VERSION} <{SINGLEFILE_MAX_VERSION}"],
},
SYS_NPM_BINPROVIDER.name: {
"packages": lambda:
[], # prevent modifying system global npm packages
},
} }
def install(self, *args, quiet=False) -> 'SinglefileBinary': @validate_call
def install(self, binprovider_name: Optional[BinProviderName]=None) -> Self:
# force install to only use lib/npm provider, we never want to modify global NPM packages
return BaseBinary.install(self, binprovider_name=binprovider_name or LIB_NPM_BINPROVIDER.name)
install_playbook = self.plugin_dir / 'install_singlefile.yml' @validate_call
def load_or_install(self, binprovider_name: Optional[BinProviderName] = None) -> Self:
# force install to only use lib/npm provider, we never want to modify global NPM packages
try:
return self.load()
except Exception:
return BaseBinary.install(self, binprovider_name=binprovider_name or LIB_NPM_BINPROVIDER.name)
singlefile_bin = run_playbook(install_playbook, data_dir=settings.CONFIG.OUTPUT_DIR, quiet=quiet).BINARIES.singlefile
return self.__class__.model_validate( # ALTERNATIVE INSTALL METHOD using Ansible:
{ # install_playbook = PLUGANTIC_DIR / 'ansible' / 'install_singlefile.yml'
**self.model_dump(), # singlefile_bin = run_playbook(install_playbook, data_dir=settings.CONFIG.OUTPUT_DIR, quiet=quiet).BINARIES.singlefile
"loaded_abspath": singlefile_bin.abspath, # return self.__class__.model_validate(
"loaded_version": singlefile_bin.version, # {
"loaded_binprovider": env, # **self.model_dump(),
"binproviders_supported": self.binproviders_supported, # "loaded_abspath": singlefile_bin.abspath,
} # "loaded_version": singlefile_bin.version,
) # "loaded_binprovider": env,
# "binproviders_supported": self.binproviders_supported,
# }
# )
SINGLEFILE_BINARY = SinglefileBinary() SINGLEFILE_BINARY = SinglefileBinary()