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

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/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/httpfs/app_bottle.py

@@ -11,6 +11,7 @@ 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

{podflow-20250404.dist-info → podflow-20250404.1.dist-info}/METADATA

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

{podflow-20250404.dist-info → podflow-20250404.1.dist-info}/RECORD

@@ -35,12 +35,12 @@ podflow/config/get_config.py,sha256=TpLbh5GoPO7csWUJ-di65XXnkN3LSnMXkFw85h5ndHs,
 podflow/download/__init__.py,sha256=1lATXiOAEx5oDUDR99mQRiTrQlQ9CQkJNAKpsLrnPCo,47
 podflow/download/convert_bytes.py,sha256=6Q3TcPGzCO2FlhOKWbp9RB_GPmfuyKY5suIyE9EJf6k,543
 podflow/download/delete_part.py,sha256=wjY6WulpUMjLx38on0kTLXj0gA04rIuKAdwFidZtWGU,679
-podflow/download/dl_aideo_video.py,sha256=KKs8EpS3NI_sBMHr-QCAtoq6aGnoRXrqVU07KyLEHlg,10057
+podflow/download/dl_aideo_video.py,sha256=LxA_Nt51ZG2MaIyVOi5CyDH7PA-EONxxAVW1wO8i4vE,10344
 podflow/download/show_progress.py,sha256=cWlyIh6WqoH3s4WpFSyL6xtiXhQFbrVJVcckxO-1NLg,1595
-podflow/download/wait_animation.py,sha256=SbdtpY4QzTOxGKX93kSde3syj88dTOzrJMJkkCiS1Yc,1307
+podflow/download/wait_animation.py,sha256=AUTvszXF89QA7XYjocFIauPKV7Qj8cFqry44teClaLQ,1314
 podflow/download/youtube_and_bilibili_download.py,sha256=dlUh9cPHrYgZAhtXlBUOdFIpZOhv9xOtgdcTaqUvLuY,1294
 podflow/httpfs/__init__.py,sha256=BxEXkufjcx-a0F7sDVXo65hmyANqCCbZUd6EH9i8T2c,45
-podflow/httpfs/app_bottle.py,sha256=FU3LpdEDGXhEb-fHRWIk1WYgywKN3FSQAKECdJ68RNA,16797
+podflow/httpfs/app_bottle.py,sha256=xslFhq0GW9Q6QEioRRkqs0UuGcdI2qVhMyCGZZtxJw4,16845
 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
@@ -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-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,,
+podflow-20250404.1.dist-info/METADATA,sha256=RPYAiLB81ussdErIcCXHnzOkMT8mDehpd2iHVK7DhCo,14165
+podflow-20250404.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+podflow-20250404.1.dist-info/entry_points.txt,sha256=mn7hD_c_dmpKe3XU0KNekheBvD01LhlJ9htY-Df0j2A,131
+podflow-20250404.1.dist-info/top_level.txt,sha256=fUujhhz-RrMI8aGvi-3Ey5y7FQnpOOgoFw9OWM3yLCU,8
+podflow-20250404.1.dist-info/RECORD,,