feat(notify): SMTP 通知支持多收件人

README.md

@@ -163,8 +163,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow
 用于从 Alist 生成 strm 文件，基于 WebDAV 实现的轻量版本，alist_strm_lite 与 alist_strm 二选一即可，各配置含义如下： 
 
 * url: Alist 访问地址，例如：http://127.0.0.1:5244
-* webdav_username: Alist WebDAV 用户名
+* token: Alist 访问令牌，Alist 管理后台-设置-其他-令牌-复制令牌
-* webdav_password: Alist WebDAV 密码
 * quark_root_path: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark`
 * quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/`
 * strm_save_dir: strm 文件保存路径，如使用 docker 对应 docker 内部路径，默认 `/media`

media_servers/alist_strm_lite.py

@@ -2,21 +2,27 @@
 # -*- encoding: utf-8 -*-
 """
 @File    :   alist_strm_lite.py
-@Desc    :   Alist 生成 strm 文件简化版（基于 WebDAV）
+@Desc    :   Alist 生成 strm 文件简化版
 @Version :   v1.0
 @Time    :   2024/11/16
 @Author  :   xiaoQQya
 @Contact :   xiaoQQya@126.com
 """
 import os
-import re
+import requests
-from webdav3.client import Client
 
 
 class Alist_strm_lite:
 
     video_exts = ["mp4", "mkv", "flv", "mov", "m4v", "avi", "webm", "wmv"]
