From afb7b5f5052b0597119845dba8aa9ffb081454ec Mon Sep 17 00:00:00 2001
From: Codex Bot <codex-bot@users.noreply.github.com>
Date: Sat, 21 Feb 2026 08:11:57 -0800
Subject: [PATCH] Fix run.bat startup robustness and endpoint defaults

---
 run.bat | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/run.bat b/run.bat
index ea2e030..73a769e 100644
--- a/run.bat
+++ b/run.bat
@@ -1,16 +1,67 @@
-%ECHO OFF
+@echo off
+setlocal EnableExtensions
 
-facetracker -l 1
+pushd "%~dp0" >nul
+
+set "TARGET_IP=127.0.0.1"
+set "TARGET_PORT=11573"
+set "TRACKER_EXE=%~dp0facetracker.exe"
+set "TRACKER_EXE_BINARY=%~dp0Binary\facetracker.exe"
+set "TRACKER_PY=%~dp0facetracker.py"
+set "TRACKER_MODE="
+
+if exist "%TRACKER_EXE%" (
+    set "TRACKER_MODE=exe"
+) else if exist "%TRACKER_EXE_BINARY%" (
+    set "TRACKER_MODE=exe"
+    set "TRACKER_EXE=%TRACKER_EXE_BINARY%"
+) else if exist "%TRACKER_PY%" (
+    set "TRACKER_MODE=python"
+) else (
+    echo Error: Could not find facetracker.exe, Binary\facetracker.exe, or facetracker.py.
+    goto :finish
+)
+
+if /I "%TRACKER_MODE%"=="python" (
+    where python >nul 2>&1
+    if errorlevel 1 (
+        echo Error: Python is required to run facetracker.py, but python was not found in PATH.
+        goto :finish
+    )
+    python -c "import onnxruntime, cv2, PIL, numpy" >nul 2>&1
+    if errorlevel 1 (
+        echo Error: Missing Python dependencies for facetracker.py.
+        echo Install with: pip install onnxruntime opencv-python pillow numpy
+        goto :finish
+    )
+)
+
+echo Streaming target: %TARGET_IP%:%TARGET_PORT%
+call :run_tracker -l 1
+if errorlevel 1 goto :finish
 
 echo Make sure that nothing is accessing your camera before you proceed.
+set /p "cameraNum=Select your camera from the list above and enter the corresponding number: "
 
-set /p cameraNum=Select your camera from the list above and enter the corresponding number:
+call :run_tracker -a %cameraNum%
+if errorlevel 1 goto :finish
 
-facetracker -a %cameraNum%
+set /p "dcaps=Select your camera mode or -1 for default settings [default: -1]: "
+if not defined dcaps set "dcaps=-1"
+set /p "fps=Select the FPS [default: 24]: "
+if not defined fps set "fps=24"
 
-set /p dcaps=Select your camera mode or -1 for default settings:
-set /p fps=Select the FPS:
+call :run_tracker -c %cameraNum% -F %fps% -D %dcaps% -v 3 -P 1 --discard-after 0 --scan-every 0 --no-3d-adapt 1 --max-feature-updates 900 -i %TARGET_IP% -p %TARGET_PORT%
 
-facetracker -c %cameraNum% -F %fps% -D %dcaps% -v 3 -P 1 --discard-after 0 --scan-every 0 --no-3d-adapt 1 --max-feature-updates 900
+:finish
+popd >nul
+pause
+exit /b
 
-pause
\ No newline at end of file
+:run_tracker
+if /I "%TRACKER_MODE%"=="exe" (
+    "%TRACKER_EXE%" %*
+) else (
+    python "%TRACKER_PY%" %*
+)
+exit /b %errorlevel%