From efd341d8ad3db03c20cd4ea18dfd3de5ee1eb90a Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 26 Sep 2024 02:42:50 -0700 Subject: [PATCH] add DIR_OUTPUT_PERMISSIONS to STORAGE_CONFIG and fix ripgrep constants import --- archivebox/plugins_search/ripgrep/apps.py | 3 ++- archivebox/plugins_sys/config/apps.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/archivebox/plugins_search/ripgrep/apps.py b/archivebox/plugins_search/ripgrep/apps.py index ba398762..e2671141 100644 --- a/archivebox/plugins_search/ripgrep/apps.py +++ b/archivebox/plugins_search/ripgrep/apps.py @@ -1,11 +1,12 @@ __package__ = 'archivebox.plugins_search.ripgrep' import re +from pathlib import Path from subprocess import run from typing import List, Dict, ClassVar, Iterable # from typing_extensions import Self -from django.conf import settings +import archivebox # Depends on other PyPI/vendor packages: from pydantic import InstanceOf, Field diff --git a/archivebox/plugins_sys/config/apps.py b/archivebox/plugins_sys/config/apps.py index ac893ab2..4a1f1228 100644 --- a/archivebox/plugins_sys/config/apps.py +++ b/archivebox/plugins_sys/config/apps.py @@ -2,21 +2,18 @@ __package__ = 'archivebox.plugins_sys.config' import os import sys import shutil -import platform import archivebox from typing import List, ClassVar, Dict, Optional from datetime import datetime from pathlib import Path from pydantic import InstanceOf, Field, field_validator, model_validator, computed_field -from benedict import benedict from rich import print -from django.conf import settings from django.utils.crypto import get_random_string from plugantic.base_plugin import BasePlugin from plugantic.base_configset import BaseConfigSet, ConfigSectionName -from plugantic.base_hook import BaseHook +from plugantic.base_hook import BaseHook, HookType from .constants import CONSTANTS, CONSTANTS_CONFIG @@ -122,6 +119,9 @@ class StorageConfig(BaseConfigSet): OUTPUT_PERMISSIONS: str = Field(default='644') RESTRICT_FILE_NAMES: str = Field(default='windows') ENFORCE_ATOMIC_WRITES: bool = Field(default=True) + + # not supposed to be user settable: + DIR_OUTPUT_PERMISSIONS: str = Field(default=lambda c: c['OUTPUT_PERMISSIONS'].replace('6', '7').replace('4', '5')) STORAGE_CONFIG = StorageConfig()