podflow 20250608__py3-none-any.whl → 20250629__py3-none-any.whl

podflow/basic/http_client.py

@@ -17,6 +17,7 @@ def http_client(
     data=None,
     mode="get",
     file=None,
+    mistake=False,
 ):
     user_agent = {
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
@@ -41,7 +42,7 @@ def http_client(
             "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36",
         }
         user_agent |= headers_douyin
-    err = None  # 初始化 err 变量
+    err = ""  # 初始化 err 变量
     response = None  # 初始化 response 变量
     # 创建一个Session对象
     session = requests.Session()
@@ -64,16 +65,26 @@ def http_client(
             response.raise_for_status()
         except Exception as http_get_error:
             if response is not None and response.status_code in {404}:
-                return response
+                if mistake:
+                    return response, err
+                else:
+                    return response
             if name:
                 time_print(f"{name}|\033[31m连接异常重试中...\033[97m{num + 1}\033[0m")
             if err:
-                err = f"{err}\n{str(http_get_error)}"
+                if err.split('\n')[-1] != str(http_get_error):
+                    err = f"{err}\n{str(http_get_error)}"
             else:
                 err = f":\n{str(http_get_error)}"
         else:
-            return response
+            if mistake:
+                return response, err
+            else:
+                return response
         time.sleep(retry_delay)
     if name:
         time_print(f"{name}|\033[31m达到最大重试次数\033[97m{max_retries}\033[0m{err}")
-    return response
+    if mistake:
+        return response, err
+    else:
+        return response

podflow/basic/random_sequence.py

@@ -0,0 +1,10 @@
+# podflow/basic/random_sequence.py
+# coding: utf-8
+
+import random
+
+
+def random_sequence(n):
+    arr = list(range(n))  # 生成0到n-1的列表
+    random.shuffle(arr)   # 原地随机打乱列表顺序
+    return arr            # 返回打乱后的列表

podflow/download_and_build.py

@@ -3,7 +3,6 @@
 
 import threading
 from podflow import gVar
-from podflow.upload.upload_files import all_upload
 from podflow.youtube.build import get_youtube_introduction
 from podflow.message.create_main_rss import create_main_rss
 from podflow.download.youtube_and_bilibili_download import youtube_and_bilibili_download
@@ -16,21 +15,12 @@ def get_and_duild():
 
 
 # 下载并构建YouTube和哔哩哔哩视频模块
-def download_and_build(upload_url):
+def download_and_build():
     thread_download = threading.Thread(target=youtube_and_bilibili_download)
     thread_build = threading.Thread(target=get_and_duild)
-    if upload_url:
-        thread_upload = threading.Thread(
-            target=all_upload,
-            args=(upload_url,)
-        )
 
     thread_download.start()
     thread_build.start()
-    if upload_url:
-        thread_upload.start()
 
     thread_download.join()
     thread_build.join()
-    if upload_url:
-        thread_upload.join()

podflow/httpfs/app_bottle.py

@@ -2,6 +2,7 @@
 # coding: utf-8
 
 import os
+import re
 import json
 import time
 import hashlib
@@ -19,6 +20,7 @@ from podflow.upload.build_hash import build_hash
 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
 
 
 class bottle_app:
@@ -30,6 +32,7 @@ class bottle_app:
         self.logname = "httpfs.log"  # 默认日志文件名
         self.http_fs = False
         self._last_message_state = {}  # 用于 SSE，跟踪消息状态
+        self.random_list = random_sequence(64)
 
     def setup_routes(self, upload=False):
         # 设置/favicon.ico路由，回调函数为favicon
@@ -42,6 +45,7 @@ class bottle_app:
             self.app_bottle.route("/newuser", callback=self.new_user)
             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)
         else:
             self.app_bottle.route("/index", callback=self.index)
             self.app_bottle.route("/getid", method="POST", callback=self.getid)
@@ -88,7 +92,7 @@ class bottle_app:
             206: "\033[36m",  # 青色 (部分内容)
         }
         # 默认颜色
-        if status:
+        if status in status_colors:
             color = status_colors.get(status, "\033[0m")
             status = f"{color}{status}\033[0m"
         now_time = datetime.now().strftime("%H:%M:%S")
@@ -316,90 +320,161 @@ class bottle_app:
     def upload(self):
         # 初始化 upload_file 为 None，以便在 finally 块中安全检查
         upload_file = None
