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

swap more direct settings.CONFIG access to abx getters

Browse source
This commit is contained in:
Nick Sweeting 2024-10-24 15:42:19 -07:00
parent b61f6ff8d8
commit 4b6f08b0fe
No known key found for this signature in database
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
archivebox/main.py
View file

@ -1052,7 +1052,8 @@ def install(out_dir: Path=DATA_DIR, binproviders: Optional[List[str]]=None, bina
from rich import print
from django.conf import settings
from archivebox import CONSTANTS
import abx.archivebox.reads
from archivebox.config.permissions import IS_ROOT, ARCHIVEBOX_USER, ARCHIVEBOX_GROUP
from archivebox.config.paths import get_or_create_working_lib_dir
@ -1075,11 +1076,11 @@ def install(out_dir: Path=DATA_DIR, binproviders: Optional[List[str]]=None, bina
package_manager_names = ', '.join(
f'[yellow]{binprovider.name}[/yellow]'
for binprovider in reversed(list(settings.BINPROVIDERS.values()))
for binprovider in reversed(list(abx.archivebox.reads.get_BINPROVIDERS().values()))
if not binproviders or (binproviders and binprovider.name in binproviders)
)
print(f'[+] Setting up package managers {package_manager_names}...')
for binprovider in reversed(list(settings.BINPROVIDERS.values())):
for binprovider in reversed(list(abx.archivebox.reads.get_BINPROVIDERS().values())):
if binproviders and binprovider.name not in binproviders:
continue
try:
@ -1092,7 +1093,7 @@ def install(out_dir: Path=DATA_DIR, binproviders: Optional[List[str]]=None, bina
print()
for binary in reversed(list(settings.BINARIES.values())):
for binary in reversed(list(abx.archivebox.reads.get_BINARIES().values())):
if binary.name in ('archivebox', 'django', 'sqlite', 'python'):
# obviously must already be installed if we are running
continue