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

Podflow/__init__.py

@@ -19,6 +19,7 @@ default_config = {
     "token": "",  # token认证, 如为null或""将不启用token
     "delete_incompletement": False,  # 是否删除下载中断媒体(下载前处理流程)
     "remove_media": True,  # 是否删除无用的媒体文件
+    "upload": False,  # 是否将长期媒体进行上传
     "channelid_youtube": {  # Youtube频道列表
         "youtube": {
             "update_size": 15,  # 每次获取频道媒体数量
@@ -100,9 +101,7 @@ class Application_gVar:
         self.channelid_bilibili_ids_update = {}  # 需更新的哔哩哔哩频道字典
         self.bilibili_content_bvid_update = {}  # 需下载哔哩哔哩视频字典
         self.channelid_bilibili_rss = {}  # 哔哩哔哩频道最新Rss Response字典
-        self.bilibili_content_bvid_backward_update = (
-            {}
-        )  # 向后更新需下载哔哩哔哩视频字典
+        self.bilibili_content_bvid_backward_update = {}  # 向后更新需下载哔哩哔哩视频字典
         self.video_id_failed = []  # YouTube&哔哩哔哩视频下载失败列表
         self.video_id_update_format = {}  # YouTube和哔哩哔哩视频下载的详细信息字典
         self.hash_rss_original = ""  # 原始rss哈希值文本
@@ -111,10 +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.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

@@ -144,9 +144,9 @@ def bilibili_xml_items(output_dir):
             )
             if item["description"] and item["description"][0] == "『":
                 original_judgment = False
-            entry_num += 1
-            if entry_num >= channelid_bilibili_value["update_size"]:
-                break
+        entry_num += 1
+        if entry_num >= channelid_bilibili_value["update_size"]:
+            break
     items_guid = re.findall(r"(?<=<guid>).+?(?=</guid>)", "".join(items_list))
     # 存量接入
     entry_count = channelid_bilibili_value["last_size"] - len(items_guid)
@@ -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/config/build_original.py

@@ -6,8 +6,8 @@ from Podflow.config.get_config import get_config
 from Podflow.basic.folder_build import folder_build
 from Podflow.config.get_channelid import get_channelid
 from Podflow.config.correct_config import correct_config
-from Podflow.config.correct_channelid import correct_channelid
 from Podflow.config.get_channelid_id import get_channelid_id
+from Podflow.config.correct_channelid import correct_channelid
 
 
 def build_original():

Podflow/config/correct_config.py

@@ -101,3 +101,8 @@ def correct_config():
         config["remove_media"], bool
     ):
         config["remove_media"] = default_config["remove_media"]
+    # 对upload进行纠正
+    if "upload" not in config or not isinstance(
+        config["upload"], bool
+    ):
+        config["upload"] = default_config["upload"]

Podflow/main.py

@@ -13,9 +13,6 @@ 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 模块
@@ -28,8 +25,7 @@ from Podflow.download.youtube_and_bilibili_download import youtube_and_bilibili_
 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.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
@@ -49,7 +45,7 @@ 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
@@ -58,12 +54,19 @@ 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():
     # 获取传入的参数
     parse_arguments()
     # 开始运行
-    print(f"{datetime.now().strftime('%H:%M:%S')}|Podflow|{version('Podflow')}开始运行.....")
+    print(
+        f"{datetime.now().strftime('%H:%M:%S')}|Podflow|{version('Podflow')}开始运行....."
+    )
     # 判断是否安装ffmpeg
     ffmpeg_judge()
     # 初始化
@@ -116,6 +119,8 @@ def main():
         gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
             get_original_rss()
         )
+        # 初始化原始上传信息
+        get_upload_original()
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
         # 判断是否有更新内容
@@ -150,6 +155,8 @@ def main():
             gVar.server_process_print_flag[0] = "pause"
             # 下载YouTube和哔哩哔哩视频
             youtube_and_bilibili_download()
