podflow 20250405__py3-none-any.whl → 20250413__py3-none-any.whl

podflow/__init__.py

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

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/basic/time_print.py

@@ -3,36 +3,48 @@
 
 from datetime import datetime
 from podflow import gVar
-from podflow.httpfs.to_html import ansi_to_html
+from podflow.httpfs.to_html import ansi_to_html, qrcode_to_html
 
 
-def time_print(text, Top=False, NoEnter=False, Time=True, Url=""):
+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}"
-    if Top:
-        text_print = f"\r{text}"
-    else:
-        text_print = f"{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 = ansi_to_html(text)
-        if not gVar.index_message["enter"] and gVar.index_message["podflow"]:
-            if Top and gVar.index_message["podflow"]:
+        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)
-    if NoEnter:
-        gVar.index_message["enter"] = False
-    else:
-        gVar.index_message["enter"] = True
+    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/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/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/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/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/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/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/message/fail_message_initialize.py

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

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/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/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/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/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

podflow/templates/index.html

@@ -20,6 +20,8 @@
       --menu-text: #333333;
       --menu-width: 170px;
       --menu-selected-bg: #cccccc;
+      /* 新增进度条颜色变量 */
+      --progress-bar-color: #28a745; /* 更柔和的绿色 */
     }
 
     /* 深色模式变量 */
@@ -37,6 +39,8 @@
         --menu-bg: #333333;
         --menu-text: #e0e0e0;
         --menu-selected-bg: #555555;
+        /* 深色模式下的进度条颜色 */
+        --progress-bar-color: #40c057; /* 略亮的绿色 */
       }
     }
 
@@ -241,6 +245,46 @@
       display: inline-block; /* 让容器并排显示 */
       margin: 0px;
     }
+
+    /* 主进度条样式 */
+    .progress-bar {
+      width: 100%;
+      height: 22px; /* 略微增加高度 */
+      background-color: #e0e0e0;
+      border-radius: 12px; /* 更圆润的边角 */
+      overflow: hidden;
+      position: relative;
+      border: 1px solid #ccc; /* 增加一个浅灰色边框 */
+    }
+    .progress-bar .progress {
+      height: 100%;
+      background-color: var(--progress-bar-color); /* 使用颜色变量 */
+      /* 添加一个微妙的渐变效果 */
+      background-image: linear-gradient(to right, rgba(255, 255, 255, 0.15) 0%, rgba(0, 0, 0, 0.15) 100%);
+      width: 0%;
+      transition: width 0.3s ease-in-out; /* 更平滑的过渡 */
+      border-radius: 12px; /* 与容器保持一致 */
+    }
+    .progress-bar .status-text {
+      position: absolute;
+      top: 50%;
+      left: 15px; /* 稍微调整左边距 */
+      transform: translateY(-50%);
+      color: var(--text-color); /* 使用文本颜色变量 */
+      font-weight: bold;
+      font-size: 14px;
+      z-index: 2; /* 确保状态文本覆盖在进度条上 */
+    }
+    .progress-bar .percentage-text {
+      position: absolute;
+      top: 50%;
+      right: 15px; /* 稍微调整右边距 */
+      transform: translateY(-50%);
+      color: var(--text-color); /* 使用文本颜色变量 */
+      font-weight: bold;
+      font-size: 14px;
+      z-index: 2; /* 确保百分比文本覆盖在进度条上 */
+    }
   </style>
   <script src="https://cdn.jsdelivr.net/gh/davidshimjs/qrcodejs/qrcode.min.js"></script>
 </head>
@@ -275,7 +319,14 @@
     <!-- 消息滚动显示页面 -->
     <section id="pageMessage">
       <h2>Podflow 运行情况</h2>
+      </div>
       <form>
+        <label>主进度：</label>
+        <div class="progress-bar">
+          <div class="progress" id="mainProgress"></div>
+          <div class="status-text" id="progressStatus">准备中</div>
+          <div class="percentage-text" id="progressPercentage">0.00%</div>
+        </div>
         <label>构建服务：</label><br>
         <div class="common-area" id="messageArea"></div>
         <label>服务器：</label><br>
@@ -284,7 +335,7 @@
     </section>
   </main>
   <script>
