podflow 20250706__tar.gz → 20250803__tar.gz

{podflow-20250706 → podflow-20250803}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250706
+Version: 20250803
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz

{podflow-20250706 → podflow-20250803}/podflow/__init__.py

@@ -34,7 +34,7 @@ default_config = {
             "QRcode": False,  # 是否显示子博客地址二维码(仅在DisplayRSSaddress为True时有效)
             "BackwardUpdate": False,  # 是否向后更新
             "BackwardUpdate_size": 3,  # 向后更新数量(仅在BackwardUpdate为True时有效)
-            "want_retry_count": 8,  # 媒体获取失败后多少次后重试(小于等于该数量时将一直重试)
+            "want_retry_count": 25,  # 媒体获取失败后多少次后重试(小于等于该数量时将一直重试)
             "title_change": [  # 标题文本修改(默认为无, 可多个条件，以列表形式存在)
                 {  # match和url参数至少有一个, 如都有将同时生效
                     "mode": "add-left",  # 修改模式(add-left: 开头添加, add-right: 结尾添加, replace: 内容替换)
@@ -146,6 +146,7 @@ class Application_parse:
         self.file = ""
         self.httpfs = False
         self.index = False
+        self.save = []
 
 
 # 创建 Application 类的实例

{podflow-20250706 → podflow-20250803}/podflow/config/correct_channelid.py

@@ -62,19 +62,19 @@ def correct_channelid(channelid, website):
     # 复制字典channelid, 遍历复制后的字典进行操作以避免在循环中删除元素导致的迭代错误
     channelid_copy = channelid.copy()
     # 对channelid的错误进行更正
-    for channelid_key, channeli_value in channelid_copy.items():
+    for channelid_key, channelid_value in channelid_copy.items():
         # 判断是否为字典
-        if not isinstance(channeli_value, dict):
-            channeli_value = {"id": channeli_value}
-            channelid[channelid_key] = channeli_value
+        if not isinstance(channelid_value, dict):
+            channelid_value = {"id": channelid_value}
+            channelid[channelid_key] = channelid_value
         # 判断id是否正确
         if (
-            "id" not in channeli_value
+            "id" not in channelid_value
             or (
                 website == "youtube"
-                and not re.search(r"^UC.{22}", channeli_value["id"])
+                and not re.search(r"^UC.{22}", channelid_value["id"])
             )
-            or (website == "bilibili" and not channeli_value["id"].isdigit())
+            or (website == "bilibili" and not channelid_value["id"].isdigit())
         ):
             # 删除错误的
             del channelid[channelid_key]
@@ -82,9 +82,9 @@ def correct_channelid(channelid, website):
         else:
             # 对update_size进行纠正
             if (
-                "update_size" not in channeli_value
-                or not isinstance(channeli_value["update_size"], int)
-                or channeli_value["update_size"] <= 0
+                "update_size" not in channelid_value
+                or not isinstance(channelid_value["update_size"], int)
+                or channelid_value["update_size"] <= 0
             ):
                 channelid[channelid_key]["update_size"] = default_config[
                     f"channelid_{website}"
@@ -92,13 +92,13 @@ def correct_channelid(channelid, website):
             # 对id进行纠正
             if website == "youtube":
                 channelid[channelid_key]["id"] = re.search(
-                    r"UC.{22}", channeli_value["id"]
+                    r"UC.{22}", channelid_value["id"]
                 ).group()
             # 对last_size进行纠正
             if (
-                "last_size" not in channeli_value
-                or not isinstance(channeli_value["last_size"], int)
-                or channeli_value["last_size"] <= 0
+                "last_size" not in channelid_value
+                or not isinstance(channelid_value["last_size"], int)
+                or channelid_value["last_size"] <= 0
             ):
                 channelid[channelid_key]["last_size"] = default_config[
                     f"channelid_{website}"
@@ -108,77 +108,77 @@ def correct_channelid(channelid, website):
                 channelid[channelid_key]["update_size"],
             )
             # 对title进行纠正
-            if "title" not in channeli_value:
+            if "title" not in channelid_value:
                 channelid[channelid_key]["title"] = channelid_key
             # 对quality进行纠正
             if (
                 (
-                    "quality" not in channeli_value
-                    or channeli_value["quality"] not in dpi
+                    "quality" not in channelid_value
+                    or channelid_value["quality"] not in dpi
                 )
-                and "media" in channeli_value
-                and channeli_value["media"] == "mp4"
+                and "media" in channelid_value
+                and channelid_value["media"] == "mp4"
             ):
                 channelid[channelid_key]["quality"] = default_config[
                     f"channelid_{website}"
                 ][channelid_name]["quality"]
             # 对media进行纠正
             if (
-                "media" in channeli_value
-                and channeli_value["media"] not in media
-                and channeli_value["media"] in video_media
+                "media" in channelid_value
+                and channelid_value["media"] not in media
+                and channelid_value["media"] in video_media
             ):
                 channelid[channelid_key]["media"] = "mp4"
             elif (
-                "media" in channeli_value
-                and channeli_value["media"] not in media
-                or "media" not in channeli_value
+                "media" in channelid_value
+                and channelid_value["media"] not in media
+                or "media" not in channelid_value
             ):
                 channelid[channelid_key]["media"] = "m4a"
             # 对DisplayRSSaddress进行纠正
-            if "DisplayRSSaddress" not in channeli_value or not isinstance(
-                channeli_value["DisplayRSSaddress"], bool
+            if "DisplayRSSaddress" not in channelid_value or not isinstance(
+                channelid_value["DisplayRSSaddress"], bool
             ):
                 channelid[channelid_key]["DisplayRSSaddress"] = False
             # 对InmainRSS进行纠正
-            if "InmainRSS" in channeli_value and isinstance(
-                channeli_value["InmainRSS"], bool
+            if "InmainRSS" in channelid_value and isinstance(
+                channelid_value["InmainRSS"], bool
             ):
-                if channeli_value["InmainRSS"] is False:
+                if channelid_value["InmainRSS"] is False:
                     channelid[channelid_key]["DisplayRSSaddress"] = True
             else:
                 channelid[channelid_key]["InmainRSS"] = True
             # 对QRcode进行纠正
-            if "QRcode" not in channeli_value or not isinstance(
-                channeli_value["QRcode"], bool
+            if "QRcode" not in channelid_value or not isinstance(
+                channelid_value["QRcode"], bool
             ):
                 channelid[channelid_key]["QRcode"] = False
             # 对BackwardUpdate进行纠正
-            if "BackwardUpdate" not in channeli_value or not isinstance(
-                channeli_value["BackwardUpdate"], bool
+            if "BackwardUpdate" not in channelid_value or not isinstance(
+                channelid_value["BackwardUpdate"], bool
             ):
                 channelid[channelid_key]["BackwardUpdate"] = False
             # 对BackwardUpdate_size进行纠正
             if channelid[channelid_key]["BackwardUpdate"] and (
-                "BackwardUpdate_size" not in channeli_value
-                or not isinstance(channeli_value["BackwardUpdate_size"], int)
-                or channeli_value["BackwardUpdate_size"] <= 0
+                "BackwardUpdate_size" not in channelid_value
+                or not isinstance(channelid_value["BackwardUpdate_size"], int)
+                or channelid_value["BackwardUpdate_size"] <= 0
             ):
                 channelid[channelid_key]["BackwardUpdate_size"] = default_config[
                     f"channelid_{website}"
                 ][channelid_name]["BackwardUpdate_size"]
             # 对want_retry_count进行纠正
             if (
-                "want_retry_count" not in channeli_value
-                or not isinstance(channeli_value["want_retry_count"], int)
-                or channeli_value["want_retry_count"] <= 0
+                "want_retry_count" not in channelid_value
+                or not isinstance(channelid_value["want_retry_count"], int)
+                or channelid_value["want_retry_count"] <= 0
             ):
                 channelid[channelid_key]["want_retry_count"] = default_config[
                     f"channelid_{website}"
                 ][channelid_name]["want_retry_count"]
             # 对title_change进行纠正
-            if "title_change" in channeli_value:
-                title_changes = channeli_value["title_change"]
+            if "title_change" in channelid_value:
+                title_changes = channelid_value["title_change"]
                 uphold_title_changes = []
                 if isinstance(title_changes, list):
                     for title_change in title_changes:
@@ -208,23 +208,23 @@ def correct_channelid(channelid, website):
                 else:
                     del channelid[channelid_key]["title_change"]
             if website == "bilibili" and (
-                "AllPartGet" not in channeli_value
-                or not isinstance(channeli_value["AllPartGet"], bool)
+                "AllPartGet" not in channelid_value
+                or not isinstance(channelid_value["AllPartGet"], bool)
             ):
                 channelid[channelid_key]["AllPartGet"] = (
                     channelid[channelid_key]["update_size"] > 5
                 )
             if website == "youtube" and (
-                "NoShorts" not in channeli_value
-                or not isinstance(channeli_value["NoShorts"], bool)
+                "NoShorts" not in channelid_value
+                or not isinstance(channelid_value["NoShorts"], bool)
             ):
                 channelid[channelid_key]["NoShorts"] = False
         if (
             channelid[channelid_key]["InmainRSS"] is False
-            and f"{config['address']}/channel_rss/{channeli_value['id']}.xml"
+            and f"{config['address']}/channel_rss/{channelid_value['id']}.xml"
             not in parse.shortcuts_url_original
         ):
             gVar.shortcuts_url[channelid_key] = (
-                f"{config['address']}/channel_rss/{channeli_value['id']}.xml"
+                f"{config['address']}/channel_rss/{channelid_value['id']}.xml"
             )
     return channelid

{podflow-20250706 → podflow-20250803}/podflow/httpfs/app_bottle.py

@@ -21,6 +21,7 @@ from podflow.upload.time_key import check_time_key
 from podflow.basic.folder_build import folder_build
 from podflow.httpfs.get_channelid import get_channelid
 from podflow.basic.random_sequence import random_sequence
+from podflow.upload.find_media_index import find_media_index
 from podflow.upload.store_users_info import store_users_info
 
 
@@ -47,6 +48,7 @@ class bottle_app:
             self.app_bottle.route("/login", callback=self.login)
             self.app_bottle.route("/upload", method="POST", callback=self.upload)
             self.app_bottle.route("/flush", method="POST", callback=self.clear_cache)
+            self.app_bottle.route("/remove", method="POST", callback=self.remove)
         else:
             self.app_bottle.route("/index", callback=self.index)
             self.app_bottle.route("/getid", method="POST", callback=self.getid)
@@ -278,7 +280,7 @@ class bottle_app:
             self.print_out("newuser", 401)
             return {
                 "code": -1,
-                "message": "Unauthorized: Invalid Token",
+                "message": "Unauthorized: Invalid Token",  # 未经授权: 无效的 Token
             }
 
     # 路由处理登陆请求
@@ -357,6 +359,12 @@ class bottle_app:
                 "code": -6,
                 "message": "ChannelId Does Not Exist",  # 频道ID不存在
             }
+        if not filename:
+            self.print_out("upload", 404)
+            return {
+                "code": -14,
+                "message": "Filename Not Provided",  # 未提供文件名
+            }
         address = f"channel_audiovisual/{channelid}"
         file_list = os.listdir(address) if os.path.exists(address) else []
         # 安全地分割文件名和后缀
@@ -431,7 +439,7 @@ class bottle_app:
                                 original_file.seek(0)
                                 if upload_hash == build_hash(original_file):
                                     self.print_out("upload same", 200)
-                                    store_users_info(username,filename)
+                                    store_users_info(username, filename, channelid)
                                     close_file()
                                     return {
                                         "code": 1,
@@ -452,7 +460,7 @@ class bottle_app:
                         )  # 传递文件对象
                         # 打印成功信息并返回成功码
                         self.print_out("upload", 200)
-                        store_users_info(username,filename)
+                        store_users_info(username, filename, channelid)
                         close_file()
                         return {
                             "code": 0,
@@ -465,7 +473,7 @@ class bottle_app:
                 # 捕获所有其他可能的异常
                 self.print_out("upload", 500)
                 return {
-                    "code": -9,
+                    "code": -10,
                     "message": f"Server Error: {str(e)}",  # 将异常信息返回给客户端
                 }
             finally:
@@ -495,7 +503,7 @@ class bottle_app:
                             original_file.seek(0)
                             if upload_hash == build_hash(original_file):
                                 self.print_out("upload same", 200)
-                                store_users_info(username,filename)
+                                store_users_info(username, filename, channelid)
                                 return {
                                     "code": 1,
                                     "message": "The Same File Exists",  # 相同文件已存在
@@ -557,10 +565,155 @@ class bottle_app:
         else:
             self.print_out("flush", 404)
             return {
-                "code": -10,
-                "message": "Cache Does Not Exist",  # 频道ID不存在
+                "code": -12,
+                "message": "Cache Does Not Exist",  # 缓存不存在
             }
 
+    # 路由处理删除请求
+    def remove(self):
+        # 获取已上传数据
+        upload_message = gVar.upload_message
+        # 获取上传数据配置(存储用户名和密码)
+        upload_data = gVar.upload_data
+        # 从请求参数中获取用户名，默认为空字符串
+        username = request.query.get("username", "")
+        # 从请求参数中获取密码，默认为空字符串
+        password = request.query.get("password", "")
+        if username not in upload_data:
+            self.print_out("login", 401)
+            return {
+                "code": -2,
+                "message": "Username Error",  # 用户名错误
+                "error": None,
+            }
+        # 验证密码是否正确
+        if upload_data[username] != password:
+            self.print_out("login", 401)
+            return {
+                "code": -3,
+                "message": "Password Error",  # 密码错误
+                "error": None,
+            }
+        mode = request.query.get("mode", "")
+        if mode not in ["file", "folder"]:
+            self.print_out("remove", 404)
+            return {
+                "code": -13,
+                "message": "Invalid Mode",  # 无效的模式
+                "error": None,
+            }
+        channelid = request.query.get("channel_id", "")
+        if not channelid:
+            # 打印错误信息并返回错误码
+            self.print_out("remove", 404)
+            return {
+                "code": -6,
+                "message": "ChannelId Does Not Exist",  # 频道ID不存在
+                "error": None,
+            }
+        if mode == "file":
+            filename = request.query.get("filename", "")
+            if not filename:
+                self.print_out("remove", 404)
+                return {
+                    "code": -14,
+                    "message": "Filename Not Provided",  # 未提供文件名
+                    "error": None,
+                }
+            index = find_media_index(upload_message, filename, "mediaid")
+            if index == -1:
+                self.print_out("remove", 404)
+                return{
+                    "code": -15,
+                    "message": "File Not In Data",  # 文件不在数据中
+                    "error": None,
+                }
+            if upload_message[index]["channelid"] != channelid:
+                self.print_out("remove", 404)
+                return {
+                    "code": -16,
+                    "message": "ChannelId Mismatch",  # 频道ID不匹配
+                    "error": None,
+                }
+            userlist = upload_message[index]["users"]
+            if username not in userlist:
+                self.print_out("remove", 404)
+                return {
+                    "code": -17,
+                    "message": "User Not In List",  # 用户不在列表中
+                    "error": None,
+                }
+            try:
+                os.remove(f"channel_audiovisual/{channelid}/{filename}")
+            except FileNotFoundError:
+                self.print_out("remove", 404)
+                return {
+                    "code": -18,
+                    "message": "File Not Found",  # 文件未找到
+                    "error": None,
+                }
+            except Exception as e:
+                self.print_out("remove", 500)
+                return {
+                    "code": -19,
+                    "message": f"Error Removing File: {str(e)}",  # 删除文件错误
+                    "error": str(e),
+                }
+            if len(userlist) == 1:
+                # 如果用户列表中只有当前用户, 则删除该条记录
+                del upload_message[index]
+            else:
+                # 如果用户列表中有多个用户, 则移除当前用户
+                upload_message[index]["users"].remove(username)
+            self.print_out("remove", 200)
+            return {
+                "code": 4,
+                "message": "File Removed Successfully",  # 文件删除成功
+                "error": None,
+            }
+        else:
+            remove_num = 0
+            for item in upload_message:
+                userlist = item["users"]
+                if item["channelid"] == channelid and username in userlist:
+                    try:
+                        os.remove(f"channel_audiovisual/{channelid}/{item['mediaid']}")
+                        remove_num += 1
+                    except FileNotFoundError:
+                        self.print_out("remove", 404)
+                        return {
+                            "code": -18,
+                            "message": "File Not Found",  # 文件未找到
+                            "error": None,
+                        }
+                    except Exception as e:
+                        self.print_out("remove", 500)
+                        return {
+                            "code": -19,
+                            "message": f"Error Removing File: {str(e)}",  # 删除文件错误
+                            "error": str(e),
+                        }
+                    if len(userlist) == 1:
+                        # 如果用户列表中只有当前用户, 则删除该条记录
+                        del upload_message[index]
+                    else:
+                        # 如果用户列表中有多个用户, 则移除当前用户
+                        upload_message[index]["users"].remove(username)
+            if remove_num == 0:
+                self.print_out("remove", 404)
+                return {
+                    "code": -20,
+                    "message": "No Files Found",  # 未找到用户的文件
+                    "error": None,
+                }
+            else:
+                self.print_out("remove", 200)
+                return {
+                    "code": 5,
+                    "message": "Folder Removed Successfully",  # 文件夹删除成功
+                    "error": None,
+                }
+
     # 路由处理模板文件请求
     def serve_template_file(self, filepath):
         template_dir = pkg_resources.resource_filename("podflow", "templates")

{podflow-20250706 → podflow-20250803}/podflow/main_podcast.py

@@ -12,6 +12,7 @@ import cherrypy
 
 # 基本功能模块
 from podflow import gVar, parse
+from podflow.basic.file_save import file_save
 from podflow.basic.split_dict import split_dict
 from podflow.basic.time_print import time_print
 
@@ -211,9 +212,9 @@ def main_podcast():
             progress_update(0.83, num=0.0049)
             if gVar.config["remove_media"]:
                 # 删除不在rss中的媒体文件
-                remove_file()
+                remove_file(upload_url)
                 # 删除已抛弃的媒体文件夹
-                remove_dir()
+                remove_dir(upload_url)
             progress_update(0.84)
             # 补全缺失媒体文件到字典
             make_up_file()
@@ -257,6 +258,12 @@ def main_podcast():
             if upload_url:
                 thread_upload.join()
             time_print("频道无更新内容")
+        # 保存需要的变量
+        if parse.save:
+            for save_data in parse.save:
+                file_data = getattr(gVar, save_data, None)
+                if file_data:
+                    file_save(file_data, f"{save_data}.json")
         # 清空变量内数据
         gVar.channelid_youtube_ids_update.clear()  # 需更新的YouTube频道字典
         gVar.youtube_content_ytid_update.clear()  # 需下载YouTube视频字典

{podflow-20250706 → podflow-20250803}/podflow/message/fail_message_initialize.py

@@ -170,15 +170,20 @@ error_reason = [
         "text",
     ],
     [
-        r"Got error: HTTPSConnectionPool\(host='.+\.mcdn\.bilivideo\.cn', port=8082\): Read timed out\. \(read timeout=20\.0\)",
+        r"Got error: HTTPSConnectionPool\(host='.+\.mcdn\.bilivideo\.cn', port=[0-9]{4}\): Read timed out\. \(read timeout=20\.0\)",
         "\033[31m响应超时\033[0m",
         "regexp",
     ],
     [
-        r"Got error: \<urllib3\.connection\.HTTPSConnection object at .{18}\>: Failed to establish a new connection: \[WinError 10061\] 由于目标计算机积极拒绝，无法连接。"
+        r"Got error: \<urllib3\.connection\.HTTPSConnection object at .{18}\>: Failed to establish a new connection: \[WinError 10061\] 由于目标计算机积极拒绝，无法连接。",
         "\033[31m链接拒绝\033[0m",
         "regexp",
     ],
+    [
+        r"YouTube said: The playlist does not exist.",
+        "\033[31m播放列表不存在\033[0m",
+        "text",
+    ],
 ]
 
 
@@ -194,6 +199,7 @@ def fail_message_initialize(message_error, video_url):
         .replace("[youtube] ", "")
         .replace("[download] ", "")
         .replace("[BiliBili] ", "")
+        .replace("[youtube:tab] ", "")
     )
     if video_url[:2] == "BV":
         fail_message = fail_message.replace(f"{video_url[2:]}: ", "")

{podflow-20250706 → podflow-20250803}/podflow/message/update_information_display.py

@@ -1,9 +1,24 @@
-# podflow/message/want_retry.py
+# podflow/message/update_information_display.py
 # coding: utf-8
 
 import re
 import os
+from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.message.want_retry import want_retry
+
+
+def skip_display(name, channelid_key, channelid_value, id_update):
+    if name == "YouTube":
+        failed_count = gVar.channelid_youtube[channelid_value]["want_retry_count"]
+    elif name == "BiliBili":
+        failed_count = gVar.channelid_bilibili[channelid_value]["want_retry_count"]
+    else:
+        failed_count = 0
+    for video_id in id_update[channelid_key]:
+        if want_retry(video_id, failed_count):
+            return False
+    return True
 
 
 # 输出需要更新的信息模块
@@ -40,11 +55,23 @@ def update_information_display(
                 channelid_key in content_id_update
                 and channelid_key in content_id_backward_update
             ):
-                print_channelid_ids_update += f"\033[34m{channelid_value}\033[0m"
+                if (
+                    skip_display(name, channelid_key, channelid_value, content_id_update)
+                    and skip_display(name, channelid_key, channelid_value, content_id_backward_update)
+                ):
+                    print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
+                else:
+                    print_channelid_ids_update += f"\033[34m{channelid_value}\033[0m"
             elif channelid_key in content_id_update:
-                print_channelid_ids_update += f"\033[32m{channelid_value}\033[0m"
+                if skip_display(name, channelid_key, channelid_value, content_id_update):
+                    print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
+                else:
+                    print_channelid_ids_update += f"\033[32m{channelid_value}\033[0m"
             elif channelid_key in content_id_backward_update:
-                print_channelid_ids_update += f"\033[36m{channelid_value}\033[0m"
+                if skip_display(name, channelid_key, channelid_value, content_id_backward_update):
+                    print_channelid_ids_update += f"\033[97m{channelid_value}\033[0m"
+                else:
+                    print_channelid_ids_update += f"\033[36m{channelid_value}\033[0m"
             else:
                 print_channelid_ids_update += f"\033[33m{channelid_value}\033[0m"
     # 如果含有特殊字符将使用此输出

{podflow-20250706 → podflow-20250803}/podflow/parse_arguments.py

@@ -73,6 +73,13 @@ def parse_arguments():
         action="store_true",
         help="Only upload server function, solely for LAN backup (applicable to iOS)",
     )
+    parser.add_argument(
+        "--save",
+        nargs="*",
+        type=str,
+        metavar="Variable",
+        help="Used during testing",
+    )
     parser.add_argument("--file", nargs="?", help=argparse.SUPPRESS)  # 仅运行在ipynb中
     # 解析参数
     args = parser.parse_args()
@@ -83,6 +90,7 @@ def parse_arguments():
     parse.httpfs = args.httpfs
     parse.upload = args.upload
     parse.index = args.index
+    parse.save = args.save
     # 检查并处理参数的状态
     if args.times is not None:
         parse.update_num = int(args.times[0])