From d42e2f56d664a3476bf8c5fc908caab588884305 Mon Sep 17 00:00:00 2001
From: Cp0204 <Cp0204@qq.com>
Date: Sat, 16 Nov 2024 01:27:49 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96Alist?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=8A=E8=B7=AF=E5=BE=84=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media_servers/alist.py | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/media_servers/alist.py b/media_servers/alist.py
index d34c2ab..2a33c6f 100644
--- a/media_servers/alist.py
+++ b/media_servers/alist.py
@@ -1,11 +1,14 @@
 import os
-import re
 import requests
 
 
 class Alist:
 
-    default_config = {"url": "", "token": "", "path_prefix": "/quark"}
+    default_config = {
+        "url": "",  # Alist服务器URL
+        "token": "",  # Alist服务器Token
+        "quark_root_path": "/quark",  # 夸克根目录在Alist中的挂载路径
+    }
     is_active = False
 
     def __init__(self, **kwargs):
@@ -21,8 +24,10 @@ class Alist:
 
     def run(self, task):
         if task.get("savepath"):
-            path = self._normalize_path(task["savepath"])
-            self.refresh(path)
+            full_path = os.path.normpath(
+                os.path.join(self.quark_root_path, task["savepath"].lstrip("/"))
+            ).replace("\\", "/")
+            self.refresh(full_path)
 
     def get_info(self):
         url = f"{self.url}/api/admin/setting/list"
@@ -54,22 +59,20 @@ class Alist:
             "per_page": 0,
         }
         try:
-            response = requests.request(
-                "POST", url, headers=headers, json=payload
-            )
+            response = requests.request("POST", url, headers=headers, json=payload)
             response.raise_for_status()
             response = response.json()
             if response.get("code") == 200:
-                print(f"📁 刷新Alist目录：{path} 成功✅")
+                print(f"📁 刷新Alist目录：[{path}] 成功✅")
                 return response.get("data")
             elif "object not found" in response.get("message", ""):
                 # 如果是根目录就不再往上查找
-                if path == "/" or path == self.path_prefix:
+                if path == "/" or path == self.quark_root_path:
                     print(f"📁 刷新Alist目录：根目录不存在，请检查 Alist 配置")
                     return False
                 # 获取父目录
                 parent_path = os.path.dirname(path)
-                print(f"📁 刷新Alist目录：{path} 不存在，转父目录 {parent_path}")
+                print(f"📁 刷新Alist目录：[{path}] 不存在，转父目录 [{parent_path}]")
                 # 递归刷新父目录
                 return self.refresh(parent_path)
             else:
@@ -77,9 +80,3 @@ class Alist:
         except requests.exceptions.RequestException as e:
             print(f"刷新Alist目录出错: {e}")
         return False
-
-    def _normalize_path(self, path):
-        """标准化路径格式"""
-        if not path.startswith(self.path_prefix):
-            path = f"/{self.path_prefix}/{path}"
-        return re.sub(r"/{2,}", "/", path)