-        try:
-            # 获取上传数据配置(存储用户名和密码)
-            upload_data = gVar.upload_data
-            # 从请求参数中获取用户名，默认为空字符串
-            username = request.query.get("username", "")
-            # 从请求参数中获取密码，默认为空字符串
-            password = request.query.get("password", "")
-            upload_hash = request.query.get("hash", "")
-            channelid = request.query.get("channel_id", "")
-
-            # 验证用户是否存在
-            if username not in upload_data:
-                self.print_out("login", 401)
-                return {
-                    "code": -2,
-                    "message": "Username Error",  # 用户名错误
-                }
-            # 验证密码是否正确
-            if upload_data[username] != password:
-                self.print_out("login", 401)
-                return {
-                    "code": -3,
-                    "message": "Password Error",  # 密码错误
-                }
-            # 从请求中获取上传的文件对象
-            upload_file = request.files.get("file")
-            # 检查是否有文件被上传
-            if not upload_file:
-                # 打印错误信息并返回错误码
-                self.print_out("upload", 404)
-                return {
-                    "code": -4,
-                    "message": "No File Provided",  # 没有上传文件
-                }
-
-            # 获取实际的文件句柄
-            uploadfile_obj = upload_file.file
-
-            # 判断文件是否完整
-            uploadfile_obj.seek(0) # 确保从文件开头计算哈希
-            uploadfile_hash = build_hash(uploadfile_obj)
-            if upload_hash != uploadfile_hash:
-                self.print_out("upload", 401)
-                return {
-                    "code": -5,
-                    "message": "Incomplete File",  # 文件不完整
-                    "hash": uploadfile_hash,
-                }
-            if not channelid:
-                # 打印错误信息并返回错误码
+        # 获取上传数据配置(存储用户名和密码)
+        upload_data = gVar.upload_data
+        # 从请求参数中获取用户名，默认为空字符串
+        username = request.query.get("username", "")
+        # 从请求参数中获取密码，默认为空字符串
+        password = request.query.get("password", "")
+        upload_hash = request.query.get("hash", "")
+        channelid = request.query.get("channel_id", "")
+        check = request.query.get("check", "")
+        filename = request.query.get("filename", "")
+        if username not in upload_data:
+            self.print_out("login", 401)
+            return {
+                "code": -2,
+                "message": "Username Error",  # 用户名错误
+            }
+        # 验证密码是否正确
+        if upload_data[username] != password:
+            self.print_out("login", 401)
+            return {
+                "code": -3,
+                "message": "Password Error",  # 密码错误
+            }
+        if not re.match(r"^[0-9a-fA-F]{64}$", upload_hash):
+            self.print_out("upload", 404)
+            return {
+                "code": -8,
+                "message": "Invalid Hash Format",  # 哈希值格式不正确
+            }
+        if not channelid:
+            # 打印错误信息并返回错误码
+            self.print_out("upload", 404)
+            return {
+                "code": -6,
+                "message": "ChannelId Does Not Exist",  # 频道ID不存在
+            }
+        address = f"channel_audiovisual/{channelid}"
+        file_list = os.listdir(address) if os.path.exists(address) else []
+        # 安全地分割文件名和后缀
+        parts = filename.rsplit(".", 1)
+        name = parts[0]
+        suffix = parts[1].lower() if len(parts) > 1 else ""  # 转换为小写以便比较
+        if suffix not in ["mp4", "m4a"]:
+            self.print_out("upload", 404)
+            return {
+                "code": -7,
+                "message": "File Name Error",  # 文件格式错误
+            }
+        create_check = ""
+        for ref in self.random_list:
+            create_check += upload_hash[ref]
+        if check:
+            if check != create_check:
                 self.print_out("upload", 404)
                 return {
-                    "code": -6,
-                    "message": "ChannelId Does Not Exist",  # 频道ID不存在
+                    "code": -9,
+                    "message": "Check Error",  # 检查错误
                 }
-            # 获取上传文件的原始文件名
-            filename = upload_file.filename
-            # 安全地分割文件名和后缀
-            parts = filename.rsplit(".", 1)
-            name = parts[0]
-            suffix = parts[1].lower() if len(parts) > 1 else "" # 转换为小写以便比较
-
-            if suffix not in ["mp4", "m4a"]:
-                self.print_out("upload", 404)
+            try:
+                # 从请求中获取上传的文件对象
+                upload_file = request.files.get("file")
+                # 检查是否有文件被上传
+                if not upload_file:
+                    # 打印错误信息并返回错误码
+                    self.print_out("upload", 404)
+                    return {
+                        "code": -4,
+                        "message": "No File Provided",  # 没有上传文件
+                    }
+                # 获取实际的文件句柄
+                uploadfile_obj = upload_file.file
+                # 判断文件是否完整
+                uploadfile_obj.seek(0)  # 确保从文件开头计算哈希
+                uploadfile_hash = build_hash(uploadfile_obj)
+                if upload_hash != uploadfile_hash:
+                    self.print_out("upload", 401)
+                    return {
+                        "code": -5,
+                        "message": "Incomplete File",  # 文件不完整
+                        "hash": uploadfile_hash,
+                    }
+                num = 0
+                while True:
+                    # 构建当前尝试的文件名
+                    current_filename = (
+                        f"{name}.{suffix}" if num == 0 else f"{name}.{num}.{suffix}"
+                    )
+                    full_target_path = os.path.join(
+                        os.getcwd(), address, current_filename
+                    )  # 完整的保存路径
+                    if current_filename in file_list:
+                        # 如果文件名已存在，检查是否是相同文件
+                        # 再次检查文件是否存在于磁盘，以防在列表检查后文件被删除
+                        if os.path.exists(full_target_path):
+                            with open(full_target_path, "rb") as original_file:
+                                original_file.seek(0)
+                                if upload_hash == build_hash(original_file):
+                                    self.print_out("upload same", 200)
+                                    return {
+                                        "code": 1,
+                                        "message": "The Same File Exists",  # 相同文件已存在
+                                        "data": {
+                                            "filename": current_filename,
+                                        },
+                                    }
+                        num += 1  # 如果哈希不同，尝试下一个文件名
+                    else:
+                        # 文件名不存在，可以保存
+                        folder_build(
+                            channelid, "channel_audiovisual"
+                        )  # 确保目标文件夹存在
+                        uploadfile_obj.seek(0)  # 再次重置文件指针到开头，准备写入
+                        file_save(
+                            uploadfile_obj, current_filename, address, True
+                        )  # 传递文件对象
+                        # 打印成功信息并返回成功码
+                        self.print_out("upload", 200)
+                        return {
+                            "code": 0,
+                            "message": "Upload Success",  # 上传成功
+                            "data": {
+                                "filename": current_filename,
+                            },
+                        }
+            except Exception as e:
+                # 捕获所有其他可能的异常
+                self.print_out("upload", 500)
                 return {
-                    "code": -7,
-                    "message": "File Format Error",  # 文件格式错误
+                    "code": -9,
+                    "message": f"Server Error: {str(e)}",  # 将异常信息返回给客户端
                 }
