Merge pull request #110 from katagomo/main

更新配置文件读取和调用方法

Author: HisAtri

Dockerfile

@@ -1,32 +1,37 @@
-# 第一阶段：安装GCC
-FROM python:3.12.1-alpine as gcc_installer
-
-# 安装GCC及其他依赖
-RUN apk add --no-cache gcc musl-dev jpeg-dev zlib-dev libjpeg
-
-# 第二阶段：安装Python依赖
-FROM gcc_installer as requirements_installer
+# 使用更小的基础镜像
+FROM python:3.12.1-slim as builder
 
 # 设置工作目录
 WORKDIR /app
 
-# 只复制 requirements.txt，充分利用 Docker 缓存层
-COPY ./requirements.txt /app/
+# 安装必要的编译依赖
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gcc \
+    libjpeg-dev \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
 
-# 安装Python依赖
-RUN pip install --no-user --prefix=/install -r requirements.txt
+# 复制依赖文件
+COPY requirements.txt .
 
-# 第三阶段：运行环境
-FROM python:3.12.1-alpine
+# 安装依赖到指定目录
+RUN pip install --no-cache-dir --prefix=/install -r requirements.txt
+
+# 最终阶段
+FROM python:3.12.1-slim
 
-# 设置工作目录
 WORKDIR /app
 
-# 复制Python依赖
-COPY --from=requirements_installer /install /usr/local
+# 只复制必要的Python包
+COPY --from=builder /install /usr/local
+
+# 复制应用代码
+COPY . .
 
-# 复制项目代码
-COPY ./ /app
+# 清理不必要的文件（如果有的话）
+RUN rm -rf __pycache__ \
+    && rm -rf *.pyc \
+    && find . -type d -name __pycache__ -exec rm -r {} +
 
 # 设置启动命令
 CMD ["python", "/app/app.py"]

api/__init__.py

@@ -10,9 +10,11 @@
 logger = logging.getLogger(__name__)
 
 v1_bp = Blueprint('v1', __name__, url_prefix='/api/v1')
-# Blueprint直接复制app配置项
 v1_bp.config = app.config.copy()
 
+navidrome_bp = Blueprint('navidrome', __name__, url_prefix='/api/navidrome')
+navidrome_bp.config = app.config.copy()
+
 
 # 缓存逻辑
 cache_dir = './flask_cache'

api/login.py

@@ -4,9 +4,7 @@
 
 from mod.auth import webui, cookie
 from mod.auth.authentication import require_auth
-from mod.args import GlobalArgs
-
-args = GlobalArgs()
+from mod.args import args
 
 
 @app.route('/login')
