videoconverter-worker 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

{videoconverter_worker-1.0.6.dist-info → videoconverter_worker-1.0.8.dist-info}/METADATA

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

videoconverter_worker-1.0.8.dist-info/RECORD

@@ -0,0 +1,10 @@
+ffmpeg_runner.py,sha256=2sYugXkKp-NKj3ahxbwbhAo4G49FDu-0oze-cdJvcY0,12218
+metadata.py,sha256=32zQn7jJ6XTHhunwTn5Xv0qmpjHnap_pkPxY0XI8MBs,3116
+schema.py,sha256=3ILdGl5qSQOSvKfiKWcnaxdyHwV4rDvGnRZIparVp3o,4361
+task_queue.py,sha256=sYQelPRuTbP9g_sPs69xOR3n5SIxGBFxY4EI5ueQrQs,11822
+worker.py,sha256=oDd4NG0OM5GsoYnRNf8XtcwIyoe8Zd7SkXABrC8WqzM,22417
+videoconverter_worker-1.0.8.dist-info/METADATA,sha256=rPAbe8ov972I4JqYOylfTTlFlJuQkavM51e0oYpbCoo,5139
+videoconverter_worker-1.0.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+videoconverter_worker-1.0.8.dist-info/entry_points.txt,sha256=qedJjjix02n9Hz8adBioDIpGHghm8S3fQZdFwM5LV1A,83
+videoconverter_worker-1.0.8.dist-info/top_level.txt,sha256=iamWyiqUZ4X0_2UZx6GEk9gsPmiI9qhse_15HqtzUj8,48
+videoconverter_worker-1.0.8.dist-info/RECORD,,

worker.py

@@ -31,14 +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:
             ts = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
-            sys.stderr.write(f"\r{ts} [INFO] worker: 去字幕中 {dots}   ")
+            extra = _cpu_ram_str()
+            sys.stderr.write(f"\r{ts} [INFO] worker: 去字幕中{extra} {dots}   ")
             sys.stderr.flush()
         except (OSError, UnicodeEncodeError):
             break
@@ -353,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
@@ -375,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)
@@ -445,7 +470,7 @@ def main() -> int:
     parser.add_argument(
         "--dir",
         default=".",
-        help="简易模式：工作目录，默认当前目录",
+        help="简易模式：工作目录（支持相对路径），不存在则自动创建，默认当前目录",
     )
     parser.add_argument(
         "--start",
@@ -506,9 +531,12 @@ def main() -> int:
 
     if args.simple:
         base = Path(args.dir).resolve()
-        if not base.is_dir():
-            logger.error("目录不存在: %s", base)
+        if base.exists() and not base.is_dir():
+            logger.error("路径已存在但不是目录: %s", base)
             return 1
+        if not base.exists():
+            base.mkdir(parents=True, exist_ok=True)
+            logger.info("已创建工作目录: %s", base)
         out_dir = Path(args.output).resolve() if args.output else (base / "videoconverter_out")
         out_dir.mkdir(parents=True, exist_ok=True)
         if args.file:

videoconverter_worker-1.0.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-ffmpeg_runner.py,sha256=2sYugXkKp-NKj3ahxbwbhAo4G49FDu-0oze-cdJvcY0,12218
-metadata.py,sha256=32zQn7jJ6XTHhunwTn5Xv0qmpjHnap_pkPxY0XI8MBs,3116
-schema.py,sha256=3ILdGl5qSQOSvKfiKWcnaxdyHwV4rDvGnRZIparVp3o,4361
-task_queue.py,sha256=sYQelPRuTbP9g_sPs69xOR3n5SIxGBFxY4EI5ueQrQs,11822
-worker.py,sha256=JEuCMeqFzNIepJP6fDEWeokA2zZ3eJ6MnxkewmFGXGE,21143
-videoconverter_worker-1.0.6.dist-info/METADATA,sha256=YsRlsAkXt7kn4M4hbHz87OQ6FcPfsnOPtU1np3fneh4,5139
-videoconverter_worker-1.0.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-videoconverter_worker-1.0.6.dist-info/entry_points.txt,sha256=qedJjjix02n9Hz8adBioDIpGHghm8S3fQZdFwM5LV1A,83
-videoconverter_worker-1.0.6.dist-info/top_level.txt,sha256=iamWyiqUZ4X0_2UZx6GEk9gsPmiI9qhse_15HqtzUj8,48
-videoconverter_worker-1.0.6.dist-info/RECORD,,