-            address = f"channel_audiovisual/{channelid}"
-            file_list = os.listdir(address) if os.path.exists(address) else []
+            finally:
+                # 无论函数如何退出（正常返回或抛出异常），都会执行此块
+                if (
+                    upload_file
+                    and hasattr(upload_file, "file")
+                    and not upload_file.file.closed
+                ):
+                    upload_file.file.close()
+        else:
             num = 0
             while True:
                 # 构建当前尝试的文件名
-                current_filename = f"{name}.{suffix}" if num == 0 else f"{name}.{num}.{suffix}"
-                full_target_path = os.path.join(os.getcwd(), address, current_filename) # 完整的保存路径
-
+                current_filename = (
+                    f"{name}.{suffix}" if num == 0 else f"{name}.{num}.{suffix}"
+                )
+                full_target_path = os.path.join(
+                    os.getcwd(), address, current_filename
+                )  # 完整的保存路径
                 if current_filename in file_list:
-                    # 如果文件名已存在，检查是否是相同文件
-                    # 再次检查文件是否存在于磁盘，以防在列表检查后文件被删除
                     if os.path.exists(full_target_path):
                         with open(full_target_path, "rb") as original_file:
                             original_file.seek(0)
                             if upload_hash == build_hash(original_file):
-                                self.print_out("upload", 200)
+                                self.print_out("upload same", 200)
                                 return {
                                     "code": 1,
                                     "message": "The Same File Exists",  # 相同文件已存在
@@ -407,34 +482,65 @@ class bottle_app:
                                         "filename": current_filename,
                                     },
                                 }
-                    num += 1 # 如果哈希不同，尝试下一个文件名
+                    num += 1  # 如果哈希不同，尝试下一个文件名
                 else:
-                    # 文件名不存在，可以保存
-                    folder_build(channelid, "channel_audiovisual") # 确保目标文件夹存在
-                    uploadfile_obj.seek(0) # 再次重置文件指针到开头，准备写入
-                    file_save(uploadfile_obj, current_filename, address, True) # 传递文件对象
-                    # 打印成功信息并返回成功码
-                    self.print_out("upload", 200)
+                    self.print_out("advance upload", 200)
                     return {
-                        "code": 0,
-                        "message": "Upload Success",  # 上传成功
+                        "code": 2,
+                        "message": "Can Be Uploaded",  # 可以上传
                         "data": {
                             "filename": current_filename,
+                            "check": create_check,  # 返回创建的检查值
                         },
                     }
-        except Exception as e:
-            # 捕获所有其他可能的异常
-            self.print_out("upload", 500)
+
+    # 路由处理清除缓存请求
+    def clear_cache(self):
+        # 获取上传数据配置(存储用户名和密码)
+        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": -99,
-                "message": f"Server Error: {str(e)}", # 将异常信息返回给客户端
+                "code": -2,
+                "message": "Username Error",  # 用户名错误
+            }
+        # 验证密码是否正确
+        if upload_data[username] != password:
+            self.print_out("login", 401)
+            return {
+                "code": -3,
+                "message": "Password Error",  # 密码错误
+            }
+        if os.path.exists("tmp"):
+            # 清除 tmp 目录下的所有文件
+            for filename in os.listdir("tmp"):
+                file_path = os.path.join("tmp", filename)
+                try:
+                    os.remove(file_path)  # 删除文件
+                except Exception as e:
+                    self.print_out("flush", 500)
+                    return {
+                        "code": -11,
+                        "message": "Error removing flush",  # 删除文件错误
+                        "error": str(e),
+                    }
+            self.print_out("flush", 200)
+            return {
+                "code": 3,
+                "message": "Cache Cleared Successfully",  # 缓存清除成功
+            }
+        else:
+            self.print_out("flush", 404)
+            return {
+                "code": -10,
+                "message": "Cache Does Not Exist",  # 频道ID不存在
             }
-        finally:
-            # 无论函数如何退出（正常返回或抛出异常），都会执行此块
-            if upload_file and hasattr(upload_file, 'file') and not upload_file.file.closed:
-                upload_file.file.close()
-
 
+    # 路由处理模板文件请求
     def serve_template_file(self, filepath):
         template_dir = pkg_resources.resource_filename("podflow", "templates")
         return static_file(filepath, root=template_dir)
@@ -451,16 +557,14 @@ class bottle_app:
 
     # 获取 JSON 数据，Bottle 会自动解析请求体中的 JSON 数据
     def getid(self):
-        if getid_data := request.json:
-            content = getid_data.get("content", "")
-        else:
-            content = ""
+        content = getid_data.get("content", "") if (getid_data := request.json) else ""
         response_message = get_channelid(content)
         self.print_out("channelid", 200)
         # 设置响应头为 application/json
         response.content_type = "application/json"
         return {"response": response_message}
-    
+
+    # 获取配置数据
     def getconfig(self):
         self.print_out("getconfig", 200)
         # 设置响应头为 application/json

podflow/main.py

@@ -14,7 +14,7 @@ def main():
     parse_arguments()
     # 开始运行
     if parse.upload:
-        time_print("Podflow|{version('Podflow')} 接收开始运行...")
+        time_print(f"Podflow|{version('Podflow')} 接收开始运行...")
         reverse_log("upload")
         main_upload()
     else:

podflow/main_podcast.py

@@ -22,24 +22,18 @@ from podflow.httpfs.app_bottle import bottle_app_instance
 
 # 下载和视频处理模块
 from podflow.ffmpeg_judge import ffmpeg_judge
-from podflow.download.delete_part import delete_part
-from podflow.download_and_build import download_and_build
+from podflow.run_and_upload import run_and_upload
 
 # RSS 和消息处理模块
 from podflow.message.save_rss import save_rss
 from podflow.message.get_original_rss import get_original_rss
