podflow 20250328__tar.gz → 20250330.1__tar.gz

{podflow-20250328 → podflow-20250330.1}/PKG-INFO

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

{podflow-20250328 → podflow-20250330.1}/podflow/__init__.py

@@ -119,6 +119,12 @@ class Application_gVar:
         self.upload_data = {}  # 上传用户账号密码字典
 
         self.shortcuts_url = {}  # 输出至shortcut的url字典
+        
+        self.index_message = {  # 图形界面显示信息字典
+            "podflow": [],  # 主窗口信息列表
+            "http": [],  # httpfs窗口信息列表
+            "enter": True,  # 是否换行
+        }
 
 
 # 参数变量

podflow-20250330.1/podflow/basic/time_print.py

@@ -0,0 +1,27 @@
+# podflow/basic/time_print.py
+# coding: utf-8
+
+from datetime import datetime
+from podflow import gVar
+from podflow.httpfs.ansi_to_html import ansi_to_html
+
+
+def time_print(text, Top=False, NoEnter=False, Time=True):
+    if Time:
+        text = f"{datetime.now().strftime('%H:%M:%S')}|{text}"
+    if Top:
+        text = f"\r{text}"
+    if NoEnter:
+        print(text, end="")
+    else:
+        print(text)
+    text = ansi_to_html(text)
+    if not gVar.index_message["enter"] and gVar.index_message["podflow"]:
+        if Top:
+            gVar.index_message["podflow"][0] = text
+        else:
+            gVar.index_message["podflow"][0] += (text)
+    else:
+        gVar.index_message["podflow"].append(text)
+    if NoEnter:
+        gVar.index_message["enter"] = False

{podflow-20250328 → podflow-20250330.1}/podflow/basic/write_log.py

@@ -3,6 +3,8 @@
 
 import re
 from datetime import datetime
+from podflow import gVar
+from podflow.httpfs.ansi_to_html import ansi_to_html
 
 
 # 日志模块
@@ -34,4 +36,5 @@ def write_log(
         formatted_time_mini = current_time.strftime("%H:%M:%S")
         log_print = f"{formatted_time_mini}|{log}" if time_display else f"{log}"
         log_print = f"{log_print}|{suffix}" if suffix else f"{log_print}"
+        gVar.index_message["podflow"].append(ansi_to_html(log_print))
         print(log_print)

podflow-20250330.1/podflow/httpfs/ansi_to_html.py

@@ -0,0 +1,52 @@
+# podflow/httpfs/ansi_to_htmlpy
+# coding: utf-8
+
+import re
+import html
+
+
+def ansi_to_html(ansi_text):
+    html_output = ""
+    ansi_codes = {
+        "\033[30m": "color: black;",  # 黑色
+        "\033[31m": "color: red;",  # 红色
+        "\033[32m": "color: green;",  # 绿色
+        "\033[33m": "color: yellow;",  # 黄色
+        "\033[34m": "color: blue;",  # 蓝色
+        "\033[35m": "color: magenta;",  # 品红
+        "\033[36m": "color: cyan;",  # 青色
+        "\033[37m": "color: white;",  # 白色
+        "\033[90m": "color: gray;",  # 亮黑色 (通常显示为灰色)
+        "\033[91m": "color: #ff69b4;",  # 亮红色 (例如：热粉色)
+        "\033[92m": "color: #90ee90;",  # 亮绿色 (例如：浅绿色)
+        "\033[93m": "color: #ffff00;",  # 亮黄色 (通常与黄色相同)
+        "\033[94m": "color: #add8e6;",  # 亮蓝色 (例如：浅蓝色)
+        "\033[95m": "color: #ff00ff;",  # 亮品红 (通常与品红相同)
+        "\033[96m": "color: #00ffff;",  # 亮青色 (通常与青色相同)
+        "\033[97m": "color: #f0f8ff;",  # 亮白色 (例如：爱丽丝蓝)
+        "\033[0m": "",  # 重置
+    }
+    inside_span = False
+
+    parts = re.split(r"(\033\[\d+m)", ansi_text)
+
+    for part in parts:
+        if part in ansi_codes:
+            style = ansi_codes[part]
+            if style:
+                if inside_span:
+                    html_output += "</span>"
+                html_output += f'<span style="{style}">'
+                inside_span = True
+            elif inside_span:  # Reset code
+                html_output += "</span>"
+                inside_span = False
+        else:
+            escaped_part = html.escape(part)
+            html_output += escaped_part
+
+    if inside_span:
+        html_output += "</span>"
+
+    #html_output = html_output.replace("\n", "</p><p>")
+    return html_output

{podflow-20250328 → podflow-20250330.1}/podflow/httpfs/app_bottle.py

@@ -13,6 +13,7 @@ from podflow.basic.file_save import file_save
 from podflow.basic.write_log import write_log
 from podflow.upload.build_hash import build_hash
 from podflow.upload.time_key import check_time_key
+from podflow.httpfs.ansi_to_html import ansi_to_html
 from podflow.httpfs.get_channelid import get_channelid
 
 
@@ -40,6 +41,7 @@ class bottle_app:
             self.app_bottle.route("/index", callback=self.index)
             self.app_bottle.route("/getid", method="POST", callback=self.getid)
             self.app_bottle.route("/<filename:path>", callback=self.serve_static)
+            self.app_bottle.route("/message", callback=self.message)
 
     # 设置日志文件名及写入判断
     def set_logname(self, logname="httpfs.log", http_fs=False):
@@ -92,7 +94,9 @@ class bottle_app:
             )
         for suffix in suffixs:
             filename = filename.replace(suffix, "")
