Fix desktop packaging runtime issues

Author: yibailiu

scripts/build_local.sh

@@ -11,6 +11,8 @@ cd "$PROJECT_ROOT"
 python3 -m venv .venv
 ./.venv/bin/python -m pip install --upgrade pip
 ./.venv/bin/python -m pip install -r requirements-build.txt
+VERSION="$(./.venv/bin/python -c 'from videomerge import __version__; print(__version__)')"
+BUNDLE_VERSION="${VERSION%%-*}"
 
 rm -rf build
 
@@ -33,6 +35,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
   PYINSTALLER_ARGS+=(
     --windowed
     --icon "$ICON_ICNS"
+    --osx-bundle-identifier "com.videomergingtool.app"
     --add-binary "$VENDOR_FFMPEG_DIR/ffmpeg:ffmpeg"
     --add-binary "$VENDOR_FFMPEG_DIR/ffprobe:ffmpeg"
   )
@@ -52,6 +55,10 @@ echo
 if [[ "$(uname -s)" == "Darwin" && -d "$PROJECT_ROOT/dist/$NAME.app" ]]; then
   DMG_PATH="$PROJECT_ROOT/dist/$NAME.dmg"
   DMG_ROOT="$PROJECT_ROOT/build/dmg-root"
+  INFO_PLIST="$PROJECT_ROOT/dist/$NAME.app/Contents/Info.plist"
+  plutil -replace CFBundleShortVersionString -string "$BUNDLE_VERSION" "$INFO_PLIST"
+  plutil -replace CFBundleVersion -string "$VERSION" "$INFO_PLIST"
+  plutil -replace CFBundleIconName -string "VideoMergingTool" "$INFO_PLIST"
   rm -f "$DMG_PATH"
   rm -rf "$DMG_ROOT"
   mkdir -p "$DMG_ROOT"

scripts/build_windows.ps1

