From 60352fbe62f7bb1a417d1416e08c2bddfa784e86 Mon Sep 17 00:00:00 2001
From: x1ao4 <kazaf_ken@163.com>
Date: Fri, 30 May 2025 19:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20AList=20Strm=20Gen=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=20STRM?=
 =?UTF-8?q?=20=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/alist_strm.py     |  14 ++--
 plugins/alist_strm_gen.py | 155 ++++++++++++++++++++++++++------------
 plugins/aria2.py          |  12 +--
 3 files changed, 119 insertions(+), 62 deletions(-)

diff --git a/plugins/alist_strm.py b/plugins/alist_strm.py
index 0d7c3f3..a9ec54d 100644
--- a/plugins/alist_strm.py
+++ b/plugins/alist_strm.py
@@ -2,7 +2,7 @@ import re
 import requests
 
 """
-    配合 Alist-Strm 项目，触发特定配置运行
+    配合 AList-Strm 项目，触发特定配置运行
     https://github.com/tefuirZ/alist-strm
 """
 
@@ -47,12 +47,12 @@ class Alist_strm:
                     for item in matchs
                     if item[0] in config_id_str.split(",")
                 ]
-                print(f"Alist-Strm 配置运行: {config_name}")
+                print(f"AList-Strm 配置运行: {config_name}")
                 return True
             else:
-                print(f"Alist-Strm 配置运行: 匹配失败 ❌ 请检查网络连通和cookie有效性")
+                print(f"AList-Strm 配置运行: 匹配失败 ❌ 请检查网络连通和 Cookie 有效性")
         except Exception as e:
-            print(f"获取 Alist-Strm 配置信息出错: {e}")
+            print(f"获取 AList-Strm 配置信息出错 ❌ {e}")
         return False
 
     def run_selected_configs(self, selected_configs_str):
@@ -61,7 +61,7 @@ class Alist_strm:
         try:
             selected_configs = [int(x.strip()) for x in selected_configs_str.split(",")]
         except ValueError:
-            print("🔗 Alist-Strm 配置运行: 出错 ❌ ID 应以 , 分割")
+            print("🔗 AList-Strm 配置运行: 出错 ❌ ID 应以 , 分割")
             return False
         data = [("selected_configs", config_id) for config_id in selected_configs]
         data.append(("action", "run_selected"))
@@ -73,10 +73,10 @@ class Alist_strm:
             match = re.search(r'role="alert">\s*([^<]+)\s*<button', html_content)
             if match:
                 alert = match.group(1).strip()
-                print(f"🔗 Alist-Strm 配置运行: {alert} ✅")
+                print(f"🔗 AList-Strm 配置运行: {alert} ✅")
                 return True
             else:
-                print(f"🔗 Alist-Strm 配置运行: 失败 ❌")
+                print(f"🔗 AList-Strm 配置运行: 失败 ❌")
         except Exception as e:
             print(f"Error: {e}")
         return False
diff --git a/plugins/alist_strm_gen.py b/plugins/alist_strm_gen.py
index cca94e3..295c6ee 100644
--- a/plugins/alist_strm_gen.py
+++ b/plugins/alist_strm_gen.py
@@ -2,16 +2,15 @@
 # -*- encoding: utf-8 -*-
 """
 @File    :   alist_strm_gen.py
-@Desc    :   Alist 生成 strm 文件简化版
-@Version :   v1.1
-@Time    :   2024/11/16
-@Author  :   xiaoQQya
-@Contact :   xiaoQQya@126.com
+@Desc    :   AList 生成 STRM 文件简化版
+@Time    :   2025/05/30
+@Author  :   xiaoQQya, x1ao4
 """
 import os
 import re
 import json
 import requests
+from quark_auto_save import sort_file_by_name
 
 
 class Alist_strm_gen:
@@ -32,47 +31,97 @@ class Alist_strm_gen:
     storage_mount_path = None
     quark_root_dir = None
     strm_server = None
