podflow 20250221__tar.gz → 20250301__tar.gz

{podflow-20250221 → podflow-20250301}/PKG-INFO

@@ -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 → podflow-20250301}/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-20250221 → podflow-20250301}/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-20250221 → podflow-20250301}/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-20250301/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-20250301/Podflow/httpfs/port_judge.py

@@ -0,0 +1,14 @@
+# Podflow/httpfs/port_judge.py
+# coding: utf-8
+
+import socket
+
+
+def port_judge(hostip, port):
+    try:
+        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

podflow-20250301/Podflow/main.py

@@ -0,0 +1,21 @@
+# Podflow/main.py
+# coding: utf-8
+
+from datetime import datetime
+from importlib.metadata import version
+from Podflow.main_podcast import main_podcast
+from Podflow.parse_arguments import parse_arguments
+
+
+def main():
+    # 获取传入的参数
+    parse_arguments()
+    # 开始运行
+    print(
+        f"{datetime.now().strftime('%H:%M:%S')}|Podflow|{version('Podflow')}开始运行....."
+    )
+    main_podcast()
+
+
+if __name__ == "__main__":
+    main()

podflow-20250221/Podflow/main.py → podflow-20250301/Podflow/main_podcast.py

@@ -1,4 +1,4 @@
-# Podflow/main.py
+# Podflow/main_podcast.py
 # coding: utf-8
 
 import sys
@@ -7,12 +7,10 @@ import time
 import urllib
 import subprocess
 from datetime import datetime
-from importlib.metadata import version
 import cherrypy
 
 # 基本功能模块
 from Podflow import gVar, parse
-from Podflow.parse_arguments import parse_arguments
 from Podflow.basic.split_dict import split_dict
 
 # 网络和 HTTP 模块
@@ -21,12 +19,11 @@ 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.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.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
@@ -52,7 +49,7 @@ 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.youtube.build import print_fail_youtube_introduction
 
 # 长期媒体进行上传模块
 from Podflow.upload.add_upload import add_upload
@@ -60,21 +57,15 @@ from Podflow.upload.update_upload import update_upload
 from Podflow.upload.get_upload_original import get_upload_original
 
 
-def main():
-    # 获取传入的参数
-    parse_arguments()
-    # 开始运行
-    print(
-        f"{datetime.now().strftime('%H:%M:%S')}|Podflow|{version('Podflow')}开始运行....."
-    )
+def main_podcast():
     # 判断是否安装ffmpeg
     ffmpeg_judge()
     # 初始化
     build_original()
     # http共享
     port = gVar.config["port"]
-    host = "0.0.0.0"
-    if port_judge(host, port):
+    hostip = "0.0.0.0"
+    if port_judge(hostip, port):
         # 启动 CherryPy 服务器
         cherrypy.tree.graft(
             bottle_app_instance.app_bottle
@@ -83,7 +74,7 @@ def main():
             {
                 "global": {
                     "tools.sessions.on": True,  # 启用会话支持
-                    "server.socket_host": host,  # 监听所有 IP 地址
+                    "server.socket_host": hostip,  # 监听所有 IP 地址
                     "server.socket_port": port,  # 设置监听端口
                     "log.screen": False,  # 禁用屏幕日志输出
                     "log.access_file": "",  # 关闭访问日志
@@ -97,6 +88,7 @@ def main():
         )
         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"
@@ -153,22 +145,16 @@ def main():
                 delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
-            # 下载YouTube和哔哩哔哩视频
-            youtube_and_bilibili_download()
+            # 下载并构建YouTube和哔哩哔哩视频
+            download_and_build()
             # 添加新媒体至上传列表
             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()
+            # 打印无法获取youtube频道简介
+            print_fail_youtube_introduction()
             if gVar.config["remove_media"]:
                 # 删除不在rss中的媒体文件
                 remove_file()
@@ -226,7 +212,3 @@ def main():
     # 关闭CherryPy服务器
     cherrypy.engine.exit()
     print(f"{datetime.now().strftime('%H:%M:%S')}|Podflow运行结束")
-
-
-if __name__ == "__main__":
-    main()

podflow-20250301/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-20250301/Podflow/message/create_main_rss.py

@@ -0,0 +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
+    channelid_bilibili_ids = gVar.channelid_bilibili_ids
+    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-20250301/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-20250301/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-20250301/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-20250221 → podflow-20250301}/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 → podflow-20250301}/podflow.egg-info/PKG-INFO

@@ -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 → podflow-20250301}/podflow.egg-info/SOURCES.txt

@@ -1,8 +1,11 @@
 README.md
 setup.py
 Podflow/__init__.py
+Podflow/download_and_build.py
 Podflow/ffmpeg_judge.py
 Podflow/main.py
+Podflow/main_podcast.py
+Podflow/main_upload.py
 Podflow/parse_arguments.py
 Podflow/basic/__init__.py
 Podflow/basic/file_save.py
@@ -76,7 +79,10 @@ Podflow/remove/remove_file.py
 Podflow/upload/__init__.py
 Podflow/upload/add_upload.py
 Podflow/upload/get_upload_original.py
+Podflow/upload/linked_client.py
+Podflow/upload/linked_server.py
 Podflow/upload/update_upload.py
+Podflow/upload/upload_print.py
 Podflow/youtube/__init__.py
 Podflow/youtube/build.py
 Podflow/youtube/get.py

{podflow-20250221 → podflow-20250301}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250221",
+    version="20250301",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",

podflow-20250221/Podflow/httpfs/port_judge.py

@@ -1,21 +0,0 @@
-# Podflow/httpfs/port_judge.py
-# coding: utf-8
-
-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)
-    try:
-        # 尝试绑定到指定端口
-        sock.bind((host, port))
-    except OSError:
-        # 如果绑定失败，说明端口被占用
-        return False
-    else:
-        # 如果绑定成功，端口可用，关闭 socket
-        sock.close()
-        return True

podflow-20250221/Podflow/message/create_main_rss.py

@@ -1,34 +0,0 @@
-# Podflow/message/create_main_rss.py
-# coding: utf-8
-
-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
-
-
-# 生成主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