+            # 添加新媒体至上传列表
+            add_upload()
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 打印无法保留原节目信息
@@ -181,41 +188,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')}|频道无更新内容")
 

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

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

@@ -1,11 +1,10 @@
 # Podflow/message/create_main_rss.py
 # coding: utf-8
 
-import re
 from Podflow import gVar
 from Podflow.youtube.build import youtube_xml_items
 from Podflow.bilibili.build import bilibili_xml_items
-from Podflow.message.display_qrcode_and_url import display_qrcode_and_url
+from Podflow.message.get_media_name import get_media_name
 
 
 # 生成主rss模块
@@ -14,31 +13,22 @@ def create_main_rss():
     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)
-        display_qrcode_and_url(
-            output_dir,
-            channelid_youtube_value,
-            output_dir_youtube,
-            gVar.channelid_youtube_ids_update,
-        )
-        if channelid_youtube_value["InmainRSS"]:
-            gVar.all_items.append(items)
-        gVar.all_youtube_content_ytid[output_dir] = re.findall(
-            r"(?:/UC.{22}/)(.{11}\.m4a|.{11}\.mp4)(?=\"|\?)",
-            items,
-        )
+        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)
-        display_qrcode_and_url(
-            output_dir,
-            channelid_bilibili_value,
-            output_dir_bilibili,
-            gVar.channelid_bilibili_ids_update,
-        )
-        if channelid_bilibili_value["InmainRSS"]:
-            gVar.all_items.append(items)
-        gVar.all_bilibili_content_bvid[output_dir] = 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,
-        )
+        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

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/message/fail_message_initialize.py

@@ -135,15 +135,22 @@ error_reason = [
         "text",
     ],
     [
-        r"Got error: HTTPSConnectionPool\(host='rr[0-9]---sn-.{8}\.googlevideo.com', port=443\): Read timed out\.",
+        r"Got error: HTTPSConnectionPool\(host='rr[0-9]---sn-.{8}\.googlevideo.com', port=443\): Read timed out\. \(read timeout=20\.0\)",
         "\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",
+    ],
 ]
 
 
 # 失败信息初始化模块
 def fail_message_initialize(message_error, video_url):