+    # 缓存生成的文件列表
+    generated_files = []
 
     def __init__(self, **kwargs):
         self.plugin_name = self.__class__.__name__.lower()
-        if kwargs:
-            for key, _ in self.default_config.items():
-                if key in kwargs:
-                    setattr(self, key, kwargs[key])
+        
+        # 检查必要配置
+        missing_configs = []
+        for key, _ in self.default_config.items():
+            if key in kwargs:
+                setattr(self, key, kwargs[key])
+            else:
+                missing_configs.append(key)
+        
+        if missing_configs:
+            print(f"{self.plugin_name} 模块缺少必要参数: {', '.join(missing_configs)}")
+            return
+            
+        if not self.url or not self.token or not self.storage_id:
+            print(f"{self.plugin_name} 模块配置不完整，请检查配置")
+            return
+            
+        # 检查 strm_save_dir 是否存在
+        if not os.path.exists(self.strm_save_dir):
+            try:
+                os.makedirs(self.strm_save_dir)
+            except Exception as e:
+                print(f"创建 STRM 保存目录失败 ❌ {e}")
+                return
+                
+        success, result = self.storage_id_to_path(self.storage_id)
+        if success:
+            self.is_active = True
+            # 存储挂载路径, 夸克根文件夹
+            self.storage_mount_path, self.quark_root_dir = result
+            # 替换strm文件内链接的主机地址
+            self.strm_replace_host = self.strm_replace_host.strip()
+            if self.strm_replace_host:
+                if self.strm_replace_host.startswith("http"):
+                    self.strm_server = f"{self.strm_replace_host}/d"
                 else:
-                    print(f"{self.plugin_name} 模块缺少必要参数: {key}")
-            if self.url and self.token and self.storage_id:
-                success, result = self.storage_id_to_path(self.storage_id)
-                if success:
-                    self.is_active = True
-                    # 存储挂载路径, 夸克根文件夹
-                    self.storage_mount_path, self.quark_root_dir = result
-                    # 替换strm文件内链接的主机地址
-                    self.strm_replace_host = self.strm_replace_host.strip()
-                    if self.strm_replace_host:
-                        if self.strm_replace_host.startswith("http"):
-                            self.strm_server = f"{self.strm_replace_host}/d"
-                        else:
-                            self.strm_server = f"http://{self.strm_replace_host}/d"
-                    else:
-                        self.strm_server = f"{self.url.strip()}/d"
+                    self.strm_server = f"http://{self.strm_replace_host}/d"
+            else:
+                self.strm_server = f"{self.url.strip()}/d"
+        else:
+            pass
 
     def run(self, task, **kwargs):
+        if not self.is_active:
+            return
+            
         task_config = task.get("addition", {}).get(
             self.plugin_name, self.default_task_config
         )
+        
         if not task_config.get("auto_gen"):
             return
-        if task.get("savepath") and task.get("savepath").startswith(
-            self.quark_root_dir
-        ):
-            alist_path = os.path.normpath(
-                os.path.join(
-                    self.storage_mount_path,
-                    task["savepath"].replace(self.quark_root_dir, "", 1).lstrip("/"),
-                )
-            ).replace("\\", "/")
-            self.check_dir(alist_path)
+            
+        if not task.get("savepath"):
+            return
+            
+        # 标准化路径
+        savepath = os.path.normpath(task["savepath"]).replace("\\", "/")
+        quark_root = os.path.normpath(self.quark_root_dir).replace("\\", "/")
+        
+        # 确保路径以 / 开头
+        if not savepath.startswith("/"):
+            savepath = "/" + savepath
+        if not quark_root.startswith("/"):
+            quark_root = "/" + quark_root
+            
+        if not savepath.startswith(quark_root):
+            print(f"{self.plugin_name} 任务的保存路径不在配置的夸克根目录内，跳过处理")
+            return
+            
+        alist_path = os.path.normpath(
+            os.path.join(
+                self.storage_mount_path,
+                savepath.replace(quark_root, "", 1).lstrip("/"),
+            )
+        ).replace("\\", "/")
+        
+        # 清空生成的文件列表
+        self.generated_files = []
+        self.check_dir(alist_path)
+        
+        # 按顺序显示生成的文件
+        if self.generated_files:
+            sorted_files = sorted(self.generated_files, key=sort_file_by_name)
+            for file_path in sorted_files:
+                print(f"🌐 生成 STRM 文件: {file_path} 成功 ✅")
 
     def storage_id_to_path(self, storage_id):
         storage_mount_path, quark_root_dir = None, None
