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

Podflow/basic/http_client.py

@@ -16,7 +16,7 @@ def http_client(
     cookies=None,
     data=None,
     mode="get",
-    filename=None
+    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"

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,63 +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.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.save_rss import save_rss
-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_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 get_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():
@@ -67,165 +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()
-        )
-        # 初始化原始上传信息
-        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和哔哩哔哩视频
-            youtube_and_bilibili_download()
-            # 添加新媒体至上传列表
-            add_upload()
-            # 恢复进程打印
-            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()
-            # 删除无法补全的媒体
-            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运行结束")
+    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/message/create_main_rss.py

@@ -1,34 +1,69 @@
 # Podflow/message/create_main_rss.py
 # coding: utf-8
 
+import time
 from Podflow import gVar
 from Podflow.youtube.build import youtube_xml_items
 from Podflow.bilibili.build import bilibili_xml_items
 from Podflow.message.get_media_name import get_media_name
 
 
+def update_output_dir():
+    output_dirs = []
+    for format_value in gVar.video_id_update_format.values():
+        if (
+            isinstance(format_value, dict)
+            and format_value["main"] not in gVar.video_id_failed
+        ):
+            output_dirs.append(format_value["id"])
+    return output_dirs
+
+
 # 生成主rss模块
 def create_main_rss():
     channelid_youtube_ids = gVar.channelid_youtube_ids
-    for output_dir, output_dir_youtube in channelid_youtube_ids.items():
-        channelid_youtube_value = gVar.channelid_youtube[output_dir_youtube]
-        items = youtube_xml_items(output_dir)
-        items["DisplayRSSaddress"] = channelid_youtube_value["DisplayRSSaddress"]
-        items["QRcode"] = channelid_youtube_value["QRcode"]
-        items["ID_Name"] = output_dir_youtube
-        items["InmainRSS"] = channelid_youtube_value["InmainRSS"]
-        items["type"] = "youtube"
-        gVar.all_youtube_content_ytid[output_dir] = get_media_name("youtube", items["items"])
-        gVar.all_items[output_dir] = items
-
     channelid_bilibili_ids = gVar.channelid_bilibili_ids
-    for output_dir, output_dir_bilibili in channelid_bilibili_ids.items():
-        channelid_bilibili_value = gVar.channelid_bilibili[output_dir_bilibili]
-        items = bilibili_xml_items(output_dir)
-        items["DisplayRSSaddress"] = channelid_bilibili_value["DisplayRSSaddress"]
-        items["QRcode"] = channelid_bilibili_value["QRcode"]
-        items["ID_Name"] = output_dir_bilibili
-        items["InmainRSS"] = channelid_bilibili_value["InmainRSS"]
-        items["type"] = "bilibili"
-        gVar.all_bilibili_content_bvid[output_dir] = get_media_name("bilibili", items["items"])
-        gVar.all_items[output_dir] = items
+    gVar.all_items = {
+        key: {} for key in channelid_youtube_ids | channelid_bilibili_ids
+    }
+    all_channelid = list(gVar.all_items.keys())
+
+    while all_channelid:
+        for index, output_dir in enumerate(all_channelid):
+            if output_dir in update_output_dir():
+                time.sleep(1)
+            else:
+                if output_dir in channelid_youtube_ids:
+                    output_dir_youtube = channelid_youtube_ids[output_dir]
+                    channelid_youtube_value = gVar.channelid_youtube[output_dir_youtube]
+                    items = youtube_xml_items(output_dir)
+                    items["DisplayRSSaddress"] = channelid_youtube_value[
+                        "DisplayRSSaddress"
+                    ]
+                    items["QRcode"] = channelid_youtube_value["QRcode"]
+                    items["ID_Name"] = output_dir_youtube
+                    items["InmainRSS"] = channelid_youtube_value["InmainRSS"]
+                    items["type"] = "youtube"
+                    gVar.all_youtube_content_ytid[output_dir] = get_media_name(
+                        "youtube", items["items"]
+                    )
+                    gVar.all_items[output_dir] = items
+                elif output_dir in channelid_bilibili_ids:
+                    output_dir_bilibili = channelid_bilibili_ids[output_dir]
+                    channelid_bilibili_value = gVar.channelid_bilibili[
+                        output_dir_bilibili
+                    ]
+                    items = bilibili_xml_items(output_dir)
+                    items["DisplayRSSaddress"] = channelid_bilibili_value[
+                        "DisplayRSSaddress"
+                    ]
+                    items["QRcode"] = channelid_bilibili_value["QRcode"]
+                    items["ID_Name"] = output_dir_bilibili
+                    items["InmainRSS"] = channelid_bilibili_value["InmainRSS"]
+                    items["type"] = "bilibili"
+                    gVar.all_bilibili_content_bvid[output_dir] = get_media_name(
+                        "bilibili", items["items"]
+                    )
+                    gVar.all_items[output_dir] = items
+                del all_channelid[index]
+                break