-from podflow.message.get_video_format import get_video_format
-from podflow.message.optimize_download import optimize_download
 from podflow.message.original_rss_fail_print import original_rss_fail_print
-from podflow.message.update_information_display import update_information_display
-from podflow.message.update_youtube_bilibili_rss import update_youtube_bilibili_rss
 
 # 登录模块
 from podflow.bilibili.login import get_bilibili_data
 from podflow.youtube.login import get_youtube_cookie
 
 # 配置和图标模块
-from podflow.config.channge_icon import channge_icon
 from podflow.config.build_original import build_original
 
 # 制作和修改文件模块
@@ -51,6 +45,7 @@ from podflow.makeup.make_up_file_format_mod import make_up_file_format_mod
 # 移除模块
 from podflow.remove.remove_dir import remove_dir
 from podflow.remove.remove_file import remove_file
+from podflow.remove.remove_flush import remove_flush
 
 # 处理 YouTube 信息模块
 from podflow.youtube.build import print_fail_youtube
@@ -139,59 +134,13 @@ def main_podcast():
         bottle_app_instance.cherry_print()
         # 登陆上传服务器
         if upload_url:
-            upload_json = login_upload(upload_url)
-            if upload_json:
-                gVar.upload_json = upload_json
-            else:
-                gVar.config["upload"] = False
-        else:
-            gVar.config["upload"] = False
+            gVar.upload_json = login_upload(upload_url)
         progress_update(0.035, num=0.0024)
         # 初始化原始上传信息
         get_upload_original()
         progress_update(0.04)
-        # 更新Youtube和哔哩哔哩频道xml
-        update_youtube_bilibili_rss()
-        progress_update(0.1)
-        # 判断是否有更新内容
-        if gVar.channelid_youtube_ids_update or gVar.channelid_bilibili_ids_update:
-            gVar.update_generate_rss = True
+        run_and_upload(upload_url)
         if gVar.update_generate_rss:
-            # 根据日出日落修改封面(只适用原封面)
-            channge_icon()
-            progress_update(0.11, num=0.0049)
-            # 输出需要更新的信息
-            update_information_display(
-                gVar.channelid_youtube_ids_update,
-                gVar.youtube_content_ytid_update,
-                gVar.youtube_content_ytid_backward_update,
-                "YouTube",
-            )
-            update_information_display(
-                gVar.channelid_bilibili_ids_update,
-                gVar.bilibili_content_bvid_update,
-                gVar.bilibili_content_bvid_backward_update,
-                "BiliBili",
-            )
-            progress_update(0.12)
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 获取视频格式信息
-            get_video_format()
-            progress_update(0.199)
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            # 优化下载顺序
-            optimize_download()
-            # 删除中断下载的媒体文件
-            if gVar.config["delete_incompletement"]:
-                delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
-            progress_update(0.20, refresh=2)
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 下载并构建YouTube和哔哩哔哩视频
-            download_and_build(upload_url)
-            progress_update(0.8)
             # 添加新媒体至上传列表
             add_upload()
             progress_update(0.81, num=0.0049)
@@ -243,6 +192,8 @@ def main_podcast():
             # 更新并保存上传列表
             update_upload()
             progress_update(1, refresh=3)
+            # 清理缓存文件
+            remove_flush(upload_url)
         else:
             time_print("频道无更新内容")
         # 清空变量内数据
@@ -267,6 +218,7 @@ def main_podcast():
         gVar.overall_rss = ""  # 更新后的rss文本
         gVar.make_up_file_format.clear()  # 补全缺失媒体字典
         gVar.make_up_file_format_fail.clear()  # 补全缺失媒体失败字典
+        gVar.upload_original.clear()  # 原始上传信息字典
         # 将需要更新转为否
         gVar.update_generate_rss = False
         if parse.update_num != -1:

podflow/main_upload.py

@@ -1,6 +1,7 @@
 # podflow/main_upload.py
 # coding: utf-8
 
+import os
 import sys
 import cherrypy
 from podflow.upload.login import get_login
@@ -15,6 +16,11 @@ def main_upload():
     folder_build("channel_audiovisual")
     # 构建文件夹channel_data
     folder_build("channel_data")
+    # 在程序启动时设置 TMPDIR 环境变量
+    new_tmp_dir = os.path.join(os.getcwd(), "tmp")
+    os.makedirs(new_tmp_dir, exist_ok=True) # 确保目录存在
+    os.environ['TMPDIR'] = new_tmp_dir
+    time_print(f"临时文件目录已设置为: {os.environ['TMPDIR']}")
     # 获取账号密码
     get_login()
     # 服务发现相关配置

podflow/message/fail_message_initialize.py

@@ -139,6 +139,11 @@ error_reason = [
         "\033[31m响应超时\033[0m",
         "regexp",
     ],
+    [
+        r"Got error: HTTPSConnectionPool\(host='rr[0-9]---sn-.{8}\.googlevideo.com', port=443\): Read timed out\.",
+        "\033[31m响应超时\033[0m",
+        "regexp",
+    ],
     [
         r"Requested format is not available. Use --list-formats for a list of available formats",
         "\033[31m格式不可用\033[0m",
@@ -154,6 +159,26 @@ error_reason = [
         "\033[31m无法解析\033[0m",
         "regexp",
     ],
+    [
+        r"An extractor error has occurred. (caused by KeyError('bvid')); please report this issue on  https://github.com/yt-dlp/yt-dlp/issues?q= , filling out the appropriate issue template. Confirm you are on the latest version using  yt-dlp -U",
+        "\033[31m提取错误\033[0m",
+        "text",
+    ],
+    [
+        r"Unable to download JSON metadata: HTTP Error 504: Gateway Time-out (caused by <HTTPError 504: Gateway Time-out>)",
+        "\033[31m网关超时\033[0m",
+        "text",
+    ],
+    [
+        r"Got error: HTTPSConnectionPool\(host='.+\.mcdn\.bilivideo\.cn', port=8082\): 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\] 由于目标计算机积极拒绝，无法连接。"
+        "\033[31m链接拒绝\033[0m",
+        "regexp",
+    ],
 ]
 
 

