podflow 20250413.3__tar.gz → 20250415__tar.gz

{podflow-20250413.3 → podflow-20250415}/PKG-INFO

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

{podflow-20250413.3 → podflow-20250415}/podflow/__init__.py

@@ -107,6 +107,7 @@ class Application_gVar:
         self.hash_rss_original = ""  # 原始rss哈希值文本
         self.xmls_original = {}  # 原始xml信息字典
         self.xmls_original_fail = []  # 未获取原始xml频道列表
+        self.xmls_quantity = {}  # xml数量字典
         self.youtube_xml_get_tree = {}  # YouTube频道简介和图标字典
         self.all_youtube_content_ytid = {}  # 所有YouTube视频id字典
         self.all_bilibili_content_bvid = {}  # 所有哔哩哔哩视频id字典
@@ -119,7 +120,7 @@ class Application_gVar:
         self.upload_data = {}  # 上传用户账号密码字典
 
         self.shortcuts_url = {}  # 输出至shortcut的url字典
-        
+
         self.index_message = {  # 图形界面显示信息字典
             "podflow": [],  # 主窗口信息列表
             "http": [],  # httpfs窗口信息列表

{podflow-20250413.3 → podflow-20250415}/podflow/basic/time_stamp.py

@@ -4,7 +4,7 @@
 import time
 import threading
 import contextlib
-from datetime import datetime
+from podflow.basic.time_print import time_print
 from podflow.basic.http_client import http_client
 
 
@@ -57,5 +57,5 @@ def time_stamp():
     thread3.join()
     if time_stamps:
         return int(sum(time_stamps) / len(time_stamps))
-    print(f"{datetime.now().strftime('%H:%M:%S')}|\033[31m获取时间戳api失败\033[0m")
+    time_print("\033[31m获取时间戳api失败\033[0m")
     return round(time.time() * 1000)

{podflow-20250413.3 → podflow-20250415}/podflow/bilibili/get.py

@@ -318,7 +318,13 @@ def bilibili_json_update(bilibili_key, bilibili_value):
 
 
 # 更新哔哩哔哩频道xml模块
-def bilibili_rss_update(bilibili_key, bilibili_value):
+def bilibili_rss_update(
+    bilibili_key,
+    bilibili_value,
+    ratio_thread,
+    rss_update_lock,
+):
+    bilibili_content_bvid_backward = []  # 初始化向后更新的内容列表
     # 获取已下载文件列表
     bilibili_content_bvid_original = get_file_list(
         bilibili_key, gVar.channelid_bilibili[bilibili_value]["media"]
@@ -352,11 +358,13 @@ def bilibili_rss_update(bilibili_key, bilibili_value):
             "content": bilibili_space,
             "type": "int",
         }  # 设置为整型内容
+        gVar.xmls_quantity[bilibili_key]["update"] = 0
     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
     else:
         gVar.channelid_bilibili_rss[bilibili_key] = {
             "content": bilibili_space,
@@ -369,6 +377,7 @@ def bilibili_rss_update(bilibili_key, bilibili_value):
         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
         )  # 合并新内容和原内容
@@ -463,7 +472,6 @@ def bilibili_rss_update(bilibili_key, bilibili_value):
                         gVar.channelid_bilibili_ids_update[bilibili_key] = (
                             bilibili_value  # 标记ID更新
                         )
-                        bilibili_content_bvid_backward = []  # 初始化向后更新的内容列表
                         for guid in backward_list:
                             if (
                                 guid not in bilibili_content_bvid_original
@@ -475,3 +483,10 @@ def bilibili_rss_update(bilibili_key, bilibili_value):
                             gVar.bilibili_content_bvid_backward_update[bilibili_key] = (
                                 bilibili_content_bvid_backward  # 更新最终的向后更新内容
                             )
+    gVar.xmls_quantity[bilibili_key]["backward"] = 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

{podflow-20250413.3 → podflow-20250415}/podflow/httpfs/to_html.py

@@ -16,14 +16,14 @@ def ansi_to_html(ansi_text):
         "\033[35m": "ansi-35m",  # 品红
         "\033[36m": "ansi-36m",  # 青色
         "\033[37m": "ansi-37m",  # 白色
-        "\033[90m": "ansi-90m",  # 亮黑色 (通常显示为灰色)
-        "\033[91m": "ansi-91m",  # 亮红色 (例如：热粉色)
-        "\033[92m": "ansi-92m",  # 亮绿色 (例如：浅绿色)
-        "\033[93m": "ansi-93m",  # 亮黄色 (通常与黄色相同)
-        "\033[94m": "ansi-94m",  # 亮蓝色 (例如：浅蓝色)
-        "\033[95m": "ansi-95m",  # 亮品红 (通常与品红相同)
-        "\033[96m": "ansi-96m",  # 亮青色 (通常与青色相同)
-        "\033[97m": "ansi-97m",  # 亮白色 (例如：爱丽丝蓝)
+        "\033[90m": "ansi-90m",  # 亮黑色
+        "\033[91m": "ansi-91m",  # 亮红色 
+        "\033[92m": "ansi-92m",  # 亮绿色
+        "\033[93m": "ansi-93m",  # 亮黄色
+        "\033[94m": "ansi-94m",  # 亮蓝色
+        "\033[95m": "ansi-95m",  # 亮品红
+        "\033[96m": "ansi-96m",  # 亮青色
+        "\033[97m": "ansi-97m",  # 亮白色
         "\033[0m": "",  # 重置
     }
     inside_span = False
@@ -46,9 +46,8 @@ 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)
+    html_output = re.sub(r'^\s', '', html_output)
+    html_output = re.sub(r'\s+$', '', html_output)
     return html_output
 
 