Podflow/upload/linked_client.py

@@ -0,0 +1,74 @@
+# Podflow/upload/linked_client.py
+# coding: utf-8
+
+import time
+import socket
+from datetime import datetime
+from Podflow.upload.upload_print import upload_print
+
+
+BROADCAST_PORT = 37000
+TIMEOUT = 1  # 搜索超时时间（秒）
+MAX_BROADCAST_PORT = 37101  # 尝试广播的最大端口
+
+
+# 发现局域网内的服务器
+def discover_server(broadcast_port, timeout):
+    servers = []
+
+    # 创建UDP socket
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+        sock.settimeout(timeout)
+
+        try:
+            # 发送广播请求
+            sock.sendto(b"DISCOVER_SERVER_REQUEST", ("<broadcast>", broadcast_port))
+        except Exception as e:
+            upload_print(f"广播请求发送失败: {e}")
+            return servers
+
+        # 等待响应
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            try:
+                data, addr = sock.recvfrom(1024)
+                if data.startswith(b"SERVER_INFO|"):
+                    try:
+                        port = int(data.decode().split("|")[1])
+                        servers.append((addr[0], port))
+                    except (IndexError, ValueError):
+                        upload_print(f"收到来自 {addr} 的服务响应格式不正确")
+            except socket.timeout:
+                break
+            except Exception as e:
+                upload_print(f"接收数据出错: {e}")
+                break
+
+    return servers
+
+
+# 自动发现并连接服务器模块
+def connect_server():
+    upload_print("正在搜索服务器...")
+
+    current_port = BROADCAST_PORT
+    servers = []
+    time_print = f"{datetime.now().strftime('%H:%M:%S')}|"
+
+    # 在允许的端口范围内尝试发现服务器
+    while current_port < MAX_BROADCAST_PORT:
+        print(f"\r{time_print}正在尝试广播端口 {current_port}...", end="")
+        servers = discover_server(current_port, TIMEOUT)
+        if servers:
+            print("")
+            break
+        current_port += 1
+
+    if not servers:
+        upload_print("找不到服务器")
+        return
+
+    # 选择第一个找到的服务器
+    server_ip, server_port = servers[0]
+    upload_print(f"正在连接到{server_ip}:{server_port}")

Podflow/upload/linked_server.py

@@ -0,0 +1,32 @@
+# Podflow/upload/linked_server.py
+# coding: utf-8
+
+import socket
+from Podflow.httpfs.port_judge import port_judge
+from Podflow.upload.upload_print import upload_print
+
+
+def usable_port(port, max_num):
+    hostip = "0.0.0.0"
+    while port <= max_num:
+        if port_judge(hostip, port):
+            return port
+        else:
+            port += 1
+    return None
+
+
+# 处理服务发现请求的UDP服务模块
+def handle_discovery(broadcast_port, service_port):
+    with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+        sock.bind(("", broadcast_port))
+
+        upload_print("发现服务已启动...")
+        while True:
+            data, addr = sock.recvfrom(1024)
+            if data == b"DISCOVER_SERVER_REQUEST":
+                upload_print(f"来自{addr}的发现请求")
+                response = f"SERVER_INFO|{service_port}".encode()
+                sock.sendto(response, addr)

Podflow/upload/upload_print.py

@@ -0,0 +1,8 @@
+# Podflow/upload/upload_print.py
+# coding: utf-8
+
+from datetime import datetime
+
+
+def upload_print(text):
+    print(f"{datetime.now().strftime('%H:%M:%S')}|{text}")

Podflow/youtube/build.py

@@ -8,8 +8,6 @@ import contextlib
 import xml.etree.ElementTree as ET
 from datetime import datetime, timezone
 from Podflow import gVar
-from Podflow.message.xml_rss import xml_rss
-from Podflow.basic.file_save import file_save
 from Podflow.message.xml_item import xml_item
 from Podflow.basic.http_client import http_client
 from Podflow.message.format_time import format_time