@@ -16,7 +14,7 @@ def login_check():
     未登录时返回页面，已登录时重定向至主页
     :return:
     """
-    if require_auth(request=request) < 0 and args.auth:
+    if require_auth(request=request) < 0 and args("auth"):
         return render_template_string(webui.html_login())
 
     return redirect('/src')
@@ -33,7 +31,7 @@ def login_api():
     data = request.get_json()
     if 'password' in data:
         pwd = data['password']
-        if args.valid(pwd):
+        if pwd in args("auth"):
             logger.info("user login")
             response = make_response(jsonify(success=True))
             response.set_cookie('api_auth_token', cookie.set_cookie(pwd))

app.py

@@ -4,25 +4,22 @@
 from waitress import serve
 
 from mod import check_update
-from mod.args import GlobalArgs
+from mod.args import args
 from mod.dev.debugger import debugger
 from api import *
 from api import __import__
 
-args = GlobalArgs()
-
 
 def run_server(debug=False):
     if not debug:
         # Waitress WSGI 服务器
-        serve(app, host=args.ip, port=args.port, threads=32, channel_timeout=30)
+        serve(app, host=args("server", "ip"), port=args("server", "port"), threads=32, channel_timeout=30)
     else:
         debugger.debug = True
         debugger.log("info", "Debug模式已开启")
         debugger.log("info", f"Version: {args.version}")
-        if args.auth:
-            debugger.log("info", f"Auth: {args.auth}")
-        app.run(host='*', port=args.port, debug=True)
+        debugger.log("info", f"Auth: {args('auth')}")
+        app.run(host='0.0.0.0', port=args("server", "port"), debug=True)
 
 
 if __name__ == '__main__':
@@ -41,3 +38,4 @@ def run_server(debug=False):
     app.register_blueprint(v1_bp)
     # 启动
     run_server(args.debug)
+

buildup.py

@@ -10,7 +10,7 @@
 subprocess.run("pip install -r requirements.txt", shell=True)
 subprocess.run("pip install pyinstaller", shell=True)
 
-from mod.args import GlobalArgs
+from mod.args import args
 
 sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
 
@@ -22,7 +22,7 @@
 if (ARCHITECTURE == "x86_64") & (platform.architecture()[0] == "32bit"):
     ARCHITECTURE = "i386"
 APP_NAME = "lrcapi"
-APP_VERSION = GlobalArgs().version
+APP_VERSION = args.version
 PACK_NAME = f"{APP_NAME}-{APP_VERSION}-{PLATFORM}-{ARCHITECTURE}{'.exe' if PLATFORM == 'Windows' else ''}"
 
 # 打包

mod/args/__init__.py

@@ -12,6 +12,8 @@
 parser.add_argument('--port', type=int, default=28883, help='应用的运行端口，默认28883')
 parser.add_argument('--auth', type=str, default='', help='用于验证Header.Authentication字段，建议纯ASCII字符')
 parser.add_argument("--debug", action="store_true", help="Enable debug mode")
+parser.add_argument('--ip', type=str, default='*', help='服务器监听IP，默认*')
+parser.add_argument('--token', type=str, default='', help='用于翻译歌词的API Token')
 kw_args, unknown_args = parser.parse_known_args()
 arg_auths: dict = {kw_args.auth: "rwd"} if kw_args.auth else None
 
@@ -70,6 +72,7 @@ def __init__(self):
         self.auth = os.environ.get('API_AUTH', None)
         self.port = os.environ.get('API_PORT', None)
         self.auths = None
+        self.token = os.environ.get('API_TOKEN', None)
         if self.auth:
             self.auths: dict = {
                 self.auth: "all"
@@ -120,48 +123,31 @@ class Args():
     def __init__(self, data=None, default=None):
         self.__data: dict = data
         self.__default: dict = default or {}
+        self.version = "1.5.7"
+        self.debug = kw_args.debug
 
     def __invert__(self):
-        return self.__data
-
-    def __get(self, key: str) -> 'Args':
-        # 如果不是字典，则返回Args包装的None
-        if not isinstance(self.__data, dict):
-            return Args()
-        else:
-            # 如果key不存在，则返回Args包装的None
-            if key not in self.__data.keys():
-                return Args()
-            # 如果key对应的值是字典，则返回Args包装的字典，默认值从__default中获取
-            if isinstance(self.__data[key], dict):
-                return Args(data=self.__data[key], default=self.__default.get(key, {}))
-            # 如果key对应的值不是字典，则返回Args包装的值
-            return Args(data=self.__data[key])
-
-    def __set_default(self, default_data: dict):
-        self.__default = default_data
-
-    def __call__(self):
         """
         JSON: config/config.json
         YAML: config/config.yaml
 
         default: YAML
         """
+        # 1. 首先用默认值初始化
+        self.__data = self.__default.copy()
+        
+        # 2. 加载配置文件，使用update而不是直接赋值
         for loader in (self.__load_json, self.__load_yaml):
             data = loader()
             if isinstance(data, dict):
-                self.__data = data
-                return
-            # 如果没有读取到有效数据，则使用默认数据
-            self.__data = self.__default
-            # 写入默认数据
-            directory = os.path.join(os.getcwd(), "config")
-            if not os.path.exists(directory):
-                os.makedirs(directory)
-            file_path = os.path.join(directory, "config.yaml")
-            with open(file_path, "w+") as yaml_file:
-                yaml.dump(DEFAULT_DATA, yaml_file)
+                self.__data.update(data)
+                break
+        
+        # 3. 加载环境变量
+        self.__load_env()
+        
+        # 4. 最后加载命令行参数（最高优先级）
+        self.__load_arg()
 
     @staticmethod
     def __load_json() -> dict|None:
@@ -181,17 +167,55 @@ def __load_yaml() -> dict|None:
                 return yaml.safe_load(yaml_file)
         except (yaml.YAMLError, FileNotFoundError):
             return None
-
-    def __getattribute__(self, item):
-        if item.startswith('_'):
-            return super().__getattribute__(item)
-        return self.__get(item)
-
-    def __str__(self):
-        return str({
-            "data": self.__data,
-            "default": self.__default
-        })
+        
+    def __load_env(self):
+        auth = os.environ.get('API_AUTH', None)
+        port = os.environ.get('API_PORT', None)
+        token = os.environ.get('API_TOKEN', None)
+        if auth:
+            self.__data["auth"] = {auth: "all"}
+        if port:
+            # 确保 server 是一个字典
+            if not isinstance(self.__data.get("server"), dict):
+                self.__data["server"] = {"ip": "*"}
+            self.__data["server"]["port"] = port
+        if token:
+            self.__data["token"] = token
+
+    def __load_arg(self):
+        auth = kw_args.auth
+        port = kw_args.port
+        ip = kw_args.ip
+        token = kw_args.token
+        logger.info(f"Auth: {auth}; Port: {port}; IP: {ip}")
+        if auth:
+            self.__data["auth"] = {auth: "all"}
+        if port:
+            if not isinstance(self.__data.get("server"), dict):
+                self.__data["server"] = {"ip": "*"}
+            self.__data["server"]["port"] = port
+        if ip:
+            if not isinstance(self.__data.get("server"), dict):
+                self.__data["server"] = {"ip": "*"}
+            self.__data["server"]["ip"] = ip
+        if token:
+            self.__data["token"] = token
+        #logger.info(f"Final config data: {self.__data}")
+
+    def __call__(self, *args):
+        data = self.__data
+        default = self.__default
+        for key in args:
+            if key in data:
+                data = data[key]
+            elif key in default:
+                data = default[key]
+            else:
+                return None
+        return data
+    
+args = Args(default=DEFAULT_DATA)
+~args  # 初始化配置
 
 if __name__ == '__main__':
     default: dict = {
@@ -202,8 +226,5 @@ def __str__(self):
         "auth": {}
     }
     config = Args(default=default)
-    config()
-    print(~config.server)
-    print(~config.server.port)
-    print(~config.auth)
-    print(~config.auth.admin)
+    ~config
+    print(config("server", "port"))

mod/auth/authentication.py

@@ -1,9 +1,7 @@
 import flask
 
 from . import cookie
-from mod.args import GlobalArgs
-
-args = GlobalArgs()
+from mod.args import args
 
 
 def require_auth(request: flask.request, permission: str = 'r'):
@@ -19,7 +17,7 @@ def require_auth(request: flask.request, permission: str = 'r'):
     cookie_permission: bool = has_permission(get_permission(cookie_key), permission)
     header_permission: bool = has_permission(get_permission(auth_header), permission)
 
-    if not args.auth:
+    if not args("auth"):
         if permission == 'r':
             return 1
         else:
@@ -38,7 +36,7 @@ def get_permission(name: str) -> str:
     """
     if not name:
         return ''
-    auth_dict: dict = args.auth
+    auth_dict: dict = args("auth")
     return auth_dict.get(name, '')