-    (function() {
+    (function() {    
       // 生成单个二维码的函数
       function generateQRCodeForNode(container) {
         const rootStyles = getComputedStyle(document.documentElement);
@@ -305,62 +356,29 @@
           container.textContent = 'URL 未提供';
         }
       }
-
-      // 为所有存在的二维码容器生成二维码
-      function generateQRCodes() {
-        const containers = document.querySelectorAll('.qrcode-container');
-        containers.forEach(generateQRCodeForNode);
-      }
-
-      // 利用 MutationObserver 动态监听 container 内新增的二维码容器
-      function observeQRCodes(container) {
-        const observer = new MutationObserver((mutationsList) => {
-          mutationsList.forEach(mutation => {
-            mutation.addedNodes.forEach(node => {
-              if (node.nodeType === Node.ELEMENT_NODE) {
-                if (node.classList.contains('qrcode-container')) {
-                  generateQRCodeForNode(node);
-                  // 在生成二维码后，检查是否需要滚动
-                  if (!userScrolled && container.scrollHeight - container.scrollTop <= container.clientHeight + 10) {
-                    container.scrollTop = container.scrollHeight;
-                  }
-                } else {
-                  const childContainers = node.querySelectorAll('.qrcode-container');
-                  childContainers.forEach(generateQRCodeForNode);
-                  // 在生成二维码后，检查是否需要滚动
-                  if (!userScrolled && container.scrollHeight - container.scrollTop <= container.clientHeight + 10) {
-                    container.scrollTop = container.scrollHeight;
-                  }
-                }
-              }
-            });
-          });
-        });
-        observer.observe(container, { childList: true, subtree: true });
-      }
-
+    
       // 缓存常用节点
       const menu = document.getElementById('menu');
       const toggleMenuBtn = document.getElementById('toggleMenu');
-      const mainArea = document.getElementById('main');
       const pages = {
         pageChannel: document.getElementById('pageChannel'),
         pageMessage: document.getElementById('pageMessage')
       };
       const inputForm = document.getElementById('inputForm');
       const inputOutput = document.getElementById('inputOutput');
-      const messageArea = document.getElementById('messageArea');
-      const messageHttp = document.getElementById('messageHttp');
       const pasteBtn = document.getElementById('pasteBtn');
       const copyBtn = document.getElementById('copyBtn');
       const clearBtn = document.getElementById('clearBtn');
-
+      // 缓存进度条和文本元素
+      const mainProgress = document.getElementById('mainProgress');
+      const progressStatus = document.getElementById('progressStatus');
+      const progressPercentage = document.getElementById('progressPercentage');
+      const messageArea = document.getElementById('messageArea');
+      const messageHttp = document.getElementById('messageHttp');
+    
+      let lastMessage = { podflow: [], http: [], schedule: [] };
       let pollingTimer = null;
-
-      // 监听 messageArea 内动态新增的二维码容器
-      observeQRCodes(messageArea);
-      observeQRCodes(messageHttp); // Also observe for messageHttp
-
+    
       // 菜单切换函数
       function toggleMenu() {
         menu.classList.toggle('hidden');
@@ -372,7 +390,7 @@
           toggleMenuBtn.textContent = '❮';
         }
       }
-
+    
       // 根据页面标识显示对应面板
       function showPage(pageId) {
         Object.values(pages).forEach(page => page.style.display = 'none');
@@ -383,35 +401,33 @@
             toggleMenu();
           }
           pageId === 'pageMessage' ? startMessagePolling() : stopMessagePolling();
-          if (pageId === 'pageMessage') {
-            generateQRCodes(); // 页面切换时生成已有二维码
-          }
         }
       }
-
+    
       // 初始化默认页面
       showPage('pageMessage');
-
-      let lastMessage = { podflow: [], http: [] };
+    
       let userScrolled = false;
-
+    
       // 监听滚动事件，检测用户是否手动滚动
       function onUserScroll(event) {
         const element = event.target;
         // 判断是否接近底部，增加一定的容差值
-        const nearBottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 20;
+        const nearBottom = element.scrollHeight - element.scrollTop <= element.clientHeight + 10;
         userScrolled = !nearBottom;
       }
-
+    
       messageArea.addEventListener('scroll', onUserScroll);
       messageHttp.addEventListener('scroll', onUserScroll);
