podflow 20250212__py3-none-any.whl → 20250301__py3-none-any.whl

Podflow/__init__.py

@@ -110,12 +110,12 @@ class Application_gVar:
         self.youtube_xml_get_tree = {}  # YouTube频道简介和图标字典
         self.all_youtube_content_ytid = {}  # 所有YouTube视频id字典
         self.all_bilibili_content_bvid = {}  # 所有哔哩哔哩视频id字典
-        self.all_items = []  # 更新后所有item明细列表
+        self.all_items = {}  # 更新后所有item明细字典
         self.overall_rss = ""  # 更新后的rss文本
         self.make_up_file_format = {}  # 补全缺失媒体字典
         self.make_up_file_format_fail = {}  # 补全缺失媒体失败字典
         
-        self.upload_original = {}  # 原始上传信息字典
+        self.upload_original = []  # 原始上传信息字典
 
         self.shortcuts_url = {}  # 输出至shortcut的url字典
 

Podflow/basic/http_client.py

@@ -16,6 +16,7 @@ def http_client(
     cookies=None,
     data=None,
     mode="get",
+    filename=None,
 ):
     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"
@@ -52,8 +53,12 @@ def http_client(
         session.params.update(data)
     for num in range(max_retries):
         try:
-            if mode != "post":
+            if mode.lower() != "post":
                 response = session.get(url, timeout=8)
+            elif filename:
+                with open(filename, "rb") as f:
+                    files = {"file": f}  # 这里 "file" 对应服务器端接收文件的字段名称
+                    response = session.post(url, files=files, timeout=8)
             else:
                 response = session.post(url, timeout=8)
             response.raise_for_status()
@@ -64,7 +69,10 @@ def http_client(
                 print(
                     f"{datetime.now().strftime('%H:%M:%S')}|{name}|\033[31m连接异常重试中...\033[97m{num + 1}\033[0m"
                 )
-            err = f":\n{str(http_get_error)}" if err else ""
+            if err:
+                err = f"{err}\n{str(http_get_error)}"
+            else:
+                err = f":\n{str(http_get_error)}"
         else:
             return response
         time.sleep(retry_delay)

Podflow/bilibili/build.py

@@ -193,9 +193,11 @@ def bilibili_xml_items(output_dir):
     items = f"""<!-- {{{output_dir}}} -->
 {items}
 <!-- {{{output_dir}}} -->"""
-    file_save(
-        xml_rss(title, link, description, category, icon, items),
-        f"{output_dir}.xml",
-        "channel_rss",
-    )
-    return items
+    return {
+        "title": title,
+        "link": link,
+        "description": description,
+        "category": category,
+        "icon": icon,
+        "items": items,
+    }

Podflow/bilibili/login.py

@@ -8,9 +8,9 @@ import re
 import time
 from datetime import datetime
 import requests
-from Cryptodome.Cipher import PKCS1_OAEP
-from Cryptodome.Hash import SHA256
-from Cryptodome.PublicKey import RSA
+from Crypto.Cipher import PKCS1_OAEP
+from Crypto.Hash import SHA256
+from Crypto.PublicKey import RSA
 from Podflow.basic.file_save import file_save
 from Podflow.basic.http_client import http_client
 from Podflow.basic.qr_code import qr_code

Podflow/download/youtube_and_bilibili_download.py

@@ -8,7 +8,7 @@ from Podflow.download.dl_aideo_video import dl_aideo_video
 
 # 下载YouTube和哔哩哔哩视频
 def youtube_and_bilibili_download():
-    for video_id, format_value in gVar.video_id_update_format.items():
+    for video_id, format_value in gVar.video_id_update_format.copy().items():
         if isinstance(format_value, dict) and format_value["main"] not in gVar.video_id_failed:
             output_dir_name = format_value["name"]
             display_color = "\033[35m" if format_value["backward_update"] else "\033[95m"
@@ -28,3 +28,4 @@ def youtube_and_bilibili_download():
                 write_log(
                     f"{display_color}{output_dir_name}\033[0m|{video_id} \033[31m无法下载\033[0m"
                 )
+        del gVar.video_id_update_format[video_id]

Podflow/download_and_build.py

@@ -0,0 +1,24 @@
+# Podflow/download_and_build.py
+# coding: utf-8
+
+import threading
+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
+
+
+def get_and_duild():
+    get_youtube_introduction()
+    create_main_rss()
+
+
+# 下载并构建YouTube和哔哩哔哩视频模块
+def download_and_build():
+    thread_download = threading.Thread(target=youtube_and_bilibili_download)
+    thread_build = threading.Thread(target=get_and_duild)
+
+    thread_download.start()
+    thread_build.start()
+
+    thread_download.join()
+    thread_build.join()

Podflow/httpfs/port_judge.py

@@ -4,18 +4,11 @@
 import socket
 
 
-def port_judge(host, port):
-    # 创建一个新的 socket
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    # 设置 socket 为可重用
-    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+def port_judge(hostip, port):
     try:
-        # 尝试绑定到指定端口
-        sock.bind((host, port))
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.bind((hostip, port))
+            return True
     except OSError:
-        # 如果绑定失败，说明端口被占用
         return False
-    else:
-        # 如果绑定成功，端口可用，关闭 socket
-        sock.close()
-        return True

Podflow/main.py

@@ -1,65 +1,10 @@
 # Podflow/main.py
 # coding: utf-8
 
-import sys
-import json
-import time
-import urllib
-import subprocess
 from datetime import datetime
 from importlib.metadata import version
-import cherrypy
-
-# 基本功能模块
-from Podflow import gVar, parse
+from Podflow.main_podcast import main_podcast
 from Podflow.parse_arguments import parse_arguments
-from Podflow.basic.file_save import file_save
-from Podflow.basic.qr_code import qr_code
-from Podflow.basic.write_log import write_log
-from Podflow.basic.split_dict import split_dict
-
-# 网络和 HTTP 模块
-from Podflow.httpfs.port_judge import port_judge
-from Podflow.httpfs.app_bottle import bottle_app_instance
-
-# 下载和视频处理模块
-from Podflow.download.delete_part import delete_part
-from Podflow.download.youtube_and_bilibili_download import youtube_and_bilibili_download
-from Podflow.ffmpeg_judge import ffmpeg_judge
-
-# RSS 和消息处理模块
-from Podflow.message.xml_rss import xml_rss
-from Podflow.message.backup_zip_save import backup_zip_save
-from Podflow.message.create_main_rss import create_main_rss
-from Podflow.message.get_original_rss import get_original_rss
-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.message.get_video_format import get_video_format
-
-# 登录模块
-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
-
-# 制作和修改文件模块
-from Podflow.makeup.make_up_file import make_up_file
-from Podflow.makeup.make_up_file_mod import make_up_file_mod
-from Podflow.makeup.make_up_file_format_mod import make_up_file_format_mod
-from Podflow.makeup.del_makeup_yt_format_fail import del_makeup_yt_format_fail
-
-# 移除模块
-from Podflow.remove.remove_file import remove_file
-from Podflow.remove.remove_dir import remove_dir
-
-# 处理 YouTube 信息模块
-from Podflow.youtube.build import get_youtube_introduction
-
-# 长期媒体进行上传模块
-from Podflow.upload.get_upload_original import get_upload_original
 
 
 def main():
@@ -69,190 +14,7 @@ def main():
     print(
         f"{datetime.now().strftime('%H:%M:%S')}|Podflow|{version('Podflow')}开始运行....."
     )
-    # 判断是否安装ffmpeg
-    ffmpeg_judge()
-    # 初始化
-    build_original()
-    # http共享
-    port = gVar.config["port"]
-    host = "0.0.0.0"
-    if port_judge(host, port):
-        # 启动 CherryPy 服务器
-        cherrypy.tree.graft(
-            bottle_app_instance.app_bottle
-        )  # 将 Bottle 应用嵌入到 CherryPy 中
-        cherrypy.config.update(
-            {
-                "global": {
-                    "tools.sessions.on": True,  # 启用会话支持
-                    "server.socket_host": host,  # 监听所有 IP 地址
-                    "server.socket_port": port,  # 设置监听端口
-                    "log.screen": False,  # 禁用屏幕日志输出
-                    "log.access_file": "",  # 关闭访问日志
-                    "log.error_file": "",  # 关闭错误日志
-                }
-            }
-        )
-        cherrypy.engine.start()  # 启动 CherryPy 服务器
-        print(
-            f"{datetime.now().strftime('%H:%M:%S')}|HTTP服务器启动, 端口: \033[32m{port}\033[0m"
-        )
-        if parse.httpfs:  # HttpFS参数判断, 是否继续运行
-            cherrypy.engine.block()  # 阻止程序退出, 保持HTTP服务运行
-    else:
-        print(
-            f"{datetime.now().strftime('%H:%M:%S')}|HTTP服务器端口: \033[32m{port}\033[0m, \033[31m被占用\033[0m"
-        )
-        if parse.httpfs:
-            sys.exit(0)
-    # 主流程
-    while parse.update_num > 0 or parse.update_num == -1:  # 循环主更新
-        # 暂停进程打印
-        gVar.server_process_print_flag[0] = "pause"
-        # 获取YouTube cookie
-        gVar.youtube_cookie = get_youtube_cookie(gVar.channelid_youtube_ids_original)
-        # 更新哔哩哔哩data
-        gVar.channelid_bilibili_ids, gVar.bilibili_data = get_bilibili_data(
-            gVar.channelid_bilibili_ids_original
-        )
-        # 恢复进程打印
-        bottle_app_instance.cherry_print()
-        # 获取原始xml字典和rss文本
-        gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
-            get_original_rss()
-        )
-        # 初始化原始上传信息
-        if gVar.config["upload"]:
-            if upload_original := get_upload_original():
-                gVar.upload_original = upload_original
-            else:
-                gVar.config["upload"] = False
-        # 更新Youtube和哔哩哔哩频道xml
-        update_youtube_bilibili_rss()
-        # 判断是否有更新内容
-        if gVar.channelid_youtube_ids_update or gVar.channelid_bilibili_ids_update:
-            gVar.update_generate_rss = True
-        if gVar.update_generate_rss:
-            # 根据日出日落修改封面(只适用原封面)
-            channge_icon()
-            # 输出需要更新的信息
-            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",
-            )
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 获取视频格式信息
-            get_video_format()
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            # 删除中断下载的媒体文件
-            if gVar.config["delete_incompletement"]:
-                delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 下载YouTube和哔哩哔哩视频
-            youtube_and_bilibili_download()
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            # 打印无法保留原节目信息
-            original_rss_fail_print(gVar.xmls_original_fail)
-            # 获取YouTube频道简介
-            get_youtube_introduction()
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 生成分和主rss
-            create_main_rss()
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            if gVar.config["remove_media"]:
-                # 删除不在rss中的媒体文件
-                remove_file()
-                # 删除已抛弃的媒体文件夹
-                remove_dir()
-            # 补全缺失媒体文件到字典
-            make_up_file()
-            # 按参数获取需要补全的最大个数
-            gVar.make_up_file_format = split_dict(
-                gVar.make_up_file_format,
-                gVar.config["completion_count"],
-                True,
-            )[0]
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 补全在rss中缺失的媒体格式信息
-            make_up_file_format_mod()
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            # 生成主rss
-            overall_rss = xml_rss(
-                gVar.config["title"],
-                gVar.config["link"],
-                gVar.config["description"],
-                gVar.config["category"],
-                gVar.config["icon"],
-                "\n".join(gVar.all_items),
-            )
-            # 删除无法补全的媒体
-            overall_rss = del_makeup_yt_format_fail(overall_rss)
-            # 保存主rss
-            file_save(overall_rss, f"{gVar.config['filename']}.xml")
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            address = gVar.config["address"]
-            filename = gVar.config["filename"]
-            if token := gVar.config["token"]:
-                overall_url = f"{address}/{filename}.xml?token={token}"
-            else:
-                overall_url = f"{address}/{filename}.xml"
-            write_log("总播客已更新", f"地址:\n\033[34m{overall_url}\033[0m")
-            if "main" not in gVar.displayed_QRcode:
-                qr_code(overall_url)
-                gVar.displayed_QRcode.append("main")
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-            # 备份主rss
-            backup_zip_save(overall_rss)
-            # 暂停进程打印
-            gVar.server_process_print_flag[0] = "pause"
-            # 下载补全Youtube和哔哩哔哩视频模块
-            make_up_file_mod()
-            # 恢复进程打印
-            bottle_app_instance.cherry_print()
-        else:
-            print(f"{datetime.now().strftime('%H:%M:%S')}|频道无更新内容")
-
-        # 将需要更新转为否
-        gVar.update_generate_rss = False
-        if parse.update_num != -1:
-            parse.update_num -= 1
-        if parse.argument == "a-shell":
-            openserver_process = subprocess.Popen(
-                [
-                    "open",
-                    f"shortcuts://run-shortcut?name=Podflow&input=text&text={urllib.parse.quote(json.dumps(gVar.shortcuts_url))}",
-                ]
-            )
-            # 延时
-            time.sleep(60 + len(gVar.shortcuts_url) * 5)
-            openserver_process.terminate()
-            break
-        elif parse.update_num == 0:
-            break
-        else:
-            # 延时
-            time.sleep(parse.time_delay)
-    # 关闭CherryPy服务器
-    cherrypy.engine.exit()
-    print(f"{datetime.now().strftime('%H:%M:%S')}|Podflow运行结束")
+    main_podcast()
 
 
 if __name__ == "__main__":