@@ -15,12 +15,15 @@ if (-not (Test-Path ".venv")) {
 
 & ".\.venv\Scripts\python.exe" -m pip install --upgrade pip
 & ".\.venv\Scripts\python.exe" -m pip install -r requirements-build.txt
+$Version = (& ".\.venv\Scripts\python.exe" -c "from videomerge import __version__; print(__version__)").Trim()
+$VersionFile = Join-Path $ProjectRoot "build\version_info.txt"
 
 if (Test-Path "build") {
     Remove-Item -Recurse -Force "build"
 }
 
 & ".\.venv\Scripts\python.exe" "scripts\prepare_ffmpeg.py" --output $VendorFfmpegDir --force
+& ".\.venv\Scripts\python.exe" "scripts\write_windows_version.py" $VersionFile
 
 & ".\.venv\Scripts\pyinstaller.exe" `
     --onefile `
@@ -29,19 +32,21 @@ if (Test-Path "build") {
     --noconfirm `
     --name $Name `
     --icon $IconPath `
+    --version-file $VersionFile `
     --collect-all typer `
     --collect-all click `
     --collect-all rich `
     --collect-all webview `
     --collect-all certifi `
     --hidden-import videomerge.gui `
     --hidden-import tkinter `
-    --add-binary "$VendorFfmpegDir\ffmpeg.exe;ffmpeg" `
-    --add-binary "$VendorFfmpegDir\ffprobe.exe;ffmpeg" `
     main.py
 
 Write-Host ""
 Write-Host "Build complete: $ProjectRoot\dist\$Name.exe"
+New-Item -ItemType Directory -Force -Path (Join-Path $ProjectRoot "dist\ffmpeg") | Out-Null
+Copy-Item (Join-Path $VendorFfmpegDir "ffmpeg.exe") (Join-Path $ProjectRoot "dist\ffmpeg\ffmpeg.exe") -Force
+Copy-Item (Join-Path $VendorFfmpegDir "ffprobe.exe") (Join-Path $ProjectRoot "dist\ffmpeg\ffprobe.exe") -Force
 
 $Inno = Get-Command "ISCC.exe" -ErrorAction SilentlyContinue
 if ($Inno) {
@@ -54,7 +59,7 @@ if ($Inno) {
 [Setup]
 AppId=$AppId
 AppName=$Name
-AppVersion=1.0.0
+AppVersion=$Version
 DefaultDirName={autopf}\$Name
 DefaultGroupName=$Name
 OutputDir=$InstallerDir
@@ -65,6 +70,7 @@ SolidCompression=yes
 
 [Files]
 Source: "$ExePath"; DestDir: "{app}"; Flags: ignoreversion
+Source: "$ProjectRoot\dist\ffmpeg\*"; DestDir: "{app}\ffmpeg"; Flags: ignoreversion recursesubdirs
 
 [Icons]
 Name: "{group}\$Name"; Filename: "{app}\$Name.exe"

scripts/write_windows_version.py

@@ -0,0 +1,64 @@
+from __future__ import annotations
+
+import argparse
+import re
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+
+from videomerge import __version__
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("output", type=Path)
+    args = parser.parse_args()
+
+    numeric = _numeric_version(__version__)
+    args.output.parent.mkdir(parents=True, exist_ok=True)
+    args.output.write_text(
+        f"""# UTF-8
+VSVersionInfo(
+  ffi=FixedFileInfo(
+    filevers=({numeric[0]}, {numeric[1]}, {numeric[2]}, {numeric[3]}),
+    prodvers=({numeric[0]}, {numeric[1]}, {numeric[2]}, {numeric[3]}),
+    mask=0x3f,
+    flags=0x0,
+    OS=0x40004,
+    fileType=0x1,
+    subtype=0x0,
+    date=(0, 0)
+  ),
+  kids=[
+    StringFileInfo([
+      StringTable(
+        '040904B0',
+        [
+          StringStruct('CompanyName', 'VideoMergingTool'),
+          StringStruct('FileDescription', 'VideoMergingTool'),
+          StringStruct('FileVersion', '{__version__}'),
+          StringStruct('InternalName', 'VideoMergingTool'),
+          StringStruct('OriginalFilename', 'VideoMergingTool.exe'),
+          StringStruct('ProductName', 'VideoMergingTool'),
+          StringStruct('ProductVersion', '{__version__}')
+        ]
+      )
+    ]),
+    VarFileInfo([VarStruct('Translation', [1033, 1200])])
+  ]
+)
+""",
+        encoding="utf-8",
+    )
+
+
+def _numeric_version(version: str) -> tuple[int, int, int, int]:
+    parts = [int(part) for part in re.findall(r"\d+", version)[:4]]
+    while len(parts) < 4:
+        parts.append(0)
+    return tuple(parts[:4])
+
+
+if __name__ == "__main__":
+    main()

tests/test_gui_folder_picker.py

@@ -7,17 +7,30 @@
 
 
 class GuiFolderPickerTests(unittest.TestCase):
-    def test_windows_uses_tk_folder_picker(self) -> None:
+    def test_windows_prefers_file_dialog_folder_picker(self) -> None:
         with patch("videomerge.gui.platform.system", return_value="Windows"), patch(
-            "videomerge.gui._pick_folder_tk",
+            "videomerge.gui._pick_folder_windows",
             return_value="C:/Videos",
-        ) as pick_tk, patch("videomerge.gui._pick_folder_macos") as pick_macos:
+        ) as pick_windows, patch("videomerge.gui._pick_folder_tk") as pick_tk, patch(
+            "videomerge.gui._pick_folder_macos"
+        ) as pick_macos:
             selected = _pick_folder("source")
 
         self.assertEqual(selected, "C:/Videos")
-        pick_tk.assert_called_once_with("Select source video folder")
+        pick_windows.assert_called_once_with("Select source video folder")
+        pick_tk.assert_not_called()
         pick_macos.assert_not_called()
 
+    def test_windows_falls_back_to_tk_folder_picker(self) -> None:
+        with patch("videomerge.gui.platform.system", return_value="Windows"), patch(
+            "videomerge.gui._pick_folder_windows",
+            return_value="",
+        ), patch("videomerge.gui._pick_folder_tk", return_value="C:/Videos") as pick_tk:
+            selected = _pick_folder("source")
+
+        self.assertEqual(selected, "C:/Videos")
+        pick_tk.assert_called_once_with("Select source video folder")
+
     def test_macos_uses_osascript_folder_picker(self) -> None:
         with patch("videomerge.gui.platform.system", return_value="Darwin"), patch(
             "videomerge.gui._pick_folder_macos",

videomerge/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.1.0"
+__version__ = "0.2.6-dev"

videomerge/gpu.py

@@ -7,6 +7,7 @@
 from enum import Enum
 
 from .models import ToolPaths
+from .utils import subprocess_window_kwargs
 
 
 class GpuMode(str, Enum):
@@ -69,15 +70,20 @@ def resolve_gpu_plan(
     return GpuPlan(gpu_mode, None, available, reason)
 
 
-def detect_ffmpeg_encoders(tools: ToolPaths) -> set[str]:
-    process = subprocess.run(
-        [str(tools.ffmpeg), "-hide_banner", "-encoders"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-        encoding="utf-8",
-        errors="replace",
-    )
+def detect_ffmpeg_encoders(tools: ToolPaths, timeout: int = 5) -> set[str]:
+    try:
+        process = subprocess.run(
+            [str(tools.ffmpeg), "-hide_banner", "-encoders"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            timeout=timeout,
+            **subprocess_window_kwargs(),
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return set()
     output = f"{process.stdout}\n{process.stderr}"
     encoders: set[str] = set()
     for line in output.splitlines():

videomerge/gui.py

@@ -22,6 +22,8 @@
 from .models import MergeMode, Orientation, VideoFile
 from .probe import probe_files
 from .scanner import scan_video_files
+from .utils import subprocess_window_kwargs
+from . import __version__
 
 
 HTML = r"""<!doctype html>
@@ -925,7 +927,7 @@ def _open_desktop_window(url: str) -> None:
             "Desktop GUI requires pywebview. Install dependencies with `pip install -r requirements.txt`."
         ) from exc
 
-    webview.create_window("VideoMergingTool", url, width=1280, height=820, min_size=(900, 620))
+    webview.create_window(f"VideoMergingTool {__version__}", url, width=1280, height=820, min_size=(900, 620))
     webview.start()
 
 
@@ -969,7 +971,7 @@ def _deps(self) -> None:
             try:
                 logger = _gui_logger(state)
                 tools = resolve_tools(logger, True, default_tools_dir())
-                encoders = detect_ffmpeg_encoders(tools)
+                encoders = detect_ffmpeg_encoders(tools, timeout=3)
                 gpu_encoders = sorted(
                     encoder
                     for encoder in encoders
@@ -1182,6 +1184,7 @@ def _terminate_process(process: subprocess.Popen[str]) -> None:
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
                 check=False,
+                **subprocess_window_kwargs(),
             )
         else:
             os.killpg(process.pid, signal.SIGTERM)
@@ -1201,7 +1204,7 @@ def _terminate_process(process: subprocess.Popen[str]) -> None:
 
 def _process_group_kwargs() -> dict[str, object]:
     if os.name == "nt":
-        return {"creationflags": subprocess.CREATE_NEW_PROCESS_GROUP}
+        return {"creationflags": subprocess.CREATE_NEW_PROCESS_GROUP | getattr(subprocess, "CREATE_NO_WINDOW", 0)}
     return {"start_new_session": True}
 
 
@@ -1220,6 +1223,8 @@ def _pick_folder(kind: str) -> str:
     title = "Select output folder" if kind == "output" else "Select source video folder"
     if platform.system() == "Darwin":
         return _pick_folder_macos(title)
+    if platform.system() == "Windows":
+        return _pick_folder_windows(title) or _pick_folder_tk(title)
     return _pick_folder_tk(title)
 
 
@@ -1233,6 +1238,43 @@ def _pick_folder_macos(title: str) -> str:
             text=True,
             encoding="utf-8",
             errors="replace",
+            **subprocess_window_kwargs(),
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+    except Exception:
+        return ""
+    return ""
+
+
+def _pick_folder_windows(title: str) -> str:
+    escaped_title = title.replace("'", "''")
+    script = f"""
+Add-Type -AssemblyName System.Windows.Forms
+$dialog = New-Object System.Windows.Forms.OpenFileDialog
+$dialog.Title = '{escaped_title}'
+$dialog.CheckFileExists = $false
+$dialog.ValidateNames = $false
+$dialog.FileName = 'Select this folder'
+$dialog.Filter = 'Folders|*.folder'
+if ($dialog.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {{
+  $selected = $dialog.FileName
+  if (Test-Path -LiteralPath $selected -PathType Container) {{
+    Write-Output $selected
+  }} else {{
+    Write-Output (Split-Path -Parent $selected)
+  }}
+}}
+"""
+    try:
+        result = subprocess.run(
+            ["powershell", "-NoProfile", "-STA", "-ExecutionPolicy", "Bypass", "-Command", script],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+            **subprocess_window_kwargs(),
         )
         if result.returncode == 0:
             return result.stdout.strip()

videomerge/probe.py

@@ -8,7 +8,7 @@
 
 from .errors import ProbeError
 from .models import Orientation, ToolPaths, VideoFile
-from .utils import parse_fraction
+from .utils import parse_fraction, subprocess_window_kwargs
 
 
 def probe_file(path: Path, tools: ToolPaths, logger: logging.Logger) -> VideoFile:
@@ -29,6 +29,7 @@ def probe_file(path: Path, tools: ToolPaths, logger: logging.Logger) -> VideoFil
         text=True,
         encoding="utf-8",
         errors="replace",
+        **subprocess_window_kwargs(),
     )
     if process.returncode != 0:
         raise ProbeError(process.stderr.strip() or f"ffprobe failed for {path}")

videomerge/utils.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import os
 import shlex
 import subprocess
 from pathlib import Path
@@ -9,6 +10,12 @@
 from .errors import CommandError
 
 
+def subprocess_window_kwargs() -> dict[str, int]:
+    if os.name != "nt":
+        return {}
+    return {"creationflags": getattr(subprocess, "CREATE_NO_WINDOW", 0)}
+
+
 def run_command(args: Sequence[str | Path], logger: logging.Logger, dry_run: bool = False) -> None:
     printable = " ".join(shlex.quote(str(arg)) for arg in args)
     logger.debug("Running command: %s", printable)
@@ -23,6 +30,7 @@ def run_command(args: Sequence[str | Path], logger: logging.Logger, dry_run: boo
         text=True,
         encoding="utf-8",
         errors="replace",
+        **subprocess_window_kwargs(),
     )
     if process.returncode != 0:
         if process.stdout.strip():