podflow 20250212__tar.gz → 20250301__tar.gz

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

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

{podflow-20250212 → podflow-20250301}/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-20250212 → podflow-20250301}/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-20250212 → podflow-20250301}/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-20250212 → 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-20250212 → 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-20250212/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,15 +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.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 模块
@@ -24,13 +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.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.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
@@ -49,34 +42,30 @@ 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.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.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():
-    # 获取传入的参数
-    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
@@ -85,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": "",  # 关闭访问日志
@@ -99,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"
@@ -122,11 +112,7 @@ def main():
             get_original_rss()
         )
         # 初始化原始上传信息
-        if gVar.config["upload"]:
-            if upload_original := get_upload_original():
-                gVar.upload_original = upload_original
-            else:
-                gVar.config["upload"] = False
+        get_upload_original()
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
         # 判断是否有更新内容
@@ -159,20 +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()
@@ -192,41 +174,18 @@ def main():
             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)
+            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')}|频道无更新内容")
 
@@ -253,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-20250212/Podflow/makeup/del_makeup_yt_format_fail.py → podflow-20250301/Podflow/makeup/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

{podflow-20250212 → podflow-20250301}/Podflow/makeup/make_up_file_format_mod.py

@@ -8,7 +8,7 @@ from Podflow.basic.write_log import write_log
 from Podflow.message.media_format import media_format
 
 
-def makeup_yt_format(video_id, makeup_yt_format_lock):
+def makeup_format(video_id, makeup_format_lock):
     id_value = gVar.make_up_file_format[video_id]
     makeup_id_format = media_format(
         id_value["url"],
@@ -62,7 +62,7 @@ def makeup_yt_format(video_id, makeup_yt_format_lock):
                 }
             del gVar.make_up_file_format[video_id]
     else:
-        with makeup_yt_format_lock:
+        with makeup_format_lock:
             write_log(f"{id_value['name']}|{video_id}|{makeup_id_format}")
             gVar.make_up_file_format_fail[video_id] = id_value[
                 "id"
@@ -78,19 +78,19 @@ def make_up_file_format_mod():
             f"{datetime.now().strftime('%H:%M:%S')}|补全缺失媒体 \033[34m下载准备中...\033[0m"
         )
     # 创建线程锁
-    makeup_yt_format_lock = threading.Lock()
+    makeup_format_lock = threading.Lock()
     # 创建线程列表
-    makeup_yt_format_threads = []
+    makeup_format_threads = []
     for video_id in gVar.make_up_file_format:
         thread = threading.Thread(
-            target=makeup_yt_format,
+            target=makeup_format,
             args=(
                 video_id,
-                makeup_yt_format_lock,
+                makeup_format_lock,
             ),
         )
-        makeup_yt_format_threads.append(thread)
+        makeup_format_threads.append(thread)
         thread.start()
     # 等待所有线程完成
-    for thread in makeup_yt_format_threads:
+    for thread in makeup_format_threads:
         thread.join()

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-20250212 → podflow-20250301}/Podflow/message/display_qrcode_and_url.py

@@ -9,9 +9,10 @@ from Podflow.basic.qr_code import qr_code
 # 显示网址及二维码模块
 def display_qrcode_and_url(
     output_dir,
-    channelid_video,
-    channelid_video_name,
-    channelid_video_ids_update,
+    display_rss_address,
+    qrcode,
+    name,
+    ids_update,
 ):
     address = gVar.config["address"]
     if token := gVar.config["token"]:
@@ -19,17 +20,14 @@ def display_qrcode_and_url(
     else:
         xml_url = f"{address}/channel_rss/{output_dir}.xml"
 
-    if channelid_video["DisplayRSSaddress"] or output_dir in channelid_video_ids_update:
-        update_text = "已更新" if output_dir in channelid_video_ids_update else "无更新"
+    if display_rss_address or output_dir in ids_update:
+        update_text = "已更新" if output_dir in ids_update else "无更新"
         print(
-            f"{datetime.now().strftime('%H:%M:%S')}|{channelid_video_name} 播客{update_text}|地址:\n\033[34m{xml_url}\033[0m"
+            f"{datetime.now().strftime('%H:%M:%S')}|{name} 播客{update_text}|地址:\n\033[34m{xml_url}\033[0m"
         )
     if (
-        (
-            channelid_video["DisplayRSSaddress"]
-            or output_dir in channelid_video_ids_update
-        )
-        and channelid_video["QRcode"]
+        (display_rss_address or output_dir in ids_update)
+        and qrcode
         and output_dir not in gVar.displayed_QRcode
     ):
         qr_code(xml_url)

{podflow-20250212 → podflow-20250301}/Podflow/message/fail_message_initialize.py

@@ -139,6 +139,11 @@ error_reason = [
         "\033[31m响应超时\033[0m",
         "regexp",
     ],
+    [
+        r"Requested format is not available. Use --list-formats for a list of available formats",
+        "\033[31m格式不可用\033[0m",
+        "text",
+    ],
 ]
 
 

podflow-20250301/Podflow/message/get_media_name.py

@@ -0,0 +1,26 @@
+# Podflow/message/get_media_name.py
+# coding: utf-8
+
+import re
+
+
+# 定义一个函数，用于获取媒体名称
+def get_media_name(id_type, items):
+    # 如果id_type为youtube
+    if id_type == "youtube":
+        # 使用正则表达式匹配items中的youtube链接，返回匹配结果
+        return re.findall(
+            r"(?:/UC.{22}/)(.{11}\.m4a|.{11}\.mp4)(?=\"|\?)",
+            items,
+        )
+    # 如果id_type为bilibili
+    elif id_type == "bilibili":
+        # 使用正则表达式匹配items中的bilibili链接，返回匹配结果
+        return re.findall(
+            r"(?:/[0-9]+/)(BV.{10}\.m4a|BV.{10}\.mp4|BV.{10}_p[0-9]+\.m4a|BV.{10}_p[0-9]+\.mp4|BV.{10}_[0-9]{9}\.m4a|BV.{10}_[0-9]{9}\.mp4)(?=\"|\?)",
+            items,
+        )
+    # 如果id_type不是youtube或bilibili
+    else:
+        # 返回空列表
+        return []