-
+    
       // 轮询消息更新，更新 messageArea 与 messageHttp
       function getMessages() {
         fetch('message')
           .then(response => response.json()) // 解析 JSON 数据
           .then(data => {
             if (JSON.stringify(data) !== JSON.stringify(lastMessage)) {
+              // 更新进度条
+              updateProgress(data.schedule);
               // 追加新消息
               appendMessages(messageArea, data.podflow, lastMessage.podflow);
               appendMessages(messageHttp, data.http, lastMessage.http);
@@ -420,6 +436,23 @@
           })
           .catch(error => console.error('获取消息失败:', error));
       }
+    
+      // 更新进度条并显示状态和百分比
+      function updateProgress(scheduleData) {
+        // 检查 schedule 数据是否存在且长度为 2
+        if (scheduleData && scheduleData.length === 2) {
+          const [status, progress] = scheduleData; // 直接解构数组
+          if (status === "准备中" || status === "构建中") {
+            mainProgress.style.width = `${progress * 100}%`;
+            progressStatus.textContent = status;   // 显示状态
+            progressPercentage.textContent = `${(progress * 100).toFixed(2)}%`;   // 显示百分比，保留两位小数
+          } else if (status === "已完成") {
+            mainProgress.style.width = '100%';
+            progressStatus.textContent = '已完成';   // 显示完成状态
+            progressPercentage.textContent = '100.0%';   // 显示百分比
+          }
+        }
+      }
 
       function createMessageElement(message) {
         const p = document.createElement('p');
@@ -428,29 +461,58 @@
         return p;
       }
 
+      function processQRCodeContainers(p) {
+        const qrContainers = p.querySelectorAll('.qrcode-container');
+        qrContainers.forEach(container => {
+          // 判断当前容器是否有 data-url 属性，并且值不为空
+          if (container.dataset.url) {
+            generateQRCodeForNode(container);
+          } else {
+            // 如果没有 data-url 或值为空，可以执行其他操作，例如输出提示信息
+            console.log('容器中未提供 URL，跳过二维码生成:', container);
+            container.textContent = '未提供二维码 URL'; // 可选：在容器中显示提示
+          }
+        });
+      }
+    
+      // 修改后的 appendMessages 函数：先生成消息节点内的二维码，再将节点追加或替换到消息容器中
       function appendMessages(container, newMessages, oldMessages) {
         // 判断当前是否在底部
         const wasAtBottom = container.scrollHeight - container.scrollTop <= container.clientHeight + 10;
-
-        // 当两数组长度相等且有内容时，只比较最后一项
+        // 较为简单的情况：两数组长度相同且有内容，只比较最后四项
         if (newMessages.length === oldMessages.length && newMessages.length > 0) {
-          const lastNewMessage = newMessages[newMessages.length - 1];
-          const lastOldMessage = oldMessages[oldMessages.length - 1];
-          if (lastNewMessage !== lastOldMessage) {
-            const p = createMessageElement(lastNewMessage);
-            const lastChild = container.lastElementChild;
-            if (lastChild) {
-              container.replaceChild(p, lastChild);
-            } else {
-              container.appendChild(p);
+          let replaceCount;
+          if (newMessages[newMessages.length - 1].includes("未扫描") || 
+              newMessages[newMessages.length - 1].includes("二维码超时, 请重试")) {
+            replaceCount = Math.min(4, newMessages.length);
+          } else {
+            replaceCount = 1;
+          }
+          for (let i = 0; i < replaceCount; i++) {
+            // 计算从后向前的索引位置
+            const index = newMessages.length - 1 - i;
+            const newMessage = newMessages[index];
+            const oldMessage = oldMessages[index];
+            if (newMessage !== oldMessage) {
+              // 先创建消息节点
+              const p = createMessageElement(newMessage);
+              // 在插入前先处理二维码生成
+              processQRCodeContainers(p);
+              // 替换到容器中 - 注意这里要找到对应位置的子元素
+              const childToReplace = container.children[index];
+              if (childToReplace) {
+                container.replaceChild(p, childToReplace);
+              }
             }
           }
         } else {
-          // 如果 newMessages 与 oldMessages 数量不一致
-          // 先替换容器中最后一项为 newMessages 中对应位置的消息（若 oldMessages 存在数据）
+          // 当 newMessages 与 oldMessages 数量不一致时
+          // 如果 oldMessages 存在数据，先替换容器中最后一项对应的消息
           if (oldMessages.length > 0) {
             const replaceIndex = oldMessages.length - 1;
             const p = createMessageElement(newMessages[replaceIndex]);
+            // 先生成二维码
+            processQRCodeContainers(p);
             const lastChild = container.lastElementChild;
             if (lastChild) {
               container.replaceChild(p, lastChild);
@@ -460,30 +522,35 @@
           }
           // 再追加从 oldMessages.length 开始的后续消息
           newMessages.slice(oldMessages.length).forEach(msg => {
-            container.appendChild(createMessageElement(msg));
+            const p = createMessageElement(msg);
+            // 先生成二维码
+            processQRCodeContainers(p);
+            // 插入容器中
+            container.appendChild(p);
           });
         }
-
         // 如果之前在底部且用户没有主动滚动，则自动滚动到底部
         if (wasAtBottom && !userScrolled) {
           container.scrollTop = container.scrollHeight;
         }
       }
-
+    
+      // 启动消息轮询
       function startMessagePolling() {
         getMessages();
-        pollingTimer = setInterval(getMessages, 250);
+        pollingTimer = setInterval(getMessages, 500);
       }
-
+    
+      // 停止消息轮询
       function stopMessagePolling() {
         if (pollingTimer !== null) {
           clearInterval(pollingTimer);
           pollingTimer = null;
         }
       }
-
-      startMessagePolling();
-
+    
+  //  startMessagePolling();
+    
       // 表单异步提交（获取 Channel-ID）
       inputForm && inputForm.addEventListener('submit', function(event) {
         event.preventDefault();
@@ -493,19 +560,19 @@
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ content })
         })
-        .then(response => {
-          if (!response.ok) {
-            throw new Error('网络响应异常');
-          }
-          return response.json();
-        })
-        .then(data => inputOutput.value = data.response)
-        .catch(error => {
-          console.error('请求失败:', error);
-          alert('请求失败，请稍后重试！');
-        });
+          .then(response => {
+            if (!response.ok) {
+              throw new Error('网络响应异常');
+            }
+            return response.json();
+          })
+          .then(data => inputOutput.value = data.response)
+          .catch(error => {
+            console.error('请求失败:', error);
+            alert('请求失败，请稍后重试！');
+          });
       });