-        self.bottle_print.append(f"{now_time}|{client_ip} {filename} {status}")
+        bottle_text = f"{now_time}|{client_ip} {filename} {status}"
+        self.bottle_print.append(bottle_text)
+        gVar.index_message["http"].append(ansi_to_html(bottle_text))
 
     # CherryPy 服务器打印模块
     def cherry_print(self, flag_judgment=True):
@@ -376,16 +380,16 @@ class bottle_app:
                     },
                 }
 
+    # 使用pkg_resources获取模板文件路径
     def index(self):
-        # 使用pkg_resources获取模板文件路径
         template_path = pkg_resources.resource_filename('podflow', 'templates/index.html')
         with open(template_path, 'r', encoding="UTF-8") as f:
             html_content = f.read()
         self.print_out("index", 200)
         return html_content
 
+    # 获取 JSON 数据，Bottle 会自动解析请求体中的 JSON 数据
     def getid(self):
-        # 获取 JSON 数据，Bottle 会自动解析请求体中的 JSON 数据
         if getid_data := request.json:
             content = getid_data.get("content", "")
         else:
@@ -396,5 +400,10 @@ class bottle_app:
         response.content_type = 'application/json'
         return {"response": response_message}
 
+    # 处理消息的接收和发送。
+    def message(self):
+        response.content_type = 'application/json'
+        return gVar.index_message # 获取消息列表
+
 
 bottle_app_instance = bottle_app()

{podflow-20250328 → podflow-20250330.1}/podflow/main_podcast.py

@@ -120,8 +120,12 @@ def main_podcast():
         gVar.xmls_original, gVar.hash_rss_original, gVar.xmls_original_fail = (
             get_original_rss()
         )
+        # 暂停进程打印
+        gVar.server_process_print_flag[0] = "pause"
         # 连接上传服务器
         upload_url = connect_upload_server()
+        # 恢复进程打印
+        bottle_app_instance.cherry_print()
         # 登陆上传服务器
         if upload_url:
             upload_json = login_upload(upload_url)

{podflow-20250328 → podflow-20250330.1}/podflow/makeup/make_up_file_format_mod.py

@@ -31,9 +31,9 @@ def makeup_format(video_id, makeup_format_lock):
                     "channel_data/yt_dlp_youtube.txt",
                 )
                 if fail_info in makeup_id_format:
-                    makeup_id_format = f"\x1b[31m{fail_info}\x1b[0m(Cookies错误)"
+                    makeup_id_format = f"\033[31m{fail_info}\033[0m(Cookies错误)"
             else:
-                makeup_id_format = f"\x1b[31m{fail_info}\x1b[0m(需要Cookies)"
+                makeup_id_format = f"\033[31m{fail_info}\033[0m(需要Cookies)"
             break
     if isinstance(makeup_id_format, list):
         if len(makeup_id_format) == 1:

{podflow-20250328 → podflow-20250330.1}/podflow/message/get_youtube_and_bilibili_video_format.py

@@ -53,15 +53,15 @@ def get_youtube_and_bilibili_video_format(
                         gVar.video_id_update_format[id_num]["cookie"],
                     )
                     if fail_info in id_update_format:
-                        id_update_format = f"\x1b[31m{fail_info}\x1b[0m(Cookies错误)"
+                        id_update_format = f"\033[31m{fail_info}\033[0m(Cookies错误)"
                 else:
-                    id_update_format = f"\x1b[31m{fail_info}\x1b[0m(需要Cookies)"
+                    id_update_format = f"\033[31m{fail_info}\033[0m(需要Cookies)"
                 break
     else:
         if gVar.video_id_update_format[id_num]["power"] is True and (
             "试看" in id_update_format or id_update_format == "无法获取音频ID"
         ):
-            id_update_format = "\x1b[31m充电专属\x1b[0m"
+            id_update_format = "\033[31m充电专属\033[0m"
     if isinstance(id_update_format, list):
         if len(id_update_format) == 1:
             one_format(id_update_format, id_num)