瀏覽代碼

add DIR_OUTPUT_PERMISSIONS to STORAGE_CONFIG and fix ripgrep constants import

Nick Sweeting 1 年之前
父節點
當前提交
efd341d8ad
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 2 1
      archivebox/plugins_search/ripgrep/apps.py
  2. 4 4
      archivebox/plugins_sys/config/apps.py

+ 2 - 1
archivebox/plugins_search/ripgrep/apps.py

@@ -1,11 +1,12 @@
 __package__ = 'archivebox.plugins_search.ripgrep'
 __package__ = 'archivebox.plugins_search.ripgrep'
 
 
 import re
 import re
+from pathlib import Path
 from subprocess import run
 from subprocess import run
 from typing import List, Dict, ClassVar, Iterable
 from typing import List, Dict, ClassVar, Iterable
 # from typing_extensions import Self
 # from typing_extensions import Self
 
 
-from django.conf import settings
+import archivebox
 
 
 # Depends on other PyPI/vendor packages:
 # Depends on other PyPI/vendor packages:
 from pydantic import InstanceOf, Field
 from pydantic import InstanceOf, Field

+ 4 - 4
archivebox/plugins_sys/config/apps.py

@@ -2,21 +2,18 @@ __package__ = 'archivebox.plugins_sys.config'
 import os
 import os
 import sys
 import sys
 import shutil
 import shutil
-import platform
 import archivebox
 import archivebox
 
 
 from typing import List, ClassVar, Dict, Optional
 from typing import List, ClassVar, Dict, Optional
 from datetime import datetime
 from datetime import datetime
 from pathlib import Path
 from pathlib import Path
 from pydantic import InstanceOf, Field, field_validator, model_validator, computed_field
 from pydantic import InstanceOf, Field, field_validator, model_validator, computed_field
-from benedict import benedict
 from rich import print
 from rich import print
 
 
-from django.conf import settings
 from django.utils.crypto import get_random_string
 from django.utils.crypto import get_random_string
 from plugantic.base_plugin import BasePlugin
 from plugantic.base_plugin import BasePlugin
 from plugantic.base_configset import BaseConfigSet, ConfigSectionName
 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
 from .constants import CONSTANTS, CONSTANTS_CONFIG
 
 
@@ -122,6 +119,9 @@ class StorageConfig(BaseConfigSet):
     OUTPUT_PERMISSIONS: str             = Field(default='644')
     OUTPUT_PERMISSIONS: str             = Field(default='644')
     RESTRICT_FILE_NAMES: str            = Field(default='windows')
     RESTRICT_FILE_NAMES: str            = Field(default='windows')
     ENFORCE_ATOMIC_WRITES: bool         = Field(default=True)
     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()
 STORAGE_CONFIG = StorageConfig()