From 25b7a93d25e490c516b87ad4a57e27173d886b59 Mon Sep 17 00:00:00 2001 From: Eddy Pedroni Date: Thu, 17 Jul 2025 15:31:43 +0200 Subject: Fix CLI --- Makefile | 5 ++++- cli-project/src/solo_tool_cli.py | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0fc9a3b..7ebeaac 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ web-deploy: .venv/touchfile web-dev: .venv/touchfile ./.venv/bin/python web-project/src/solo_tool_web.py +cli: .venv/touchfile + ./.venv/bin/solo-tool-cli https://files.0xf7.com amboss + install: deployment/solo-tool.service deployment/start-solo-tool.sh mkdir -p ~/.config/systemd/user install -o eddy -g eddy -m 644 deployment/solo-tool.service ~/.config/systemd/user @@ -36,4 +39,4 @@ uninstall: rm ~/.config/systemd/user/solo-tool.service systemctl --user daemon-reload -.PHONY: all test clean web-deploy web-dev install uninstall +.PHONY: all test clean web-deploy web-dev cli install uninstall diff --git a/cli-project/src/solo_tool_cli.py b/cli-project/src/solo_tool_cli.py index d0f39c1..34d88dd 100644 --- a/cli-project/src/solo_tool_cli.py +++ b/cli-project/src/solo_tool_cli.py @@ -3,18 +3,23 @@ import time from solo_tool import SoloTool from solo_tool.midi_controller_launchpad_mini import MidiController -from solo_tool.session_manager import loadSession +from solo_tool.session_manager import getSessionManager def main(): args = sys.argv[1:] - if len(args) == 0: - print("Please provide path to session file") + if len(args) < 2: + print("Usage: solo_tool_cli ") sys.exit(1) - soloTool = loadSession(args[0]) + sessionManager = getSessionManager(args[0]) + soloTool = sessionManager.loadSession(args[1]) midiController = MidiController(soloTool) - midiController.connect() + try: + midiController.connect() + except: + print("Failed to connect to MIDI controller") + sys.exit(1) try: while True: -- cgit v1.2.3