Skip to content

expand all cli paths #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamespilgrim merged 1 commit into from
Sep 19, 2025
Merged

expand all cli paths #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions Software/web-server/configurations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,6 @@
"requiresRestart": true,
"internal": true
},
"configFile": {
"displayName": "Configuration File",
"description": "Main configuration file path",
"type": "path",
"default": "/etc/pitrac/golf_sim_config.json",
"requiresRestart": true,
"internal": true
},
"systemConfigPath": {
"displayName": "System Config Path",
"description": "System-wide configuration file",
"type": "path",
"default": "/etc/pitrac/golf_sim_config.json",
"internal": true
},
"userSettingsPath": {
"displayName": "User Settings Path",
"description": "User-specific configuration overrides",
Expand Down
5 changes: 3 additions & 2 deletions Software/web-server/pitrac_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def expand_path(path_str: str) -> Path:
return Path(path_str.replace("~", str(Path.home())))

self.pitrac_binary = sys_paths.get("pitracBinary", {}).get("default", "/usr/lib/pitrac/pitrac_lm")
self.config_file = sys_paths.get("configFile", {}).get("default", "/etc/pitrac/golf_sim_config.json")

log_dir = expand_path(sys_paths.get("logDirectory", {}).get("default", "~/.pitrac/logs"))
pid_dir = expand_path(sys_paths.get("pidDirectory", {}).get("default", "~/.pitrac/run"))
Expand Down Expand Up @@ -108,6 +107,8 @@ def _build_cli_args_from_metadata(self, camera: str = "camera1") -> list:
if value:
args.append(cli_arg)
else:
if param_type == "path" and value:
value = str(value).replace("~", str(Path.home()))
# Use --key=value format for consistency
args.append(f"{cli_arg}={value}")

Expand Down Expand Up @@ -643,7 +644,7 @@ def get_status(self) -> Dict[str, Any]:
"is_dual_camera": is_single_pi, # Single Pi with dual cameras
"camera1_log_file": str(self.log_file),
"camera2_log_file": str(self.camera2_log_file),
"config_file": self.config_file,
"generated_config_path": str(Path.home() / ".pitrac/config/generated_golf_sim_config.json"),
"binary": self.pitrac_binary,
"mode": system_mode,
}
Expand Down
6 changes: 3 additions & 3 deletions Software/web-server/tests/test_api_endpoints_pitrac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def test_pitrac_status(self, client, server_instance):
"camera1_pid": 12345,
"camera2_pid": None,
"mode": "single",
"config_file": "/etc/pitrac/golf_sim_config.json",
"generated_config_path": "/home/test/.pitrac/config/generated_golf_sim_config.json",
}
)

Expand All @@ -120,7 +120,7 @@ def test_pitrac_status_not_running(self, client, server_instance):
"camera1_pid": None,
"camera2_pid": None,
"mode": "single",
"config_file": "/etc/pitrac/golf_sim_config.json",
"generated_config_path": "/home/test/.pitrac/config/generated_golf_sim_config.json",
}
)

Expand All @@ -139,7 +139,7 @@ def test_pitrac_status_dual_camera(self, client, server_instance):
"camera1_pid": 12345,
"camera2_pid": 12346,
"mode": "dual",
"config_file": "/etc/pitrac/golf_sim_config.json",
"generated_config_path": "/home/test/.pitrac/config/generated_golf_sim_config.json",
}
)

Expand Down
8 changes: 4 additions & 4 deletions Software/web-server/tests/test_pitrac_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import signal
import pytest
from pathlib import Path
from unittest.mock import Mock, patch, AsyncMock, mock_open

from pitrac_manager import PiTracProcessManager
Expand Down Expand Up @@ -106,7 +107,6 @@ def test_initialization(self, mock_config_manager):
assert manager.process is None
assert manager.camera2_process is None
assert manager.pitrac_binary == "/usr/lib/pitrac/pitrac_lm"
assert manager.config_file == "/etc/pitrac/golf_sim_config.json"
assert manager.config_manager == mock_config_manager

assert mock_mkdir.call_count >= 2
Expand All @@ -124,7 +124,7 @@ def test_get_camera_role(self, manager, mock_config_manager):
def test_build_command_single_pi_mode(self, manager):
"""Test command building for single Pi mode"""
with patch("pathlib.Path.exists", return_value=True):
cmd = manager._build_command(camera="camera1", config_file_path="/tmp/test_config.json")
cmd = manager._build_command(camera="camera1", config_file_path=Path("/tmp/test_config.json"))

assert manager.pitrac_binary in cmd
assert "--system_mode=camera1" in cmd
Expand Down Expand Up @@ -154,7 +154,7 @@ def test_build_command_dual_pi_mode(self, mock_config_manager):
dual_manager = PiTracProcessManager(config_manager=mock_config_manager)

with patch("pathlib.Path.exists", return_value=True):
cmd = dual_manager._build_command(config_file_path="/tmp/test_config.json")
cmd = dual_manager._build_command(config_file_path=Path("/tmp/test_config.json"))

assert dual_manager.pitrac_binary in cmd
assert "--system_mode=camera2" in cmd
Expand All @@ -175,7 +175,7 @@ def test_set_environment_from_metadata(self, manager):
def test_build_command_with_config_file(self, manager):
"""Test command building includes config file"""
with patch("pathlib.Path.exists", return_value=True):
cmd = manager._build_command(camera="camera1", config_file_path="/tmp/test_config.json")
cmd = manager._build_command(camera="camera1", config_file_path=Path("/tmp/test_config.json"))

assert "--config_file=/tmp/test_config.json" in cmd

Expand Down