Podflow/main_podcast.py

@@ -0,0 +1,214 @@
+# Podflow/main_podcast.py
+# coding: utf-8
+
+import sys
+import json
+import time
+import urllib
+import subprocess
+from datetime import datetime
+import cherrypy
+
+# 基本功能模块
+from Podflow import gVar, parse
+from Podflow.basic.split_dict import split_dict
+
+# 网络和 HTTP 模块
+from Podflow.httpfs.port_judge import port_judge
+from Podflow.httpfs.app_bottle import bottle_app_instance
+
+# 下载和视频处理模块
+from Podflow.download.delete_part import delete_part
+from Podflow.download_and_build import download_and_build
+from Podflow.ffmpeg_judge import ffmpeg_judge
+
+# RSS 和消息处理模块
+from Podflow.message.save_rss import save_rss
+from Podflow.message.get_original_rss import get_original_rss
+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.message.get_video_format import get_video_format
+
+# 登录模块
+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
+
+# 制作和修改文件模块
+from Podflow.makeup.make_up_file import make_up_file
+from Podflow.makeup.make_up_file_mod import make_up_file_mod
+from Podflow.makeup.make_up_file_format_mod import make_up_file_format_mod
+from Podflow.makeup.del_makeup_format_fail import del_makeup_format_fail
+
+# 移除模块
+from Podflow.remove.remove_file import remove_file
+from Podflow.remove.remove_dir import remove_dir
+
+# 处理 YouTube 信息模块
+from Podflow.youtube.build import print_fail_youtube_introduction
+
+# 长期媒体进行上传模块
+from Podflow.upload.add_upload import add_upload
+from Podflow.upload.update_upload import update_upload
+from Podflow.upload.get_upload_original import get_upload_original
+
+
+def main_podcast():
+    # 判断是否安装ffmpeg
+    ffmpeg_judge()
+    # 初始化
+    build_original()
+    # http共享
+    port = gVar.config["port"]
+    hostip = "0.0.0.0"
+    if port_judge(hostip, port):
+        # 启动 CherryPy 服务器
+        cherrypy.tree.graft(
+            bottle_app_instance.app_bottle
+        )  # 将 Bottle 应用嵌入到 CherryPy 中
+        cherrypy.config.update(
+            {
+                "global": {
+                    "tools.sessions.on": True,  # 启用会话支持
+                    "server.socket_host": hostip,  # 监听所有 IP 地址
+                    "server.socket_port": port,  # 设置监听端口
+                    "log.screen": False,  # 禁用屏幕日志输出
+                    "log.access_file": "",  # 关闭访问日志
+                    "log.error_file": "",  # 关闭错误日志
+                }
+            }
+        )
+        cherrypy.engine.start()  # 启动 CherryPy 服务器
+        print(
+            f"{datetime.now().strftime('%H:%M:%S')}|HTTP服务器启动, 端口: \033[32m{port}\033[0m"
+        )
+        if parse.httpfs:  # HttpFS参数判断, 是否继续运行
+            cherrypy.engine.block()  # 阻止程序退出, 保持HTTP服务运行
+            sys.exit(0)
+    else:
+        print(
+            f"{datetime.now().strftime('%H:%M:%S')}|HTTP服务器端口: \033[32m{port}\033[0m, \033[31m被占用\033[0m"
+        )
+        if parse.httpfs:
+            sys.exit(0)
+    # 主流程
+    while parse.update_num > 0 or parse.update_num == -1:  # 循环主更新
+        # 暂停进程打印
+        gVar.server_process_print_flag[0] = "pause"
+        # 获取YouTube cookie
+        gVar.youtube_cookie = get_youtube_cookie(gVar.channelid_youtube_ids_original)
+        # 更新哔哩哔哩data
+        gVar.channelid_bilibili_ids, gVar.bilibili_data = get_bilibili_data(
+            gVar.channelid_bilibili_ids_original
+        )
+        # 恢复进程打印
+        bottle_app_instance.cherry_print()
+        # 获取原始xml字典和rss文本
+        gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
+            get_original_rss()
+        )
+        # 初始化原始上传信息
+        get_upload_original()
+        # 更新Youtube和哔哩哔哩频道xml
+        update_youtube_bilibili_rss()
+        # 判断是否有更新内容
+        if gVar.channelid_youtube_ids_update or gVar.channelid_bilibili_ids_update:
+            gVar.update_generate_rss = True
+        if gVar.update_generate_rss:
+            # 根据日出日落修改封面(只适用原封面)
+            channge_icon()
+            # 输出需要更新的信息
+            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",
+            )
+            # 暂停进程打印
+            gVar.server_process_print_flag[0] = "pause"
+            # 获取视频格式信息
+            get_video_format()
+            # 恢复进程打印
+            bottle_app_instance.cherry_print()
+            # 删除中断下载的媒体文件
+            if gVar.config["delete_incompletement"]:
+                delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
+            # 暂停进程打印
+            gVar.server_process_print_flag[0] = "pause"
+            # 下载并构建YouTube和哔哩哔哩视频
+            download_and_build()
+            # 添加新媒体至上传列表
+            add_upload()
+            # 恢复进程打印
+            bottle_app_instance.cherry_print()
+            # 打印无法保留原节目信息
+            original_rss_fail_print(gVar.xmls_original_fail)
+            # 打印无法获取youtube频道简介
+            print_fail_youtube_introduction()
+            if gVar.config["remove_media"]:
+                # 删除不在rss中的媒体文件
+                remove_file()
+                # 删除已抛弃的媒体文件夹
+                remove_dir()
+            # 补全缺失媒体文件到字典
+            make_up_file()
+            # 按参数获取需要补全的最大个数
+            gVar.make_up_file_format = split_dict(
+                gVar.make_up_file_format,
+                gVar.config["completion_count"],
+                True,
+            )[0]
+            # 暂停进程打印
+            gVar.server_process_print_flag[0] = "pause"
+            # 补全在rss中缺失的媒体格式信息
+            make_up_file_format_mod()
+            # 恢复进程打印
+            bottle_app_instance.cherry_print()
+            # 删除无法补全的媒体
+            del_makeup_format_fail()
+            # 暂停进程打印
+            gVar.server_process_print_flag[0] = "pause"
+            # 保存rss文件模块
+            save_rss()
+            # 下载补全Youtube和哔哩哔哩视频模块
+            make_up_file_mod()
+            # 恢复进程打印
+            bottle_app_instance.cherry_print()
+            # 更新并保存上传列表
+            update_upload()
+        else:
+            print(f"{datetime.now().strftime('%H:%M:%S')}|频道无更新内容")
+
+        # 将需要更新转为否
+        gVar.update_generate_rss = False
+        if parse.update_num != -1:
+            parse.update_num -= 1
+        if parse.argument == "a-shell":
+            openserver_process = subprocess.Popen(
+                [
+                    "open",
+                    f"shortcuts://run-shortcut?name=Podflow&input=text&text={urllib.parse.quote(json.dumps(gVar.shortcuts_url))}",
+                ]
+            )
+            # 延时
+            time.sleep(60 + len(gVar.shortcuts_url) * 5)
+            openserver_process.terminate()
+            break
+        elif parse.update_num == 0:
+            break
+        else:
+            # 延时
+            time.sleep(parse.time_delay)
+    # 关闭CherryPy服务器
+    cherrypy.engine.exit()
+    print(f"{datetime.now().strftime('%H:%M:%S')}|Podflow运行结束")

