Add passthrough preprocessing and file metadata in GUI

Author: yibailiu

tests/test_gui_gpu.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import json
+import tempfile
 import unittest
 from pathlib import Path
 from unittest.mock import Mock, patch
 
-from videomerge.gui import _build_merge_command, _detect_gui_ffmpeg_encoders, _windows_notification_script
+from videomerge.gui import _build_merge_command, _detect_gui_ffmpeg_encoders, _serialize_files, _windows_notification_script
+from videomerge.models import Orientation, VideoFile
 
 
 class GuiGpuTests(unittest.TestCase):
@@ -45,6 +47,17 @@ def test_gui_command_writes_selected_file_list(self) -> None:
 
         self.assertEqual(selected, ["/tmp/in/a.mp4", "/tmp/in/b.mp4"])
 
+    def test_serialize_files_includes_filesystem_time_and_size(self) -> None:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            path = Path(temp_dir) / "clip.mp4"
+            path.write_bytes(b"x" * 1536)
+            serialized = _serialize_files([_video(path)])[0]
+
+        self.assertIn("modified_time", serialized)
+        self.assertIn("file_time", serialized)
+        self.assertEqual(serialized["file_size"], "1.5 KB")
+        self.assertEqual(serialized["file_size_bytes"], 1536)
+
     def test_windows_notification_script_uses_notify_icon_and_sound(self) -> None:
         script = _windows_notification_script("A&B's", "done", True)
 
@@ -63,6 +76,30 @@ def test_macos_gui_encoder_detection_retries_until_videotoolbox_is_seen(self) ->
         self.assertIn("h264_videotoolbox", encoders)
         self.assertEqual(detect.call_count, 2)
 
+def _video(path: Path) -> VideoFile:
+    return VideoFile(
+        path=path,
+        container="mp4",
+        video_codec="h264",
+        audio_codec="aac",
+        width=1280,
+        height=720,
+        display_width=1280,
+        display_height=720,
+        aspect_ratio="1280:720",
+        frame_rate="30/1",
+        frame_rate_float=30.0,
+        pixel_format="yuv420p",
+        duration=10.0,
+        has_audio=True,
+        orientation=Orientation.landscape,
+        rotation=0,
+        video_bitrate=2_000_000,
+        audio_bitrate=128_000,
+        audio_sample_rate=48000,
+        audio_channels=2,
+    )
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_transcode_rotation.py

@@ -11,6 +11,7 @@
     build_preprocess_segments,
     build_video_filter,
     can_concat_originals,
+    choose_passthrough_signature,
     choose_audio_action,
     choose_audio_target,
     choose_video_action,
@@ -207,7 +208,7 @@ def test_group_rejects_original_copy_when_concat_signature_differs(self) -> None
             )
         )
 
-    def test_preprocess_group_uses_safe_segments_when_any_file_needs_normalization(self) -> None:
+    def test_preprocess_group_passthroughs_dominant_ready_files_when_some_need_normalization(self) -> None:
         captured_commands = []
         first = _plain_video()
         second = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("second.mp4"), "frame_rate": "30000/1001", "frame_rate_float": 29.97})
@@ -235,9 +236,9 @@ def fake_run_command(args, logger, dry_run=False):  # type: ignore[no-untyped-de
                 owner.cleanup()
 
         self.assertEqual(len(outputs), 2)
-        self.assertNotEqual(outputs[0], first.path)
+        self.assertEqual(outputs[0], first.path)
         self.assertNotEqual(outputs[1], second.path)
-        self.assertEqual(len(captured_commands), 2)
+        self.assertEqual(len(captured_commands), 1)
         self.assertTrue(all("-vf" in command for command in captured_commands))
 
     def test_safe_segmentation_preserves_order_and_batches_ready_runs(self) -> None:
@@ -258,11 +259,26 @@ def test_safe_segmentation_preserves_order_and_batches_ready_runs(self) -> None:
         self.assertEqual([segment.files for segment in segments], [[first, second], [third], [fourth]])
         self.assertEqual([segment.copy_compatible for segment in segments], [True, False, True])
 
-    def test_preprocess_group_batches_consecutive_ready_files_before_normalization(self) -> None:
+    def test_choose_passthrough_signature_uses_most_common_ready_signature(self) -> None:
+        first = _plain_video()
+        second = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("second.mp4")})
+        third = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("third.mp4"), "frame_rate": "60/2", "frame_rate_float": 30.0})
+        audio_target = AudioTarget("aac", "aac", 48000, 2, "128k")
+        segments = build_preprocess_segments(
+            [first, second, third],
+            Canvas(1280, 720),
+            30.0,
+            CodecPlan("h264", "aac", "libx264", "aac"),
+            audio_target,
+        )
+
+        self.assertEqual(choose_passthrough_signature(segments), choose_passthrough_signature([segments[0]]))
+
+    def test_preprocess_group_normalizes_non_dominant_ready_signature(self) -> None:
         captured_commands = []
         first = _plain_video()
         second = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("second.mp4")})
