podflow 20250404__tar.gz → 20250404.2__tar.gz

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

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

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

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

{podflow-20250404 → podflow-20250404.2}/podflow/download/dl_aideo_video.py

@@ -2,11 +2,11 @@
 # coding: utf-8
 
 import os
-from datetime import datetime
 import ffmpeg
 import yt_dlp
 from podflow import gVar
 from podflow.basic.write_log import write_log
+from podflow.basic.time_print import time_print
 from podflow.basic.get_duration import get_duration
 from podflow.download.show_progress import show_progress
 from podflow.message.fail_message_initialize import fail_message_initialize
@@ -36,7 +36,7 @@ def download_video(
 
         def error(self, msg):
             msg = fail_message_initialize(msg, video_url).ljust(48)
-            print(msg)
+            time_print(msg, Time=False)
 
     outtmpl = f"channel_audiovisual/{output_dir}/{video_url}{sesuffix}.{output_format}"
     ydl_opts = {
@@ -215,15 +215,21 @@ def dl_aideo_video(
     print_message = (
         "\033[34m开始下载\033[0m 🍪" if cookies else "\033[34m开始下载\033[0m"
     )
-    print(
-        f"{datetime.now().strftime('%H:%M:%S')}|{video_write_log} {print_message}",
-        end="",
+    time_print(
+        f"{video_write_log} {print_message}",
+        NoEnter=True,
     )
     if output_format == "m4a":
         if video_format[1] in ["140", "30280"]:
-            print("")
+            time_print(
+                "",
+                Time=False,
+            )
         else:
-            print(f" \033[97m{video_format[1]}\033[0m")
+            time_print(
+                f" \033[97m{video_format[1]}\033[0m",
+                Time=False,
+            )
         video_id_failed = dl_retry_video(
             video_url,
             output_dir,
@@ -238,8 +244,12 @@ def dl_aideo_video(
             playlist_num,
         )
     else:
-        print(
-            f"\n{datetime.now().strftime('%H:%M:%S')}|\033[34m视频部分开始下载\033[0m \033[97m{video_format[2]}\033[0m"
+        time_print(
+            "",
+            Time=False,
+        )
+        time_print(
+            f"\033[34m视频部分开始下载\033[0m \033[97m{video_format[2]}\033[0m",
         )
         video_id_failed = dl_retry_video(
             video_url,
@@ -255,8 +265,8 @@ def dl_aideo_video(
             playlist_num,
         )
         if video_id_failed is None:
-            print(
-                f"{datetime.now().strftime('%H:%M:%S')}|\033[34m音频部分开始下载\033[0m \033[97m{video_format[1]}\033[0m"
+            time_print(
+                f"\033[34m音频部分开始下载\033[0m \033[97m{video_format[1]}\033[0m",
             )
             video_id_failed = dl_retry_video(
                 video_url,
@@ -272,9 +282,9 @@ def dl_aideo_video(
                 playlist_num,
             )
         if video_id_failed is None:
-            print(
-                f"{datetime.now().strftime('%H:%M:%S')}|\033[34m开始合成...\033[0m",
-                end="",
+            time_print(
+                "\033[34m开始合成...\033[0m",
+                NoEnter=True,
             )
             # 指定视频文件和音频文件的路径
             video_file = f"channel_audiovisual/{output_dir}/{video_url}.part.mp4"
@@ -288,14 +298,21 @@ def dl_aideo_video(
                     audio, video, output_file, vcodec="copy", acodec="copy"
                 )
                 ffmpeg.run(stream, quiet=True)
-                print(" \033[32m合成成功\033[0m")
+                time_print(
+                    " \033[32m合成成功\033[0m",
+                    Time=False
+                )
                 # 删除临时文件
                 os.remove(f"channel_audiovisual/{output_dir}/{video_url}.part.mp4")
                 os.remove(f"channel_audiovisual/{output_dir}/{video_url}.part.m4a")
             except ffmpeg.Error as dl_aideo_video_error:
                 video_id_failed = video_url
+                time_print(
+                    "",
+                    Time=False,
+                )
                 write_log(
-                    f"\n{video_write_log} \033[31m下载失败\033[0m\n错误信息: 合成失败:{dl_aideo_video_error}"
+                    f"{video_write_log} \033[31m下载失败\033[0m\n错误信息: 合成失败:{dl_aideo_video_error}"
                 )
     if video_id_failed is None:
         if output_format == "m4a":

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

@@ -27,7 +27,7 @@ def wait_animation(stop_flag, wait_animation_display_info):
             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",
+                f"{prepare_youtube_print}|{wait_animation_display_info}\033[34m准备中{animation}\033[0m \033[31m失败:\033[0m",
                 Top=True,
                 Time=False,
             )

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

@@ -11,10 +11,10 @@ from podflow import gVar
 from podflow.upload.login import create
 from podflow.basic.file_save import file_save
 from podflow.basic.write_log import write_log
+from podflow.httpfs.to_html import ansi_to_html
 from podflow.upload.build_hash import build_hash
 from podflow.upload.time_key import check_time_key
 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 message_html() # 获取消息列表
+        return gVar.index_message # 获取消息列表
 
 
 bottle_app_instance = bottle_app()

{podflow-20250404 → podflow-20250404.2}/podflow/templates/index.html

@@ -287,8 +287,8 @@
         if (url) {
           new QRCode(container, {
             text: url,
-            width: 256,
-            height: 256,
+            width: 220,
+            height: 220,
             colorDark: textColor,
             colorLight: inputBg,
             correctLevel: QRCode.CorrectLevel.L

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

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

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

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