@@ -82,7 +131,7 @@ class Alist_strm_gen:
             storage_mount_path, quark_root_dir = match.group(1), match.group(2)
             file_list = self.get_file_list(storage_mount_path)
             if file_list.get("code") != 200:
-                print(f"Alist-Strm 生成: 获取挂载路径失败 ❌ {file_list.get('message')}")
+                print(f"AList-Strm 生成: 获取挂载路径失败 ❌ {file_list.get('message')}")
                 return False, (None, None)
         # 2. 检查是否数字，调用 Alist API 获取存储信息
         elif re.match(r"^\d+$", storage_id):
@@ -97,15 +146,15 @@ class Alist_strm_gen:
                     )
                 elif storage_info["driver"] == "QuarkTV":
                     print(
-                        f"Alist-Strm 生成: [QuarkTV] 驱动 ⚠️ storage_id 请手动填入 /Alist挂载路径:/Quark目录路径"
+                        f"AList-Strm 生成: [QuarkTV] 驱动 ⚠️ storage_id 请手动填入 /Alist挂载路径:/Quark目录路径"
                     )
                 else:
-                    print(f"Alist-Strm 生成: 不支持 [{storage_info['driver']}] 驱动 ❌")
+                    print(f"AList-Strm 生成: 不支持 [{storage_info['driver']}] 驱动 ❌")
         else:
-            print(f"Alist-Strm 生成: storage_id [{storage_id}] 格式错误❌")
+            print(f"AList-Strm 生成: storage_id [{storage_id}] 格式错误 ❌")
         # 返回结果
         if storage_mount_path and quark_root_dir:
-            print(f"Alist-Strm 生成: [{storage_mount_path}:{quark_root_dir}]")
+            print(f"AList-Strm 生成: [{storage_mount_path}:{quark_root_dir}]")
             return True, (storage_mount_path, quark_root_dir)
         else:
             return False, (None, None)
@@ -121,15 +170,15 @@ class Alist_strm_gen:
             if data.get("code") == 200:
                 return data.get("data", [])
             else:
-                print(f"Alist-Strm 生成: 获取存储失败 ❌ {data.get('message')}")
+                print(f"AList-Strm 生成: 获取存储失败 ❌ {data.get('message')}")
         except Exception as e:
-            print(f"Alist-Strm 生成: 获取存储出错 {e}")
+            print(f"AList-Strm 生成: 获取存储出错 ❌ {e}")
         return []
 
     def check_dir(self, path):
         data = self.get_file_list(path)
         if data.get("code") != 200:
-            print(f"📺 Alist-Strm 生成: 获取文件列表失败 ❌ {data.get('message')}")
+            print(f"🌐 AList-Strm 生成: 获取文件列表失败 ❌ {data.get('message')}")
             return
         elif files := data.get("data", {}).get("content"):
             for item in files:
@@ -154,7 +203,7 @@ class Alist_strm_gen:
             response.raise_for_status()
             return response.json()
         except Exception as e:
-            print(f"📺 Alist-Strm 生成: 获取文件列表出错 ❌ {e}")
+            print(f"🌐 AList-Strm 生成: 获取文件列表出错 ❌ {e}")
         return {}
 
     def generate_strm(self, file_path):
@@ -168,10 +217,18 @@ class Alist_strm_gen:
             if os.path.exists(strm_path):
                 return
             if not os.path.exists(os.path.dirname(strm_path)):
