Merge remote-tracking branch 'origin/main'

app/core/config.py

@@ -1,10 +1,13 @@
 import os
 import secrets
+import sys
 from pathlib import Path
 from typing import List
 
 from pydantic import BaseSettings
 
+from app.utils.system import SystemUtils
+
 
 class Settings(BaseSettings):
     # 项目名称
@@ -28,7 +31,7 @@ class Settings(BaseSettings):
     # 是否开发模式
     DEV: bool = False
     # 配置文件目录
-    CONFIG_DIR: str = "/config"
+    CONFIG_DIR: str = None
     # 超级管理员
     SUPERUSER: str = "admin"
     # 超级管理员初始密码
@@ -209,7 +212,11 @@ class Settings(BaseSettings):
     def CONFIG_PATH(self):
         if self.CONFIG_DIR:
             return Path(self.CONFIG_DIR)
-        return self.INNER_CONFIG_PATH
+        elif SystemUtils.is_docker():
+            return Path("/config")
+        elif SystemUtils.is_frozen():
+            return Path(sys.executable).parent / "config"
+        return self.ROOT_PATH / "config"
 
     @property
     def TEMP_PATH(self):
@@ -274,6 +281,9 @@ class Settings(BaseSettings):
         with self.CONFIG_PATH as p:
             if not p.exists():
                 p.mkdir(parents=True, exist_ok=True)
+            if SystemUtils.is_frozen():
+                if not (p / "app.env").exists():
+                    SystemUtils.copy(self.INNER_CONFIG_PATH / "app.env", p / "app.env")
         with self.TEMP_PATH as p:
             if not p.exists():
                 p.mkdir(parents=True, exist_ok=True)
@@ -286,6 +296,6 @@ class Settings(BaseSettings):
 
 
 settings = Settings(
-    _env_file=Path(os.environ.get("CONFIG_DIR", "/config")) / "app.env",
+    _env_file=Settings().CONFIG_PATH / "app.env",
     _env_file_encoding="utf-8"
 )

app/db/init.py

@@ -39,7 +39,7 @@ def update_db():
     更新数据库
     """
     db_location = settings.CONFIG_PATH / 'user.db'
-    script_location = settings.ROOT_PATH / 'alembic'
+    script_location = settings.ROOT_PATH / 'database'
     try:
         alembic_cfg = Config()
         alembic_cfg.set_main_option('script_location', str(script_location))

app/helper/display.py

@@ -2,12 +2,15 @@ from pyvirtualdisplay import Display
 
 from app.log import logger
 from app.utils.singleton import Singleton
+from app.utils.system import SystemUtils
 
 
 class DisplayHelper(metaclass=Singleton):
     _display: Display = None
 
     def __init__(self):
+        if not SystemUtils.is_docker():
+            return
         try:
             self._display = Display(visible=False, size=(1024, 768))
             self._display.start()

app/plugins/invitessignin/__init__.py

@@ -22,7 +22,7 @@ class InvitesSignin(_PluginBase):
     # 插件图标
     plugin_icon = "invites.png"
     # 主题色
-    plugin_color = "#4FB647"
+    plugin_color = "#FFFFFF"
     # 插件版本
     plugin_version = "1.0"
     # 插件作者

app/plugins/iyuuautoseed/__init__.py

@@ -109,7 +109,7 @@ class IYUUAutoSeed(_PluginBase):
             self._nolabels = config.get("nolabels")
             self._nopaths = config.get("nopaths")
             self._clearcache = config.get("clearcache")
-            self._permanent_error_caches = config.get("permanent_error_caches") or []
+            self._permanent_error_caches = [] if self._clearcache else config.get("permanent_error_caches") or []
             self._error_caches = [] if self._clearcache else config.get("error_caches") or []
             self._success_caches = [] if self._clearcache else config.get("success_caches") or []
 

app/utils/system.py

@@ -3,6 +3,7 @@ import os
 import platform
 import re
 import shutil
+import sys
 from pathlib import Path
 from typing import List, Union, Tuple
 
@@ -27,20 +28,39 @@ class SystemUtils:
 
     @staticmethod
     def is_docker() -> bool:
+        """
+        判断是否为Docker环境
+        """
         return Path("/.dockerenv").exists()
 
     @staticmethod
     def is_synology() -> bool:
+        """
+        判断是否为群晖系统
+        """
         if SystemUtils.is_windows():
             return False
         return True if "synology" in SystemUtils.execute('uname -a') else False
 
     @staticmethod
     def is_windows() -> bool:
+        """
+        判断是否为Windows系统
+        """
         return True if os.name == "nt" else False
 
+    @staticmethod
+    def is_frozen() -> bool:
+        """
+        判断是否为冻结的二进制文件
+        """
+        return True if getattr(sys, 'frozen', False) else False
+
     @staticmethod
     def is_macos() -> bool:
+        """
+        判断是否为MacOS系统
+        """
         return True if platform.system() == 'Darwin' else False
 
     @staticmethod
@@ -77,7 +97,7 @@ class SystemUtils:
         """
         try:
             # link到当前目录并改名
-            tmp_path = (src.parent / dest.name).with_suffix(".mp")
+            tmp_path = src.parent / (dest.name + ".mp")
             tmp_path.hardlink_to(src)
             # 移动到目标目录
             shutil.move(tmp_path, dest)