-
+    
       // 粘贴功能
       pasteBtn.addEventListener('click', function() {
         if (navigator.clipboard && navigator.clipboard.readText) {
@@ -526,7 +593,7 @@
           }
         }
       });
-
+    
       // 复制功能
       copyBtn.addEventListener('click', function() {
         if (navigator.clipboard && navigator.clipboard.writeText) {
@@ -544,12 +611,12 @@
           }
         }
       });
-
+    
       // 清空输入框
       clearBtn.addEventListener('click', function() {
         inputOutput.value = '';
       });
-
+    
       // 菜单项点击事件委托
       menu.addEventListener('click', function(event) {
         const target = event.target;
@@ -557,24 +624,17 @@
           showPage(target.dataset.page);
         }
       });
-
+    
       // 菜单切换按钮事件绑定
       toggleMenuBtn.addEventListener('click', toggleMenu);
-
+    
       // 针对手机端，初始化时隐藏菜单
       if (window.innerWidth <= 600) {
         menu.classList.add('hidden');
         toggleMenuBtn.style.left = '0px';
         toggleMenuBtn.textContent = '❯';
       }
-
-      // 在页面加载完成后首次生成二维码（如果当前显示的是 Channel 页面）
-      window.addEventListener('load', () => {
-        if (pages.pageChannel.style.display === 'block') {
-          generateQRCodes();
-        }
-      });
     })();
-  </script>
+    </script>    
 </body>
 </html>

{podflow-20250405.dist-info → podflow-20250413.dist-info}/METADATA

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

{podflow-20250405.dist-info → podflow-20250413.dist-info}/RECORD

@@ -1,8 +1,8 @@
-podflow/__init__.py,sha256=N8hpfDHmVdVyDQs50yt_EMscS2v6CTD5a8oBWUkUOf0,7222
+podflow/__init__.py,sha256=CgmkC0DhJ05yHdFmZRwImFN1jxf6Z8ggokIlPApDl_I,7275
 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=0WXZpltTQ5InKnPt5LlIWK1dNbt8v2QE_vWVR5td7Cc,10680
+podflow/main_podcast.py,sha256=zUDTqabL07Aq-jTfxnCvD2b6NmHK0kUGOb942VfNKgI,12460
 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
@@ -13,17 +13,17 @@ podflow/basic/get_file_list.py,sha256=XmnC4faObislyTsL9WUeyztyTQrvdi76lMzPudKEfX
 podflow/basic/get_html_dict.py,sha256=V-PgDtD6pm5mZC1LUPttUbZzxhjkS3WDYHxWR3yzIEY,869
 podflow/basic/http_client.py,sha256=h4IwxC7ZSi4rJ-mHvj26FQqz5krERzUg4hKEgj-yj-M,2895
 podflow/basic/list_merge_tidy.py,sha256=7hWfSnsPh23edHNU92vxtI0nfpfN8m54GTEt2rGm2HQ,368