-                os.makedirs(os.path.dirname(strm_path))
-            with open(strm_path, "w", encoding="utf-8") as strm_file:
-                strm_file.write(f"{self.strm_server}{file_path}")
-            print(f"📺 生成 STRM 文件 {strm_path} 成功 ✅")
+                try:
+                    os.makedirs(os.path.dirname(strm_path))
+                except Exception as e:
+                    print(f"🌐 创建目录失败: {os.path.dirname(strm_path)} ❌ {e}")
+                    return
+            try:
+                with open(strm_path, "w", encoding="utf-8") as strm_file:
+                    strm_file.write(f"{self.strm_server}{file_path}")
+                # 将生成的文件添加到列表中，稍后统一显示
+                self.generated_files.append(strm_path)
+            except Exception as e:
+                print(f"🌐 生成 STRM 文件: {strm_path} 失败 ❌ {e}")
 
     def get_root_folder_full_path(self, cookie, pdir_fid):
         if pdir_fid == "0":
@@ -203,5 +260,5 @@ class Alist_strm_gen:
                     path = f"{path}/{item['file_name']}"
                 return path
         except Exception as e:
-            print(f"Alist-Strm 生成: 获取 Quark 路径出错 {e}")
+            print(f"AList-Strm 生成: 获取 Quark 路径出错 ❌ {e}")
         return ""
diff --git a/plugins/aria2.py b/plugins/aria2.py
index f462469..9ee0ee5 100644
--- a/plugins/aria2.py
+++ b/plugins/aria2.py
@@ -151,7 +151,7 @@ class Aria2:
         download_return, cookie = account.download(file_fids)
         
         if not download_return.get("data"):
-            print("📝 Aria2: 获取下载链接失败")
+            print("📝 Aria2: 获取下载链接失败 ❌")
             return
         
         # 准备要下载的文件信息    
@@ -186,7 +186,7 @@ class Aria2:
                 # print(f"📥 Aria2下载: {file_path} (已存在，跳过)")
                 continue
             
-            print(f"📥 Aria2 下载: {file_path}")
+            print(f"📥 添加 Aria2 下载任务: {file_path} 成功 ✅")
             
             # 确保目录存在
             os.makedirs(os.path.dirname(local_path), exist_ok=True)
@@ -210,7 +210,7 @@ class Aria2:
                 if idx >= 0 and idx < len(file_info):
                     downloaded_files.append(file_info[idx])
             except Exception as e:
-                print(f"📥 Aria2 添加下载任务失败: {e}")
+                print(f"📥 添加 Aria2 下载任务失败 ❌ {e}")
         
         # 如果配置了自动删除且有成功添加下载任务的文件，则删除夸克网盘中的文件
         if task_config.get("auto_delete_quark_files") and downloaded_files:
@@ -225,7 +225,7 @@ class Aria2:
                 if files_to_delete:
                     account.delete(files_to_delete)
             except Exception as e:
-                print(f"📝 Aria2: 删除夸克网盘文件失败: {e}")
+                print(f"📝 Aria2: 删除夸克网盘文件失败 ❌ {e}")
         else:
             if not task_config.get("auto_delete_quark_files"):
                 # 未启用自动删除，不需要输出信息
@@ -249,7 +249,7 @@ class Aria2:
             response.raise_for_status()
             return response.json()
         except Exception as e:
-            print(f"Aria2 下载: 错误{e}")
+            print(f"Aria2 下载: 错误 ❌ {e}")
         return {}
 
     def get_version(self):
@@ -259,7 +259,7 @@ class Aria2:
             print(f"Aria2 下载: v{response['result']['version']}")
             return True
         else:
-            print(f"Aria2 下载: 连接失败{response.get('error')}")
+            print(f"Aria2 下载: 连接失败 ❌ {response.get('error')}")
             return False
 
     def add_uri(self, params=None):