@@ -25,10 +23,9 @@ def get_youtube_introduction():
     # 使用http获取youtube频道简介和图标模块
     def youtube_xml_get(output_dir):
         if channel_about := http_client(
-            f"https://www.youtube.com/channel/{output_dir}/about",
-            f"{gVar.channelid_youtube_ids[output_dir]} 简介",
-            2,
-            5,
+            url=f"https://www.youtube.com/channel/{output_dir}/about",
+            max_retries=2,
+            retry_delay=5,
         ):
             channel_about = channel_about.text
             xml_tree = {
@@ -46,6 +43,8 @@ def get_youtube_introduction():
                 channel_about,
                 flags=re.DOTALL,
             ).group()
+        else:
+            xml_tree = False
             with youtube_xml_get_lock:
                 gVar.youtube_xml_get_tree[output_dir] = xml_tree
 
@@ -60,6 +59,15 @@ def get_youtube_introduction():
         thread.join()
 
 
+# 打印无法获取youtube频道简介模块
+def print_fail_youtube_introduction():
+    for output_dir, xml_tree in gVar.youtube_xml_get_tree:
+        if isinstance(xml_tree, bool) and not xml_tree:
+            print(
+                f"{datetime.now().strftime('%H:%M:%S')}|{gVar.channelid_youtube_ids[output_dir]} 简介获取失败"
+            )
+
+
 # 获取YouTube播放列表模块
 def get_youtube_playlist(url, channelid_title):
     videoids = []
@@ -69,7 +77,15 @@ def get_youtube_playlist(url, channelid_title):
             0
         ]["tabRenderer"]["content"]["sectionListRenderer"]["contents"][0][
             "itemSectionRenderer"
-        ]["contents"][0]["playlistVideoListRenderer"]["contents"]
+        ][
+            "contents"
+        ][
+            0
+        ][
+            "playlistVideoListRenderer"
+        ][
+            "contents"
+        ]
         videoids.extend(
             content["playlistVideoRenderer"]["videoId"] for content in contents
         )
@@ -262,12 +278,14 @@ def youtube_xml_items(output_dir):
     except Exception:  # 参数不存在直接更新
         description = gVar.config["description"]
         icon = gVar.config["icon"]
+    youtube_xml_get_tree = gVar.youtube_xml_get_tree
     if (
         output_dir in gVar.channelid_youtube_ids_update
-        and output_dir in gVar.youtube_xml_get_tree
+        and output_dir in youtube_xml_get_tree
+        and isinstance(youtube_xml_get_tree[output_dir], dict)
     ):
-        description = gVar.youtube_xml_get_tree[output_dir]["description"]
-        icon = gVar.youtube_xml_get_tree[output_dir]["icon"]
+        description = youtube_xml_get_tree[output_dir]["description"]
+        icon = youtube_xml_get_tree[output_dir]["icon"]
     category = gVar.config["category"]
     if output_dir_value["type"] == "dict":
         title = output_dir_value["content"]["title"]

{podflow-20250221.dist-info → podflow-20250301.dist-info}/METADATA

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

{podflow-20250221.dist-info → podflow-20250301.dist-info}/RECORD

@@ -1,6 +1,9 @@
 Podflow/__init__.py,sha256=fRgwxrydKSb9rK_ZsZsb2XhbGEgxxTYKmLB4f88fg0M,6908
+Podflow/download_and_build.py,sha256=LeLjLHnF5N9vdrroDsB-mT4UKY2OwPSL3APUAkhTuwc,671
 Podflow/ffmpeg_judge.py,sha256=krttVs1PDot_0CDq5rmtUIpchiaiqtAkPYFQRLG6OQM,1275
-Podflow/main.py,sha256=nfegfi0Wggw3AlNF4mHHudOgONbtBleSOhpdnYinFU8,8854
+Podflow/main.py,sha256=qSUmVrY5uM1pAViEnPkk9Dx_18NqbZE8W2_fU-Hg2O8,456
+Podflow/main_podcast.py,sha256=IUVEEYpXfyVNSACkDriTPgLsQhjC1xHFZTP5V3zwZZw,8289
+Podflow/main_upload.py,sha256=FzWWRDK5GmvMas-BcTRBq1H5djVgg5-NF8vXMoo7Sko,886
 Podflow/parse_arguments.py,sha256=qa5228sralPV7s4JdB6UgS1ug66rBqckDvSOwjz2tIc,2171
 Podflow/basic/__init__.py,sha256=SyFA_F_0-zn1VejCL83IPeZx1k2HCiqNY-0l0bp1N88,44
 Podflow/basic/file_save.py,sha256=mstWM6njYtCpq2sa28JD_neClvVLcjJOrGlCXBjUnZs,696
