call validate functions at AppConfig.ready time manually

This commit is contained in:
Nick Sweeting 2024-10-21 01:32:53 -07:00
parent 7a6f1f36d2
commit 267fde0138
No known key found for this signature in database
12 changed files with 43 additions and 24 deletions

View file

@ -37,6 +37,12 @@ def get_BINARIES():
'chrome': CHROME_BINARY,
}
@abx.hookimpl
def ready():
from .config import CHROME_CONFIG
CHROME_CONFIG.validate()
# @abx.hookimpl
# def get_EXTRACTORS():
# return {

View file

@ -1,19 +1,20 @@
__package__ = 'plugins_extractor.chrome'
import os
from pathlib import Path
from typing import List, Optional
from pydantic import Field, model_validator
from pydantic import Field
from pydantic_pkgr import bin_abspath
from abx.archivebox.base_configset import BaseConfigSet
from abx.archivebox.base_binary import env
from archivebox.config import CONSTANTS
from archivebox.config.common import ARCHIVING_CONFIG, SHELL_CONFIG
from archivebox.misc.logging import STDERR
from archivebox.misc.util import dedupe
from archivebox.logging_util import pretty_path
CHROMIUM_BINARY_NAMES_LINUX = [

View file

@ -24,7 +24,7 @@ def get_PLUGIN():
@abx.hookimpl
def get_CONFIG():
from .config import WGET_CONFIG
return {
'wget': WGET_CONFIG
}
@ -45,3 +45,8 @@ def get_EXTRACTORS():
'wget': WGET_EXTRACTOR,
'warc': WARC_EXTRACTOR,
}
@abx.hookimpl
def ready():
from .config import WGET_CONFIG
WGET_CONFIG.validate()

View file

@ -4,7 +4,7 @@ import subprocess
from typing import List, Optional
from pathlib import Path
from pydantic import Field, model_validator
from pydantic import Field
from abx.archivebox.base_configset import BaseConfigSet
@ -40,8 +40,7 @@ class WgetConfig(BaseConfigSet):
WGET_USER_AGENT: str = Field(default=lambda: ARCHIVING_CONFIG.USER_AGENT)
WGET_COOKIES_FILE: Optional[Path] = Field(default=lambda: ARCHIVING_CONFIG.COOKIES_FILE)
@model_validator(mode='after')
def validate_use_ytdlp(self):
def validate(self):
if self.USE_WGET and self.WGET_TIMEOUT < 10:
STDERR.print(f'[red][!] Warning: TIMEOUT is set too low! (currently set to TIMEOUT={self.WGET_TIMEOUT} seconds)[/red]')
STDERR.print(' wget will fail to archive any sites if set to less than ~20 seconds.')

View file

@ -35,3 +35,8 @@ def get_BINARIES():
'ytdlp': YTDLP_BINARY,
'ffmpeg': FFMPEG_BINARY,
}
@abx.hookimpl
def ready():
from .config import YTDLP_CONFIG
YTDLP_CONFIG.validate()

View file

@ -2,7 +2,7 @@ __package__ = 'plugins_extractor.ytdlp'
from typing import List
from pydantic import Field, model_validator, AliasChoices
from pydantic import Field, AliasChoices
from abx.archivebox.base_configset import BaseConfigSet
@ -19,8 +19,7 @@ class YtdlpConfig(BaseConfigSet):
YTDLP_CHECK_SSL_VALIDITY: bool = Field(default=lambda: ARCHIVING_CONFIG.CHECK_SSL_VALIDITY)
YTDLP_TIMEOUT: int = Field(default=lambda: ARCHIVING_CONFIG.MEDIA_TIMEOUT)
@model_validator(mode='after')
def validate_use_ytdlp(self):
def validate(self):
if self.USE_YTDLP and self.YTDLP_TIMEOUT < 20:
STDERR.print(f'[red][!] Warning: MEDIA_TIMEOUT is set too low! (currently set to MEDIA_TIMEOUT={self.YTDLP_TIMEOUT} seconds)[/red]')
STDERR.print(' youtube-dl/yt-dlp will fail to archive any media if set to less than ~20 seconds.')