+    if video_url[:2] == "BV":
+        video_url = video_url[:12]
     fail_message = (
         str(message_error)
         .replace("ERROR: ", "")

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 []

Podflow/message/get_original_rss.py

@@ -48,7 +48,9 @@ def get_original_rss():
         get_xmls_original = {}
         rss_original = ""
     # 如原始xml无对应的原频道items, 将尝试从对应频道的xml中获取
-    for channelid_key in (gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids).keys():
+    for channelid_key in (
+        gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids
+    ).keys():
         if channelid_key not in get_xmls_original.keys():
             try:
                 with open(

Podflow/message/save_rss.py

@@ -0,0 +1,85 @@
+# Podflow/message/save_rss.py
+# coding: utf-8
+
+from Podflow import gVar
+from Podflow.basic.qr_code import qr_code
+from Podflow.message.xml_rss import xml_rss
+from Podflow.basic.file_save import file_save
+from Podflow.basic.write_log import write_log
+from Podflow.message.backup_zip_save import backup_zip_save
+from Podflow.message.display_qrcode_and_url import display_qrcode_and_url
+
+
+# 保存rss文件模块
+def save_rss():
+    # 定义一个空列表，用于存储所有rss的items
+    main_items = []
+    # 遍历gVar.all_items字典，获取每个rss的输出目录和items_dict
+    for output_dir, items_dict in gVar.all_items.items():
+        # 获取items_dict中的各个字段
+        title = items_dict["title"]
+        link = items_dict["link"]
+        description = items_dict["description"]
+        category = items_dict["category"]
+        icon = items_dict["icon"]
+        items = items_dict["items"]
+        # 调用file_save函数，将rss保存到指定目录
+        file_save(
+            xml_rss(title, link, description, category, icon, items),
+            f"{output_dir}.xml",
+            "channel_rss",
+        )
+        # 获取items_dict中的其他字段
+        display_rss_address = items_dict["DisplayRSSaddress"]
+        qrcode = items_dict["QRcode"]
+        id_name = items_dict["ID_Name"]
+        id_type = items_dict["type"]
+        # 根据id_type获取对应的ids_update
+        if id_type == "youtube":
+            ids_update = gVar.channelid_youtube_ids_update
+        elif id_type == "bilibili":
+            ids_update = gVar.channelid_bilibili_ids_update
+        else:
+            ids_update = {}
+        # 调用display_qrcode_and_url函数，显示rss地址和二维码
+        display_qrcode_and_url(
+            output_dir,
+            display_rss_address,
+            qrcode,
+            id_name,
+            ids_update,
+        )
+        # 如果items_dict中的InmainRSS字段为True，则将items添加到main_items列表中
+        if items_dict["InmainRSS"]:
+            main_items.append(items)
+
+    # 生成主rss
+    overall_rss = xml_rss(
+        gVar.config["title"],
+        gVar.config["link"],
+        gVar.config["description"],
+        gVar.config["category"],
+        gVar.config["icon"],
+        "\n".join(main_items),
+    )
+
+    # 保存主rss
+    file_save(overall_rss, f"{gVar.config['filename']}.xml")
+
+    # 获取gVar.config中的地址和文件名
+    address = gVar.config["address"]
+    filename = gVar.config["filename"]
+    # 如果gVar.config中的token字段存在，则将token添加到overall_url中
+    if token := gVar.config["token"]:
+        overall_url = f"{address}/{filename}.xml?token={token}"
+    else:
+        overall_url = f"{address}/{filename}.xml"
+    # 调用write_log函数，记录总播客已更新
+    write_log("总播客已更新", f"地址:\n\033[34m{overall_url}\033[0m")
+    # 如果gVar.displayed_QRcode中不包含"main"，则调用qr_code函数，显示总播客的二维码，并将"main"添加到gVar.displayed_QRcode中
+    if "main" not in gVar.displayed_QRcode:
+        qr_code(overall_url)
+        gVar.displayed_QRcode.append("main")
+
+    # 备份主rss
+    backup_zip_save(overall_rss)

Podflow/remove/remove_file.py

@@ -9,6 +9,7 @@ from Podflow.basic.write_log import write_log
 # 删除多余媒体文件模块
 def remove_file():
     channelid_youtube_ids = gVar.channelid_youtube_ids
+
     for output_dir, name in channelid_youtube_ids.items():
         for file_name in os.listdir(f"channel_audiovisual/{output_dir}"):
             if file_name not in gVar.all_youtube_content_ytid[output_dir]:

Podflow/upload/__init__.py

@@ -0,0 +1,2 @@
+# Podflow/upload/__init__.py
+# coding: utf-8

Podflow/upload/add_upload.py

@@ -0,0 +1,36 @@
+# Podflow/upload/add_upload.py
+# coding: utf-8
+
+import time
+from Podflow import gVar
+
+
+# 添加新媒体至上传列表模块
+def add_upload():
+    # 获取video_id_update_format和video_id_failed的值
+    video_id_update_format = gVar.video_id_update_format
+    video_id_failed = gVar.video_id_failed
+    # 遍历video_id_update_format的键值对
+    for video_id, video_id_value in video_id_update_format.items():
+        # 判断video_id_value是否为字典，并且main不在video_id_failed中
+        if (
+            isinstance(video_id_value, dict)
+            and video_id_value["main"] not in video_id_failed
+        ):
+            # 构造media_id
+            media_id = f"{video_id}.{video_id_value['media']}"
+            # 判断gVar.upload_original中是否存在media_id
+            if not any(
+                item.get("media_id") == media_id for item in gVar.upload_original
+            ):
+                # 如果不存在，则将media_id、channel_id、media_time、upload、remove、hash添加到gVar.upload_original中
+                gVar.upload_original.append(
+                    {
+                        "media_id": media_id,
+                        "channel_id": video_id_value["id"],
+                        "media_time": int(time.time()),
+                        "upload": False,
+                        "remove": False,
+                        "hash": None,
+                    }
+                )

Podflow/upload/get_upload_original.py

@@ -0,0 +1,104 @@
+# Podflow/upload/get_upload_original.py
+# coding: utf-8
+
+import re
+import json
+from datetime import datetime
+from collections import Counter
+from email.utils import parsedate_tz, mktime_tz
+from Podflow import gVar
+from Podflow.basic.file_save import file_save
+from Podflow.basic.write_log import write_log
+from Podflow.message.get_media_name import get_media_name
+
+
+# 获取原始上传数据模块
+def get_upload():
+    xmls_original = gVar.xmls_original
+    try:
+        # 尝试打开并读取 JSON 文件
+        with open("channel_data/upload.json", "r") as file:
+            upload_original = file.read()  # 读取原始上传数据
+        upload_original = json.loads(
+            upload_original
+        )  # 将读取的字符串转换为 Python 对象（列表或字典）
+    except Exception:
+        # 如果读取或解析失败，将 upload_original 初始化为空列表
+        upload_original = []
+
+    # 如果 upload_original 不为空
+    if upload_original:
+        # 提取每个条目的 channel_id
+        channel_ids = [item.get("channel_id") for item in upload_original]
+        # 统计每个 channel_id 的出现次数
+        channelid_counts = Counter(channel_ids)
+        # 将出现次数转换为字典
+        age_counts = dict(channelid_counts)
+        # 统计 xmls_original 中每个键对应的 <guid> 标签内的元素数量
+        xmls_original_counts = {
+            key: len(re.findall(r"(?<=<guid>).+(?=</guid>)", value))
+            for key, value in xmls_original.items()
+        }
+        # 如果两个计数字典不相等，提示错误
+        if age_counts != xmls_original_counts:
+            print(
+                f"{datetime.now().strftime('%H:%M:%S')}|无法获取完整原始上传信息"
+            )
+    # 如果 upload_original 为空
+    else:
+        # 遍历 xmls_original 的每个键值对
+        for xmls_original_key, xmls_original_value in xmls_original.items():
+            # 如果当前键在 channelid_youtube_ids 中
+            if xmls_original_key in gVar.channelid_youtube_ids:
+                # 使用正则表达式解析包含特定格式媒体ID的字符串
+                media = get_media_name("youtube", xmls_original_value)
+            # 如果当前键在 channelid_bilibili_ids 中
+            elif xmls_original_key in gVar.channelid_bilibili_ids:
+                media = get_media_name("bilibili", xmls_original_value)
+            else:
+                media = []
+            # 查找每个上传条目的发布时间
+            upload_time = re.findall(
+                r"(?<=<pubDate>).+(?=</pubDate>)",
+                xmls_original_value,
+            )
+            # 将日期字符串列表转换为 Unix 时间戳列表
+            timestamps = [
+                mktime_tz(
+                    parsedate_tz(date_string)
+                )  # 解析和转换每个日期字符串为 Unix 时间戳
+                for date_string in upload_time
+                if parsedate_tz(date_string)  # 确保解析成功
+            ]
+            # 如果媒体和时间戳的数量不匹配，记录错误并清空 upload_original
+            if len(media) != len(timestamps):
+                write_log("获取原始上传内容失败")  # 错误日志
+                upload_original.clear()  # 清空 upload_original
+                break  # 退出循环
+            # 如果数量匹配，则整合 media_id、channel_id 和上传时间到 upload_original 列表
+            upload_original += [
+                {
+                    "media_id": key,
+                    "channel_id": xmls_original_key,
+                    "media_time": value,
+                    "upload": False,
+                    "remove": False,
+                    "hash": None,
+                }
+                for value, key in zip(
+                    timestamps, media
+                )  # 使用 zip() 将 media 和 timestamps 组合成对
+            ]
+        # 如果成功填充 upload_original
+        if upload_original:
+            file_save(upload_original, "upload.json", "channel_data")  # 保存到文件
+    return upload_original
+
+
+# 初始化原始上传信息
+def get_upload_original():
+    if gVar.config["upload"]:
+        if upload_original := get_upload():
+            gVar.upload_original = upload_original
+        else:
+            gVar.config["upload"] = False

Podflow/upload/update_upload.py

@@ -0,0 +1,74 @@
+# Podflow/upload/update_upload.py
+# coding: utf-8
+
+import re
+import time
+from email.utils import parsedate_tz, mktime_tz
+from Podflow import gVar
+from Podflow.basic.file_save import file_save
+from Podflow.message.get_media_name import get_media_name
+
+
+# 更新并保存上传列表模块
+def update_upload():
+    # 如果没有开启上传功能，则直接返回
+    if not gVar.config["upload"]:
+        return
+    # 初始化一个字典，用于存储每个输出目录的媒体名称
+    media_name = {}
+    # 初始化一个列表，用于存储需要上传的媒体部分
+    main_upload = []
+    # 获取原始上传列表
+    upload_original = gVar.upload_original
+    # 获取所有项目
+    all_items = gVar.all_items
+    # 遍历所有项目，获取每个输出目录的媒体名称
+    for output_dir, items_dict in all_items.items():
+        media_name[output_dir] = get_media_name(items_dict["type"], items_dict["items"])
+    # 遍历原始上传列表，筛选出需要上传的媒体部分
+    for upload_part in upload_original:
+        if (
+            upload_part["channel_id"] in media_name
+            and upload_part["media_id"] in media_name[upload_part["channel_id"]]
+        ):
+            main_upload.append(upload_part)
+
+    # 获取需要上传的媒体部分的ID
+    media_ids = [item["media_id"] for item in main_upload if "media_id" in item]
+    # 遍历每个输出目录的媒体部分，筛选出需要上传的媒体部分
+    for output_dir, media_parts in media_name.items():
+        for part in media_parts:
+            if part not in media_ids:
+                # 构造正则表达式，用于匹配媒体部分
+                pattern = rf"<!-- {output_dir} -->(?:(?!<!-- {output_dir} -->).)+channel_audiovisual/{output_dir}/{part}.+?<!-- {output_dir} -->"
+                pubdate_text = ""
+                # 在所有项目中匹配媒体部分
+                if match := re.search(
+                    pattern, all_items[output_dir]["items"], flags=re.DOTALL
+                ):
+                    date_text = match.group()
+                    # 在匹配的媒体部分中提取发布日期
+                    pattern = r"(?<=<pubDate>).+(?=</pubDate>)"
+                    if match := re.search(pattern, date_text):
+                        pubdate_text = match.group()
+                # 如果发布日期存在，则转换为时间戳；否则，使用当前时间戳
+                pubdate_text = (
+                    mktime_tz(parsedate_tz(pubdate_text))
+                    if parsedate_tz(pubdate_text)
+                    else int(time.time())
+                )
+
+                # 将需要上传的媒体部分添加到列表中
+                main_upload.append(
+                    {
+                        "media_id": part,
+                        "channel_id": output_dir,
+                        "media_time": pubdate_text,
+                        "upload": False,
+                        "remove": False,
+                        "hash": None,
+                    }
+                )
+
+    # 将需要上传的媒体部分保存到文件中
+    file_save(main_upload, "upload.json", "channel_data")  # 保存到文件

Podflow/youtube/build.py

@@ -194,7 +194,6 @@ def youtube_xml_items(output_dir):
                     guid, item, channelid_title, title_change, output_dir
                 ):
                     items_list.append(f"{xml_item_text}<!-- {output_dir} -->")
-                    entry_num += 1
                     if (
                         gVar.video_id_update_format[guid]["description"]
                         and gVar.video_id_update_format[guid]["description"][0] == "『"
@@ -214,9 +213,9 @@ def youtube_xml_items(output_dir):
                 items_list.append(
                     f"{youtube_xml_item(entry, title_change)}<!-- {output_dir} -->"
                 )
-                entry_num += 1
                 if re.search(r"(?<=<media:description>)『", entry):
                     original_judgment = False
+            entry_num += 1
             if entry_num >= update_size:
                 break
     items_guid = re.findall(r"(?<=<guid>).+?(?=</guid>)", "".join(items_list))
@@ -279,9 +278,11 @@ def youtube_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-20250205.dist-info → podflow-20250221.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250205
+Version: 20250221
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz
@@ -15,13 +15,13 @@ Description-Content-Type: text/markdown
 Requires-Dist: astral>=3.2
 Requires-Dist: bottle>=0.13.2
 Requires-Dist: qrcode>=8.0
-Requires-Dist: yt-dlp>=2025.1.26
+Requires-Dist: yt-dlp>=2025.2.19
 Requires-Dist: chardet>=5.2.0
 Requires-Dist: cherrypy>=18.10.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: pycryptodome>=3.21.0
 Requires-Dist: ffmpeg-python>=0.2.0
-Requires-Dist: BeautifulSoup4>=4.12.3
+Requires-Dist: BeautifulSoup4>=4.13.3
 
 # Podflow
 

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

@@ -1,6 +1,6 @@
-Podflow/__init__.py,sha256=fkPG1o_2qAA_qeUgBPs9FPWc5-7p8WuQ-h2FqrgsZS4,6803
+Podflow/__init__.py,sha256=fRgwxrydKSb9rK_ZsZsb2XhbGEgxxTYKmLB4f88fg0M,6908
 Podflow/ffmpeg_judge.py,sha256=krttVs1PDot_0CDq5rmtUIpchiaiqtAkPYFQRLG6OQM,1275
-Podflow/main.py,sha256=wIpxvDoC62Feeig43GU8VmJ557MFJ1tsLAwP3llHdJo,9757
+Podflow/main.py,sha256=nfegfi0Wggw3AlNF4mHHudOgONbtBleSOhpdnYinFU8,8854
 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 +8,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=lsVRA672y47FXBjC8gDVHdsat0OwR5l_y-1o2WzGqxk,2644
+Podflow/basic/http_client.py,sha256=bwhZVauQplM1DIFQ7tDO53bhVEbD_4fyl1QSc0xq9l4,3002
 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
@@ -17,14 +17,14 @@ Podflow/basic/time_stamp.py,sha256=vf0p6FIK2-ZN2p2sotbpf4dewQMy-Vior-aREYfT0Zc,1
 Podflow/basic/vary_replace.py,sha256=aecFDuAOvQjTpgtoSW5uDu8Tx_YTs4bCFF9imVFkfVY,211
 Podflow/basic/write_log.py,sha256=Sm6qzTSb1x6X2uQnnmVD4dU6BsY1PONxenwsWAdFxso,1358
 Podflow/bilibili/__init__.py,sha256=ekvpCzR4bg6ar73Gq0YWQcPXND4TEqP46pb9iLyke9g,47
-Podflow/bilibili/build.py,sha256=G-MhhURoTRmGNJGRySltraFsslIEDtJxhL93_DnqlfY,7948
+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/config/__init__.py,sha256=BroaS1uvdLb00OQeJXc1i7QeuErD-U-2QjynQH5IDdE,45
-Podflow/config/build_original.py,sha256=wfHpze2Z-0IjKMqkA5nBz5gwM8zPnnMx7wtl4owYKAs,1809
+Podflow/config/build_original.py,sha256=tZtsGUi1rG6DH6cxaiaVQPRtIl6U0-FqOdeho7CXl0s,1809
 Podflow/config/channge_icon.py,sha256=z2tFFiP7aZFiMP1RqXkrovWAxBOI77rTHKhuzzhFfn0,5653
 Podflow/config/correct_channelid.py,sha256=o88DH1RJVloeXHI2ZKP7vb-3VUqM2yQaaUWRq3V_rfg,9252
-Podflow/config/correct_config.py,sha256=DCN2TuuEmzwBYYMdFrI_uhaE_2Vs7eUj2J-fSA9MFiE,3791
+Podflow/config/correct_config.py,sha256=faER2s7jBB7siX0b5XNoMgjnR88CddQK2Yl53xVdQSI,3958
 Podflow/config/get_channelid.py,sha256=3Eeh_GN1qUJGhNl5uVDUZHZpcY-fa16BtfwWpJ4Yyjg,641
 Podflow/config/get_channelid_id.py,sha256=JAZ1nf_AnfOa19j4PTEwN2aITojvAvDFQj56FOWH8g8,586
 Podflow/config/get_config.py,sha256=xM_C1Vk5EUAdPKwR7guPSo2IVR_QOZ-EFHfbmtMtm30,1326
@@ -39,23 +39,25 @@ 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/makeup/__init__.py,sha256=HaBchKbUjRqqXSGCkMfEqLOyx3tlqB2htXvTDs59owI,45
-Podflow/makeup/del_makeup_yt_format_fail.py,sha256=j2QCpfL-UslUfVYBwBxlJnZdp6BMNLpS-D3zjGwTakc,638
+Podflow/makeup/del_makeup_format_fail.py,sha256=rUSJD5lXMBM5pCde1amrtF6s93MMHp66-NHCXZy56AI,642
 Podflow/makeup/make_up_file.py,sha256=6r5Mf_zK9snLS2hByD-HyKyuKWTccqqDJXh39GKhq28,2222
-Podflow/makeup/make_up_file_format_mod.py,sha256=1hUne0OxWi7tfl4vpe2Jlp74Zub6f2W_IRzVmijzBCY,3640
+Podflow/makeup/make_up_file_format_mod.py,sha256=NMG8gzp1ARSyZWZvMta3BMFPH75o1YYmaIbv247MgSw,3613
 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=pbi5h0EOPLtX9rh9IUZ4QWdXQnQXNRPTE35XCUqiiqw,1773
-Podflow/message/display_qrcode_and_url.py,sha256=72DwF1H2-cmVxsRlTb93Othc-6fkgFWEVHl3djm3acE,1183
-Podflow/message/fail_message_initialize.py,sha256=r3fT21bFDY1c72yrBxouT2RPw0n29FUZR9Qi2o7Q8n8,6042
+Podflow/message/create_main_rss.py,sha256=fGKAvbH6faS72p6g3t1iFlNSWusd-kxJhDJyfTItMkc,1657
+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
-Podflow/message/get_original_rss.py,sha256=CK_Q5enOzUafgL2l5OlXBpC08Nj_B7AKPzw5DomXLwA,2369
+Podflow/message/get_media_name.py,sha256=5a9Tuvsr7-jslJ8h3hH23Bh11mN6GcCQmHUQwvwS54A,861
+Podflow/message/get_original_rss.py,sha256=QRtpHEYeS9rDh4Cv_EkTIC89eSw0I6540ykrTT3yr-4,2383
 Podflow/message/get_video_format.py,sha256=RIX0fxuPYkoQPRWt-ulJPhfEWtMkyxwOEVqcuRsp4v8,4770
 Podflow/message/get_video_format_multithread.py,sha256=ZXzY9RwT59eOvP6Lmx-I07P3C1CWCl-4l_uw_pkozqE,1406
 Podflow/message/get_youtube_and_bilibili_video_format.py,sha256=RuaxL3JwZs3_Bqm77g9SIcyV8o-WJu_qOCWhEnD15WE,4321
 Podflow/message/media_format.py,sha256=WH0NnjWPLigU8Wy2kbqDIhj_RISnaCCXtsR5qIjLFdU,7346
 Podflow/message/original_rss_fail_print.py,sha256=pVVb_BGM1HofHDh9pCX5GS03gOnNAssfHDjj5Ytz_mw,502
 Podflow/message/rss_create_hash.py,sha256=NODhtprDPkpiuiezupARKm5Xr4Zt2Io_lcxmHedPAQc,638
+Podflow/message/save_rss.py,sha256=ZBZrEWrF70w2lmJ3oP84sTPL3d5w93ZLq01Zeg0wurs,3201
 Podflow/message/title_correction.py,sha256=JR2q3PubOUUAfQEPjIzeRzUe4Jy86opGIO1st51qt2g,915
 Podflow/message/update_information_display.py,sha256=-vIBKaR6_JrZJyzvN6-YUfj_ISY7qw_1fGiyXDxFAE4,3061
 Podflow/message/update_youtube_bilibili_rss.py,sha256=eSQhYyLsOGyNpE7i4AjQ2auSUrunJUE18qPiPbhiv4Q,5238
@@ -68,13 +70,17 @@ Podflow/netscape/bulid_netscape.py,sha256=lG2uQQIGVX1H7iyOEO8aGKlaPdBPWbZq4rgdcJ
 Podflow/netscape/get_cookie_dict.py,sha256=ptT2H8ZwFseK8EmpH0jn-lhzh-KCciOOPwpAJnIFDFU,691
 Podflow/remove/__init__.py,sha256=kns-jfTXH8lXh9OQ5E5-llsrAPlET5rl6RYpjoZKav8,45
 Podflow/remove/remove_dir.py,sha256=tah3LCD0bCcf5dDg3NrHuseaje3-31C5NLNupMg15TU,1099
-Podflow/remove/remove_file.py,sha256=R8Gr0d6bIAYKQ7YEfFl5_QJ_CcumTu_8XejP7xuRm2k,981
+Podflow/remove/remove_file.py,sha256=ACO2iK8RAZKGJ08uABbzGwu5-B0RLklQ-EOOkSuPFiU,982
+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/update_upload.py,sha256=4B5HyWwfmc_4Z5ZS_Wt2VcL6sgQFvq3JEl0Qubh7TwE,3183
 Podflow/youtube/__init__.py,sha256=-bdMyuw-wxoz2miVkp284amS4Qg0k7VN0JPuGF-cXlM,46
-Podflow/youtube/build.py,sha256=y1R5KI_R8ydYjjxZKvMtNaHUiyMm4iBa-MIEMbA92FY,11210
+Podflow/youtube/build.py,sha256=9L5KbTyYFSnLAqh7rj7jfEiPOQiBs2WpBwVVxo1eMTI,11192
 Podflow/youtube/get.py,sha256=dFLyiHttygqdJltwC29jD_v8wwoLynE5NUdow_0wERI,16970
 Podflow/youtube/login.py,sha256=DlS_ZG4g6CKWqS5ojE4UwFJSCSZDsXbeuDVgHtQAa4A,1380
-podflow-20250205.dist-info/METADATA,sha256=dNGzFuJ-V7LfCMbJlSKRFrG9j6Cme9LT2ABuuVpA_EM,13801
-podflow-20250205.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250205.dist-info/entry_points.txt,sha256=44nj8jJB7bo1JLNrKQZmwMGEA1OalrALJ0tF_G0yXLY,131
-podflow-20250205.dist-info/top_level.txt,sha256=KcvRCiz_DRWWc9i-PgpARvFB0J4CKmpZOZgPqOdG-Lk,8
-podflow-20250205.dist-info/RECORD,,
+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,,