@@ -8,7 +11,7 @@ Podflow/basic/folder_build.py,sha256=Bt1ab1shKIluvSRzWqxaFmvG3AVU3kwJNzwSesdNlIU
 Podflow/basic/get_duration.py,sha256=e9w8XktV-ozdO0v0dlsUMqcyKJZpjcibCpY-wfwZt54,532
 Podflow/basic/get_file_list.py,sha256=Y6Nqn6lxhPXiIT2eeCkY7fMPrzFClwjv7kXej4CCFCY,2389
 Podflow/basic/get_html_dict.py,sha256=EZQ0Wlu87SFbUFZuakE7JWgFx53FQKpLbP78L7Gww3E,869
-Podflow/basic/http_client.py,sha256=bwhZVauQplM1DIFQ7tDO53bhVEbD_4fyl1QSc0xq9l4,3002
+Podflow/basic/http_client.py,sha256=gvaxg_1lz81tnWCq2HIh-oliShWJCP77JUnYl2v5qng,3003
 Podflow/basic/list_merge_tidy.py,sha256=o9cEnfEK0bhjf5awls5HyUzg0siPa1e4V97-kqxlpt0,368
 Podflow/basic/qr_code.py,sha256=3q2omeQTDIt4aDlfPGVpiynfAHW7K4XYx59LBSUiEDk,1704
 Podflow/basic/split_dict.py,sha256=rxwsGuzBWXJ8nDxcxYI-BqeeccyDTsw011tjkT8rZwI,401
@@ -19,7 +22,7 @@ Podflow/basic/write_log.py,sha256=Sm6qzTSb1x6X2uQnnmVD4dU6BsY1PONxenwsWAdFxso,13
 Podflow/bilibili/__init__.py,sha256=ekvpCzR4bg6ar73Gq0YWQcPXND4TEqP46pb9iLyke9g,47
 Podflow/bilibili/build.py,sha256=Oeh6Cqb61F5zQWe8ohDP0QKwykAa4_I2fa-Yl6ZxkCw,7957
 Podflow/bilibili/get.py,sha256=PXPh_H8B_zP9dhqe6sA_QCeJcdnriBCpbF7mPq46xMw,20337
-Podflow/bilibili/login.py,sha256=aYKEj5re-JYXnA0aCOKUF9Cqwwd7FTOuAu_yvcaqdag,10944
+Podflow/bilibili/login.py,sha256=ujczE9rWKFJQ7zIJ7mvlrf2XpXpn6sQwtGtqPsaf3wg,10932
 Podflow/config/__init__.py,sha256=BroaS1uvdLb00OQeJXc1i7QeuErD-U-2QjynQH5IDdE,45
 Podflow/config/build_original.py,sha256=tZtsGUi1rG6DH6cxaiaVQPRtIl6U0-FqOdeho7CXl0s,1809
 Podflow/config/channge_icon.py,sha256=z2tFFiP7aZFiMP1RqXkrovWAxBOI77rTHKhuzzhFfn0,5653
@@ -34,10 +37,10 @@ Podflow/download/delete_part.py,sha256=G9lK8G8tOOmnEBmAHJKPdqPeLhJ61S5m8o6iL5g9S
 Podflow/download/dl_aideo_video.py,sha256=8Y8agC4bBCpWLDE6zWfCAi0PrT_ik302XkufxgXK1z8,10001
 Podflow/download/show_progress.py,sha256=7oGzhj_frO2A1o5JeGuHn7bHtma5oPpD_IWcctIO2rs,1595
 Podflow/download/wait_animation.py,sha256=E2V3cm-10e5Iif40oU722OfzDe7YiLMbDqsjZ6dshBE,1056
-Podflow/download/youtube_and_bilibili_download.py,sha256=jt6CWb8ZJ-dyIom7fJ_K1qve9pSzoW0hNwfWnZiju7w,1228
+Podflow/download/youtube_and_bilibili_download.py,sha256=uHb-ZirbDXmnW_gDTmUtus6xqLy8flXwKmSkeslN_dc,1285
 Podflow/httpfs/__init__.py,sha256=agnAtd2Xe0qfOrElKgoBattAVqUBdj79wU2e2UOpcJM,45
 Podflow/httpfs/app_bottle.py,sha256=B5rGSxSNFbrjZfmtH7GVYdHCNDZ0T_7Jxrh4_oM8-FU,9333
-Podflow/httpfs/port_judge.py,sha256=OSNyE-aWRFB8aPmv2LJugRSQdBkwoxrqv7_rEP7OFzM,565
+Podflow/httpfs/port_judge.py,sha256=KozmaCGlMVh3E0ONekxSUstJWthhwdLK4WoJ84u1c5Q,349
 Podflow/makeup/__init__.py,sha256=HaBchKbUjRqqXSGCkMfEqLOyx3tlqB2htXvTDs59owI,45
 Podflow/makeup/del_makeup_format_fail.py,sha256=rUSJD5lXMBM5pCde1amrtF6s93MMHp66-NHCXZy56AI,642
 Podflow/makeup/make_up_file.py,sha256=6r5Mf_zK9snLS2hByD-HyKyuKWTccqqDJXh39GKhq28,2222