{podflow-20250413.3 → podflow-20250415}/podflow/main_podcast.py

@@ -29,6 +29,7 @@ from podflow.download_and_build import download_and_build
 from podflow.message.save_rss import save_rss
 from podflow.message.get_original_rss import get_original_rss
 from podflow.message.get_video_format import get_video_format
+from podflow.message.optimize_download import optimize_download
 from podflow.message.original_rss_fail_print import original_rss_fail_print
 from podflow.message.update_information_display import update_information_display
 from podflow.message.update_youtube_bilibili_rss import update_youtube_bilibili_rss
@@ -122,15 +123,18 @@ def main_podcast():
         # 恢复进程打印
         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.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.server_process_print_flag[0] = "pause"
         # 连接上传服务器
         upload_url = connect_upload_server()
-        gVar.index_message["schedule"][1] = 0.04 + random.uniform(0, 0.0049)
+        gVar.index_message["schedule"][1] = 0.03 + random.uniform(0, 0.0024)
         # 恢复进程打印
         bottle_app_instance.cherry_print()
         # 登陆上传服务器
@@ -140,10 +144,10 @@ def main_podcast():
                 gVar.config["upload"] = False
         else:
             gVar.config["upload"] = False
-        gVar.index_message["schedule"][1] = 0.045 + random.uniform(0, 0.0024)
+        gVar.index_message["schedule"][1] = 0.035 + random.uniform(0, 0.0024)
         # 初始化原始上传信息
         get_upload_original()
-        gVar.index_message["schedule"][1] = 0.05
+        gVar.index_message["schedule"][1] = 0.04
         # 更新Youtube和哔哩哔哩频道xml
         update_youtube_bilibili_rss()
         gVar.index_message["schedule"][1] = 0.1
@@ -175,6 +179,8 @@ def main_podcast():
             gVar.index_message["schedule"][1] = 0.199
             # 恢复进程打印
             bottle_app_instance.cherry_print()
+            # 优化下载顺序
+            optimize_download()
             # 删除中断下载的媒体文件
             if gVar.config["delete_incompletement"]:
                 delete_part(gVar.channelid_youtube_ids | gVar.channelid_bilibili_ids)
@@ -251,6 +257,7 @@ def main_podcast():
         gVar.hash_rss_original = ""  # 原始rss哈希值文本
         gVar.xmls_original.clear()  # 原始xml信息字典
         gVar.xmls_original_fail.clear()  # 未获取原始xml频道列表
+        gVar.xmls_quantity.clear()  # xml数量字典
         gVar.youtube_xml_get_tree.clear()  # YouTube频道简介和图标字典
         gVar.all_youtube_content_ytid.clear()  # 所有YouTube视频id字典
         gVar.all_bilibili_content_bvid.clear()  # 所有哔哩哔哩视频id字典
@@ -263,10 +270,11 @@ def main_podcast():
         if parse.update_num != -1:
             parse.update_num -= 1
         if parse.argument == "a-shell":
+            shortcuts_input = urllib.parse.quote(json.dumps(gVar.shortcuts_url))
             openserver_process = subprocess.Popen(
                 [
                     "open",
-                    f"shortcuts://run-shortcut?name=Podflow&input=text&text={urllib.parse.quote(json.dumps(gVar.shortcuts_url))}",
+                    f"shortcuts://run-shortcut?name=Podflow&input=text&text={shortcuts_input}",
                 ]
             )
             # 延时
@@ -281,3 +289,6 @@ 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-20250413.3 → podflow-20250415}/podflow/makeup/make_up_file_format_mod.py

@@ -2,9 +2,9 @@
 # coding: utf-8
 
 import threading
