podflow 20250417.2__tar.gz → 20250427__tar.gz

{podflow-20250417.2 → podflow-20250427}/PKG-INFO

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

{podflow-20250417.2 → podflow-20250427}/podflow/__init__.py

@@ -126,6 +126,7 @@ class Application_gVar:
             "http": [],  # httpfs窗口信息列表
             "enter": True,  # 是否换行
             "schedule": [0, "准备中"],  # 进度条信息列表
+            "download":[],  # 下载信息列表
         }
 
 

{podflow-20250417.2 → podflow-20250427}/podflow/download/dl_aideo_video.py

@@ -9,6 +9,7 @@ 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.httpfs.download_bar import download_bar
 from podflow.download.show_progress import show_progress
 from podflow.message.fail_message_initialize import fail_message_initialize
 
@@ -94,6 +95,7 @@ def download_video(
             True,
             f"错误信息: {fail_info}{remove_info}",
         )  # 写入下载失败的日志信息
+        download_bar(mod=2, status="下载失败")
         return video_url, fail_info
 
 
@@ -133,6 +135,7 @@ def dl_full_video(
     if duration_video:
         fail_info = f"不完整({id_duration}|{duration_video}"
         write_log(f"{video_write_log} \033[31m下载失败\033[0m\n错误信息: {fail_info})")
+        download_bar(mod=2, status="下载失败")
         os.remove(
             f"channel_audiovisual/{output_dir}/{video_url}{sesuffix}.{output_format}"
         )  # 删除不完整的视频
@@ -208,6 +211,7 @@ def dl_aideo_video(
     cookies=None,
     playlist_num=None,
     display_color="\033[95m",
+    title_name="",
 ):
     if output_dir_name:
         video_write_log = f"{display_color}{output_dir_name}\033[0m|{video_url}"
@@ -221,6 +225,13 @@ def dl_aideo_video(
         f"{video_write_log} {print_message}",
         NoEnter=True,
     )
+    download_bar(
+        mod=0,
+        per=0,
+        idname=output_dir_name,
+        nametext=title_name,
+        file=f"{video_url}.{output_format}",
+    )
     if output_format == "m4a":
         if video_format[1] in ["140", "30280"]:
             time_print(
@@ -323,4 +334,5 @@ def dl_aideo_video(
         write_log(
             f"{video_write_log} \033[32m下载成功\033[0m", None, True, True, only_log
         )  # 写入下载成功的日志信息
+        download_bar(mod=2, status="下载成功")
     return video_id_failed

{podflow-20250417.2 → podflow-20250427}/podflow/download/show_progress.py

@@ -3,6 +3,7 @@
 
 from podflow.basic.time_print import time_print
 from podflow.basic.time_format import time_format
+from podflow.httpfs.download_bar import download_bar
 from podflow.download.convert_bytes import convert_bytes
 
 
@@ -30,20 +31,34 @@ def show_progress(stream):
             percent = 0
         percent = f"{percent:.1f}" if percent == 100 else f"{percent:.2f}"
         percent = percent.rjust(5)
-        eta = time_format(stream["eta"]).ljust(8)
+        eta = time_format(stream["eta"])
         time_print(
-            f"\033[94m{percent}%\033[0m|{downloaded_bytes}/{total_bytes}|\033[32m{speed}/s\033[0m|\033[93m{eta}\033[0m",
+            f"\033[94m{percent}%\033[0m|{downloaded_bytes}/{total_bytes}|\033[32m{speed}/s\033[0m|\033[93m{eta.ljust(8)}\033[0m",
             Top=True,
             NoEnter=True,
             Time=False,
         )
+        download_bar(
+            mod=1,
+            per=stream["downloaded_bytes"] / stream["total_bytes"],
+            retime=eta,
+            speed=f"{speed}/s\t{downloaded_bytes}/{total_bytes}",
+            status="下载中",
+        )
     if stream["status"] == "finished":
         if "elapsed" in stream:
-            elapsed = time_format(stream["elapsed"]).ljust(8)
+            elapsed = time_format(stream["elapsed"])
         else:
-            elapsed = "Unknown "
+            elapsed = "Unknown"
         time_print(
-            f"100.0%|{downloaded_bytes}/{total_bytes}|\033[32m{speed}/s\033[0m|\033[97m{elapsed}\033[0m",
+            f"100.0%|{downloaded_bytes}/{total_bytes}|\033[32m{speed}/s\033[0m|\033[97m{elapsed.ljust(8)}\033[0m",
             Top=True,
             Time=False,
         )
+        download_bar(
+            mod=1,
+            per=1,
+            retime=elapsed,
+            speed=f"{speed}/s\t{downloaded_bytes}/{total_bytes}",
+            status="下载完成",
+        )

{podflow-20250417.2 → podflow-20250427}/podflow/download/youtube_and_bilibili_download.py

@@ -22,10 +22,11 @@ def youtube_and_bilibili_download():
                 output_dir_name,
                 format_value["cookie"],
                 format_value["download"]["num"],
-                display_color
+                display_color,
+                format_value["title"],
             ):
                 gVar.video_id_failed.append(format_value["main"])
                 write_log(
                     f"{display_color}{output_dir_name}\033[0m|{video_id} \033[31m无法下载\033[0m"
                 )
-            gVar.video_id_update_format[video_id]["finish"] = True
+            gVar.video_id_update_format[video_id]["finish"] = True

{podflow-20250417.2 → podflow-20250427}/podflow/httpfs/app_bottle.py

@@ -2,6 +2,8 @@
 # coding: utf-8
 
 import os
+import json
+import time
 import hashlib
 import mimetypes
 import pkg_resources
@@ -26,6 +28,7 @@ class bottle_app:
         self.setup_routes()  # 设置路由
         self.logname = "httpfs.log"  # 默认日志文件名
         self.http_fs = False
+        self._last_message_state = {}  # 用于 SSE，跟踪消息状态
 
     def setup_routes(self, upload=False):
         # 设置/favicon.ico路由，回调函数为favicon
@@ -41,8 +44,11 @@ class bottle_app:
         else:
             self.app_bottle.route("/index", callback=self.index)
             self.app_bottle.route("/getid", method="POST", callback=self.getid)
+            self.app_bottle.route(
+                "/templates/<filepath:path>", callback=self.serve_template_file
+            )
             self.app_bottle.route("/<filename:path>", callback=self.serve_static)
-            self.app_bottle.route("/message", callback=self.message)
+            self.app_bottle.route("/stream", callback=self.stream)
 
     # 设置日志文件名及写入判断
     def set_logname(self, logname="httpfs.log", http_fs=False):
@@ -68,7 +74,7 @@ class bottle_app:
             return False
 
     # 添加至bottle_print模块
-    def add_bottle_print(self, client_ip, filename, status):
+    def add_bottle_print(self, client_ip, filename, status=""):
         # 后缀
         suffixs = [".mp4", ".m4a", ".xml", ".ico"]
         # 设置状态码对应的颜色
@@ -80,8 +86,9 @@ class bottle_app:
             206: "\033[36m",  # 青色 (部分内容)
         }
         # 默认颜色
-        color = status_colors.get(status, "\033[0m")
-        status = f"{color}{status}\033[0m"
+        if status:
+            color = status_colors.get(status, "\033[0m")
+            status = f"{color}{status}\033[0m"
         now_time = datetime.now().strftime("%H:%M:%S")
         client_ip = f"\033[34m{client_ip}\033[0m"
         if self.http_fs:
@@ -115,7 +122,7 @@ class bottle_app:
             self.bottle_print.clear()
 
     # 输出请求日志的函数
-    def print_out(self, filename, status):
+    def print_out(self, filename, status=""):
         client_ip = request.remote_addr
         if client_port := request.environ.get("REMOTE_PORT"):
             client_ip = f"{client_ip}:{client_port}"
@@ -395,10 +402,16 @@ class bottle_app:
                     },
                 }
 