-podflow/basic/qr_code.py,sha256=BQFxAx55vqWECTwWgybyXu3IuDFavpc3zMCmZ4XvKKE,1630
+podflow/basic/qr_code.py,sha256=lZo11jbYqFQYy9gjBtRRUoLjlaEmoES-phydnrOMcLo,1727
 podflow/basic/split_dict.py,sha256=Ir6GTortcWMUeFITFgY1v-INMla5y0IN3RN3nTgzWqM,401
 podflow/basic/time_format.py,sha256=T3tw2vbOwxMYYXDaV4Sj76WOZtsspj2lWA_DzWqUEJA,487
-podflow/basic/time_print.py,sha256=QWp8h7SV5RGMXtVPF4BUPVD9f5ht8iBCMkLJCw7GymA,1188
+podflow/basic/time_print.py,sha256=foPezlEnYU0tOb8h79nDXZNElgNjRsHScYHYk9hGeTM,1481
 podflow/basic/time_stamp.py,sha256=Kbz9PzgPtss1fRqPXdfz1q6MTGVMRi3LPClN7wrXSIk,1888
 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=Ld8lhb_3eiSagVXWyj1KIrRLjfH6p0sUolEG5VtN8mk,20337
-podflow/bilibili/login.py,sha256=XqUL-ZFtBSNmyPf-CqCvbyxtXYx7v3EnIDU0zaqSMDM,11090
+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
 podflow/config/channge_icon.py,sha256=W-EU_5_wg94_yioNofk8OTyRD2X7SY8HEjvjFmSEyh0,5653
@@ -35,7 +35,7 @@ podflow/config/get_config.py,sha256=TpLbh5GoPO7csWUJ-di65XXnkN3LSnMXkFw85h5ndHs,
 podflow/download/__init__.py,sha256=1lATXiOAEx5oDUDR99mQRiTrQlQ9CQkJNAKpsLrnPCo,47
 podflow/download/convert_bytes.py,sha256=6Q3TcPGzCO2FlhOKWbp9RB_GPmfuyKY5suIyE9EJf6k,543
 podflow/download/delete_part.py,sha256=wjY6WulpUMjLx38on0kTLXj0gA04rIuKAdwFidZtWGU,679
-podflow/download/dl_aideo_video.py,sha256=U9dVYi7TviB987bOWleNHvjnQWIiesflrhkQiFvU_hQ,10273
+podflow/download/dl_aideo_video.py,sha256=lh-r_SKcR54oxsgS5f0wpgTUS50uOL4cNZQQwaWfxJw,10380
 podflow/download/show_progress.py,sha256=w_nzq6LbewXpFwXENQwbA5-L-j3XDqzfQSMU7E_CWxs,1716
 podflow/download/wait_animation.py,sha256=AUTvszXF89QA7XYjocFIauPKV7Qj8cFqry44teClaLQ,1314
 podflow/download/youtube_and_bilibili_download.py,sha256=dlUh9cPHrYgZAhtXlBUOdFIpZOhv9xOtgdcTaqUvLuY,1294
@@ -44,43 +44,43 @@ 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/to_html.py,sha256=q-pQWhaqSGKZqRc3nV3ZSVexIIj-EJXbfXTMGGkTB7s,1863
+podflow/httpfs/to_html.py,sha256=pqNgHz3G4suTuFszULPkhKADKWc8ISlPJp7BxL2ntM4,1941
 podflow/makeup/__init__.py,sha256=ligUtfj0stTcOHFXDF6eAN7Up2PxlB0GnGbLq7iDY3c,45
 podflow/makeup/del_makeup_format_fail.py,sha256=XizQh74QYXxRg0e1uerXjd4Tiq5qChks0fTAY7n3Z1I,642
-podflow/makeup/make_up_file.py,sha256=WJnKtdr6-CMEpxJAADCEhcyIwdUdisxbqXGmzo3R5KQ,2222
+podflow/makeup/make_up_file.py,sha256=_kpvlOpW1TX379aj83rw7U9fFRsHYkYBja1yUKw6oys,2938
 podflow/makeup/make_up_file_format_mod.py,sha256=VlR4yG7N6C2laYIBKb7J6Alqq2_X5Y7kgXMQSN6lJ6E,3613
 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=0SIxVvAtgSWAr_TvdXLVDIpxvXOHeFUN8n8QzfnIB84,1740
