videoconverter-worker 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

{videoconverter_worker-1.0.3.dist-info → videoconverter_worker-1.0.4.dist-info}/METADATA

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

videoconverter_worker-1.0.4.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=7sp3Wn6qf2xFtsQpJZEhUXrvb6m8uSmCNbcE4ssapQI,21117
+videoconverter_worker-1.0.4.dist-info/METADATA,sha256=0bWYbcY5_HuBpnwNILPdmRb5LBeNPAiP_rQRfrf4tDM,5139
+videoconverter_worker-1.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+videoconverter_worker-1.0.4.dist-info/entry_points.txt,sha256=qedJjjix02n9Hz8adBioDIpGHghm8S3fQZdFwM5LV1A,83
+videoconverter_worker-1.0.4.dist-info/top_level.txt,sha256=iamWyiqUZ4X0_2UZx6GEk9gsPmiI9qhse_15HqtzUj8,48
+videoconverter_worker-1.0.4.dist-info/RECORD,,

worker.py

@@ -8,6 +8,7 @@ Python Worker：从 queue 目录读取任务并执行切分/去字幕/合成，
 import argparse
 import logging
 import sys
+import threading
 import time
 from pathlib import Path
 
@@ -30,6 +31,19 @@ logging.basicConfig(
 logger = logging.getLogger("worker")
 
 
+def _desub_spinner(stop_event: threading.Event) -> None:
+    """去字幕阶段同一行跑马灯，避免用户以为死机。"""
+    i = 0
+    while not stop_event.wait(0.25):
+        dots = "." * ((i % 3) + 1)
+        try:
+            sys.stderr.write("\r  [INFO] worker: 去字幕中 " + dots + "   ")
+            sys.stderr.flush()
+        except (OSError, UnicodeEncodeError):
+            break
+        i += 1
+
+
 def process_split_task(store: QueueStore, task: dict) -> None:
     task_id = task["task_id"]
     input_file = task["input_file"]
@@ -167,7 +181,7 @@ def _format_duration(sec: float) -> str:
 
 
 def _log_split_to_merge_duration(data: dict, task_id: str, store: QueueStore) -> None:
-    """若 metadata 含 splitStartedAt，则计算并输出从切分到合成结束的总时长。"""
+    """若 metadata 含 splitStartedAt，则计算并输出从切分到合成结束的总时长与产能预估。"""
     s = data.get("splitStartedAt") or ""
     if not s:
         return
@@ -177,10 +191,16 @@ def _log_split_to_merge_duration(data: dict, task_id: str, store: QueueStore) ->
         if ts.tzinfo is None:
             ts = ts.replace(tzinfo=timezone.utc)
         duration_sec = (datetime.now(timezone.utc) - ts).total_seconds()
-        if duration_sec >= 0:
-            msg = f"从切分到合成结束总时长: {_format_duration(duration_sec)}"
-            logger.info("videoId=%s %s", data.get("videoId", ""), msg)
-            store.add_log(task_id, "INFO", msg)
+        if duration_sec < 0:
+            return
+        msg = f"从切分到合成结束总时长: {_format_duration(duration_sec)}"
+        processed = get_processed_chunks(data)
+        if processed and duration_sec > 0:
+            src_duration_sec = processed[-1]["endTime"] - processed[0]["startTime"]
+            capacity = (src_duration_sec / 3600.0) / (duration_sec / 3600.0)
+            msg += f"，产能预估: 约 {capacity:.2f} 原视频小时/小时"
+        logger.info("videoId=%s %s", data.get("videoId", ""), msg)
+        store.add_log(task_id, "INFO", msg)
     except Exception:
         pass
 
@@ -332,27 +352,39 @@ def run_simple_compose(
     chunk_list = [c for c in (metadata.get("chunks") or []) if c.get("originalPath")]
     logger.info("切分完成: %d 块，开始去字幕", len(chunk_list))
 
-    for ch in chunk_list:
-        rel = ch.get("originalPath", "")
-        if not rel:
-            continue
-        chunk_path = Path(output_dir) / rel
-        if not chunk_path.exists():
-            continue
-        chunk_id = ch.get("chunkId", "")
-        out_dir_v = Path(output_dir) / video_id
-        out_dir_v.mkdir(parents=True, exist_ok=True)
-        output_file = out_dir_v / (Path(chunk_path).stem + "_desub.mp4")
-        cfg = dict(config)
-        cfg["inputPath"] = str(chunk_path)
-        cfg["outputPath"] = str(output_file)
-        cfg["startTime"] = 0
-        cfg["endTime"] = 0
-        cfg["forceKeyframeAtStart"] = True
-        run_desubtitle(cfg, str(chunk_path), str(output_file))
-        meta_path = Path(output_dir) / video_id / "metadata.json"
-        if meta_path.exists():
-            update_chunk_processed(str(meta_path), chunk_id, str(output_file))
+    stop_spinner = threading.Event()
+    spinner = threading.Thread(target=_desub_spinner, args=(stop_spinner,), daemon=True)
+    spinner.start()
+    try:
+        for ch in chunk_list:
+            rel = ch.get("originalPath", "")
+            if not rel:
+                continue
+            chunk_path = Path(output_dir) / rel
+            if not chunk_path.exists():
+                continue
+            chunk_id = ch.get("chunkId", "")
+            out_dir_v = Path(output_dir) / video_id
+            out_dir_v.mkdir(parents=True, exist_ok=True)
+            output_file = out_dir_v / (Path(chunk_path).stem + "_desub.mp4")
+            cfg = dict(config)
+            cfg["inputPath"] = str(chunk_path)
+            cfg["outputPath"] = str(output_file)
+            cfg["startTime"] = 0
+            cfg["endTime"] = 0
+            cfg["forceKeyframeAtStart"] = True
+            run_desubtitle(cfg, str(chunk_path), str(output_file))
+            meta_path = Path(output_dir) / video_id / "metadata.json"
+            if meta_path.exists():
+                update_chunk_processed(str(meta_path), chunk_id, str(output_file))
+    finally:
+        stop_spinner.set()
+        spinner.join(timeout=1.0)
+        try:
+            sys.stderr.write("\n")
+            sys.stderr.flush()
+        except (OSError, UnicodeEncodeError):
+            pass
 
     data = load_metadata(str(Path(output_dir) / video_id / "metadata.json"))
     processed = get_processed_chunks(data)
@@ -363,7 +395,12 @@ def run_simple_compose(
     out_file = Path(output_dir) / f"{video_id}_merged.mp4"
     merge_chunks(data, start_t, end_t, str(out_file))
     elapsed = time.time() - t0
-    logger.info("简易模式完成: %s，从切分到合成结束总时长: %s", out_file, _format_duration(elapsed))
+    src_duration_sec = end_sec - start_sec
+    capacity = (src_duration_sec / 3600.0) / (elapsed / 3600.0) if elapsed > 0 else 0
+    logger.info(
+        "简易模式完成: %s，从切分到合成结束总时长: %s，产能预估: 约 %.2f 原视频小时/小时",
+        out_file, _format_duration(elapsed), capacity,
+    )
     return str(out_file)
 
 

videoconverter_worker-1.0.3.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=2t7mFIV2i_qJJxN55wNrU6ZmPbG4wT9YEjzECi04BR8,19664
-videoconverter_worker-1.0.3.dist-info/METADATA,sha256=8qyb44UnKGgChp4v3F8SuHkL4EpK6IepBhdMLJ7UWTQ,5139
-videoconverter_worker-1.0.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-videoconverter_worker-1.0.3.dist-info/entry_points.txt,sha256=qedJjjix02n9Hz8adBioDIpGHghm8S3fQZdFwM5LV1A,83
-videoconverter_worker-1.0.3.dist-info/top_level.txt,sha256=iamWyiqUZ4X0_2UZx6GEk9gsPmiI9qhse_15HqtzUj8,48
-videoconverter_worker-1.0.3.dist-info/RECORD,,