-    default_config = {"url": "", "webdav_username": "", "webdav_password": "", "quark_root_path": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", "strm_url_host": ""}
+    default_config = {
+        "url": "",  # Alist 服务器 URL
+        "token": "",  # Alist 服务器 Token
+        "quark_root_path": "/quark",  # 夸克根目录在 Alist 中的挂载路径
+        "quark_root_dir": "/",  # 夸克在 Alist 中挂载的根目录
+        "strm_save_dir": "/media",  # 生成的 strm 文件保存的路径
+        "strm_url_host": ""  # strm 文件内链接的主机地址
+    }
     is_active = False
 
     def __init__(self, **kwargs):
@@ -26,16 +32,7 @@ class Alist_strm_lite:
                     setattr(self, key, kwargs[key])
                 else:
                     print(f"{self.__class__.__name__} 模块缺少必要参数: {key}")
-
+            if self.url and self.token and self.get_info():
-            options = {
-                "webdav_hostname": f"{self.url.rstrip('/')}/dav/",
-                "webdav_login": self.webdav_username,
-                "webdav_password": self.webdav_password,
-                "disable_check": True
-            }
-            self.client = Client(options)
-
-            if self.url and self.webdav_username and self.webdav_password and self.get_info():
                 self.is_active = True
 
     def run(self, task):
@@ -46,36 +43,57 @@ class Alist_strm_lite:
             self.refresh(full_path)
 
     def get_info(self):
+        url = f"{self.url}/api/admin/setting/list"
+        headers = {"Authorization": self.token}
+        querystring = {"group": "1"}
         try:
-            response = self.client.info("/")
+            response = requests.request("GET", url, headers=headers, params=querystring)
-            if response.get("name"):
+            response.raise_for_status()
-                print(f"Alist2strm Lite: {response.get('name')}")
+            response = response.json()
+            if response.get("code") == 200:
+                print(f"Alist-strm Lite: {response.get('data',[])[1].get('value','')} {response.get('data',[])[0].get('value','')}")
                 return True
             else:
-                print(f"Alist2strm Lite: 连接失败❌ {response}")
+                print(f"Alist-strm Lite: 连接失败❌ {response.get('message')}")
-        except Exception as e:
+        except requests.exceptions.RequestException as e:
-            print(f"Alist2strm Lite: 获取信息出错 {e}")
+            print(f"Alist-strm Lite: 获取Alist信息出错 {e}")
         return False
 
     def refresh(self, path):
         try:
-            files = self.client.list(path)
+            response = self.list(path)
-
+            if response.get("code") != 200:
-            for item in files[1:]:
+                print(f"📺 生成 STRM 文件失败❌ {response.get('message')}")
-                full_path = re.sub(r"/{2,}", "/", f"{path}/{item}")
+                return
-                if full_path.endswith("/"):
+            else:
-                    self.refresh(full_path)
+                files = response.get("data").get("content")
-                else:
+                for item in files:
-                    self.generate_strm(full_path)
+                    full_path = f"{path}/{item.get('name')}".replace("//", "/")
-            return True
+                    if item.get("is_dir"):
+                        self.refresh(full_path)
+                    else:
+                        self.generate_strm(full_path)
         except Exception as e:
-            print(f"📺 生成STRM文件失败❌ {e}")
+            print(f"📺 获取 Alist 文件列表失败❌ {e}")
-        return False
+
+    def list(self, path):
+        url = f"{self.url}/api/fs/list"
+        headers = {"Authorization": self.token}
+        payload = {
+            "path": path,
+            "refresh": False,
+            "password": "",
+            "page": 1,
+            "per_page": 0,
+        }
+        response = requests.request("POST", url, headers=headers, json=payload)
+        response.raise_for_status()
+        return response.json()
 
     def generate_strm(self, file_path):
         ext = file_path.split(".")[-1]
         if ext.lower() in self.video_exts:
-            strm_path = re.sub(r"/{2,}", "/", f"{self.strm_save_dir}{file_path.rstrip(ext)}strm")
+            strm_path = f"{self.strm_save_dir}{file_path.rstrip(ext)}strm".replace("//", "/")
             if os.path.exists(strm_path):
                 return
             if not os.path.exists(os.path.dirname(strm_path)):

notify.py

@@ -101,9 +101,11 @@ push_config = {
 
     'SMTP_SERVER': '',                  # SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
     'SMTP_SSL': 'false',                # SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
-    'SMTP_EMAIL': '',                   # SMTP 收发件邮箱，通知将会由自己发给自己
+    'SMTP_EMAIL_FROM': '',              # SMTP 发件邮箱
+    'SMTP_NAME_FROM': '',               # SMTP 发件人姓名，可随意填写
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
-    'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
+    'SMTP_EMAIL_TO': '',                # SMTP 收件邮箱，多个收件邮箱逗号分开
+    'SMTP_NAME_TO': '',                 # SMTP 收件人姓名，多个收件人逗号分开，顺序与 SMTP_EMAIL_TO 保持一致
 
     'PUSHME_KEY': '',                   # PushMe 的 PUSHME_KEY
     'PUSHME_URL': '',                   # PushMe 的 PUSHME_URL
@@ -662,12 +664,14 @@ def smtp(title: str, content: str) -> None:
     if (
         not push_config.get("SMTP_SERVER")
         or not push_config.get("SMTP_SSL")
-        or not push_config.get("SMTP_EMAIL")
+        or not push_config.get("SMTP_EMAIL_FROM")
+        or not push_config.get("SMTP_EMAIL_TO")
         or not push_config.get("SMTP_PASSWORD")
-        or not push_config.get("SMTP_NAME")
+        or not push_config.get("SMTP_NAME_FROM")
+        or not push_config.get("SMTP_NAME_TO")
     ):
         print(
-            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL 或者 SMTP_PASSWORD 或者 SMTP_NAME 未设置!!\n取消推送"
+            "SMTP 邮件 的 SMTP_SERVER 或者 SMTP_SSL 或者 SMTP_EMAIL_FROM 或者 SMTP_EMAIL_TO 或者 SMTP_PASSWORD 或者 SMTP_NAME_FROM 或者 SMTP_NAME_TO 未设置!!\n取消推送"
         )
         return
     print("SMTP 邮件 服务启动")
@@ -675,16 +679,18 @@ def smtp(title: str, content: str) -> None:
     message = MIMEText(content, "plain", "utf-8")
     message["From"] = formataddr(
         (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            Header(push_config.get("SMTP_NAME_FROM"), "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            push_config.get("SMTP_EMAIL_FROM"),
         )
     )
-    message["To"] = formataddr(
+    to_emails = push_config.get("SMTP_EMAIL_TO").split(",")
+    to_names = push_config.get("SMTP_NAME_TO").split(",")
+    message["To"] = ",".join([formataddr(
         (
-            Header(push_config.get("SMTP_NAME"), "utf-8").encode(),
+            Header(to_names[index] if len(to_names) > index else "", "utf-8").encode(),
-            push_config.get("SMTP_EMAIL"),
+            to_email,
         )
-    )
+    ) for index, to_email in enumerate(to_emails)])
     message["Subject"] = Header(title, "utf-8")
 
     try:
@@ -694,11 +700,11 @@ def smtp(title: str, content: str) -> None:
             else smtplib.SMTP(push_config.get("SMTP_SERVER"))
         )
         smtp_server.login(
-            push_config.get("SMTP_EMAIL"), push_config.get("SMTP_PASSWORD")
+            push_config.get("SMTP_EMAIL_FROM"), push_config.get("SMTP_PASSWORD")
         )
         smtp_server.sendmail(
-            push_config.get("SMTP_EMAIL"),
+            push_config.get("SMTP_EMAIL_FROM"),
-            push_config.get("SMTP_EMAIL"),
+            to_emails,
             message.as_bytes(),
         )
         smtp_server.close()
@@ -966,9 +972,11 @@ def add_notify_function():
     if (
         push_config.get("SMTP_SERVER")
         and push_config.get("SMTP_SSL")
-        and push_config.get("SMTP_EMAIL")
+        and push_config.get("SMTP_EMAIL_FROM")
         and push_config.get("SMTP_PASSWORD")
-        and push_config.get("SMTP_NAME")
+        and push_config.get("SMTP_EMAIL_TO")
+        and push_config.get("SMTP_NAME_FROM")
+        and push_config.get("SMTP_NAME_TO")
     ):
         notify_function.append(smtp)
     if push_config.get("PUSHME_KEY"):

quark_config.json

@@ -15,8 +15,7 @@
     },
     "alist_strm_lite": {
       "url": "",
-      "webdav_username": "",
+      "token": "",
-      "webdav_password": "",
       "quark_root_path": "/quark",
       "quark_root_dir": "/",
       "strm_save_dir": "/media",

requirements.txt

@@ -2,4 +2,3 @@ flask
 apscheduler
 requests
 treelib
-webdavclient3