podflow/remove/remove_flush.py

@@ -0,0 +1,50 @@
+# podflow/remove/remove_flush.py
+# coding: utf-8
+
+from podflow import gVar
+from podflow.basic.http_client import http_client
+from podflow.httpfs.app_bottle import bottle_app_instance
+
+# 缓存文件清理模块
+def remove_flush(upload_url):
+    if gVar.upload_json:
+        result = {
+            3: "缓存文件清理成功",
+            -2: "用户名错误",
+            -3: "密码错误",
+            -10: "缓存文件不存在",
+            -11: "缓存文件删除失败"
+        }
+        username = gVar.upload_json["username"]
+        password = gVar.upload_json["password"]
+        data = {
+            "username": username,
+            "password": password,
+        }
+        response, err = http_client(
+            url=f"{upload_url}/flush",
+            name="",
+            max_retries=3,
+            data=data,
+            mode="post",
+            mistake=True,
+        )
+        if response:
+            response = response.json()
+            code = response.get("code")
+            data = response.get("data", {})
+            message = response.get("message", "")
+            if code == 3:
+                bottle_text = "\033[32m缓存文件清理成功\033[0m"
+            elif code == -11:
+                error_message = response.get("error", "")
+                if error_message:
+                    bottle_text = f"\033[31m缓存文件清理失败\033[0m: {error_message}"
+                else:
+                    bottle_text = "\033[31m缓存文件清理失败\033[0m"
+            else:
+                bottle_text = f"\033[31m缓存文件清理失败\033[0m: {result.get(code, message)}"
+        else:
+            bottle_text = f"\033[31m缓存文件清理失败\033[0m: 网络连接失败{err}"
+        bottle_app_instance.add_bottle_print(upload_url, "flush", bottle_text)
+        bottle_app_instance.cherry_print(False)

podflow/run_and_upload.py

@@ -0,0 +1,77 @@
+# podflow/run_and_upload.py
+# coding: utf-8
+
+import threading
+from podflow import gVar
+from podflow.upload.upload_files import all_upload
+from podflow.config.channge_icon import channge_icon
+from podflow.download.delete_part import delete_part
+from podflow.httpfs.progress_bar import progress_update
+from podflow.download_and_build import download_and_build
+from podflow.httpfs.app_bottle import bottle_app_instance
+from podflow.message.get_video_format import get_video_format
+from podflow.message.optimize_download import optimize_download
+from podflow.message.update_information_display import update_information_display
+from podflow.message.update_youtube_bilibili_rss import update_youtube_bilibili_rss
+
+
+def find_and_duild():
+    # 更新Youtube和哔哩哔哩频道xml
+    update_youtube_bilibili_rss()
+    progress_update(0.1)
+    # 判断是否有更新内容
+    if gVar.channelid_youtube_ids_update or gVar.channelid_bilibili_ids_update:
+        gVar.update_generate_rss = True
+    if gVar.update_generate_rss:
+        # 根据日出日落修改封面(只适用原封面)
+        channge_icon()
+        progress_update(0.11, num=0.0049)
+        # 输出需要更新的信息
+        update_information_display(
+            gVar.channelid_youtube_ids_update,
+            gVar.youtube_content_ytid_update,
+            gVar.youtube_content_ytid_backward_update,
+            "YouTube",
+        )
+        update_information_display(
+            gVar.channelid_bilibili_ids_update,
+            gVar.bilibili_content_bvid_update,
+            gVar.bilibili_content_bvid_backward_update,
+            "BiliBili",
+        )
+        progress_update(0.12)
+        # 暂停进程打印
+        gVar.server_process_print_flag[0] = "pause"
+        # 获取视频格式信息
+        get_video_format()
+        progress_update(0.199)
+        # 恢复进程打印
+        bottle_app_instance.cherry_print()
+        # 优化下载顺序
+        optimize_download()
+        # 删除中断下载的媒体文件
+        if gVar.config["delete_incompletement"]:
+            delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
+        progress_update(0.20, refresh=2)
+        # 暂停进程打印
+        gVar.server_process_print_flag[0] = "pause"
+        # 下载并构建YouTube和哔哩哔哩视频
+        download_and_build()
+        progress_update(0.8)
+
+# 运行并上传模块
+def run_and_upload(upload_url):
+    thread_find_and_duild = threading.Thread(target=find_and_duild)
+    if upload_url:
+        thread_upload = threading.Thread(
+            target=all_upload,
+            args=(upload_url,)
+        )
+
+    thread_find_and_duild.start()
+    if upload_url:
+        thread_upload.start()
+
+    thread_find_and_duild.join()
+    if upload_url:
+        thread_upload.join()

podflow/upload/add_upload.py

@@ -7,6 +7,9 @@ from podflow import gVar
 
 # 添加新媒体至上传列表模块
 def add_upload():
+    # 如果没有开启上传功能，则直接返回
+    if not gVar.config["upload"]:
+        return
     # 获取video_id_update_format和video_id_failed的值
     video_id_update_format = gVar.video_id_update_format
     video_id_failed = gVar.video_id_failed

podflow/upload/upload_files.py

@@ -1,18 +1,24 @@
 # podflow/upload/upload_files.py
 # coding: utf-8
 
-from datetime import datetime
 from podflow import gVar
-from podflow.httpfs.to_html import ansi_to_html
 from podflow.upload.build_hash import build_hash
 from podflow.basic.http_client import http_client
 from podflow.httpfs.app_bottle import bottle_app_instance
 
 
 # 上传文件模块
