podflow 20250402.3__py3-none-any.whl → 20250404__py3-none-any.whl

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/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/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/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.dist-info → podflow-20250404.dist-info}/METADATA

@@ -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.dist-info → podflow-20250404.dist-info}/RECORD

@@ -16,7 +16,7 @@ podflow/basic/list_merge_tidy.py,sha256=7hWfSnsPh23edHNU92vxtI0nfpfN8m54GTEt2rGm
 podflow/basic/qr_code.py,sha256=BQFxAx55vqWECTwWgybyXu3IuDFavpc3zMCmZ4XvKKE,1630
 podflow/basic/split_dict.py,sha256=Ir6GTortcWMUeFITFgY1v-INMla5y0IN3RN3nTgzWqM,401
 podflow/basic/time_format.py,sha256=T3tw2vbOwxMYYXDaV4Sj76WOZtsspj2lWA_DzWqUEJA,487
-podflow/basic/time_print.py,sha256=oP4wKjv4Cm5OI-FPNvcTYuion6h4g7KKPvA3XY13M8w,1115
+podflow/basic/time_print.py,sha256=eTWP7MpF_NSSG0BluTxgmpWAjHzxh6LuoNEof4fQZJQ,916
 podflow/basic/time_stamp.py,sha256=Kbz9PzgPtss1fRqPXdfz1q6MTGVMRi3LPClN7wrXSIk,1888
 podflow/basic/vary_replace.py,sha256=-TyvZxfak6U7Ak8F87ctYUBpHB2Il6iYZof37lwKjto,211
 podflow/basic/write_log.py,sha256=wfiNfFuRLCWNLXDRNPVaVsKxwB44xxTiCFJ66g71XmU,1255
@@ -37,14 +37,14 @@ podflow/download/convert_bytes.py,sha256=6Q3TcPGzCO2FlhOKWbp9RB_GPmfuyKY5suIyE9E
 podflow/download/delete_part.py,sha256=wjY6WulpUMjLx38on0kTLXj0gA04rIuKAdwFidZtWGU,679
 podflow/download/dl_aideo_video.py,sha256=KKs8EpS3NI_sBMHr-QCAtoq6aGnoRXrqVU07KyLEHlg,10057
 podflow/download/show_progress.py,sha256=cWlyIh6WqoH3s4WpFSyL6xtiXhQFbrVJVcckxO-1NLg,1595
-podflow/download/wait_animation.py,sha256=0TZLQzBQpPDfK2TYWMsmsGoaefLtW5oH34LhrgpbR40,1283
+podflow/download/wait_animation.py,sha256=SbdtpY4QzTOxGKX93kSde3syj88dTOzrJMJkkCiS1Yc,1307
 podflow/download/youtube_and_bilibili_download.py,sha256=dlUh9cPHrYgZAhtXlBUOdFIpZOhv9xOtgdcTaqUvLuY,1294
 podflow/httpfs/__init__.py,sha256=BxEXkufjcx-a0F7sDVXo65hmyANqCCbZUd6EH9i8T2c,45
-podflow/httpfs/app_bottle.py,sha256=wMTcuRZBEzBNNb6qDRQt_v-5HO8_mv755PFiIrTuycU,16787
+podflow/httpfs/app_bottle.py,sha256=FU3LpdEDGXhEb-fHRWIk1WYgywKN3FSQAKECdJ68RNA,16797
 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=a5IzUhbithfESqdc7-ovPegR_6Ovon77J10oIcJSy2U,2417
 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
@@ -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-20250402.3.dist-info/METADATA,sha256=lUDDN-uDSPvqq7doMbTgDvJXPxtY03JGTEZmbBZFNZc,14165
-podflow-20250402.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-podflow-20250402.3.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
-podflow-20250402.3.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
-podflow-20250402.3.dist-info/RECORD,,
+podflow-20250404.dist-info/METADATA,sha256=ok3yBOEgUM0TH_2sqwBGRjZONW-qaaEjNQCRR42L9ds,14163
+podflow-20250404.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250404.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250404.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250404.dist-info/RECORD,,