-        third = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("third.mp4"), "frame_rate": "30000/1001", "frame_rate_float": 29.97})
+        third = _plain_video().__class__(**{**_plain_video().__dict__, "path": Path("third.mp4"), "frame_rate": "60/2", "frame_rate_float": 30.0})
 
         def fake_run_command(args, logger, dry_run=False):  # type: ignore[no-untyped-def]
             captured_commands.append(list(args))
@@ -288,9 +304,10 @@ def fake_run_command(args, logger, dry_run=False):  # type: ignore[no-untyped-de
 
         concat_commands = [command for command in captured_commands if "-f" in command and "concat" in command]
         transcode_commands = [command for command in captured_commands if "-vf" in command]
-        self.assertEqual(len(outputs), 2)
-        self.assertEqual(len(concat_commands), 1)
-        self.assertEqual(len(transcode_commands), 2)
+        self.assertEqual(outputs[0:2], [first.path, second.path])
+        self.assertEqual(len(outputs), 3)
+        self.assertEqual(len(concat_commands), 0)
+        self.assertEqual(len(transcode_commands), 1)
 
 
 if __name__ == "__main__":

videomerge/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"

videomerge/gui.py

@@ -15,6 +15,7 @@
 import threading
 import time
 import webbrowser
+from datetime import datetime
 from http import HTTPStatus
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
@@ -252,7 +253,7 @@
       color: var(--text-muted);
       white-space: nowrap;
     }