-def upload_file(upload_url, username, password, channelid, filename):
-    filename = f"channel_audiovisual/{channelid}/{filename}"
-    with open(filename, "rb") as file:
+def upload_file(
+    upload_url,
+    username,
+    password,
+    channelid,
+    filename,
+    upload_filename=False,
+    check=""
+):
+    address = f"channel_audiovisual/{channelid}/{filename}"
+    with open(address, "rb") as file:
         file.seek(0)
         hashs = build_hash(file)
         file.seek(0)
@@ -21,18 +27,30 @@ def upload_file(upload_url, username, password, channelid, filename):
             "password": password,
             "channel_id": channelid,
             "hash": hashs,
+            "filename": filename,
         }
-        if response := http_client(
-            url=f"{upload_url}/upload",
-            name="",
-            data=data,
-            mode="post",
-            file=file,
-        ):
-            return response.json(), hashs
+        if upload_filename:
+            data["check"] = check
+            response, err = http_client(
+                url=f"{upload_url}/upload",
+                name="",
+                max_retries=3,
+                data=data,
+                mode="post",
+                file=file,
+                mistake=True,
+            )
         else:
-            return None, hashs
-    return None, hashs
+            response, err = http_client(
+                url=f"{upload_url}/upload",
+                name="",
+                max_retries=3,
+                data=data,
+                mode="post",
+                mistake=True,
+            )
+        return (response.json(), hashs, "") if response else (None, hashs, err)
+    return None, hashs, ""
 
 
 # 查找位置模块
@@ -62,13 +80,12 @@ def filter_and_sort_media(media_list):
 
 # 媒体文件上传模块
 def record_upload(upload_url, username, password, channelid, filename):
-    response, hashs = upload_file(upload_url, username, password, channelid, filename)
     channelname = (
         gVar.channelid_youtube_ids_original | gVar.channelid_bilibili_ids_original
     ).get(channelid, "")
-    now_time = datetime.now().strftime("%H:%M:%S")
     result = {
         0: "",
+        2: "可以上传",
         1: "存在相同文件",
         -2: "用户名错误",
         -3: "密码错误",
@@ -76,36 +93,73 @@ def record_upload(upload_url, username, password, channelid, filename):
         -5: "文件不完整",
         -6: "频道ID不存在",
         -7: "文件格式有误",
+        -8: "哈希值格式错",
     }
+    ahead_response, hashs, ahead_err = upload_file(
+        upload_url,
+        username,
+        password,
+        channelid,
+        filename,
+    )
     name = filename.split(".")[0]
-    if response:
-        code = response.get("code")
-        data = response.get("data", {})
-        message = response.get("message", "")
-        if code in [0, 1]:
+    if ahead_response:
+        ahead_code = ahead_response.get("code")
+        ahead_data = ahead_response.get("data", {})
+        ahead_message = ahead_response.get("message", "")
+        if ahead_code == 2:
+            ahead_bottle_text = "\033[33m上传校验成功\033[0m"
+        elif ahead_code == 1:
             index = find_media_index(gVar.upload_original, filename)
             if index != -1:
-                if filename := data.get("filename"):
+                if filename := ahead_data.get("filename"):
                     gVar.upload_original[index]["upload"] = True
                     gVar.upload_original[index]["hash"] = hashs
                     gVar.upload_original[index]["filename"] = filename
-        if code == 0:
-            bottle_text = "\033[32m上传成功\033[0m"
-        elif code == 1:
-            bottle_text = f"\033[33m上传成功\033[0m: {result.get(code, message)}"
+            ahead_bottle_text = f"\033[33m上传校成功\033[0m: {result.get(ahead_code, ahead_message)}"
         else:
-            bottle_text = f"\033[31m上传失败\033[0m: {result.get(code, message)}"
+            ahead_bottle_text = f"\033[31m上传校验失败\033[0m: {result.get(ahead_code, ahead_message)}"
     else:
-        bottle_text = "\033[31m上传失败\033[0m: 网络连接失败"
-    bottle_text = f"{now_time}|{channelname}/{name}|{bottle_text}"
-    bottle_app_instance.bottle_print.append(bottle_text)
-    gVar.index_message["http"].append(ansi_to_html(bottle_text))
+        ahead_data = {}
+        ahead_bottle_text = f"\033[31m上传校验失败\033[0m: 网络连接失败{ahead_err}"
+    bottle_app_instance.add_bottle_print(channelname, name, ahead_bottle_text)
     bottle_app_instance.cherry_print(False)
+    if ahead_code == 2:
+        response, hashs, err = upload_file(
+            upload_url,
+            username,
+            password,
+            channelid,
+            filename,
+            True,
+            ahead_data.get("check","")
+        )
+        if response:
+            code = response.get("code")
+            data = response.get("data", {})
+            message = response.get("message", "")
+            if code in [0, 1]:
+                index = find_media_index(gVar.upload_original, filename)
+                if index != -1:
+                    if filename := data.get("filename"):
+                        gVar.upload_original[index]["upload"] = True
+                        gVar.upload_original[index]["hash"] = hashs
+                        gVar.upload_original[index]["filename"] = filename
+            if code == 0:
+                bottle_text = "\033[32m上传成功\033[0m"
+            elif code == 1:
+                bottle_text = f"\033[33m上传成功\033[0m: {result.get(code, message)}"
+            else:
+                bottle_text = f"\033[31m上传失败\033[0m: {result.get(code, message)}"
+        else:
+            bottle_text = f"\033[31m上传失败\033[0m: 网络连接失败{err}"
+        bottle_app_instance.add_bottle_print(channelname, name, bottle_text)
+        bottle_app_instance.cherry_print(False)
 
 
 # 总体上传模块
 def all_upload(upload_url):
