videoconverter-worker 1.0.5__tar.gz → 1.0.7__tar.gz

{videoconverter_worker-1.0.5 → videoconverter_worker-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: videoconverter-worker
-Version: 1.0.5
+Version: 1.0.7
 Summary: VideoConverter Python Worker：从 queue 目录读取任务并执行切分/去字幕/合成
 License: MIT
 Keywords: videoconverter,ffmpeg,worker,video

{videoconverter_worker-1.0.5 → videoconverter_worker-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "videoconverter-worker"
-version = "1.0.5"
+version = "1.0.7"
 description = "VideoConverter Python Worker：从 queue 目录读取任务并执行切分/去字幕/合成"
 readme = "README.txt"
 requires-python = ">=3.8"

{videoconverter_worker-1.0.5 → videoconverter_worker-1.0.7}/videoconverter_worker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: videoconverter-worker
-Version: 1.0.5
+Version: 1.0.7
 Summary: VideoConverter Python Worker：从 queue 目录读取任务并执行切分/去字幕/合成
 License: MIT
 Keywords: videoconverter,ffmpeg,worker,video

{videoconverter_worker-1.0.5 → videoconverter_worker-1.0.7}/worker.py

@@ -31,13 +31,26 @@ logging.basicConfig(
 logger = logging.getLogger("worker")
 
 
+def _cpu_ram_str() -> str:
+    """若已安装 psutil 则返回 ' CPU 12% RAM 34%'，否则返回空字符串。不增加强制依赖。"""
+    try:
+        import psutil
+        cpu = psutil.cpu_percent(interval=None)
+        mem = psutil.virtual_memory().percent
+        return f"  CPU {cpu:.0f}% RAM {mem:.0f}%"
+    except Exception:
+        return ""
+
+
 def _desub_spinner(stop_event: threading.Event) -> None:
-    """去字幕阶段同一行跑马灯，避免用户以为死机。"""
+    """去字幕阶段同一行跑马灯，避免用户以为死机。仅 TTY 且 1 秒刷新一次；若已装 psutil 会显示 CPU/RAM 占用。"""
     i = 0
-    while not stop_event.wait(0.25):
+    while not stop_event.wait(1.0):
         dots = "." * ((i % 3) + 1)
         try:
-            sys.stderr.write("\r  [INFO] worker: 去字幕中 " + dots + "   ")
+            ts = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+            extra = _cpu_ram_str()
+            sys.stderr.write(f"\r{ts} [INFO] worker: 去字幕中 {dots}{extra}   ")
             sys.stderr.flush()
         except (OSError, UnicodeEncodeError):
             break
@@ -352,11 +365,23 @@ def run_simple_compose(
     chunk_list = [c for c in (metadata.get("chunks") or []) if c.get("originalPath")]
     logger.info("切分完成: %d 块，开始去字幕", len(chunk_list))
 
+    use_spinner = getattr(sys.stderr, "isatty", lambda: False)()  # 仅真正终端跑跑马灯，避免 Colab/后台时满屏刷日志
     stop_spinner = threading.Event()
     spinner = threading.Thread(target=_desub_spinner, args=(stop_spinner,), daemon=True)
-    spinner.start()
+
+    def _stop_spinner_newline():
+        stop_spinner.set()
+        spinner.join(timeout=1.5)
+        try:
+            sys.stderr.write("\n")
+            sys.stderr.flush()
+        except (OSError, UnicodeEncodeError):
+            pass
+
+    if use_spinner:
+        spinner.start()
     try:
-        for ch in chunk_list:
+        for i, ch in enumerate(chunk_list):
             rel = ch.get("originalPath", "")
             if not rel:
                 continue
@@ -374,17 +399,18 @@ def run_simple_compose(
             cfg["endTime"] = 0
             cfg["forceKeyframeAtStart"] = True
             run_desubtitle(cfg, str(chunk_path), str(output_file))
+            if use_spinner:
+                _stop_spinner_newline()
             meta_path = Path(output_dir) / video_id / "metadata.json"
             if meta_path.exists():
                 update_chunk_processed(str(meta_path), chunk_id, str(output_file))
+            if use_spinner and i + 1 < len(chunk_list):
+                stop_spinner = threading.Event()
+                spinner = threading.Thread(target=_desub_spinner, args=(stop_spinner,), daemon=True)
+                spinner.start()
     finally:
-        stop_spinner.set()
-        spinner.join(timeout=1.0)
-        try:
-            sys.stderr.write("\n")
-            sys.stderr.flush()
-        except (OSError, UnicodeEncodeError):
-            pass
+        if use_spinner:
+            _stop_spinner_newline()
 
     data = load_metadata(str(Path(output_dir) / video_id / "metadata.json"))
     processed = get_processed_chunks(data)