podflow 20250402.3__tar.gz → 20250404__tar.gz

{podflow-20250402.3 → podflow-20250404}/PKG-INFO

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

{podflow-20250402.3 → podflow-20250404}/podflow/basic/time_print.py

@@ -20,19 +20,20 @@ def time_print(text, Top=False, NoEnter=False, Time=True, Url=""):
     else:
         print(text_print)
 
-    text = ansi_to_html(text)
-    if not gVar.index_message["enter"] and gVar.index_message["podflow"]:
-        if Top and gVar.index_message["podflow"]:
-            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
+    if text:
+        text = ansi_to_html(text)
+    gVar.index_message["podflow"].append(
+        [
+            text,
+            Top,
+            NoEnter,
+        ]
+    )
     if Url:
         gVar.index_message["podflow"].append(
-            f'<a href="{Url}"><span class="ansi-url">{Url}</span></a>'
+            [
+                f'<a href="{Url}"><span class="ansi-url">{Url}</span></a>',
+                Top,
+                NoEnter,
+            ]
         )

{podflow-20250402.3 → podflow-20250404}/podflow/download/wait_animation.py

@@ -19,6 +19,12 @@ def wait_animation(stop_flag, wait_animation_display_info):
                 NoEnter=True,
                 Time=False,
             )
+            if i % 5 == 0:
+                animation = "."
+            else:
+                animation += "."
+            i += 1
+            time.sleep(0.5)
         elif stop_flag[0] == "error":
             time_print(
                 f"{prepare_youtube_print}|{wait_animation_display_info}\033[34m准备中{animation} \033[31m失败:\033[0m",
@@ -33,9 +39,3 @@ def wait_animation(stop_flag, wait_animation_display_info):
                 Time=False,
             )
             break
-        if i % 5 == 0:
-            animation = "."
-        else:
-            animation += "."
-        i += 1
-        time.sleep(0.5)

{podflow-20250402.3 → podflow-20250404}/podflow/httpfs/app_bottle.py

@@ -13,8 +13,8 @@ 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.to_html import ansi_to_html
 from podflow.httpfs.get_channelid import get_channelid
+from podflow.httpfs.to_html import ansi_to_html, message_html
 
 
 class bottle_app:
@@ -403,7 +403,7 @@ class bottle_app:
     # 处理消息的接收和发送。
     def message(self):
         response.content_type = 'application/json'
-        return gVar.index_message # 获取消息列表
+        return message_html() # 获取消息列表
 
 
 bottle_app_instance = bottle_app()

{podflow-20250402.3 → podflow-20250404}/podflow/httpfs/to_html.py

@@ -54,3 +54,24 @@ def ansi_to_html(ansi_text):
 def qrcode_to_html(url):
     text = f'<span class="qrcode-container" data-url="{url}"></span>'
     gVar.index_message["podflow"].append(text)
+
+
+def message_html():
+    # [text, Top, NoEnter]
+    podflow = []
+    messages = gVar.index_message["podflow"]
+    if messages:
+        for index, message in enumerate(messages):
+            if index > 1 and messages[index -1][2]:
+                if message[1]:
+                    podflow[-1] = message[0]
+                else:
+                    podflow[-1] += message[0]
+            else:
+                podflow.append(message[0])
+    message = {
+        "podflow": podflow,
+        "http": gVar.index_message["http"], 
+    }
+    return message
+    

{podflow-20250402.3 → podflow-20250404}/podflow.egg-info/PKG-INFO

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

{podflow-20250402.3 → podflow-20250404}/setup.py

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