podflow 20250406__tar.gz → 20250413__tar.gz

{podflow-20250406 → podflow-20250413}/PKG-INFO

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

{podflow-20250406 → podflow-20250413}/podflow/__init__.py

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

{podflow-20250406 → podflow-20250413}/podflow/basic/qr_code.py

@@ -3,13 +3,15 @@
 
 import math
 import pyqrcode
-from podflow.httpfs.to_html import qrcode_to_html
+from podflow.basic.time_print import time_print
 
 
 # 网址二维码模块
-def qr_code(data, to_html=False):
-    if to_html:
-        qrcode_to_html(data)
+def qr_code(
+    data,
+    to_html=False,
+    num=None
+):
     qr = pyqrcode.create(
         data,
         error='L',  # 对应于ERROR_CORRECT_L，可选值: 'L','M','Q','H'
@@ -47,5 +49,11 @@ def qr_code(data, to_html=False):
                 else:
                     ascii_art += fonts[3]
             ascii_art += "\n"
-    print(ascii_art)
+    Qrcode = data if to_html else ""
+    time_print(
+        ascii_art,
+        Time=False,
+        Qrcode=Qrcode,
+        Number=num,
+    )
     return height_double

podflow-20250413/podflow/basic/time_print.py

@@ -0,0 +1,51 @@
+# podflow/basic/time_print.py
+# coding: utf-8
+
+from datetime import datetime
+from podflow import gVar
+from podflow.httpfs.to_html import ansi_to_html, qrcode_to_html
+
+
+def time_print(
+    text,
+    Top=False,
+    NoEnter=False,
+    Time=True,
+    Url="",
+    Qrcode=False,
+    Number=None,
+    Head="",
+):
+    if Time:
+        text = f"{datetime.now().strftime('%H:%M:%S')}|{text}"
+    text_print = f"\r{text}" if Top else f"{text}"
+    if Url:
+        text_print = f"{text_print}\n\033[34m{Url}\033[0m"
+    if Head:
+        text_print = f"{Head}{text_print}"
+    if NoEnter:
+        print(text_print, end="")
+    else:
+        print(text_print)
+
+    if Number is not None and (
+        not isinstance(Number, int)
+        or not -min(len(gVar.index_message["podflow"]), 4) <= Number < 0
+    ):
+        Number = None
+    if text:
+        text = qrcode_to_html(Qrcode) if Qrcode else ansi_to_html(text)
+        if Number:
+            gVar.index_message["podflow"][Number] = text
+        elif not gVar.index_message["enter"] and gVar.index_message["podflow"]:
+            if Top:
+                gVar.index_message["podflow"][-1] = text
+            else:
+                gVar.index_message["podflow"][-1] += text
+        else:
+            gVar.index_message["podflow"].append(text)
+    gVar.index_message["enter"] = not NoEnter
+    if Url:
+        gVar.index_message["podflow"].append(
+            f'<a href="{Url}" target="_blank"><span class="ansi-url">{Url}</span></a>'
+        )

{podflow-20250406 → podflow-20250413}/podflow/bilibili/login.py

@@ -1,18 +1,19 @@
 # podflow/bilibili/login.py
 # coding: utf-8
 
-import binascii
-import json
 import os
 import re
 import time
-from datetime import datetime
+import json
+import binascii
 import requests
-from podflow.basic.file_save import file_save
-from podflow.basic.http_client import http_client
+from datetime import datetime
 from podflow.basic.qr_code import qr_code
-from podflow.basic.time_stamp import time_stamp
 from podflow.basic.write_log import write_log
+from podflow.basic.file_save import file_save
+from podflow.basic.time_print import time_print
+from podflow.basic.time_stamp import time_stamp
+from podflow.basic.http_client import http_client
 from podflow.netscape.bulid_netscape import bulid_netscape
 
 try:
@@ -75,13 +76,17 @@ def bilibili_scan_login(token):
 
 
 # 登陆哔哩哔哩模块
-def bilibili_login():
+def bilibili_login(retry=False):
     buvid3_and_bnut = http_client(
         "https://www.bilibili.com", "哔哩哔哩主页", 10, 4, True
     ).cookies.get_dict()
     token, url = bilibili_request_qr_code()
-    print(f"{datetime.now().strftime('%H:%M:%S')}|请用BiliBili App扫描登录:")
-    upward = qr_code(url)
+    if retry:
+        time_print("请用BiliBili App扫描登录:", Number=-3)
+        upward = qr_code(url, to_html=True, num=-2)
+    else:
+        time_print("请用BiliBili App扫描登录:")
+        upward = qr_code(url, to_html=True)
     login_status_change = ""
     time_text = f"{datetime.now().strftime('%H:%M:%S')}|BiliBili "
     while True:
@@ -97,16 +102,34 @@ def bilibili_login():
         else:
             login_status = "\033[31m错误\033[0m"
         if login_status_change != login_status:
+            num = -1 if retry else None
             if login_status == "":
-                print(f"{time_text}{login_status}".ljust(42), end="")
+                time_print(
+                    f"{time_text}{login_status}".ljust(42),
+                    NoEnter=True,
+                    Time=False,
+                    Number=num,
+                )
             else:
-                print(f"\r{time_text}{login_status}".ljust(42), end="")
+                time_print(
+                    f"{time_text}{login_status}".ljust(42),
+                    Top=True,
+                    NoEnter=True,
+                    Time=False,
+                    Number=num,
+                )
         login_status_change = login_status
         if status == 86038:
-            print("")
+            time_print(
+                "",
+                Time=False,
+            )
             return status, refresh_token, upward
         elif status == 0:
-            print("")
+            time_print(
+                "",
+                Time=False,
+            )
             cookie["buvid3"] = buvid3_and_bnut.get("buvid3", "")
             cookie["b_nut"] = buvid3_and_bnut.get("b_nut", "")
             return cookie, refresh_token, upward
@@ -114,8 +137,8 @@ def bilibili_login():
 
 
 # 保存哔哩哔哩登陆成功后的cookies模块
-def save_bilibili_cookies():
-    bilibili_cookie, refresh_token, upward = bilibili_login()
+def save_bilibili_cookies(retry=False):
+    bilibili_cookie, refresh_token, upward = bilibili_login(retry)
     if bilibili_cookie == 86038:
         return {"cookie": None}, upward
     bilibili_cookie = requests.utils.dict_from_cookiejar(bilibili_cookie)
@@ -238,9 +261,7 @@ JNrRuoEUXpabUzGB8QIDAQAB
 
 
 def get_bilibili_data_success(bilibili_data, channelid_bilibili_ids):
-    print(
-        f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[32m获取cookie成功\033[0m"
-    )
+    time_print("BiliBili \033[32m获取cookie成功\033[0m")
     img_key, sub_key = getWbiKeys()
     bilibili_data["img_key"] = img_key
     bilibili_data["sub_key"] = sub_key
@@ -262,28 +283,23 @@ def get_bilibili_data_state(bilibili_data, channelid_bilibili_ids):
     ):
         if bilibili_login_code != 0:
             if try_num == 0:
-                print(
-                    f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[31m未登陆\033[0m"
-                )
+                time_print("BiliBili \033[31m未登陆\033[0m")
+                bilibili_data, upward = save_bilibili_cookies()
             else:
-                print(
-                    f"\033[{upward + 3}F\033[{upward + 3}K{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[31m未登陆, 重试第\033[0m{try_num}\033[31m次\033[0m"
+                time_print(
+                    f"BiliBili \033[31m未登陆, 重试第\033[0m{try_num}\033[31m次\033[0m",
+                    Head=f"\033[{upward + 3}F\033[{upward + 3}K",
+                    Number=-4
                 )
-            bilibili_data, upward = save_bilibili_cookies()
+                bilibili_data, upward = save_bilibili_cookies(True)
             try_num += 1
         else:
-            print(
-                f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[33m需刷新\033[0m"
-            )
+            time_print("BiliBili \033[33m需刷新\033[0m")
             bilibili_data = bilibili_cookie_update(bilibili_data)
             if bilibili_data["cookie"]:
-                print(
-                    f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[32m刷新成功\033[0m"
-                )
+                time_print("BiliBili \033[32m刷新成功\033[0m")
             else:
-                print(
-                    f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[31m刷新失败, 重新登陆\033[0m"
-                )
+                time_print("BiliBili \033[31m刷新失败, 重新登陆\033[0m")
         bilibili_login_code, bilibili_login_refresh_token = judgment_bilibili_update(
             bilibili_data["cookie"]
         )
@@ -305,9 +321,7 @@ def get_bilibili_data(channelid_bilibili_ids):
         bilibili_data = {"cookie": None, "timestamp": 0.0}
     if time.time() - bilibili_data["timestamp"] - 60 * 60 > 0:
         return get_bilibili_data_state(bilibili_data, channelid_bilibili_ids)
-    print(
-        f"{datetime.now().strftime('%H:%M:%S')}|BiliBili \033[33m获取cookie成功\033[0m"
-    )
+    time_print("BiliBili \033[33m获取cookie成功\033[0m")
     if not os.path.isfile("channel_data/yt_dlp_bilibili.txt"):
         bulid_netscape("yt_dlp_bilibili", bilibili_data["cookie"])
     return channelid_bilibili_ids, bilibili_data

{podflow-20250406 → podflow-20250413}/podflow/download/dl_aideo_video.py

@@ -37,7 +37,7 @@ def download_video(
 
         def error(self, msg):
             msg = fail_message_initialize(msg, video_url).ljust(48)
-            time_print(msg, Time=False)
+            time_print(msg, Top=True, Time=False)
 
     outtmpl = f"channel_audiovisual/{output_dir}/{video_url}{sesuffix}.{output_format}"
     ydl_opts = {
@@ -78,13 +78,15 @@ def download_video(
             or re.search(r"请求拒绝|数据不完整|传输中断|请求超时|响应超时", fail_info)
         ) and "www.youtube.com" in video_website:
             if fail_info != "":
-                remove_info = "|"
+                remove_info_part = "|"
+            else:
+                remove_info_part = ""
             if os.path.isfile(outtmpl):
                 os.remove(outtmpl)
-                remove_info += "已删除失败文件"
+                remove_info = remove_info_part + "已删除失败文件"
             elif os.path.isfile(outtmpl + ".part"):
                 os.remove(outtmpl + ".part")
-                remove_info += "已删除部分失败文件"
+                remove_info = remove_info_part + "已删除部分失败文件"
         write_log(
             f"{video_write_log} \033[31m下载失败\033[0m",
             None,

{podflow-20250406 → podflow-20250413}/podflow/httpfs/to_html.py

@@ -3,7 +3,6 @@
 
 import re
 import html
-from podflow import gVar
 
 
 def ansi_to_html(ansi_text):
@@ -47,10 +46,11 @@ def ansi_to_html(ansi_text):
 
     if inside_span:
         html_output += "</span>"
-
+    html_output = re.sub(r'^\n', '', html_output)
+    html_output = re.sub(r'\n+$', '', html_output)
+    html_output = re.sub(r' +$', '', html_output)
     return html_output
 
 
 def qrcode_to_html(url):
-    text = f'<span class="qrcode-container" data-url="{url}"></span>'
-    gVar.index_message["podflow"].append(text)
+    return f'<span class="qrcode-container" data-url="{url}"></span>'

{podflow-20250406 → podflow-20250413}/podflow/main_podcast.py

@@ -4,6 +4,7 @@
 import sys
 import json
 import time
+import random
 import urllib
 import subprocess
 
@@ -106,24 +107,30 @@ def main_podcast():
             sys.exit(0)
     # 主流程
     while parse.update_num > 0 or parse.update_num == -1:  # 循环主更新
+        # 主进度条
+        gVar.index_message["schedule"] = ["准备中", 0]
         # 暂停进程打印
         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)
         # 更新哔哩哔哩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)
         # 恢复进程打印
         bottle_app_instance.cherry_print()
         # 获取原始xml字典和rss文本
         gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
             get_original_rss()
         )
+        gVar.index_message["schedule"][1] = 0.03 + random.uniform(0, 0.0049)
         # 暂停进程打印
         gVar.server_process_print_flag[0] = "pause"
         # 连接上传服务器
         upload_url = connect_upload_server()
+        gVar.index_message["schedule"][1] = 0.04 + random.uniform(0, 0.0049)
         # 恢复进程打印
         bottle_app_instance.cherry_print()
         # 登陆上传服务器
@@ -133,16 +140,20 @@ def main_podcast():
                 gVar.config["upload"] = False
         else:
             gVar.config["upload"] = False
+        gVar.index_message["schedule"][1] = 0.045 + random.uniform(0, 0.0024)
         # 初始化原始上传信息
         get_upload_original()
+        gVar.index_message["schedule"][1] = 0.05
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
+        gVar.index_message["schedule"][1] = 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)
             # 输出需要更新的信息
             update_information_display(
                 gVar.channelid_youtube_ids_update,
@@ -156,58 +167,74 @@ def main_podcast():
                 gVar.bilibili_content_bvid_backward_update,
                 "BiliBili",
             )
+            gVar.index_message["schedule"][1] = 0.12
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 获取视频格式信息
             get_video_format()
+            gVar.index_message["schedule"][1] = 0.199
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 删除中断下载的媒体文件
             if gVar.config["delete_incompletement"]:
                 delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
+            gVar.index_message["schedule"] = ["构建中", 0.20]
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 下载并构建YouTube和哔哩哔哩视频
             download_and_build()
+            gVar.index_message["schedule"][1] = 0.8
             # 添加新媒体至上传列表
             add_upload()
+            gVar.index_message["schedule"][1] = 0.81 + random.uniform(0, 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)
             # 打印无法获取youtube信息
             print_fail_youtube()
+            gVar.index_message["schedule"][1] = 0.83 + random.uniform(0, 0.0049)
             if gVar.config["remove_media"]:
                 # 删除不在rss中的媒体文件
                 remove_file()
                 # 删除已抛弃的媒体文件夹
                 remove_dir()
+            gVar.index_message["schedule"][1] = 0.84
             # 补全缺失媒体文件到字典
             make_up_file()
+            gVar.index_message["schedule"][1] = 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)
             # 暂停进程打印
             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)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
+            gVar.index_message["schedule"][1] = 0.91 + random.uniform(0, 0.0049)
             # 删除无法补全的媒体
             del_makeup_format_fail()
+            gVar.index_message["schedule"][1] = 0.92 + random.uniform(0, 0.0049)
             # 暂停进程打印
             gVar.server_process_print_flag[0] = "pause"
             # 保存rss文件模块
             save_rss()
+            gVar.index_message["schedule"][1] = 0.93 + random.uniform(0, 0.0049)
             # 下载补全Youtube和哔哩哔哩视频模块
             make_up_file_mod()
+            gVar.index_message["schedule"][1] = 0.99 + random.uniform(0, 0.0099)
             # 恢复进程打印
             bottle_app_instance.cherry_print()
             # 更新并保存上传列表
             update_upload()
+            gVar.index_message["schedule"] = ["已完成", 1]
         else:
             time_print("频道无更新内容")
         # 清空变量内数据

{podflow-20250406 → podflow-20250413}/podflow/makeup/make_up_file.py

@@ -8,9 +8,17 @@ from podflow import gVar
 # 补全缺失媒体文件到字典模块
 def make_up_file():
     channelid_youtube_ids = gVar.channelid_youtube_ids
+    channelid_bilibili_ids = gVar.channelid_bilibili_ids
+    num = 0
+    for output_dir in channelid_youtube_ids:
+        num += len(gVar.all_youtube_content_ytid[output_dir])
+    for output_dir in channelid_bilibili_ids:
+        num += len(gVar.all_bilibili_content_bvid[output_dir])
+    ratio_part = 0.01 / num if num else 0
     for output_dir, name in channelid_youtube_ids.items():
+        youtube_os_list = os.listdir(f"channel_audiovisual/{output_dir}")
         for file_name in gVar.all_youtube_content_ytid[output_dir]:
-            if file_name not in os.listdir(f"channel_audiovisual/{output_dir}"):
+            if file_name not in youtube_os_list:
                 main = file_name.split(".")[0]
                 media = file_name.split(".")[1]
                 video_id_format = {
@@ -27,11 +35,14 @@ def make_up_file():
                     video_quality = 1080
                 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
 
-    channelid_bilibili_ids = gVar.channelid_bilibili_ids
     for output_dir, name in channelid_bilibili_ids.items():
+        bilibili_os_list = os.listdir(f"channel_audiovisual/{output_dir}")
         for file_name in gVar.all_bilibili_content_bvid[output_dir]:
-            if file_name not in os.listdir(f"channel_audiovisual/{output_dir}"):
+            if file_name not in bilibili_os_list:
                 main = file_name.split(".")[0][:12]
                 if main not in gVar.make_up_file_format:
                     media = file_name.split(".")[1]
@@ -49,3 +60,8 @@ def make_up_file():
                         video_quality = 1080
                     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

{podflow-20250406 → podflow-20250413}/podflow/message/create_main_rss.py

@@ -29,6 +29,8 @@ def create_main_rss():
     }
     all_channelid = list(gVar.all_items.keys())
 
+    ratio_part = 0.6 / len(all_channelid) if all_channelid else 0
+
     while all_channelid:
         for index, output_dir in enumerate(all_channelid):
             if output_dir in update_output_dir():
@@ -66,5 +68,10 @@ 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-20250406 → podflow-20250413}/podflow/message/fail_message_initialize.py

@@ -144,6 +144,11 @@ error_reason = [
         "\033[31m格式不可用\033[0m",
         "text",
     ],
+    [
+        r"Offline.",
+        "\033[31m直播已停止\033[0m",
+        "text",
+    ]
 ]
 
 

{podflow-20250406 → podflow-20250413}/podflow/message/get_video_format.py

@@ -92,6 +92,20 @@ def get_video_format():
     get_bilibili_format_front(gVar.bilibili_content_bvid_update, False)
     get_youtube_format_front(gVar.youtube_content_ytid_backward_update, True)
     get_bilibili_format_front(gVar.bilibili_content_bvid_backward_update, True)
+    if (
+        gVar.youtube_content_ytid_update
+        or gVar.bilibili_content_bvid_update
+        or gVar.youtube_content_ytid_backward_update
+        or gVar.bilibili_content_bvid_backward_update
+    ):
+        ratio_part = 0.079 / (
+            len(gVar.youtube_content_ytid_update)
+            + len(gVar.bilibili_content_bvid_update)
+            + len(gVar.youtube_content_ytid_backward_update)
+            + len(gVar.bilibili_content_bvid_backward_update)
+        )
+    else:
+        ratio_part = 0
     # 按参数拆分获取量
     if len(gVar.video_id_update_format) != 0:
         video_id_update_format_list = split_dict(
@@ -107,5 +121,7 @@ def get_video_format():
             )
             # 获取视频信息多线程模块
             get_video_format_multithread(
-                video_id_update_format_item, wait_animation_display_info
+                video_id_update_format_item,
+                wait_animation_display_info,
+                ratio_part,
             )

{podflow-20250406 → podflow-20250413}/podflow/message/get_video_format_multithread.py

@@ -10,7 +10,9 @@ from podflow.message.get_youtube_and_bilibili_video_format import (
 
 # YouTube&哔哩哔哩获取视频信息多线程模块
 def get_video_format_multithread(
-    video_id_update_format_item, wait_animation_display_info
+    video_id_update_format_item,
+    wait_animation_display_info,
+    ratio_part,
 ):
     # 创建共享的标志变量
     stop_flag = ["keep"]  # 使用列表来存储标志变量
@@ -26,12 +28,21 @@ def get_video_format_multithread(
     prepare_animation.start()
     # 创建线程锁
     video_format_lock = threading.Lock()
+    ratio_part_lock = threading.Lock()
     # 创建线程列表
     video_id_update_threads = []
+    
     for video_id in video_id_update_format_item.keys():
         thread = threading.Thread(
             target=get_youtube_and_bilibili_video_format,
-            args=(video_id, stop_flag, video_format_lock, prepare_animation),
+            args=(
+                video_id,
+                stop_flag,
+                video_format_lock,
+                prepare_animation,
+                ratio_part,
+                ratio_part_lock,
+                ),
         )
         video_id_update_threads.append(thread)
         thread.start()

{podflow-20250406 → podflow-20250413}/podflow/message/get_youtube_and_bilibili_video_format.py

@@ -26,7 +26,11 @@ def one_format(id_update_format, id_num):
 
 # YouTube&哔哩哔哩视频信息模块
 def get_youtube_and_bilibili_video_format(
-    id_num, stop_flag, video_format_lock, prepare_animation
+    id_num, stop_flag,
+    video_format_lock,
+    prepare_animation,
+    ratio_part,
+    ratio_part_lock,
 ):
     url = gVar.video_id_update_format[id_num]["url"]
     media = gVar.video_id_update_format[id_num]["media"]
@@ -101,3 +105,9 @@ def get_youtube_and_bilibili_video_format(
                 False,
             )
             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

{podflow-20250406 → podflow-20250413}/podflow/message/update_youtube_bilibili_rss.py

@@ -61,6 +61,12 @@ def update_youtube_bilibili_rss():
         ) in pattern_youtube_error.items():
             if pattern_youtube_error_key in youtube_content:
                 return pattern_youtube_error_value
+    if gVar.channelid_youtube_ids or gVar.channelid_bilibili_ids:
+        ratio_part = 0.05 / (
+            len(gVar.channelid_youtube_ids) + len(gVar.channelid_bilibili_ids)
+        )
+    else:
+        ratio_part = 0
 
     # 更新Youtube频道
     for youtube_key, youtube_value in gVar.channelid_youtube_ids.copy().items():
@@ -97,6 +103,10 @@ def update_youtube_bilibili_rss():
             if youtube_response_type == "text":
                 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
+
     # 更新哔哩哔哩频道
     for bilibili_key, bilibili_value in gVar.channelid_bilibili_ids.copy().items():
         bilibili_space = gVar.channelid_bilibili_rss[bilibili_key]["content"]
@@ -114,3 +124,8 @@ def update_youtube_bilibili_rss():
             file_save(bilibili_space, f"{bilibili_key}.json", "channel_id")
             # 构建频道文件夹
             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

{podflow-20250406 → podflow-20250413}/podflow/netscape/get_cookie_dict.py

@@ -1,8 +1,8 @@
 # podflow/Netscape/get_cookie_dict.py
 # coding: utf-8
 
-from datetime import datetime
 from http.cookiejar import LoadError, MozillaCookieJar
+from podflow.basic.time_print import time_print
 
 
 # 将Netscape转Dict模块
@@ -14,8 +14,8 @@ def get_cookie_dict(file):
         cookie_jar.load(ignore_discard=True)
         return {cookie.name: cookie.value for cookie in cookie_jar}
     except FileNotFoundError:
-        print(f"{datetime.now().strftime('%H:%M:%S')}|{parts[-1]}文件不存在")
+        time_print(f"{parts[-1]}文件不存在")
         return None
     except LoadError:
-        print(f"{datetime.now().strftime('%H:%M:%S')}|{parts[-1]}文件错误")
+        time_print(f"{parts[-1]}文件错误")
         return None