Podflow/main_upload.py

@@ -0,0 +1,28 @@
+# Podflow/main_upload.py
+# coding: utf-8
+
+import sys
+import threading
+from Podflow.upload.upload_print import upload_print
+from Podflow.upload.linked_server import handle_discovery, usable_port
+
+
+def main_upload():
+    # 服务发现相关配置
+    broadcast_port = 37001  # 服务发现用端口
+    service_port = 5000  # 实际服务端口
+
+    broadcast_port = usable_port(broadcast_port, 37100)
+    service_port = usable_port(service_port, 5050)
+    if broadcast_port and service_port:
+        discovery_thread = threading.Thread(
+            target=handle_discovery,
+            args=(broadcast_port, service_port),
+        )
+        discovery_thread.start()
+    else:
+        if not broadcast_port:
+            upload_print("\033[31m广播端口被占用\033[0m")
+        if not service_port:
+            upload_print("\033[31m服务端口被占用\033[0m")
+        sys.exit(0)

Podflow/makeup/{del_makeup_yt_format_fail.py → del_makeup_format_fail.py}

@@ -1,4 +1,4 @@
-# Podflow/makeup/del_makeup_yt_format_fail.py
+# Podflow/makeup/del_makeup_format_fail.py
 # coding: utf-8
 
 import re
@@ -6,14 +6,13 @@ from Podflow import gVar
 
 
 # 删除无法补全的媒体模块
-def del_makeup_yt_format_fail(overall_rss):
+def del_makeup_format_fail():
     for video_id, id_value in gVar.make_up_file_format_fail.items():
         pattern_video_fail_item = rf"<!-- {id_value} -->(?:(?!<!-- {id_value} -->).)+?<guid>{video_id}</guid>.+?<!-- {id_value} -->"
         replacement_video_fail_item = f"<!-- {id_value} -->"
-        overall_rss = re.sub(
+        gVar.all_items[id_value]["items"] = re.sub(
             pattern_video_fail_item,
             replacement_video_fail_item,
-            overall_rss,
+            gVar.all_items[id_value]["items"],
             flags=re.DOTALL,
         )
-    return overall_rss