diff options
| -rw-r--r-- | solo_tool_cli.py | 16 | ||||
| -rw-r--r-- | solo_tool_cli_integrationtest.py | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/solo_tool_cli.py b/solo_tool_cli.py index b6e7817..8d53a33 100644 --- a/solo_tool_cli.py +++ b/solo_tool_cli.py @@ -1,3 +1,5 @@ +import sys + from solo_tool import SoloTool from midi_controller_launchpad_mini import MidiController @@ -5,7 +7,7 @@ class SoloToolCLI: def __init__(self, sessionJson, soloToolOverride=None, midiOverride=None): self._soloTool = SoloTool() if soloToolOverride is None else soloToolOverride self._soloTool.loadSession(sessionJson) - self._midiController = MidiController() if midiOverride is None else midiOverride + self._midiController = MidiController(self._soloTool) if midiOverride is None else midiOverride self._commands = { "song" : self._song, "midi" : self._midi @@ -32,3 +34,15 @@ class SoloToolCLI: else: print("Supported device: Novation Launchpad Mini MkII") +def main(args): + if len(args) == 0: + print("Please provide path to session file") + sys.exit(1) + + soloToolCli = SoloToolCLI(args[0]) + while(True): + commandString = input("> ") + soloToolCli.input(commandString) + +if __name__ == '__main__': + main(sys.argv[1:]) diff --git a/solo_tool_cli_integrationtest.py b/solo_tool_cli_integrationtest.py index ae007a3..9134dcf 100644 --- a/solo_tool_cli_integrationtest.py +++ b/solo_tool_cli_integrationtest.py @@ -7,7 +7,7 @@ from solo_tool import SoloTool from player_mock import Player class MockMidiController: - def __init__(self): + def __init__(self, soloTool): self.connected = False def connect(self): @@ -23,7 +23,7 @@ def soloTool(mockPlayer): @pytest.fixture def mockMidi(soloTool): - return MockMidiController() + return MockMidiController(soloTool) @pytest.fixture def uut(soloTool, mockMidi): |