+    def serve_template_file(self, filepath):
+        template_dir = pkg_resources.resource_filename("podflow", "templates")
+        return static_file(filepath, root=template_dir)
+
     # 使用pkg_resources获取模板文件路径
     def index(self):
-        template_path = pkg_resources.resource_filename('podflow', 'templates/index.html')
-        with open(template_path, 'r', encoding="UTF-8") as f:
+        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
@@ -412,13 +425,61 @@ class bottle_app:
         response_message = get_channelid(content)
         self.print_out("channelid", 200)
         # 设置响应头为 application/json
-        response.content_type = 'application/json'
+        response.content_type = "application/json"
         return {"response": response_message}
 
-    # 处理消息的接收和发送。
-    def message(self):
-        response.content_type = 'application/json'
-        return gVar.index_message # 获取消息列表
+    # --- 新增 SSE 流处理路由 ---
+    def stream(self):
+        response.content_type = "text/event-stream"
+        response.set_header("Cache-Control", "no-cache")
+        response.set_header("Connection", "keep-alive")
+        response.set_header(
+            "Access-Control-Allow-Origin", "*"
+        )  # 如果前端在不同源，需要设置 CORS
+        try:
+            while True:
+                # 获取当前消息状态
+                # 确保 gVar.index_message 存在且结构完整
+                if not hasattr(gVar, "index_message"):
+                    current_state = {
+                        "http": [],
+                        "podflow": [],
+                        "schedule": {},
+                        "download": [],
+                    }
+                else:
+                    current_state = gVar.index_message
+                    # 确保所有预期的键都存在
+                    for key in ["http", "podflow", "schedule", "download"]:
+                        if key not in current_state:
+                            current_state[key] = (
+                                [] if key in ["http", "podflow", "download"] else {}
+                            )
+                # 简单实现：总是发送当前状态
+                # 优化：可以比较 current_state 和 last_state_sent，仅在有变化时发送
+                # if current_state != last_state_sent:
+                try:
+                    # 使用 json.dumps 将 Python 字典转换为 JSON 字符串
+                    message_json = json.dumps(current_state)
+                    sse_data = f"data: {message_json}\n\n"
+                    yield sse_data.encode("utf-8")  # 发送编码后的数据
+                except TypeError as e:
+                    # 如果序列化失败，记录错误，可以发送一个错误事件
+                    self.print_out(f"Error serializing message data for SSE: {e}")
+                    error_message = json.dumps({"error": "Failed to serialize data"})
+                    yield f"event: error\ndata: {error_message}\n\n".encode("utf-8")
+                # 等待一段时间再检查/发送
+                time.sleep(0.25)  # 每秒发送一次更新（或检查更新）
+        except (GeneratorExit, BrokenPipeError, ConnectionResetError):
+            # 客户端断开连接时会触发这些异常
+            self.print_out("SSE client disconnected.")
+            # 这里可以进行一些清理工作（如果需要）
+        except Exception as e:
+            # 捕获其他潜在错误
+            self.print_out(f"Error in SSE stream: {e}")
+        finally:
+            # 确保循环退出时会执行一些操作（如果需要）
+            self.print_out("SSE stream loop finished.")
 
 
 bottle_app_instance = bottle_app()