-podflow/message/create_main_rss.py,sha256=g2DZGLf81yUsLCpiB8QVaxSxqhJ5lVeC43ndRiCbodg,2999
+podflow/message/create_main_rss.py,sha256=yo12YYUxYTjGSHD5CrnRIbUZumtr0NOZqQWXpC3t55k,3296
 podflow/message/display_qrcode_and_url.py,sha256=VqmRkDYYG03VihfW4SAU49HJVmfqWbLTgMxqCaREeCo,1037
-podflow/message/fail_message_initialize.py,sha256=3rFpRPXopLGNmSq88ODyQe15bu-T-Iiz9CUMeC-RAQ0,6371
+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=PYA7UGhHXbUN66vWmxWOp5Ns423CopHxw4vR19zXaPs,2383
-podflow/message/get_video_format.py,sha256=-LsgmawTKcDvR1wMgr3ue09fCHnmDvJNJxh7ztk-SZA,4770
-podflow/message/get_video_format_multithread.py,sha256=2t2UlBWG1RF0IRBBbGzeeWshWXfMgyny6keaWbmgTaI,1406
-podflow/message/get_youtube_and_bilibili_video_format.py,sha256=BFlplFy-j3J_2UVvmtNsfCK-Uvfjj3JZu8pscn1U0Ts,4439
+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/media_format.py,sha256=Q4WoML4UqL0Ry-QN8DHFJqOQ2tXcFN6u5hmhdSLdP1g,7346
 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=9hHym9e2DbSTZ1tSfBfErLJWmi9I71edNORdAaZCPTw,5238
+podflow/message/update_youtube_bilibili_rss.py,sha256=ZgR0ARCRNVRxSFP5LKaYWrNIQlYXCvQlDZBOMXYqzKo,5783
 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
 podflow/message/xml_rss.py,sha256=ogCteSUXyJJXLhOE7-ZBcRdWYzrRr2Qykjt3oppRpC4,1679
 podflow/netscape/__init__.py,sha256=SUw_BtbV3moA324UdxRECkPLv1xHkjio8r_5JTkVfxI,47
 podflow/netscape/bulid_netscape.py,sha256=wmUPlDGF8G456GGyajU_6Ak5WJzsqsq4bZgPjCSTGhI,2279
-podflow/netscape/get_cookie_dict.py,sha256=k-n0UIIXjLPdzJJlyZptyq6MbVBS5-RMur2amfYUo9w,691
+podflow/netscape/get_cookie_dict.py,sha256=laqw-eriABiLyciRLzDmistVHHWqmUM-9eEbYZzsqBQ,643
 podflow/remove/__init__.py,sha256=x1pMfpIyE6xUrmIOkdl43mbvKLwndGo5pIoOBXhJsP4,45
 podflow/remove/remove_dir.py,sha256=xQIhrnqnYjMzXjoSWaTvm7JwPYOFTN1muuTPdaLDXpQ,1099
 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=Hiojlu48ebZKYSgTSTc_UAId4HIAu59gFakKnYW_-r4,18778
+podflow/templates/index.html,sha256=i8T2wsvPQG6vP0qVN6LiGwC_0QF65IIWlz7MllVWO1Q,21558
 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
@@ -95,8 +95,8 @@ podflow/youtube/__init__.py,sha256=pgXod8gq0IijZxIkPSwgAOcb9JI5rd1mqMomoR7bcJ4,4
 podflow/youtube/build.py,sha256=3LYk_ICVXj9XkE9jZ8jEVI8596xxS_QZkcoIwcBE3Ys,12006
 podflow/youtube/get.py,sha256=Of7PRgUknhpyW70nvyVAUYVb5KyFViKiBTfH3Y6Mke8,16970
 podflow/youtube/login.py,sha256=KYl--ya6Z1u0uIcOp9l8i3DIIj9hsYUDH4dtJjI0MLM,1295
-podflow-20250405.dist-info/METADATA,sha256=Wk84DRVfITCP0CrsBEsL-njqoO8KmqghfST3W5nLzkA,14163
-podflow-20250405.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250405.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250405.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250405.dist-info/RECORD,,
+podflow-20250413.dist-info/METADATA,sha256=Kqj23ZIOpy39Dpz4T9rT-8pymmXHOmVscSBj4wCbKy4,14163
+podflow-20250413.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250413.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250413.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250413.dist-info/RECORD,,