podflow 20250415.1__py3-none-any.whl → 20250417__py3-none-any.whl

podflow/__init__.py

@@ -125,7 +125,7 @@ class Application_gVar:
             "podflow": [],  # 主窗口信息列表
             "http": [],  # httpfs窗口信息列表
             "enter": True,  # 是否换行
-            "schedule": [],  # 进度条信息列表
+            "schedule": [0, "准备中"],  # 进度条信息列表
         }
 
 

podflow/bilibili/build.py

@@ -6,11 +6,10 @@ import html
 import contextlib
 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.bilibili.get import get_bilibili_cid
 from podflow.message.format_time import format_time
+from podflow.httpfs.progress_bar import progress_bar
 from podflow.basic.get_file_list import get_file_list
 from podflow.message.xml_original_item import xml_original_item
 
@@ -23,6 +22,7 @@ def get_items_list(
     items_counts,
     output_dir,
     items_list,
+    ratio_part,
 ):
     pubDate = datetime.fromtimestamp(item["created"], timezone.utc).strftime(
         "%Y-%m-%dT%H:%M:%S%z"
@@ -63,6 +63,7 @@ def get_items_list(
                     title_change,
                 )
                 items_list.append(f"{xml_item_text}<!-- {output_dir} -->")
+                progress_bar(ratio_part[0], ratio_part[1])
         elif guid_edgeinfos and items_counts[guid] == len(guid_edgeinfos):
             cid_edgeinfos = {
                 guid_edgeinfo["cid"]: guid_edgeinfo["title"]
@@ -100,6 +101,7 @@ def get_items_list(
                     title_change,
                 )
                 items_list.append(f"{xml_item_text}<!-- {output_dir} -->")
+                progress_bar(ratio_part[0], ratio_part[1])
     else:
         xml_item_text = xml_item(
             item["bvid"],
@@ -113,10 +115,11 @@ def get_items_list(
             title_change,
         )
         items_list.append(f"{xml_item_text}<!-- {output_dir} -->")
+        progress_bar(ratio_part[0], ratio_part[1])
 
 
 # 生成哔哩哔哩对应channel的需更新的items模块
-def bilibili_xml_items(output_dir):
+def bilibili_xml_items(output_dir, ratio_part):
     channelid_bilibili_value = gVar.channelid_bilibili[
         gVar.channelid_bilibili_ids[output_dir]
     ]
@@ -141,6 +144,7 @@ def bilibili_xml_items(output_dir):
                 items_counts,
                 output_dir,
                 items_list,
+                ratio_part,
             )
             if item["description"] and item["description"][0] == "『":
                 original_judgment = False
@@ -162,6 +166,7 @@ def bilibili_xml_items(output_dir):
                 items_list.append(
                     f"{xml_original_item(xml, channelid_title, original_judgment, title_change)}<!-- {output_dir} -->"
                 )
+                progress_bar(ratio_part[0], ratio_part[1])
                 xml_num += 1
             if xml_num >= entry_count:
                 break
@@ -182,6 +187,7 @@ def bilibili_xml_items(output_dir):
                     items_counts,
                     output_dir,
                     items_list,
+                    ratio_part,
                 )
     # 生成对应xml
     description = html.escape(output_dir_value["content"]["sign"])

podflow/bilibili/get.py

@@ -12,6 +12,7 @@ from hashlib import md5
 from functools import reduce
 from podflow import gVar
 from podflow.basic.http_client import http_client
+from podflow.httpfs.progress_bar import progress_bar
 from podflow.basic.get_file_list import get_file_list
 from podflow.basic.list_merge_tidy import list_merge_tidy
 
@@ -19,10 +20,70 @@ from podflow.basic.list_merge_tidy import list_merge_tidy
 # WBI签名模块
 def WBI_signature(params={}, img_key="", sub_key=""):
     mixinKeyEncTab = [
-        46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
-        33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
-        61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
-        36, 20, 34, 44, 52,
+        46,
+        47,
+        18,
+        2,
+        53,
+        8,
+        23,
+        32,
+        15,
+        50,
+        10,
+        31,
+        58,
+        3,
+        45,
+        35,
+        27,
+        43,
+        5,
+        49,
+        33,
+        9,
+        42,
+        19,
+        29,
+        28,
+        14,
+        39,
+        12,
+        38,
+        41,
+        13,
+        37,
+        48,
+        7,
+        16,
+        24,
+        55,
+        40,
+        61,
+        26,
+        17,
+        0,
+        1,
+        60,
+        51,
+        30,
+        4,
+        22,
+        25,
+        54,
+        21,
+        56,
+        59,
+        6,
+        63,
+        57,
+        62,
+        11,
+        36,
+        20,
+        34,
+        44,
+        52,
     ]
 
     def getMixinKey(orig: str):
@@ -302,7 +363,9 @@ def bilibili_json_update(bilibili_key, bilibili_value):
         else:
             return bilibili_card_json["code"]
     # 查询哔哩哔哩用户投稿视频明细
-    for num in range(math.ceil(gVar.channelid_bilibili[bilibili_value]["update_size"] / 25)):
+    for num in range(
+        math.ceil(gVar.channelid_bilibili[bilibili_value]["update_size"] / 25)
+    ):
         num += 1
         bilibili_entry, bilibili_list = get_bilibili_vlist(
             bilibili_key,
@@ -325,6 +388,7 @@ def bilibili_rss_update(
     rss_update_lock,
 ):
     bilibili_content_bvid_backward = []  # 初始化向后更新的内容列表
+    last_size = gVar.channelid_bilibili[bilibili_value]["last_size"]
     # 获取已下载文件列表
     bilibili_content_bvid_original = get_file_list(
         bilibili_key, gVar.channelid_bilibili[bilibili_value]["media"]
@@ -358,13 +422,13 @@ def bilibili_rss_update(
             "content": bilibili_space,
             "type": "int",
         }  # 设置为整型内容
-        gVar.xmls_quantity[bilibili_key]["update"] = 0
+        bilibili_space_new = guids
     elif bilibili_space is None:
         gVar.channelid_bilibili_rss[bilibili_key] = {
             "content": bilibili_space_original,
             "type": "json",
         }  # 使用原始json内容
-        gVar.xmls_quantity[bilibili_key]["update"] = 0
+        bilibili_space_new = guids
     else:
         gVar.channelid_bilibili_rss[bilibili_key] = {
             "content": bilibili_space,
@@ -377,7 +441,6 @@ def bilibili_rss_update(
         bilibili_content_bvid = bilibili_space["list"][
             : gVar.channelid_bilibili[bilibili_value]["update_size"]
         ]
-        gVar.xmls_quantity[bilibili_key]["update"] = len(bilibili_content_bvid)
         bilibili_space_new = list_merge_tidy(
             bilibili_content_bvid, guids
         )  # 合并新内容和原内容
@@ -387,7 +450,9 @@ def bilibili_rss_update(
             for exclude in bilibili_content_bvid
             if exclude not in bilibili_content_bvid_original  # 筛选新增的内容
         ]:
-            gVar.channelid_bilibili_ids_update[bilibili_key] = bilibili_value  # 需要更新ID
+            gVar.channelid_bilibili_ids_update[bilibili_key] = (
+                bilibili_value  # 需要更新ID
+            )
             gVar.bilibili_content_bvid_update[bilibili_key] = (
                 bilibili_content_bvid  # 更新新增内容
             )
@@ -395,9 +460,9 @@ def bilibili_rss_update(
         if (
             gVar.channelid_bilibili[bilibili_value]["BackwardUpdate"] and guids
         ):  # 如果设置了向后更新
-            backward_update_size = gVar.channelid_bilibili[bilibili_value][
-                "last_size"
-            ] - len(bilibili_space_new)  # 计算需要向后更新的数量
+            backward_update_size = last_size - len(
+                bilibili_space_new
+            )  # 计算需要向后更新的数量
             if backward_update_size > 0:
                 backward_update_size = min(
                     backward_update_size,
@@ -483,10 +548,9 @@ def bilibili_rss_update(
                             gVar.bilibili_content_bvid_backward_update[bilibili_key] = (
                                 bilibili_content_bvid_backward  # 更新最终的向后更新内容
                             )
-    gVar.xmls_quantity[bilibili_key]["backward"] = len(bilibili_content_bvid_backward)
+    gVar.xmls_quantity[bilibili_key] = min(last_size, len(bilibili_space_new)) + len(
+        bilibili_content_bvid_backward
+    )
     # 更新进度条
     with rss_update_lock:
-        ratio = gVar.index_message["schedule"][1] + ratio_thread
-        if ratio > 0.09:
-            ratio = 0.09
-        gVar.index_message["schedule"][1] = ratio
+        progress_bar(ratio_thread, 0.09)

podflow/httpfs/progress_bar.py

@@ -0,0 +1,32 @@
+# podflow/httpfs/progress_bar.py
+# coding: utf-8
+
+import random
+from podflow import gVar
+
+
+def progress_update(
+    ratio,
+    added=False,
+    refresh=0,
+    num=0
+):
+    state = {
+        1: "准备中",
+        2: "构建中",
+        3: "已完成",
+    }
+    if num != 0:
+        ratio +=random.uniform(0, num)
+    if added:
+        ratio += gVar.index_message["schedule"][1]
+    gVar.index_message["schedule"][1] = ratio
+    if refresh != 0:
+        gVar.index_message["schedule"][0] = state[refresh]
+
+
+def progress_bar(ratio_part, maximum):
+    ratio = gVar.index_message["schedule"][1] + ratio_part
+    if ratio > maximum:
+        ratio = maximum
+    progress_update(ratio)

podflow/main_podcast.py

@@ -4,7 +4,6 @@
 import sys
 import json
 import time
-import random
 import urllib
 import subprocess
 
@@ -18,6 +17,7 @@ from podflow.basic.time_print import time_print
 # 网络和 HTTP 模块
 from podflow.httpfs.browser import open_url
 from podflow.httpfs.port_judge import port_judge
+from podflow.httpfs.progress_bar import progress_update
 from podflow.httpfs.app_bottle import bottle_app_instance
 
 # 下载和视频处理模块
@@ -49,8 +49,8 @@ from podflow.makeup.del_makeup_format_fail import del_makeup_format_fail
 from podflow.makeup.make_up_file_format_mod import make_up_file_format_mod
 
 # 移除模块
-from podflow.remove.remove_file import remove_file
 from podflow.remove.remove_dir import remove_dir
+from podflow.remove.remove_file import remove_file
 
 # 处理 YouTube 信息模块
 from podflow.youtube.build import print_fail_youtube
@@ -109,32 +109,27 @@ def main_podcast():
     # 主流程
     while parse.update_num > 0 or parse.update_num == -1:  # 循环主更新
         # 主进度条
-        gVar.index_message["schedule"] = ["准备中", 0]
+        progress_update(0, refresh=1)
         # 暂停进程打印
         gVar.server_process_print_flag[0] = "pause"
         # 获取YouTube cookie
         gVar.youtube_cookie = get_youtube_cookie(gVar.channelid_youtube_ids_original)
-        gVar.index_message["schedule"][1] = 0.01 + random.uniform(0, 0.0049)
+        progress_update(0.01 ,num=0.0049)
         # 更新哔哩哔哩data
         gVar.channelid_bilibili_ids, gVar.bilibili_data = get_bilibili_data(
             gVar.channelid_bilibili_ids_original
         )
-        gVar.index_message["schedule"][1] = 0.02 + random.uniform(0, 0.0049)
+        progress_update(0.02, num=0.0049)
         # 恢复进程打印
         bottle_app_instance.cherry_print()
         # 获取原始xml字典和rss文本
-        (
-            gVar.xmls_original,
-            gVar.hash_rss_original,
-            gVar.xmls_original_fail,
-            gVar.xmls_quantity,
-        ) = get_original_rss()
-        gVar.index_message["schedule"][1] = 0.025 + random.uniform(0, 0.0024)
+        gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail  = get_original_rss()
+        progress_update(0.025, num=-0.0024)
         # 暂停进程打印
         gVar.server_process_print_flag[0] = "pause"
         # 连接上传服务器
         upload_url = connect_upload_server()
-        gVar.index_message["schedule"][1] = 0.03 + random.uniform(0, 0.0024)
+        progress_update(0.03, num=0.0024)
         # 恢复进程打印
         bottle_app_instance.cherry_print()
         # 登陆上传服务器
@@ -144,20 +139,20 @@ def main_podcast():
                 gVar.config["upload"] = False
         else:
             gVar.config["upload"] = False
-        gVar.index_message["schedule"][1] = 0.035 + random.uniform(0, 0.0024)
+        progress_update(0.035, num=0.0024)
         # 初始化原始上传信息
         get_upload_original()
-        gVar.index_message["schedule"][1] = 0.04
+        progress_update(0.04)
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
-        gVar.index_message["schedule"][1] = 0.1
+        progress_update(0.1)
         # 判断是否有更新内容
         if gVar.channelid_youtube_ids_update or gVar.channelid_bilibili_ids_update:
             gVar.update_generate_rss = True
         if gVar.update_generate_rss:
             # 根据日出日落修改封面(只适用原封面)
             channge_icon()
-            gVar.index_message["schedule"][1] = 0.11 + random.uniform(0, 0.0049)
+            progress_update(0.11, num=0.0049)
             # 输出需要更新的信息
             update_information_display(
                 gVar.channelid_youtube_ids_update,
@@ -171,12 +166,12 @@ def main_podcast():
                 gVar.bilibili_content_bvid_backward_update,
                 "BiliBili",
             )
-            gVar.index_message["schedule"][1] = 0.12
+            progress_update(0.12)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 获取视频格式信息
             get_video_format()
-            gVar.index_message["schedule"][1] = 0.199
+            progress_update(0.199)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 优化下载顺序
@@ -184,63 +179,63 @@ def main_podcast():
             # 删除中断下载的媒体文件
             if gVar.config["delete_incompletement"]:
                 delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
-            gVar.index_message["schedule"] = ["构建中", 0.20]
+            progress_update(0.20, refresh=2)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 下载并构建YouTube和哔哩哔哩视频
             download_and_build()
-            gVar.index_message["schedule"][1] = 0.8
+            progress_update(0.8)
             # 添加新媒体至上传列表
             add_upload()
-            gVar.index_message["schedule"][1] = 0.81 + random.uniform(0, 0.0049)
+            progress_update(0.81, num=0.0049)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 打印无法保留原节目信息
             original_rss_fail_print(gVar.xmls_original_fail)
-            gVar.index_message["schedule"][1] = 0.82 + random.uniform(0, 0.0049)
+            progress_update(0.82, num=0.0049)
             # 打印无法获取youtube信息
             print_fail_youtube()
-            gVar.index_message["schedule"][1] = 0.83 + random.uniform(0, 0.0049)
+            progress_update(0.83, num=0.0049)
             if gVar.config["remove_media"]:
                 # 删除不在rss中的媒体文件
                 remove_file()
                 # 删除已抛弃的媒体文件夹
                 remove_dir()
-            gVar.index_message["schedule"][1] = 0.84
+            progress_update(0.84)
             # 补全缺失媒体文件到字典
             make_up_file()
-            gVar.index_message["schedule"][1] = 0.85
+            progress_update(0.85)
             # 按参数获取需要补全的最大个数
             gVar.make_up_file_format = split_dict(
                 gVar.make_up_file_format,
                 gVar.config["completion_count"],
                 True,
             )[0]
-            gVar.index_message["schedule"][1] = 0.86 + random.uniform(0, 0.0049)
+            progress_update(0.86, num=0.0049)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 补全在rss中缺失的媒体格式信息
             make_up_file_format_mod()
-            gVar.index_message["schedule"][1] = 0.90 + random.uniform(0, 0.0049)
+            progress_update(0.90, num=0.0049)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
-            gVar.index_message["schedule"][1] = 0.91 + random.uniform(0, 0.0049)
+            progress_update(0.91, num=0.0049)
             # 删除无法补全的媒体
             del_makeup_format_fail()
-            gVar.index_message["schedule"][1] = 0.92 + random.uniform(0, 0.0049)
+            progress_update(0.92, num=0.0049)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 保存rss文件模块
             save_rss()
-            gVar.index_message["schedule"][1] = 0.93 + random.uniform(0, 0.0049)
+            progress_update(0.93, num=0.0049)
             # 下载补全Youtube和哔哩哔哩视频模块
             make_up_file_mod()
-            gVar.index_message["schedule"][1] = 0.99 + random.uniform(0, 0.0099)
+            progress_update(0.99, num=0.0099)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 更新并保存上传列表
             update_upload()
-            gVar.index_message["schedule"] = ["已完成", 1]
+            progress_update(1, refresh=3)
         else:
             time_print("频道无更新内容")
         # 清空变量内数据
@@ -289,6 +284,3 @@ def main_podcast():
     # 关闭CherryPy服务器
     time_print("Podflow运行结束")
     cherrypy.engine.exit()
-
-    from podflow.basic.file_save import file_save
-    file_save(gVar.video_id_update_format,"video_id_update_format.json")

podflow/makeup/make_up_file.py

@@ -3,6 +3,7 @@
 
 import os
 from podflow import gVar
+from podflow.httpfs.progress_bar import progress_bar
 
 
 # 补全缺失媒体文件到字典模块
@@ -36,8 +37,7 @@ def make_up_file():
                 video_id_format["quality"] = video_quality
                 gVar.make_up_file_format[main] = video_id_format
             # 更新进度条
-            ratio = gVar.index_message["schedule"][1] + ratio_part
-            gVar.index_message["schedule"][1] = ratio
+            progress_bar(ratio_part, 0.85)
 
     for output_dir, name in channelid_bilibili_ids.items():
         bilibili_os_list = os.listdir(f"channel_audiovisual/{output_dir}")
@@ -61,7 +61,4 @@ def make_up_file():
                     video_id_format["quality"] = video_quality
                     gVar.make_up_file_format[main] = video_id_format
             # 更新进度条
-            ratio = gVar.index_message["schedule"][1] + ratio_part
-            if ratio > 0.85:
-                ratio = 0.85
-            gVar.index_message["schedule"][1] = ratio
+            progress_bar(ratio_part, 0.85)

podflow/message/create_main_rss.py

@@ -29,7 +29,7 @@ def create_main_rss():
     }
     all_channelid = list(gVar.all_items.keys())
 
-    ratio_part = 0.6 / len(all_channelid) if all_channelid else 0
+    ratio_part = 0.6 / sum(gVar.xmls_quantity.values()) if all_channelid else 0
 
     while all_channelid:
         for index, output_dir in enumerate(all_channelid):
@@ -39,7 +39,7 @@ def create_main_rss():
                 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 = youtube_xml_items(output_dir, [ratio_part, 0.8])
                     items["DisplayRSSaddress"] = channelid_youtube_value[
                         "DisplayRSSaddress"
                     ]
@@ -56,7 +56,7 @@ def create_main_rss():
                     channelid_bilibili_value = gVar.channelid_bilibili[
                         output_dir_bilibili
                     ]
-                    items = bilibili_xml_items(output_dir)
+                    items = bilibili_xml_items(output_dir, [ratio_part, 0.8])
                     items["DisplayRSSaddress"] = channelid_bilibili_value[
                         "DisplayRSSaddress"
                     ]
@@ -68,10 +68,5 @@ def create_main_rss():
                         "bilibili", items["items"]
                     )
                     gVar.all_items[output_dir] = items
-                # 主进度条更新
-                ratio = gVar.index_message["schedule"][1] + ratio_part
-                if ratio > 0.8:
-                    ratio = 0.8
-                gVar.index_message["schedule"][1] = ratio
                 del all_channelid[index]
                 break

podflow/message/get_original_rss.py

@@ -30,7 +30,6 @@ def rss_create_hash(data):
 # 获取原始xml模块
 def get_original_rss():
     xmls_original_fail = []
-    xmls_quantity = {}
     # 获取原始总xml文件
     try:
         with open(
@@ -62,21 +61,9 @@ def get_original_rss():
                         f"<!-- {{{channelid_key}}} -->\n"
                     )[1]
                     get_xmls_original[channelid_key] = get_xmls_original_key
-                    xmls_quantity[channelid_key] = {
-                        "original": len(
-                            get_xmls_original_key.split(f"<!-- {channelid_key} -->")
-                        )
-                    }
             except FileNotFoundError:  # 文件不存在直接更新
                 xmls_original_fail.append(channelid_key)
-                xmls_quantity[channelid_key] = {"original": 0}
-        else:
-            xmls_quantity[channelid_key] = {
-                "original": len(
-                    get_xmls_original[channelid_key].split(f"<!-- {channelid_key} -->")
-                )
-            }
     # 生成原始rss的哈希值
     hash_rss_original = rss_create_hash(rss_original)
 
-    return get_xmls_original, hash_rss_original, xmls_original_fail, xmls_quantity
+    return get_xmls_original, hash_rss_original, xmls_original_fail

podflow/message/get_youtube_and_bilibili_video_format.py

@@ -3,6 +3,7 @@
 
 from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.httpfs.progress_bar import progress_bar
 from podflow.message.media_format import media_format
 
 
@@ -107,7 +108,4 @@ def get_youtube_and_bilibili_video_format(
             del gVar.video_id_update_format[id_num]
     with ratio_part_lock:
         # 主进度条更新
-        ratio = gVar.index_message["schedule"][1] + ratio_part
-        if ratio > 0.199:
-            ratio = 0.199
-        gVar.index_message["schedule"][1] = ratio
+        progress_bar(ratio_part, 0.199)

podflow/message/optimize_download.py

@@ -10,18 +10,10 @@ from podflow.basic.time_print import time_print
 def optimize_download():
     xmls_quantity = gVar.xmls_quantity
     video_id_update_format = gVar.video_id_update_format
-    channel_sums = {}
     sorted_video_id_update_format = {}
-    time_print("开始计算频道媒体数量")
-    # 计算每个频道的总和
-    for channel_id, values in xmls_quantity.items():
-        total = values["original"] + values["update"] + values["backward"]
-        channel_sums[channel_id] = total
-        gVar.xmls_quantity[channel_id]["total"] = total
-    time_print("开始对频道进行排序")
-    # 按总和从大到小排序
-    sorted_channels = sorted(channel_sums.items(), key=lambda x: x[1], reverse=True)
     time_print("开始优化下载顺序")
+    # 按总和从大到小排序
+    sorted_channels = sorted(xmls_quantity.items(), key=lambda x: x[1], reverse=True)
     # 根据总和排序数据
     for channel_id, _ in sorted_channels:
         for key, value in video_id_update_format.items():

podflow/message/update_youtube_bilibili_rss.py

@@ -9,6 +9,7 @@ from podflow.basic.write_log import write_log
 from podflow.youtube.get import youtube_rss_update
 from podflow.basic.folder_build import folder_build
 from podflow.bilibili.get import bilibili_rss_update
+from podflow.httpfs.progress_bar import progress_bar
 
 
 # 更新Youtube和哔哩哔哩频道xml多线程模块
@@ -115,8 +116,7 @@ def update_youtube_bilibili_rss():
                 del gVar.channelid_youtube_ids[youtube_key]
             write_log(f"YouTube频道 {youtube_value} 无法更新")
         # 更新进度条
-        ratio = gVar.index_message["schedule"][1] + ratio_part
-        gVar.index_message["schedule"][1] = ratio
+        progress_bar(ratio_part, 0.1)
 
     # 更新哔哩哔哩频道
     for bilibili_key, bilibili_value in gVar.channelid_bilibili_ids.copy().items():
@@ -136,7 +136,4 @@ def update_youtube_bilibili_rss():
             # 构建频道文件夹
             folder_build(bilibili_key, "channel_audiovisual")
         # 更新进度条
-        ratio = gVar.index_message["schedule"][1] + ratio_part
-        if ratio > 0.1:
-            ratio = 0.1
-        gVar.index_message["schedule"][1] = ratio
+        progress_bar(ratio_part, 0.1)

podflow/templates/index.html

@@ -176,6 +176,10 @@
     }
     .button-container {
       margin-top: 10px;
+      display: flex;
+      justify-content: center; /* 水平居中 */
+      flex-wrap: wrap; /* 换行 */
+      gap: 10px; /* 按钮间距 */
     }
     button {
       background-color: var(--button-bg);
@@ -564,7 +568,7 @@
       // 启动消息轮询
       function startMessagePolling() {
         getMessages();
-        pollingTimer = setInterval(getMessages, 500);
+        pollingTimer = setInterval(getMessages, 250);
       }
     
       // 停止消息轮询

podflow/upload/linked_client.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from podflow import gVar
 from podflow.upload.time_key import time_key
 from podflow.basic.time_print import time_print
+from podflow.httpfs.progress_bar import progress_update
 
 
 BROADCAST_PORT = 37001
@@ -75,6 +76,7 @@ def connect_upload_server():
             time_print(" " * terminal_width, True, True, False)
             # 打印尝试广播端口
             time_print(f"{time_text}尝试广播端口{current_port}...", True, True, False)
+            progress_update(0.0005, added=True)
             servers = discover_server(current_port, TIMEOUT)
             if servers:
                 break

podflow/youtube/build.py

@@ -12,6 +12,7 @@ from podflow.message.xml_item import xml_item
 from podflow.basic.time_print import time_print
 from podflow.basic.http_client import http_client
 from podflow.message.format_time import format_time
+from podflow.httpfs.progress_bar import progress_bar
 from podflow.basic.get_html_dict import get_html_dict
 from podflow.message.xml_original_item import xml_original_item
 
@@ -184,7 +185,7 @@ def get_xml_item(guid, item, channelid_title, title_change, output_dir):
 
 
 # 生成YouTube对应channel的需更新的items模块
-def youtube_xml_items(output_dir):
+def youtube_xml_items(output_dir, ratio_part):
     items_list = [f"<!-- {output_dir} -->"]
     entry_num = 0
     original_judgment = True
@@ -214,6 +215,7 @@ def youtube_xml_items(output_dir):
                     guid, item, channelid_title, title_change, output_dir
                 ):
                     items_list.append(f"{xml_item_text}<!-- {output_dir} -->")
+                    progress_bar(ratio_part[0], ratio_part[1])
                     if (
                         gVar.video_id_update_format[guid]["description"]
                         and gVar.video_id_update_format[guid]["description"][0] == "『"
@@ -233,6 +235,7 @@ def youtube_xml_items(output_dir):
                 items_list.append(
                     f"{youtube_xml_item(entry, title_change)}<!-- {output_dir} -->"
                 )
+                progress_bar(ratio_part[0], ratio_part[1])
                 if re.search(r"(?<=<media:description>)『", entry):
                     original_judgment = False
             entry_num += 1
@@ -253,6 +256,7 @@ def youtube_xml_items(output_dir):
                 items_list.append(
                     f"{xml_original_item(xml, channelid_title, original_judgment, title_change)}<!-- {output_dir} -->"
                 )
+                progress_bar(ratio_part[0], ratio_part[1])
                 xml_num += 1
             if xml_num >= entry_count:
                 break
@@ -270,6 +274,7 @@ def youtube_xml_items(output_dir):
                     output_dir,
                 ):
                     items_list.append(f"{backward_xml_item_text}<!-- {output_dir} -->")
+                    progress_bar(ratio_part[0], ratio_part[1])
     # 生成对应xml
     try:
         with open(

podflow/youtube/get.py

@@ -9,6 +9,7 @@ from podflow import gVar
 from podflow.basic.time_print import time_print
 from podflow.basic.http_client import http_client
 from podflow.basic.vary_replace import vary_replace
+from podflow.httpfs.progress_bar import progress_bar
 from podflow.basic.get_html_dict import get_html_dict
 from podflow.basic.list_merge_tidy import list_merge_tidy
 
@@ -67,7 +68,9 @@ def get_youtube_html_playlists(
             ]  # 获取发布时间
             item[videoid]["image"] = player_Microformat_Renderer["thumbnail"][
                 "thumbnails"
-            ][0]["url"]  # 获取封面图
+            ][0][
+                "url"
+            ]  # 获取封面图
             with contextlib.suppress(KeyError, TypeError, IndexError, ValueError):
                 fail.remove(videoid)  # 若成功获取，则从失败列表中移除
         else:
@@ -196,6 +199,8 @@ def youtube_rss_update(
     channelid_youtube = gVar.channelid_youtube
     channelid_youtube_rss = gVar.channelid_youtube_rss
     channelid_youtube_ids_update = gVar.channelid_youtube_ids_update
+    youtube_content_ytid_backward = []
+    last_size = channelid_youtube[youtube_value]["last_size"]
     # 获取已下载媒体名称
     youtube_media = (
         ("m4a", "mp4")  # 根据 channelid_youtube 的媒体类型选择文件格式
@@ -314,11 +319,8 @@ def youtube_rss_update(
         except TypeError:
             youtube_content_ytid = []  # 处理类型错误
         youtube_content_ytid = youtube_content_ytid[
-            : channelid_youtube[youtube_value][
-                "update_size"
-            ]  # 限制视频ID数量
+            : channelid_youtube[youtube_value]["update_size"]  # 限制视频ID数量
         ]
-    gVar.xmls_quantity[youtube_key]["update"] = len(youtube_content_ytid)
     youtube_content_new = list_merge_tidy(youtube_content_ytid, guids)  # 合并并去重
     if youtube_content_ytid := [
         exclude
@@ -331,12 +333,9 @@ def youtube_rss_update(
             youtube_content_ytid  # 保存更新的视频ID
         )
     # 向后更新
-    youtube_content_ytid_backward = []
     if channelid_youtube[youtube_value]["BackwardUpdate"] and guids:
         # 计算向后更新的数量
-        backward_update_size = channelid_youtube[youtube_value]["last_size"] - len(
-            youtube_content_new
-        )
+        backward_update_size = last_size - len(youtube_content_new)
         if backward_update_size > 0:
             for _ in range(3):
                 # 获取历史播放列表
@@ -373,10 +372,9 @@ def youtube_rss_update(
                     gVar.youtube_content_ytid_backward_update[youtube_key] = (
                         youtube_content_ytid_backward  # 保存向后更新的ID
                     )
-    gVar.xmls_quantity[youtube_key]["backward"] = len(youtube_content_ytid_backward)
+    gVar.xmls_quantity[youtube_key] = min(last_size, len(youtube_content_new)) + len(
+        youtube_content_ytid_backward
+    )
     # 更新进度条
     with rss_update_lock:
-        ratio = gVar.index_message["schedule"][1] + ratio_thread
-        if ratio > 0.09:
-            ratio = 0.09
-        gVar.index_message["schedule"][1] = ratio
+        progress_bar(ratio_thread, 0.09)

{podflow-20250415.1.dist-info → podflow-20250417.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: podflow
-Version: 20250415.1
+Version: 20250417
 Summary: A podcast server that includes YouTube and BiliBili
 Home-page: https://github.com/gruel-zxz/podflow
 Author: gruel_zxz
@@ -33,6 +33,8 @@ Requires-Dist: BeautifulSoup4>=4.13.3
 
 YouTube的cookies需要使用chrome插件导出Netscape格式并保存到channel_data文件夹中
 
+图形界面请访问 `/index`
+
 PS:可能存在大量未知bug，改进中并尝试加入抖音……
 
 ### 安装方法

{podflow-20250415.1.dist-info → podflow-20250417.dist-info}/RECORD

@@ -1,8 +1,8 @@
-podflow/__init__.py,sha256=uFRDMRh6CVcEEgj4AMmLl43vusbI4o525Hz8Xf24Hsc,7318
+podflow/__init__.py,sha256=RVR-Iyvaawd8g0gc1-lVSCwSW209XVb0gMC-qkoD4us,7332
 podflow/download_and_build.py,sha256=GKQ1uX8Nuwdhr4wgnGr3jP1Mu0llRUPFcboQ3S05WkU,671
 podflow/ffmpeg_judge.py,sha256=wM49pPXOFwFAA_8TKHal5fV6ka9sAA87yGQMDOssvXo,1340
 podflow/main.py,sha256=Cz2E33-Kcc_1_oxNs4Z1OoqJYhonmClsrtoCW1oQmZA,739
-podflow/main_podcast.py,sha256=lqNdTQArVn6c-z0apdO-56I6SX3BawovKwPeVPgNVxc,12870
+podflow/main_podcast.py,sha256=KyKNn76XpDEUXAa6rj1WzOW9YtbuvSPLvAPGLD4QQIM,11992
 podflow/main_upload.py,sha256=H_T5KQMYzToqzQbjGQ6DWDGziy8iMnpmf7A1qOStJuo,2296
 podflow/parse_arguments.py,sha256=h3a7EaRZS04kNMFYbxTW9Ch29KgZ7dyS-yqEEt_etQI,2592
 podflow/basic/__init__.py,sha256=CAfI6mVQtz7KKbAiTIZ9_IbvaTXeAqxR1U7ov9GDoDo,44
@@ -21,8 +21,8 @@ podflow/basic/time_stamp.py,sha256=ubdnw4SjcO0JR5JGatBjAX4sxQ4Ro9AjNuzKFkhqwec,1
 podflow/basic/vary_replace.py,sha256=-TyvZxfak6U7Ak8F87ctYUBpHB2Il6iYZof37lwKjto,211
 podflow/basic/write_log.py,sha256=wfiNfFuRLCWNLXDRNPVaVsKxwB44xxTiCFJ66g71XmU,1255
 podflow/bilibili/__init__.py,sha256=6ZTpvhZTyn4f0LryXzH8lzyK1_rRHBeM-hkBoklKHRA,47
-podflow/bilibili/build.py,sha256=PKxkjUa8EedpoQTFZIgdcsVbiAWRISA-qKCpCaSTLTU,7957
-podflow/bilibili/get.py,sha256=dB1cgogf6bI42D1fNFWIvZB6xFK-VCKuWqqQrRDHhc8,20857
+podflow/bilibili/build.py,sha256=aV3iaY4VFsC4GwkeSY9uacMAnV3OY_6V_gGhMOryrvk,8236
+podflow/bilibili/get.py,sha256=xS9p4RFW1yswmihPOhYbjEZoqnouqqN_mht740LExu4,21262
 podflow/bilibili/login.py,sha256=oHnuOMvlKZUnJ1OBHuZpTEnG04pboWsueOx871lQWjc,11482
 podflow/config/__init__.py,sha256=MzgAlkSdV-5MFC11r0QSf-GPxmsLbrMc5ROIrJafjag,45
 podflow/config/build_original.py,sha256=pG9gCkBBIWwU8QxZA06Br6JRfI4XUSIEiN8eqo1-v7k,1809
@@ -44,31 +44,32 @@ podflow/httpfs/app_bottle.py,sha256=l2myMkoRoC5O7OWCyYjCmk7wOEIlgTWfFfImlhXMYwY,
 podflow/httpfs/browser.py,sha256=BJ4Xkfiki_tDr0Sc9RqAcEfIVpkAZ3RFOwo0aMHlY3U,197
 podflow/httpfs/get_channelid.py,sha256=gcwy4IVHBWNQz7qPCpjwiAklGFLRGzvM33-UZz7oFvo,2296
 podflow/httpfs/port_judge.py,sha256=l_nLpsSiIhAzfJGCOWyYC-KkCCWPUW2ybe_5hdMOEzE,764
+podflow/httpfs/progress_bar.py,sha256=mMkP92SrZZ-IBFz9ombWxzRJfMq20h5IbSc_eFcbZZA,682
 podflow/httpfs/to_html.py,sha256=60azc3xfPKQB7Qaj_wlF3MoHmG0Wkjep70-JroHA2gg,1709
 podflow/makeup/__init__.py,sha256=ligUtfj0stTcOHFXDF6eAN7Up2PxlB0GnGbLq7iDY3c,45
 podflow/makeup/del_makeup_format_fail.py,sha256=XizQh74QYXxRg0e1uerXjd4Tiq5qChks0fTAY7n3Z1I,642
-podflow/makeup/make_up_file.py,sha256=_kpvlOpW1TX379aj83rw7U9fFRsHYkYBja1yUKw6oys,2938
+podflow/makeup/make_up_file.py,sha256=Uq_oL0a28PhtEL9ZObmnhaEWcZwchB_5e8-jSiiCeoQ,2777
 podflow/makeup/make_up_file_format_mod.py,sha256=4dIMeVObr4qnMLD0mocZzBNhduc8dHx-b-w1GVotKIk,3575
 podflow/makeup/make_up_file_mod.py,sha256=padTanSPw5Dysf_CcUUVy65nCC6zbz1gPJRX98tmUdY,1075
 podflow/message/__init__.py,sha256=pZkcrrtkdtxgMriEHBZ0_rptKaQrQeMPJvPSaoI1Awo,46
 podflow/message/backup_zip_save.py,sha256=c81jnx8IxHjTcO7G0OUAppawpBIPxa9wgkj9AQhqeJc,1864
-podflow/message/create_main_rss.py,sha256=yo12YYUxYTjGSHD5CrnRIbUZumtr0NOZqQWXpC3t55k,3296
+podflow/message/create_main_rss.py,sha256=kW2QvJhxl2ZcqGV-M-OztlOaQ27ODuQxADeP8poymBQ,3118
 podflow/message/display_qrcode_and_url.py,sha256=VqmRkDYYG03VihfW4SAU49HJVmfqWbLTgMxqCaREeCo,1037
 podflow/message/fail_message_initialize.py,sha256=UPHYNErD2hnzm2WFlNqghBRDCw_sf_3EagAF5LiO9wk,6462
 podflow/message/format_time.py,sha256=gveNh4FGeS3ytwDyYB-h12d1_Km6XoX7WSPcFmDfCBk,909
 podflow/message/get_media_name.py,sha256=5ULPQOQCZ2-lxdkILwlBP-ItzdFEgvEAKxeLtplACbQ,861
-podflow/message/get_original_rss.py,sha256=4OhJ7XCRiS8Eyx4AfRr2sfOdVNmpyDrxMXZo7MpFa8Y,2990
+podflow/message/get_original_rss.py,sha256=Bzy-Fs1vZEjwvQq6D6xp-2IUidliSyaL1P4WtkLJaRg,2450
 podflow/message/get_video_format.py,sha256=bPetnFwQlhIO9do_nq3B4AwHQRxFn6SDYvFItjwEx0o,5324
 podflow/message/get_video_format_multithread.py,sha256=tbgQDMpcntulrbmXBbKL4iVr4t_9evGsuMOIZLoLebI,1615
-podflow/message/get_youtube_and_bilibili_video_format.py,sha256=QvGkm2avYlUlvxfouw545Si72DtT4SAJwWw0zu6eq_U,4705
+podflow/message/get_youtube_and_bilibili_video_format.py,sha256=LKer75ZhVDvFLd7aMOrr-9UPKIVpCEPkeIhdlmP_xu4,4633
 podflow/message/media_format.py,sha256=Q4WoML4UqL0Ry-QN8DHFJqOQ2tXcFN6u5hmhdSLdP1g,7346
-podflow/message/optimize_download.py,sha256=bIN1Lyk17tgEjjpxgxBzptLT_F_SRdSoyoyIiIT20uo,1409
+podflow/message/optimize_download.py,sha256=-6YritASap8Dp0HqDuvn-kyeamAfw8UjnR-_5S0DbYw,1034
 podflow/message/original_rss_fail_print.py,sha256=7HM5Gwi3GqBIg2dtTTDlN_FRgZZjYv6ejizS3tDiePE,502
 podflow/message/rss_create_hash.py,sha256=M5OS9KcQ4mIxLes9ij4oNji-4VKgi56bg0Shv5nCIQ4,638
 podflow/message/save_rss.py,sha256=x-yRwT7bAUt2k-R9DWa5uToqpcOdaXkPW_4VH5Gbeo4,3193
 podflow/message/title_correction.py,sha256=Zieulj2wQY_o4r3u5ZRsDQP5y8KuZHrL_l8tnM96k6g,915
 podflow/message/update_information_display.py,sha256=Zn-Xhps4PKf7NbgQrT-qTwhP096RV-48OEncK_vuUe0,3061
-podflow/message/update_youtube_bilibili_rss.py,sha256=cy6zVsn80oEpF83dpUNUp7BCzQF98uch3fbPkeab1v4,6107
+podflow/message/update_youtube_bilibili_rss.py,sha256=igt41NkGuikPzi0gqo-Hc29hMil65kHV19J4W-oGQfU,5962
 podflow/message/want_retry.py,sha256=3MtlAG4BZ2oznn0X5zYzAl2S0XzZkXhnN_LHVPcWZjA,699
 podflow/message/xml_item.py,sha256=jCB93aOoIDK6EaAFrZg5gd6mBMv7fP9uX-Z5eiTSyxg,3127
 podflow/message/xml_original_item.py,sha256=mlORI0p6aSLP6PWIAuvI4uVN0JbxUDZX5-U52ltn9E4,4048
@@ -81,23 +82,23 @@ podflow/remove/remove_dir.py,sha256=xQIhrnqnYjMzXjoSWaTvm7JwPYOFTN1muuTPdaLDXpQ,
 podflow/remove/remove_file.py,sha256=8wAJQehs-XBqvu0vPlEme2_tt0FZxc5ELwGMxXA_558,982
 podflow/repair/__init__.py,sha256=Gpc1i6xiSLodKjjmzH66c_Y1z0HQ9E9CS3p95FRnVFM,45
 podflow/repair/reverse_log.py,sha256=Wc_vAH0WB-z1fNdWx7FYaVH4caRPtot7tDwDwFhmpz4,1106
-podflow/templates/index.html,sha256=NYEjsIrf9EJJsZ-udAOdn1f92lxCRj6QFuDusA1IEwQ,22853
+podflow/templates/index.html,sha256=5CQyG7xmqRpaB8CTsPFTlcjKmaEB75z9VyoeocfiZeU,22996
 podflow/upload/__init__.py,sha256=AtOSXDrE5EjUe3z-iBd1NTDaH8n_X9qA5WXdBLkONjA,45
 podflow/upload/add_upload.py,sha256=_2-V0z75Lwu-PUCfMD9HOSxZTB102yZlZW5hSdlHcsc,1432
 podflow/upload/build_hash.py,sha256=9opa3xLd7nJbGGX5xa3uuKPS6dxlbkAb87ZdEiUxmxI,473
 podflow/upload/get_upload_original.py,sha256=TEDnRutumm2FZNIesPJIlExHyKWpfB3ZAHb3sZt7V6A,4312
-podflow/upload/linked_client.py,sha256=ilX0WjNDlgacfLo9L8VEpLnXphMl0o4P46axQ9yb9XY,3210
+podflow/upload/linked_client.py,sha256=cslPx9T2au21DYfLeHIeoR_O-NMx9AdR9MSLJHQogaU,3314
 podflow/upload/linked_server.py,sha256=h-qSx13fP8_Ny2IKW3wCNPwqRqW6-Iz1pqxD9ga9-dM,2308
 podflow/upload/login.py,sha256=85sqr12T-3NH-TD3kAMzy4yb1KOheV3Tr0eGee7NCJo,4007
 podflow/upload/time_key.py,sha256=6jZ3cxUjzj_umYDwH27R0YNZlLXxfhNp-CqV_K22wlo,967
 podflow/upload/update_upload.py,sha256=_5tp1zPNsC9DdDnLzm-P8bLcOBuDov4eMRHp_861j80,3183
 podflow/upload/upload_server.py,sha256=BFq3QrWE7U97LbC4EQiDhQXbLapEc4R00eRDBH12E6A,565
 podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,46
-podflow/youtube/build.py,sha256=3LYk_ICVXj9XkE9jZ8jEVI8596xxS_QZkcoIwcBE3Ys,12006
-podflow/youtube/get.py,sha256=7OkpcY2-ulv0o4J7QvghIe6rvxjSwSzPWjouKQ_2bj8,17253
+podflow/youtube/build.py,sha256=67m74rQOrvqU6ZZybP85ORpg3pOCkpoikttBbtO_PxY,12315
+podflow/youtube/get.py,sha256=oO32GjTFvUgP5AfFX5AlIuXU2UT6QtOUOXWLFzi8XtI,17157
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250415.1.dist-info/METADATA,sha256=2Dkmax-2CuculVofjvlVpNGXeMtnfk9lGIbXoxogY1g,14165
-podflow-20250415.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250415.1.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250415.1.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250415.1.dist-info/RECORD,,
+podflow-20250417.dist-info/METADATA,sha256=A2cWskSXZbjRwrLM4CQ_A7XcSNJHpCu_6rtnfihwOqg,14195
+podflow-20250417.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250417.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250417.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250417.dist-info/RECORD,,