-    table { width: 100%; min-width: 840px; border-collapse: collapse; table-layout: fixed; }
+    table { width: 100%; min-width: 1120px; border-collapse: collapse; table-layout: fixed; }
     th {
       position: sticky;
       top: 0;
@@ -546,16 +547,18 @@
           <table>
             <colgroup>
               <col style="width: 46px">
-              <col style="width: 32%">
+              <col style="width: 25%">
+              <col style="width: 12%">
+              <col style="width: 13%">
+              <col style="width: 8%">
+              <col style="width: 9%">
               <col style="width: 14%">
-              <col style="width: 15%">
-              <col style="width: 11%">
+              <col style="width: 9%">
               <col style="width: 10%">
-              <col style="width: 14%">
             </colgroup>
             <thead>
               <tr>
-                <th class="select-head"></th><th data-i18n="filename">Filename</th><th data-i18n="resolution">Resolution</th><th data-i18n="codec">Codec</th><th>FPS</th><th data-i18n="duration">Dur</th><th data-i18n="status">Status</th>
+                <th class="select-head"></th><th data-i18n="filename">Filename</th><th data-i18n="resolution">Resolution</th><th data-i18n="codec">Codec</th><th>FPS</th><th data-i18n="duration">Dur</th><th data-i18n="fileTime">Created/Modified</th><th data-i18n="fileSize">Size</th><th data-i18n="status">Status</th>
               </tr>
             </thead>
             <tbody id="fileRows"></tbody>
@@ -646,7 +649,7 @@
     const messages = {
       en: {
         ffmpegNotChecked: "! FFmpeg Not Checked", ffmpegChecking: "... Checking FFmpeg", ffmpegInstalled: "✓ FFmpeg Installed", ffmpegMissing: "! FFmpeg Missing", refreshFfmpeg: "Refresh FFmpeg check",
-        sourceFiles: "Source Files", noFolderSelected: "No folder selected", selectFolder: "Select Folder", filename: "Filename", resolution: "Resolution", codec: "Codec", duration: "Dur", status: "Status",
+        sourceFiles: "Source Files", noFolderSelected: "No folder selected", selectFolder: "Select Folder", filename: "Filename", resolution: "Resolution", codec: "Codec", duration: "Dur", fileTime: "Created/Modified", fileSize: "Size", status: "Status",
         processConsole: "Process Console", configuration: "Configuration", mergeStrategy: "Merge Strategy", outputSettings: "Output Settings", browse: "Browse",
         fastMerge: "Fast Merge", optimalMerge: "Optimal Merge", extremeMerge: "Extreme Merge", lossless: "Lossless", smart: "Smart", bruteForce: "Brute Force",
         fastDesc: "Stream copy only. Skips incompatible groups.", optimalDesc: "Groups by orientation and transcodes when needed.", extremeDesc: "Normalizes all files into one output.",
@@ -695,7 +698,7 @@
       },
       zh: {
         ffmpegNotChecked: "! FFmpeg 未检查", ffmpegChecking: "... 正在检查 FFmpeg", ffmpegInstalled: "✓ FFmpeg 已安装", ffmpegMissing: "! FFmpeg 缺失", refreshFfmpeg: "重新检查 FFmpeg",
-        sourceFiles: "源文件", noFolderSelected: "未选择文件夹", selectFolder: "选择文件夹", filename: "文件名", resolution: "分辨率", codec: "编码", duration: "时长", status: "状态",
+        sourceFiles: "源文件", noFolderSelected: "未选择文件夹", selectFolder: "选择文件夹", filename: "文件名", resolution: "分辨率", codec: "编码", duration: "时长", fileTime: "创建/修改", fileSize: "大小", status: "状态",
         processConsole: "处理控制台", configuration: "配置", mergeStrategy: "合并策略", outputSettings: "输出设置", browse: "浏览",
         fastMerge: "快速合并", optimalMerge: "智能合并", extremeMerge: "强制合并", lossless: "无损", smart: "智能", bruteForce: "强制",
         fastDesc: "仅使用流复制，跳过不兼容分组。", optimalDesc: "按横竖屏分组，必要时转码。", extremeDesc: "统一所有文件到一个输出。",
@@ -963,11 +966,12 @@
       Object.entries(by).forEach(([orientation, group]) => {
         const w = Math.max(...group.map(file => file.display_width));
         const h = Math.max(...group.map(file => file.display_height));
-        rows.insertAdjacentHTML("beforeend", `<tr class="group-row"><td colspan="7">${escapeHtml(t("groupLabel", { orientation, size: `${w}x${h}` }))}</td></tr>`);
+        rows.insertAdjacentHTML("beforeend", `<tr class="group-row"><td colspan="9">${escapeHtml(t("groupLabel", { orientation, size: `${w}x${h}` }))}</td></tr>`);
         group.forEach(file => {
           const cls = file.fast_ready ? "status-ok" : "status-warn";
           const status = file.fast_ready ? t("ready") : t("needsTranscode");
           const checked = state.selectedPaths.has(file.path) ? "checked" : "";
+          const timeTitle = `Created: ${file.created_time || "-"} | Modified: ${file.modified_time || "-"} | ${file.path}`;
           rows.insertAdjacentHTML("beforeend", `
             <tr>
               <td class="select-cell"><input class="file-checkbox" type="checkbox" data-path="${escapeHtml(file.path)}" ${checked}></td>
@@ -976,6 +980,8 @@
               <td class="mono">${escapeHtml(file.video_codec)}/${escapeHtml(file.audio_codec || "none")}</td>
               <td class="mono">${escapeHtml(file.fps)}</td>
               <td class="mono">${escapeHtml(file.duration)}</td>
+              <td class="mono" title="${escapeHtml(timeTitle)}">${escapeHtml(file.file_time || "-")}</td>
+              <td class="mono">${escapeHtml(file.file_size || "-")}</td>
               <td class="${cls}">${escapeHtml(status)}</td>
             </tr>`);
         });
@@ -1547,6 +1553,7 @@ def _serialize_files(files: list[VideoFile]) -> list[dict[str, object]]:
     output = []
     for file in files:
         fast_ready = any(file in members and len(members) > 1 for members in fast_groups.values())
+        stat_info = _file_stat_info(file.path)
         output.append(
             {
                 "path": str(file.path),
@@ -1559,11 +1566,50 @@ def _serialize_files(files: list[VideoFile]) -> list[dict[str, object]]:
                 "duration": _format_duration(file.duration),
                 "orientation": file.orientation.value,
                 "fast_ready": fast_ready,
+                **stat_info,
             }
         )
     return output
 
 
+def _file_stat_info(path: Path) -> dict[str, object]:
+    try:
+        stat = path.stat()
+    except OSError:
+        return {
+            "created_time": "",
+            "modified_time": "",
+            "file_time": "",
+            "file_size": "",
+            "file_size_bytes": 0,
+        }
+    created_timestamp = getattr(stat, "st_birthtime", None)
+    created_time = _format_timestamp(created_timestamp) if created_timestamp else ""
+    modified_time = _format_timestamp(stat.st_mtime)
+    return {
+        "created_time": created_time,
+        "modified_time": modified_time,
+        "file_time": created_time or modified_time,
+        "file_size": _format_file_size(stat.st_size),
+        "file_size_bytes": stat.st_size,
+    }
+
+
+def _format_timestamp(timestamp: float) -> str:
+    return datetime.fromtimestamp(timestamp).strftime("%Y-%m-%d %H:%M:%S")
+
+
+def _format_file_size(size: int) -> str:
+    value = float(max(size, 0))
+    units = ("B", "KB", "MB", "GB", "TB")
+    for unit in units:
+        if value < 1024 or unit == units[-1]:
+            if unit == "B":
+                return f"{int(value)} {unit}"
+            return f"{value:.1f} {unit}"
+        value /= 1024
+
+
 def _recommended_gpu_mode(gpu_encoders: list[str]) -> str:
     available = set(gpu_encoders)
     system = platform.system()