forks/archivebox
1
0
Fork 0
Code Releases Activity

config.py lint fixes

Browse source
This commit is contained in:
Nick Sweeting 2023-05-04 01:43:34 -07:00
parent 0b950b3253
commit f0033f75d0
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
archivebox/config.py
View file

@ -53,6 +53,7 @@ from .config_stubs import (
### Pre-Fetch Minimal System Config ### Pre-Fetch Minimal System Config
TIMEZONE = 'UTC'
SYSTEM_USER = getpass.getuser() or os.getlogin() SYSTEM_USER = getpass.getuser() or os.getlogin()
try: try:
@ -81,7 +82,6 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = {
'IN_QEMU': {'type': bool, 'default': False}, 'IN_QEMU': {'type': bool, 'default': False},
'PUID': {'type': int, 'default': os.getuid()}, 'PUID': {'type': int, 'default': os.getuid()},
'PGID': {'type': int, 'default': os.getgid()}, 'PGID': {'type': int, 'default': os.getgid()},
# TODO: 'SHOW_HINTS': {'type: bool, 'default': True},
}, },
'GENERAL_CONFIG': { 'GENERAL_CONFIG': {
@ -393,7 +393,7 @@ def get_version(config):
def get_commit_hash(config): def get_commit_hash(config):
try: try:
git_dir = config['PACKAGE_DIR'] / '../') git_dir = config['PACKAGE_DIR'] / '../'
ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1] ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1]
commit_hash = git_dir.joinpath(ref).read_text().strip() commit_hash = git_dir.joinpath(ref).read_text().strip()
return commit_hash return commit_hash
@ -1195,7 +1195,7 @@ def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None:
if config['USE_YOUTUBEDL'] and config['MEDIA_TIMEOUT'] < 20: if config['USE_YOUTUBEDL'] and config['MEDIA_TIMEOUT'] < 20:
stderr(f'[!] Warning: MEDIA_TIMEOUT is set too low! (currently set to MEDIA_TIMEOUT={config["MEDIA_TIMEOUT"]} seconds)', color='red') stderr(f'[!] Warning: MEDIA_TIMEOUT is set too low! (currently set to MEDIA_TIMEOUT={config["MEDIA_TIMEOUT"]} seconds)', color='red')
stderr(' Youtube-dl will fail to archive all media if set to less than ~20 seconds.') stderr(' youtube-dl/yt-dlp will fail to archive any media if set to less than ~20 seconds.')
stderr(' (Setting it somewhere over 60 seconds is recommended)') stderr(' (Setting it somewhere over 60 seconds is recommended)')
stderr() stderr()
stderr(' If you want to disable media archiving entirely, set SAVE_MEDIA=False instead:') stderr(' If you want to disable media archiving entirely, set SAVE_MEDIA=False instead:')

2
archivebox/extractors/__init__.py
View file

@ -184,7 +184,7 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s
link.url, link.url,
command, command,
ts ts
) + "\n")) ) + "\n" + str(e) + "\n"))
#f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n") #f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n")
# print(' ', stats) # print(' ', stats)

1
bin/build_docker.sh
View file

@ -74,6 +74,7 @@ echo "[+] Generating requirements.txt and pdm.lock from pyproject.toml..."
pdm lock --group=':all' --strategy="cross_platform" --production pdm lock --group=':all' --strategy="cross_platform" --production
pdm export --group=':all' --production --without-hashes -o requirements.txt pdm export --group=':all' --production --without-hashes -o requirements.txt
echo "[+] Building archivebox:$VERSION docker image..." echo "[+] Building archivebox:$VERSION docker image..."
# docker builder prune # docker builder prune
# docker build . --no-cache -t archivebox-dev \ # docker build . --no-cache -t archivebox-dev \