From 640abe5d647de66b431d033753ede3c5a588330b Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 12:20:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat(alist):=20=E6=96=B0=E5=A2=9E=20Alist?= =?UTF-8?q?=20=E6=8C=82=E8=BD=BD=E7=9A=84=20Quark=20=E6=A0=B9=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E9=85=8D=E7=BD=AE,=20=E9=80=82=E9=85=8D=20Alist=20?= =?UTF-8?q?=E6=8C=82=E8=BD=BD=20Quark=20=E5=AD=90=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5,=20=E9=BB=98=E8=AE=A4=E4=B8=BA=20/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media_servers/alist.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media_servers/alist.py b/media_servers/alist.py index d34c2ab..0f2d5b0 100644 --- a/media_servers/alist.py +++ b/media_servers/alist.py @@ -5,7 +5,7 @@ import requests class Alist: - default_config = {"url": "", "token": "", "path_prefix": "/quark"} + default_config = {"url": "", "token": "", "path_prefix": "/quark", "quark_root_dir": "/"} is_active = False def __init__(self, **kwargs): @@ -20,7 +20,7 @@ class Alist: self.is_active = True def run(self, task): - if task.get("savepath"): + if task.get("savepath") and task.get("savepath").startswith(self.quark_root_dir): path = self._normalize_path(task["savepath"]) self.refresh(path) @@ -81,5 +81,5 @@ class Alist: def _normalize_path(self, path): """标准化路径格式""" if not path.startswith(self.path_prefix): - path = f"/{self.path_prefix}/{path}" + path = f"/{self.path_prefix}/{path.lstrip(self.quark_root_dir)}" return re.sub(r"/{2,}", "/", path) From 9c859b212eb8cc4cf3d50c6543117ff6a8cedae4 Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 14:14:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat(alist-strm-lite):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20alist-strm-lite=EF=BC=8C=E5=9F=BA=E4=BA=8E=20WebDAV=20?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E4=BE=9D=E8=B5=96=20alist-strm=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media_servers/alist_strm_lite.py | 90 ++++++++++++++++++++++++++++++++ quark_config.json | 20 +++++++ requirements.txt | 1 + 3 files changed, 111 insertions(+) create mode 100644 media_servers/alist_strm_lite.py diff --git a/media_servers/alist_strm_lite.py b/media_servers/alist_strm_lite.py new file mode 100644 index 0000000..7f5c418 --- /dev/null +++ b/media_servers/alist_strm_lite.py @@ -0,0 +1,90 @@ +#!/usr/bin/python3 +# -*- encoding: utf-8 -*- +""" +@File : alist_strm_lite.py +@Desc : Alist 生成 strm 文件简化版（基于 WebDAV） +@Version : v1.0 +@Time : 2024/11/16 +@Author : xiaoQQya +@Contact : xiaoQQya@126.com +""" +import os +import re +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": "", "path_prefix": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", "strm_url_host": ""} + is_active = False + + def __init__(self, **kwargs): + if kwargs: + for key, _ in self.default_config.items(): + if key in kwargs: + setattr(self, key, kwargs[key]) + else: + print(f"{self.__class__.__name__} 模块缺少必要参数: {key}") + + 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): + if task.get("savepath") and task.get("savepath").startswith(self.quark_root_dir): + path = self._normalize_path(task["savepath"]) + self.refresh(path) + + def get_info(self): + try: + response = self.client.info("/") + if response.get("name"): + print(f"Alist2strm Lite: {response.get('name')}") + return True + else: + print(f"Alist2strm Lite: 连接失败❌ {response}") + except Exception as e: + print(f"Alist2strm Lite: 获取信息出错 {e}") + return False + + def refresh(self, path): + try: + files = self.client.list(path) + + for item in files[1:]: + full_path = re.sub(r"/{2,}", "/", f"{path}/{item}") + if full_path.endswith("/"): + self.refresh(full_path) + else: + self.generate_strm(full_path) + return True + except Exception as e: + print(f"📺 生成STRM文件失败❌ {e}") + return False + + 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") + 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: + host = self.strm_url_host.rstrip("/") if self.strm_url_host.strip() else self.url.rstrip("/") + strm_file.write(f"{host}/d{file_path}") + print(f"📺 生成STRM文件 {strm_path} 成功✅") + + def _normalize_path(self, path): + """标准化路径格式""" + if not path.startswith(self.path_prefix): + path = f"/{self.path_prefix}/{path.lstrip(self.quark_root_dir)}" + return re.sub(r"/{2,}", "/", path) diff --git a/quark_config.json b/quark_config.json index 85222d5..c178067 100644 --- a/quark_config.json +++ b/quark_config.json @@ -7,6 +7,26 @@ "其他推送渠道//此项可删": "配置方法同青龙" }, "media_servers": { + "alist": { + "url": "", + "token": "", + "path_prefix": "/quark", + "quark_root_dir": "/" + }, + "alist_strm_lite": { + "url": "", + "webdav_username": "", + "webdav_password": "", + "path_prefix": "/quark", + "quark_root_dir": "/", + "strm_save_dir": "/media", + "strm_url_host": "" + }, + "alist_strm": { + "url": "", + "cookie": "", + "config_id": "" + }, "emby": { "url": "", "token": "" diff --git a/requirements.txt b/requirements.txt index 0636d0c..5c1eddb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ flask apscheduler requests treelib +webdavclient3 From 25b4802ab8929186ce20b1f641f371baea574bb9 Mon Sep 17 00:00:00 2001 From: zhazhayu Date: Sat, 16 Nov 2024 14:22:30 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0Plex=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media_servers/plex.py | 99 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 media_servers/plex.py diff --git a/media_servers/plex.py b/media_servers/plex.py new file mode 100644 index 0000000..158c14a --- /dev/null +++ b/media_servers/plex.py @@ -0,0 +1,99 @@ +import os +import requests + + +class Plex: + default_config = { + "url": "", # Plex服务器URL + "token": "", # Plex Token + "base_path": "" # Plex媒体库基础路径 + } + is_active = False + + def __init__(self, **kwargs): + if kwargs: + for key, value in self.default_config.items(): + if key in kwargs: + setattr(self, key, kwargs[key]) + else: + print(f"{self.__class__.__name__} 模块缺少必要参数: {key}") + if self.url and self.token and self.base_path: + if self.get_info(): + self.is_active = True + + def run(self, task): + if task.get("savepath"): + # 拼接完整路径 + full_path = os.path.join(self.base_path, task["savepath"].lstrip("/")) + full_path = full_path.replace("\\", "/") + self.refresh(full_path) + return task + + def get_info(self): + """获取Plex服务器信息""" + headers = { + 'Accept': 'application/json', + 'X-Plex-Token': self.token + } + + try: + response = requests.get( + f"{self.url}/", + headers=headers + ) + if response.status_code == 200: + info = response.json()['MediaContainer'] + print(f"Plex媒体库: {info.get('friendlyName','')} v{info.get('version','')}") + return True + else: + print(f"Plex媒体库: 连接失败❌ 状态码：{response.status_code}") + except Exception as e: + print(f"获取Plex媒体库信息出错: {e}") + return False + + def refresh(self, folder_path): + """刷新指定文件夹""" + if not folder_path: + return False + + headers = { + 'Accept': 'application/json', + 'X-Plex-Token': self.token + } + + try: + response = requests.get( + f"{self.url}/library/sections", + headers=headers + ) + + if response.status_code != 200: + print(f"🎞️ 刷新Plex媒体库：获取库信息失败❌ 状态码：{response.status_code}") + return False + + libraries = response.json()['MediaContainer']['Directory'] + + for library in libraries: + for location in library.get('Location', []): + if folder_path.startswith(location['path']): + library_id = library['key'] + refresh_url = ( + f"{self.url}/library/sections/{library_id}/refresh" + f"?path={folder_path}" + ) + refresh_response = requests.get(refresh_url, headers=headers) + + if refresh_response.status_code == 200: + print(f"🎞️ 刷新Plex媒体库：成功✅") + print(f"📁 扫描路径: {folder_path}") + return True + else: + print(f"🎞️ 刷新Plex媒体库：刷新请求失败❌ 状态码：{refresh_response.status_code}") + return False + + print(f"🎞️ 刷新Plex媒体库：未找到匹配的媒体库❌ {folder_path}") + + except Exception as e: + print(f"刷新Plex媒体库出错: {e}") + + return False \ No newline at end of file From 8971f642933082aaa1a864e3dcd9ffd22417ce6e Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 14:22:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat(readme):=20=E6=96=B0=E5=A2=9E=E5=AA=92?= =?UTF-8?q?=E4=BD=93=E5=BA=93=E5=90=84=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9A=84?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/README.md b/README.md index c65cf14..63309ba 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ docker run -d \ -e WEBUI_USERNAME=admin \ -e WEBUI_PASSWORD=admin123 \ -v ./quark-auto-save/config:/app/config \ + -v ./media:/media \ -v /etc/localtime:/etc/localtime \ --network bridge \ --restart unless-stopped \ @@ -101,6 +102,7 @@ services: WEBUI_PASSWORD: "admin123" volumes: - ./quark-auto-save/config:/app/config + - ./media:/media - /etc/localtime:/etc/localtime ``` @@ -145,6 +147,44 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow 更多正则使用说明已转移到 Wiki ：[正则处理教程](https://github.com/Cp0204/quark-auto-save/wiki/%E6%AD%A3%E5%88%99%E5%A4%84%E7%90%86%E6%95%99%E7%A8%8B) +### 媒体库配置 + +#### alist + +用于自动刷新 Alist 目录，各配置含义如下： + +* url: Alist 访问地址，例如：http://127.0.0.1:5244 +* token：Alist 访问令牌，Alist 管理后台-设置-其他-令牌-复制令牌 +* path_prefix: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` +* quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/` + +#### alist_strm_lite + +用于从 Alist 生成 strm 文件，基于 WebDAV 实现的轻量版本，alist_strm_lite 与 alist_strm 二选一即可，各配置含义如下： + +* url: Alist 访问地址，例如：http://127.0.0.1:5244 +* webdav_username: Alist WebDAV 用户名 +* webdav_password: Alist WebDAV 密码 +* path_prefix: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` +* quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/` +* strm_save_dir: strm 文件保存路径，如使用 docker 对应 docker 内部路径，默认 `/media` +* strm_url_host: strm 文件内链接使用的主机地址，例如：http://example.host ，配合自定义 host 解析在 strm 文件迁移机器时无需重新生成 strm 文件，修改自定义 host 解析地址即可，默认为空时使用 url 配置 + +#### alist_strm + +用于从 Alist 生成 strm 文件，需配合 [alist-strm](https://github.com/tefuirZ/alist-strm) 项目使用，alist_strm_lite 与 alist_strm 二选一即可，各配置含义如下： + +* url: alist-strm 访问地址，例如：http://127.0.0.1:5000 +* cookie: alist-strm 的访问 cookie +* config_id: alist-strm 的配置 ID + +#### emby + +用于自动扫描媒体库文件，各配置含义如下： + +* url: Emby 访问地址，例如：http://127.0.0.1:8096 +* token: Emby API 密钥，管理 Emby Server-高级-API 密钥-新 API 密钥 + ### 特殊场景使用技巧 #### 忽略后缀 From 6c7e8925909904dc075794b59ac8f36e33b950bc Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 14:42:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?refactor(alist-strm-lite):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20path=5Fprefix=20=E4=B8=BA=20quark=5Froot=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- media_servers/alist_strm_lite.py | 14 +++++--------- quark_config.json | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 63309ba..b7fac1c 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow * url: Alist 访问地址，例如：http://127.0.0.1:5244 * token：Alist 访问令牌，Alist 管理后台-设置-其他-令牌-复制令牌 -* path_prefix: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` +* quark_root_path: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` * quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/` #### alist_strm_lite @@ -165,7 +165,7 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow * url: Alist 访问地址，例如：http://127.0.0.1:5244 * webdav_username: Alist WebDAV 用户名 * webdav_password: Alist WebDAV 密码 -* path_prefix: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` +* quark_root_path: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` * quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/` * strm_save_dir: strm 文件保存路径，如使用 docker 对应 docker 内部路径，默认 `/media` * strm_url_host: strm 文件内链接使用的主机地址，例如：http://example.host ，配合自定义 host 解析在 strm 文件迁移机器时无需重新生成 strm 文件，修改自定义 host 解析地址即可，默认为空时使用 url 配置 diff --git a/media_servers/alist_strm_lite.py b/media_servers/alist_strm_lite.py index 7f5c418..aa4555e 100644 --- a/media_servers/alist_strm_lite.py +++ b/media_servers/alist_strm_lite.py @@ -16,7 +16,7 @@ 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": "", "path_prefix": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", "strm_url_host": ""} + default_config = {"url": "", "webdav_username": "", "webdav_password": "", "quark_root_path": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", "strm_url_host": ""} is_active = False def __init__(self, **kwargs): @@ -40,8 +40,10 @@ class Alist_strm_lite: def run(self, task): if task.get("savepath") and task.get("savepath").startswith(self.quark_root_dir): - path = self._normalize_path(task["savepath"]) - self.refresh(path) + full_path = os.path.normpath( + os.path.join(self.quark_root_path, task["savepath"].lstrip("/").lstrip(self.quark_root_dir)) + ).replace("\\", "/") + self.refresh(full_path) def get_info(self): try: @@ -82,9 +84,3 @@ class Alist_strm_lite: host = self.strm_url_host.rstrip("/") if self.strm_url_host.strip() else self.url.rstrip("/") strm_file.write(f"{host}/d{file_path}") print(f"📺 生成STRM文件 {strm_path} 成功✅") - - def _normalize_path(self, path): - """标准化路径格式""" - if not path.startswith(self.path_prefix): - path = f"/{self.path_prefix}/{path.lstrip(self.quark_root_dir)}" - return re.sub(r"/{2,}", "/", path) diff --git a/quark_config.json b/quark_config.json index c178067..474131e 100644 --- a/quark_config.json +++ b/quark_config.json @@ -10,14 +10,14 @@ "alist": { "url": "", "token": "", - "path_prefix": "/quark", + "quark_root_path": "/quark", "quark_root_dir": "/" }, "alist_strm_lite": { "url": "", "webdav_username": "", "webdav_password": "", - "path_prefix": "/quark", + "quark_root_path": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", "strm_url_host": "" From 4d6a4650573630b85913ebacdd49591aa34aaaa7 Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 21:32:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor(alist-strm-lite):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=20alist-strm-lite=20=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E7=94=B1=20WebDAV=20=E6=9B=B4=E6=94=B9=E4=B8=BA=20Alist=20api?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E9=A1=B5=E9=9D=A2=E6=9A=B4=E9=9C=B2?= =?UTF-8?q?=20Alist=20=E6=98=8E=E6=96=87=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- media_servers/alist_strm_lite.py | 82 +++++++++++++++++++------------- quark_config.json | 3 +- requirements.txt | 1 - 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index b7fac1c..5a6927c 100644 --- a/README.md +++ b/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 用户名 -* webdav_password: Alist WebDAV 密码 +* token: Alist 访问令牌，Alist 管理后台-设置-其他-令牌-复制令牌 * quark_root_path: Alist 夸克网盘的挂载路径，Alist 管理后台-存储-夸克驱动-挂载路径，默认 `/quark` * quark_root_dir: Alist 挂载的夸克网盘根目录，Alist 管理后台-存储-夸克驱动-根文件夹ID（Alist 填写的为文件夹 ID，此处需要填写文件夹路径），默认 `/` * strm_save_dir: strm 文件保存路径，如使用 docker 对应 docker 内部路径，默认 `/media` diff --git a/media_servers/alist_strm_lite.py b/media_servers/alist_strm_lite.py index aa4555e..13e61bb 100644 --- a/media_servers/alist_strm_lite.py +++ b/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 -from webdav3.client import Client +import requests 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}") - - 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(): + if self.url and self.token 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("/") - if response.get("name"): - print(f"Alist2strm Lite: {response.get('name')}") + response = requests.request("GET", url, headers=headers, params=querystring) + response.raise_for_status() + 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}") - except Exception as e: - print(f"Alist2strm Lite: 获取信息出错 {e}") + print(f"Alist-strm Lite: 连接失败❌ {response.get('message')}") + except requests.exceptions.RequestException as e: + print(f"Alist-strm Lite: 获取Alist信息出错 {e}") return False def refresh(self, path): try: - files = self.client.list(path) - - for item in files[1:]: - full_path = re.sub(r"/{2,}", "/", f"{path}/{item}") - if full_path.endswith("/"): - self.refresh(full_path) - else: - self.generate_strm(full_path) - return True + response = self.list(path) + if response.get("code") != 200: + print(f"📺 生成 STRM 文件失败❌ {response.get('message')}") + return + else: + files = response.get("data").get("content") + for item in files: + full_path = f"{path}/{item.get('name')}".replace("//", "/") + if item.get("is_dir"): + self.refresh(full_path) + else: + self.generate_strm(full_path) except Exception as e: - print(f"📺 生成STRM文件失败❌ {e}") - return False + print(f"📺 获取 Alist 文件列表失败❌ {e}") + + 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)): diff --git a/quark_config.json b/quark_config.json index 474131e..11194a8 100644 --- a/quark_config.json +++ b/quark_config.json @@ -15,8 +15,7 @@ }, "alist_strm_lite": { "url": "", - "webdav_username": "", - "webdav_password": "", + "token": "", "quark_root_path": "/quark", "quark_root_dir": "/", "strm_save_dir": "/media", diff --git a/requirements.txt b/requirements.txt index 5c1eddb..0636d0c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,3 @@ flask apscheduler requests treelib -webdavclient3 From b18fffc4f692dc2aebed10391602aafbe61d1062 Mon Sep 17 00:00:00 2001 From: xiaoQQya Date: Sat, 16 Nov 2024 23:06:41 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat(notify):=20SMTP=20=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E6=94=B6=E4=BB=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- notify.py | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/notify.py b/notify.py index aa37e86..fd92abf 100644 --- a/notify.py +++ b/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(), - push_config.get("SMTP_EMAIL"), + Header(push_config.get("SMTP_NAME_FROM"), "utf-8").encode(), + 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(), - push_config.get("SMTP_EMAIL"), + Header(to_names[index] if len(to_names) > index else "", "utf-8").encode(), + 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"), + push_config.get("SMTP_EMAIL_FROM"), + 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"):