mirror of
https://github.com/vastsa/FileCodeBox.git
synced 2026-11-22 06:57:56 +08:00
refactor: move config and tasks modules from core to apps/base (core no longer imports apps)
This commit is contained in:
1 parent
81d33b70de
commit
3396644da3
6 files changed
+8
-8
No files matched your search
@@ -13,7 +13,7 @@ from core.settings import (
|
||||
ADMIN_SESSION_EXPIRE_MIN,
|
||||
settings,
|
||||
)
|
||||
from core.config import refresh_settings
|
||||
from apps.base.config import refresh_settings
|
||||
from core.security import INTERNAL_CONFIG_KEYS, generate_jwt_secret
|
||||
from apps.base.models import FileCodes, KeyValue
|
||||
from apps.base.utils import get_expire_info, get_file_path_name
|
||||
|
||||
File renamed without changes.
@@ -15,7 +15,7 @@ from apps.base.models import (
|
||||
UploadChunk,
|
||||
)
|
||||
from apps.base.utils import ip_limit, get_chunk_file_path_name
|
||||
from core.config import refresh_settings
|
||||
from apps.base.config import refresh_settings
|
||||
from core.logger import logger
|
||||
from core.settings import settings, data_root
|
||||
from core.storage import FileStorageInterface, storages
|
||||
@@ -17,7 +17,7 @@ from tortoise.contrib.fastapi import register_tortoise
|
||||
from apps.admin.views import admin_api
|
||||
from apps.base.models import KeyValue
|
||||
from apps.base.views import share_api, chunk_api, presign_api
|
||||
from core.config import (
|
||||
from apps.base.config import (
|
||||
ensure_security_settings,
|
||||
ensure_settings_row,
|
||||
initialize_system,
|
||||
@@ -28,7 +28,7 @@ from core.database import db_startup_lock, get_db_config, init_db
|
||||
from core.logger import get_log_level_name, is_access_log_enabled, logger
|
||||
from core.response import APIResponse
|
||||
from core.settings import settings, BASE_DIR, DEFAULT_CONFIG
|
||||
from core.tasks import (
|
||||
from apps.base.tasks import (
|
||||
clean_expired_presign_sessions,
|
||||
clean_incomplete_uploads,
|
||||
delete_expire_files,
|
||||
|
||||
@@ -5,7 +5,7 @@ import unittest
|
||||
import apps.admin.services as admin_services
|
||||
import apps.admin.views as admin_views
|
||||
import apps.admin.dependencies as admin_dependencies
|
||||
import core.config as core_config
|
||||
import apps.base.config as core_config
|
||||
from apps.admin.dependencies import create_token, verify_token
|
||||
from apps.admin.schemas import LoginData
|
||||
from apps.admin.services import ConfigService
|
||||
|
||||
@@ -19,7 +19,7 @@ from apps.base.models import (
|
||||
StorageReservation,
|
||||
UploadChunk,
|
||||
)
|
||||
from core.tasks import (
|
||||
from apps.base.tasks import (
|
||||
clean_expired_presign_sessions,
|
||||
clean_incomplete_uploads,
|
||||
delete_expire_files,
|
||||
@@ -38,9 +38,9 @@ class _OneRoundMixin(SettingsOverrideMixin):
|
||||
def _sleep(seconds):
|
||||
raise SleepSentinel
|
||||
|
||||
with patch("core.tasks.data_root", Path(tmpdir)), patch(
|
||||
with patch("apps.base.tasks.data_root", Path(tmpdir)), patch(
|
||||
"core.storage.data_root", Path(tmpdir)
|
||||
), patch("core.tasks.asyncio.sleep", side_effect=_sleep):
|
||||
), patch("apps.base.tasks.asyncio.sleep", side_effect=_sleep):
|
||||
try:
|
||||
await task_coro_factory()
|
||||
except SleepSentinel:
|
||||
|
||||
Reference in new issue
Block a user