-    if gVar.config["upload"]:
+    if gVar.upload_json:
         result = filter_and_sort_media(gVar.upload_original)
         username = gVar.upload_json["username"]
         password = gVar.upload_json["password"]

{podflow-20250608.dist-info → podflow-20250629.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250608
+Version: 20250629
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: astral>=3.2
 Requires-Dist: bottle>=0.13.2
-Requires-Dist: yt-dlp>=2025.5.22
+Requires-Dist: yt-dlp>=2025.6.25
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: pyqrcode>=1.2.1

{podflow-20250608.dist-info → podflow-20250629.dist-info}/RECORD

@@ -1,19 +1,21 @@
 podflow/__init__.py,sha256=mquu8BdWK9V4dDObCCfnPodeXOPkz-kj8_RNB7kK3Ys,7628
-podflow/download_and_build.py,sha256=vwyVs6MMLgbWZjGCFnPcj08dGxplgmU7u9CAP_ujJ8g,1037
+podflow/download_and_build.py,sha256=x7S7N26B1G9Yn2yr7YthDJgKUwEKBLtHBLlaqpofLas,746
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
-podflow/main.py,sha256=6cUgu8niM6LryBXCppQv0Nj4I2ye2bwoVrTF5vYmVFw,754
-podflow/main_podcast.py,sha256=J63BSzj044Q8YaErSoV-zE2kYrqhPqS6-TqZCEG-VOA,12396
-podflow/main_upload.py,sha256=H_T5KQMYzToqzQbjGQ6DWDGziy8iMnpmf7A1qOStJuo,2296
+podflow/main.py,sha256=7zWdpw80jqPaYu1Un1nPqaZoiAb7Dqg8zaF-cUioU4c,755
+podflow/main_podcast.py,sha256=vV4knnqzHehFjCBFRtAzq8K0xlnkWNGV320tSYDQ09o,10248
+podflow/main_upload.py,sha256=xuN15GAXokl2xzZrraLeusevl0j-TnHVziL0wobsBZc,2586
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
+podflow/run_and_upload.py,sha256=GYyrwurtb0ln7VkZLwxF3HlLjDlPSpZuRbcLO859LL4,2790
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
 podflow/basic/file_save.py,sha256=6vu4EkbsN4df5-ci6sJOgIOUEhh-WaRBOyMJ8rpouXo,1233
 podflow/basic/folder_build.py,sha256=5oHyfiDcSp2YITXQWIPwriBF9XuU3qs7wZQOWJHYJ1s,546
 podflow/basic/get_duration.py,sha256=eqdE85b7sgLyp6brhnGcOIQEWX6JqtNCGAsGyJOuXFI,532
 podflow/basic/get_file_list.py,sha256=XmnC4faObislyTsL9WUeyztyTQrvdi76lMzPudKEfXw,2389
 podflow/basic/get_html_dict.py,sha256=V-PgDtD6pm5mZC1LUPttUbZzxhjkS3WDYHxWR3yzIEY,869
-podflow/basic/http_client.py,sha256=lSDfWYF5nZ6LPEXyNjUVudPFTo1fcaPauFjIuq68JR4,2863
+podflow/basic/http_client.py,sha256=1kh0FBbPSoUtWooYdNZMLZd_V1aBo19L79nEkfTwb6E,3184
 podflow/basic/list_merge_tidy.py,sha256=7hWfSnsPh23edHNU92vxtI0nfpfN8m54GTEt2rGm2HQ,368
 podflow/basic/qr_code.py,sha256=lZo11jbYqFQYy9gjBtRRUoLjlaEmoES-phydnrOMcLo,1727
+podflow/basic/random_sequence.py,sha256=5VuXg7EfC8g8RpDouPfxDdgec3oaSruy8tXZMG68P3s,255
 podflow/basic/split_dict.py,sha256=Ir6GTortcWMUeFITFgY1v-INMla5y0IN3RN3nTgzWqM,401
 podflow/basic/time_format.py,sha256=T3tw2vbOwxMYYXDaV4Sj76WOZtsspj2lWA_DzWqUEJA,487
 podflow/basic/time_print.py,sha256=foPezlEnYU0tOb8h79nDXZNElgNjRsHScYHYk9hGeTM,1481
@@ -40,7 +42,7 @@ podflow/download/show_progress.py,sha256=y46chchUC9eZCg4ZdNMFnx_bXJQV_IUq15jVzZt
 podflow/download/wait_animation.py,sha256=AUTvszXF89QA7XYjocFIauPKV7Qj8cFqry44teClaLQ,1314
 podflow/download/youtube_and_bilibili_download.py,sha256=VCEhz6pGXFWXusdbGWqkCzi4f4VsKQVn6sZz1pfGsns,1335
 podflow/httpfs/__init__.py,sha256=BxEXkufjcx-a0F7sDVXo65hmyANqCCbZUd6EH9i8T2c,45
-podflow/httpfs/app_bottle.py,sha256=8KHi_MxHK1HMCiWb8CqnkEWxMGAu3FVS5KRA2sPGbC8,23338
+podflow/httpfs/app_bottle.py,sha256=f0bPGGVGSMabIaURmWeXwRT9k_rG3-akq6V6Ql9zrWU,27978
 podflow/httpfs/browser.py,sha256=BJ4Xkfiki_tDr0Sc9RqAcEfIVpkAZ3RFOwo0aMHlY3U,197
 podflow/httpfs/download_bar.py,sha256=0n3HATEO3pdsIpx-E_IZG9OlXa6u-9SeBCoZVgUutyc,965
 podflow/httpfs/get_channelid.py,sha256=gcwy4IVHBWNQz7qPCpjwiAklGFLRGzvM33-UZz7oFvo,2296
@@ -56,7 +58,7 @@ podflow/message/__init__.py,sha256=pZkcrrtkdtxgMriEHBZ0_rptKaQrQeMPJvPSaoI1Awo,4
 podflow/message/backup_zip_save.py,sha256=c81jnx8IxHjTcO7G0OUAppawpBIPxa9wgkj9AQhqeJc,1864
 podflow/message/create_main_rss.py,sha256=kW2QvJhxl2ZcqGV-M-OztlOaQ27ODuQxADeP8poymBQ,3118
 podflow/message/display_qrcode_and_url.py,sha256=VqmRkDYYG03VihfW4SAU49HJVmfqWbLTgMxqCaREeCo,1037
-podflow/message/fail_message_initialize.py,sha256=OlkPQUU2qgTJ-wcFhyGiTAeoY0qy_eOOQGkA0PtyxHQ,6711
+podflow/message/fail_message_initialize.py,sha256=0Itu-7bJfdPI3D508TN4Tr5MgDA_Z4ZxmPyubXrkNEQ,7864
 podflow/message/format_time.py,sha256=gveNh4FGeS3ytwDyYB-h12d1_Km6XoX7WSPcFmDfCBk,909
 podflow/message/get_media_name.py,sha256=5ULPQOQCZ2-lxdkILwlBP-ItzdFEgvEAKxeLtplACbQ,861
 podflow/message/get_original_rss.py,sha256=Bzy-Fs1vZEjwvQq6D6xp-2IUidliSyaL1P4WtkLJaRg,2450
@@ -81,6 +83,7 @@ podflow/netscape/get_cookie_dict.py,sha256=laqw-eriABiLyciRLzDmistVHHWqmUM-9eEbY
 podflow/remove/__init__.py,sha256=x1pMfpIyE6xUrmIOkdl43mbvKLwndGo5pIoOBXhJsP4,45
 podflow/remove/remove_dir.py,sha256=zqgf47UgxiGiLipb1FeoWKzrSHSxcHaEuu0261bqR1s,1105
 podflow/remove/remove_file.py,sha256=ZusvZsBQX_yRdLuboD7bZKiOX4z4Rxg66zZK9KDWHwE,1006
+podflow/remove/remove_flush.py,sha256=HWCe5SjNJ3VXaXbgFtqGdTXeJ1R2vv5qllNilB-G0_g,1851
 podflow/repair/__init__.py,sha256=Gpc1i6xiSLodKjjmzH66c_Y1z0HQ9E9CS3p95FRnVFM,45
 podflow/repair/reverse_log.py,sha256=Wc_vAH0WB-z1fNdWx7FYaVH4caRPtot7tDwDwFhmpz4,1106
 podflow/templates/index.html,sha256=kGsp1TAcf_qkV6hYRE8Ueq7CaTflR73rsTWtjnWuwwY,2775
@@ -90,7 +93,7 @@ podflow/templates/js/config.js,sha256=VZmpvtQWszofoccjJZNhbjvNkpl-CjGOdTrPkI83ND
 podflow/templates/js/index.js,sha256=GUfFhZM3vjiwfJ7USQZIIv5c7cyZwt64QZt0VInq5TI,34051
 podflow/templates/js/qrcode.min.js,sha256=xUHvBjJ4hahBW8qN9gceFBibSFUzbe9PNttUvehITzY,19927
 podflow/upload/__init__.py,sha256=AtOSXDrE5EjUe3z-iBd1NTDaH8n_X9qA5WXdBLkONjA,45
-podflow/upload/add_upload.py,sha256=_2-V0z75Lwu-PUCfMD9HOSxZTB102yZlZW5hSdlHcsc,1432
+podflow/upload/add_upload.py,sha256=LloIucGJSXARhxiWerAbJVW-FpTkTUxvYCAKPbl93Ew,1536
 podflow/upload/build_hash.py,sha256=9opa3xLd7nJbGGX5xa3uuKPS6dxlbkAb87ZdEiUxmxI,473
 podflow/upload/get_upload_original.py,sha256=TEDnRutumm2FZNIesPJIlExHyKWpfB3ZAHb3sZt7V6A,4312
 podflow/upload/linked_client.py,sha256=NdSi5uh0TbZUhOHbA_mkHo4aIz1XNKoSXHhT4rMRUpc,5288
@@ -98,14 +101,14 @@ podflow/upload/linked_server.py,sha256=h-qSx13fP8_Ny2IKW3wCNPwqRqW6-Iz1pqxD9ga9-
 podflow/upload/login.py,sha256=85sqr12T-3NH-TD3kAMzy4yb1KOheV3Tr0eGee7NCJo,4007
 podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,967
 podflow/upload/update_upload.py,sha256=_5tp1zPNsC9DdDnLzm-P8bLcOBuDov4eMRHp_861j80,3183
-podflow/upload/upload_files.py,sha256=sy4GOIWpHPPiqoZzrMXQVzRCNT2QwEWwsraUj3CCRwY,3891
+podflow/upload/upload_files.py,sha256=zKMv27cqj7u-c8dHKNZx67UNx0gkMkQAnu2oxnk6a5M,5749
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
 podflow/youtube/build.py,sha256=j6SVq3HFFGlNNqRrHfnBIThdzsH88PFmwLnejosif1U,12311
 podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250608.dist-info/METADATA,sha256=p_3SBZZLCDjvgy6iy3n8rRdD_glGFTLxzodyVGdIX-A,14195
-podflow-20250608.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250608.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250608.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250608.dist-info/RECORD,,
+podflow-20250629.dist-info/METADATA,sha256=HuCtP5vuE3A32KzkqIzEFC3e1-8-o_GNTGmeF-2Hm_o,14195
+podflow-20250629.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250629.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250629.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250629.dist-info/RECORD,,