@@ -45,7 +48,7 @@ Podflow/makeup/make_up_file_format_mod.py,sha256=NMG8gzp1ARSyZWZvMta3BMFPH75o1YY
 Podflow/makeup/make_up_file_mod.py,sha256=CDwgC8BKPf1o1x5U5DF8UR1gtoAEPmhknokkqGLdJWY,1075
 Podflow/message/__init__.py,sha256=SC42QCYhGwCvzvBnxiBz6L1MN-l57WHbH7PIh-UyPdI,46
 Podflow/message/backup_zip_save.py,sha256=cU1oLO68INKSlmckYNCWmdZKu51T-HNuVFSHYzA9a-8,1740
-Podflow/message/create_main_rss.py,sha256=fGKAvbH6faS72p6g3t1iFlNSWusd-kxJhDJyfTItMkc,1657
+Podflow/message/create_main_rss.py,sha256=R-8nfTp7cg1m9BfK-YGfb186iR_miMwDxszwOLFc-eQ,2946
 Podflow/message/display_qrcode_and_url.py,sha256=Ren6ly_W-c__FGlRxXrpNSyV16IOu-OwHDNOkzB6La0,1016
 Podflow/message/fail_message_initialize.py,sha256=J7yjPo7vaL5Ix3lHOK13DE2zZ_xmdFF9xokarajtv6E,6299
 Podflow/message/format_time.py,sha256=2Z7rPh3rrU68UoDO5fFF_ipV_SEmtotziBmBBl0mHdc,909
@@ -74,13 +77,16 @@ Podflow/remove/remove_file.py,sha256=ACO2iK8RAZKGJ08uABbzGwu5-B0RLklQ-EOOkSuPFiU
 Podflow/upload/__init__.py,sha256=9uOIL8vr_vP_XYrhfZ4IDZmfSGyCf0_MpLOc-KnbpSY,45
 Podflow/upload/add_upload.py,sha256=8kxHDLFa225WFze3oTPNtOWbcECF--bQXuALfsRJLoo,1432
 Podflow/upload/get_upload_original.py,sha256=h2aoutZ-po40N8auRDbKvse14261Y5H7vHgfAN23vV0,4358
+Podflow/upload/linked_client.py,sha256=mprI2ZEGQt9v8hRa6a3QxfFjkOWu-TxAq5dSeeptHrI,2299
+Podflow/upload/linked_server.py,sha256=qbAzkxcy1M_JOCOx0WwZYWpTXYbS2OBcD4geLhEzE08,1041
 Podflow/upload/update_upload.py,sha256=4B5HyWwfmc_4Z5ZS_Wt2VcL6sgQFvq3JEl0Qubh7TwE,3183
+Podflow/upload/upload_print.py,sha256=KDMPxlWx7jqFVJuEwBFs5U6o3K5AbXBGxcACtXKDqdE,165
 Podflow/youtube/__init__.py,sha256=-bdMyuw-wxoz2miVkp284amS4Qg0k7VN0JPuGF-cXlM,46
-Podflow/youtube/build.py,sha256=9L5KbTyYFSnLAqh7rj7jfEiPOQiBs2WpBwVVxo1eMTI,11192
+Podflow/youtube/build.py,sha256=yy-rPBGs7H4aUjgLNyKz2HE-mjyGTs3b0FL5-KPHPM0,11650
 Podflow/youtube/get.py,sha256=dFLyiHttygqdJltwC29jD_v8wwoLynE5NUdow_0wERI,16970
 Podflow/youtube/login.py,sha256=DlS_ZG4g6CKWqS5ojE4UwFJSCSZDsXbeuDVgHtQAa4A,1380
-podflow-20250221.dist-info/METADATA,sha256=h4fw0K0QDEtCMX1XjNFmiwrGzA9U6MzvNmQt95rBLo4,13801
-podflow-20250221.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250221.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
-podflow-20250221.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
-podflow-20250221.dist-info/RECORD,,
+podflow-20250301.dist-info/METADATA,sha256=B9-vRpJMHUs2TDUY53PZ4PCI8F1Nml46ZjAedU5Jxq8,13801
+podflow-20250301.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250301.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
+podflow-20250301.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
+podflow-20250301.dist-info/RECORD,,