-from datetime import datetime
 from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.basic.time_print import time_print
 from podflow.message.media_format import media_format
 
 
@@ -74,9 +74,7 @@ def makeup_format(video_id, makeup_format_lock):
 def make_up_file_format_mod():
     # 判断是否补全
     if len(gVar.make_up_file_format) != 0:
-        print(
-            f"{datetime.now().strftime('%H:%M:%S')}|补全缺失媒体 \033[34m下载准备中...\033[0m"
-        )
+        time_print("补全缺失媒体 \033[34m下载准备中...\033[0m")
     # 创建线程锁
     makeup_format_lock = threading.Lock()
     # 创建线程列表

{podflow-20250413.3 → podflow-20250415}/podflow/message/backup_zip_save.py

@@ -5,6 +5,7 @@ import zipfile
 from datetime import datetime
 from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.basic.time_print import time_print
 from podflow.message.rss_create_hash import rss_create_hash
 
 
@@ -42,4 +43,7 @@ def backup_zip_save(file_content):
                 judging_save = True
             else:
                 # 如果文件已存在, 输出提示信息
-                print(f"{file_name_str}已存在于压缩包中, 重试中...")
+                time_print(
+                    f"{file_name_str}已存在于压缩包中, 重试中...",
+                    Time=False,
+                )

{podflow-20250413.3 → podflow-20250415}/podflow/message/get_original_rss.py

@@ -30,6 +30,7 @@ def rss_create_hash(data):
 # 获取原始xml模块
 def get_original_rss():
     xmls_original_fail = []
+    xmls_quantity = {}
     # 获取原始总xml文件
     try:
         with open(
@@ -57,11 +58,25 @@ def get_original_rss():
                     f"channel_rss/{channelid_key}.xml", "r", encoding="utf-8"
                 ) as file:  # 打开文件进行读取
                     youtube_rss_original = file.read()  # 读取文件内容
-                    get_xmls_original[channelid_key] = youtube_rss_original.split(
+                    get_xmls_original_key = youtube_rss_original.split(
                         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
+
+    return get_xmls_original, hash_rss_original, xmls_original_fail, xmls_quantity

podflow-20250415/podflow/message/optimize_download.py

@@ -0,0 +1,34 @@
+# podflow/message/optimize_download.py
+# coding: utf-8
+
+from podflow import gVar
+from podflow.basic.write_log import write_log
+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 = {}
+
+    # 计算每个频道的总和
+    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
+
+    # 按总和从大到小排序
+    sorted_channels = sorted(channel_sums.items(), key=lambda x: x[1], reverse=True)
+
+    # 根据总和排序数据
+    for channel_id, _ in sorted_channels:
+        for key, value in video_id_update_format.items():
+            if value["id"] == channel_id:
+                sorted_video_id_update_format[key] = value
+    if len(video_id_update_format) == len(sorted_video_id_update_format):
+        gVar.video_id_update_format = sorted_video_id_update_format
+        time_print("下载顺序优化\033[32m成功\033[0m")
+    else:
+        write_log("下载顺序优化\033[31m失败\033[0m")

{podflow-20250413.3 → podflow-20250415}/podflow/message/update_youtube_bilibili_rss.py

@@ -13,6 +13,14 @@ from podflow.bilibili.get import bilibili_rss_update
 
 # 更新Youtube和哔哩哔哩频道xml多线程模块
 def update_youtube_bilibili_rss():
+    if gVar.channelid_youtube_ids or gVar.channelid_bilibili_ids:
+        channelid_quantity = len(gVar.channelid_youtube_ids) + len(gVar.channelid_bilibili_ids)
+        ratio_part = 0.01 / channelid_quantity
+        ratio_thread = 0.05 / channelid_quantity
+    else:
+        ratio_part = 0
+        ratio_thread = 0
+
     pattern_youtube404 = r"Error 404 \(Not Found\)"  # 设置要匹配的正则表达式模式
     pattern_youtube_error = {
         "This channel was removed because it violated our Community Guidelines.": "违反社区准则",
@@ -26,6 +34,7 @@ def update_youtube_bilibili_rss():
         r"<yt:channelId>(UC)?(.{22})?</yt:channelId>",
     ]
     youtube_bilibili_rss_update_threads = []  # 创建线程列表
+    rss_update_lock = threading.Lock()
     # Youtube多线程
     for youtube_key, youtube_value in gVar.channelid_youtube_ids.items():
         thread = threading.Thread(
@@ -36,6 +45,8 @@ def update_youtube_bilibili_rss():
                 pattern_youtube_varys,
                 pattern_youtube404,
                 pattern_youtube_error,
+                ratio_thread,
+                rss_update_lock,
             ),
         )
         youtube_bilibili_rss_update_threads.append(thread)
@@ -44,7 +55,13 @@ def update_youtube_bilibili_rss():
     # 哔哩哔哩多线程
     for bilibili_key, bilibili_value in gVar.channelid_bilibili_ids.items():
         thread = threading.Thread(
-            target=bilibili_rss_update, args=(bilibili_key, bilibili_value)
+            target=bilibili_rss_update,
+            args=(
+                bilibili_key,
+                bilibili_value,
+                ratio_thread,
+                rss_update_lock,
+            ),
         )
         youtube_bilibili_rss_update_threads.append(thread)
         # 开始多线程
@@ -61,12 +78,6 @@ 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():

{podflow-20250413.3 → podflow-20250415}/podflow/upload/get_upload_original.py

@@ -3,12 +3,12 @@
 
 import re
 import json
-from datetime import datetime
 from collections import Counter
 from email.utils import parsedate_tz, mktime_tz
 from podflow import gVar
 from podflow.basic.file_save import file_save
 from podflow.basic.write_log import write_log
+from podflow.basic.time_print import time_print
 from podflow.message.get_media_name import get_media_name
 
 
@@ -41,9 +41,7 @@ def get_upload():
         }
         # 如果两个计数字典不相等，提示错误
         if age_counts != xmls_original_counts:
-            print(
-                f"{datetime.now().strftime('%H:%M:%S')}|无法获取完整原始上传信息"
-            )
+            time_print("无法获取完整原始上传信息")
     # 如果 upload_original 为空
     else:
         # 遍历 xmls_original 的每个键值对

{podflow-20250413.3 → podflow-20250415}/podflow/upload/linked_client.py

@@ -79,7 +79,7 @@ def connect_upload_server():
             if servers:
                 break
             current_port += 1
-        print("")
+        time_print("", Time=False)
         if not servers:
             time_print("找不到上传服务器", True)
         else:

{podflow-20250413.3 → podflow-20250415}/podflow/youtube/get.py

@@ -5,8 +5,8 @@ import contextlib
 import re
 import os
 import threading
-from datetime import datetime
 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.basic.get_html_dict import get_html_dict
@@ -148,16 +148,12 @@ def get_youtube_html_playlists(
     if fail:  # 如果仍然有失败的视频
         if direction_forward or not videoid_start:
             for videoid in fail:
-                print(
-                    f"{datetime.now().strftime('%H:%M:%S')}|{youtube_value}|{videoid} HTML无法更新, 将不获取"
-                )
+                time_print(f"{youtube_value}|{videoid} HTML无法更新, 将不获取")
                 if videoid in idlist:
                     idlist.remove(videoid)  # 安全地移除视频 ID，避免 `ValueError`
                 del item[videoid]  # 删除对应的字典项
         else:
-            print(
-                f"{datetime.now().strftime('%H:%M:%S')}|{youtube_value} HTML有失败只更新部分"
-            )
+            time_print(f"{youtube_value} HTML有失败只更新部分")
             index = len(idlist)
             for videoid in fail:
                 if videoid in idlist:
@@ -194,6 +190,8 @@ def youtube_rss_update(
     pattern_youtube_varys,
     pattern_youtube404,
     pattern_youtube_error,
+    ratio_thread,
+    rss_update_lock,
 ):
     channelid_youtube = gVar.channelid_youtube
     channelid_youtube_rss = gVar.channelid_youtube_rss
@@ -320,6 +318,7 @@ def youtube_rss_update(
                 "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
@@ -332,6 +331,7 @@ 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(
@@ -364,7 +364,6 @@ def youtube_rss_update(
                 channelid_youtube_rss[youtube_key].update(
                     {"backward": youtube_html_backward_playlists}
                 )  # 添加向后更新内容
-                youtube_content_ytid_backward = []
                 youtube_content_ytid_backward.extend(
                     guid
                     for guid in backward_list
@@ -374,3 +373,10 @@ 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)
+    # 更新进度条
+    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

{podflow-20250413.3 → podflow-20250415}/podflow.egg-info/PKG-INFO

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

{podflow-20250413.3 → podflow-20250415}/podflow.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ podflow/message/get_video_format.py
 podflow/message/get_video_format_multithread.py
 podflow/message/get_youtube_and_bilibili_video_format.py
 podflow/message/media_format.py
+podflow/message/optimize_download.py
 podflow/message/original_rss_fail_print.py
 podflow/message/rss_create_hash.py
 podflow/message/save_rss.py

{podflow-20250413.3 → podflow-20250415}/setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="podflow",
-    version="20250413.3",
+    version="20250415",
     author="gruel_zxz",
     author_email="zhuxizhouzxz@gmail.com",
     description="A podcast server that includes YouTube and BiliBili",