podflow-20250427/podflow/httpfs/download_bar.py

@@ -0,0 +1,35 @@
+# podflow/httpfs/download_bar.py
+# coding: utf-8
+
+from podflow import gVar
+
+
+def download_bar(
+    mod=0,
+    per=0,
+    retime="00:00",
+    speed="   0.00 B",
+    status="准备中",
+    idname="",
+    nametext="",
+    file="",
+):
+    if mod == 0:
+        gVar.index_message["download"].append(
+            [
+                per,
+                retime,
+                speed,
+                status,
+                idname,
+                nametext,
+                file,
+            ]
+        )
+    elif mod == 1 and gVar.index_message["download"]:
+        gVar.index_message["download"][-1][0] = per
+        gVar.index_message["download"][-1][1] = retime
+        gVar.index_message["download"][-1][2] = speed
+        gVar.index_message["download"][-1][3] = status
+    elif mod == 2 and gVar.index_message["download"]:
+        gVar.index_message["download"][-1][3] = status

{podflow-20250417.2 → podflow-20250427}/podflow/main_podcast.py

@@ -69,16 +69,19 @@ def main_podcast():
     # 初始化
     build_original()
     # http共享
-    port = gVar.config["port"]
+    port = gVar.config.get("port", 8080) # 使用 .get 获取端口
     hostip = "0.0.0.0"
-    if port_judge(hostip, port):
-        # 设置路由
-        bottle_app_instance.setup_routes(upload=False)
+
+    if port_judge(hostip, port): # 假设 port_judge 存在
+        # 设置路由 (确保此时 gVar.config 等已就绪)
+        bottle_app_instance.setup_routes(upload=False) # 或者根据需要设置为 True
+
         # 设置logname
         bottle_app_instance.set_logname(
             logname="httpfs.log",
-            http_fs=gVar.config["httpfs"],
+            http_fs=gVar.config.get("httpfs", False), # 使用 .get
         )
+
         # 启动 CherryPy 服务器
         cherrypy.tree.graft(
             bottle_app_instance.app_bottle
@@ -92,13 +95,15 @@ def main_podcast():
                     "log.screen": False,  # 禁用屏幕日志输出
                     "log.access_file": "",  # 关闭访问日志
                     "log.error_file": "",  # 关闭错误日志
+                    # 添加线程池配置，对于长连接 (SSE) 可能有帮助
+                    'server.thread_pool': 30 # 示例值，根据需要调整
                 }
             }
         )
         cherrypy.engine.start()  # 启动 CherryPy 服务器
         time_print(f"HTTP服务器启动, 端口: \033[32m{port}\033[0m")
-        if parse.index:
-            open_url(f"{gVar.config['address']}/index")
+        if parse.index: # 假设 parse 已定义
+            open_url(f"{gVar.config['address']}/index") # 假设 open_url 已定义
         if parse.httpfs:  # HttpFS参数判断, 是否继续运行
             cherrypy.engine.block()  # 阻止程序退出, 保持HTTP服务运行
             sys.exit(0)