diff options
Diffstat (limited to 'cli-project')
| -rw-r--r-- | cli-project/pyproject.toml | 1 | ||||
| -rw-r--r-- | cli-project/src/solo_tool_cli.py | 62 | ||||
| -rw-r--r-- | cli-project/test/solo_tool_cli_integrationtest.py | 41 | ||||
| -rw-r--r-- | cli-project/test/test.flac | bin | 31743252 -> 0 bytes | |||
| -rw-r--r-- | cli-project/test/test.mp3 | bin | 5389533 -> 0 bytes | |||
| -rw-r--r-- | cli-project/test/test_session.json | 13 |
6 files changed, 19 insertions, 98 deletions
diff --git a/cli-project/pyproject.toml b/cli-project/pyproject.toml index 7d31a09..3e2c855 100644 --- a/cli-project/pyproject.toml +++ b/cli-project/pyproject.toml @@ -16,7 +16,6 @@ dynamic = ["version"] [project.optional-dependencies] dev = [ - "pytest" ] [project.scripts] diff --git a/cli-project/src/solo_tool_cli.py b/cli-project/src/solo_tool_cli.py index 1c8a7d6..5cc1537 100644 --- a/cli-project/src/solo_tool_cli.py +++ b/cli-project/src/solo_tool_cli.py @@ -1,57 +1,33 @@ import sys import time -import threading from solo_tool import SoloTool from solo_tool.midi_controller_launchpad_mini import MidiController -class SoloToolCLI: - def __init__(self, sessionJson, soloToolOverride=None, midiOverride=None, tickEnable=True): - self._soloTool = SoloTool() if soloToolOverride is None else soloToolOverride - self._soloTool.loadSession(sessionJson) - self._midiController = MidiController(self._soloTool) if midiOverride is None else midiOverride - self._commands = { - "song" : self._song, - "midi" : self._midi - } - if tickEnable: - self._tick() - - def input(self, commandString): - split = commandString.strip().split(" ") - if split[0] in self._commands: - self._commands[split[0]](split[1:]) - - def _song(self, args): - if len(args) > 0: - self._soloTool.setSong(int(args[0])) - else: - songs = self._soloTool.getSongs() - print("Songs:") - for i, s in enumerate(songs): - print(f" {i} {s}") - - def _midi(self, args): - if len(args) > 0 and args[0] == "connect": - print("Connecting to MIDI device...") - self._midiController.connect() - else: - print("Supported device: Novation Launchpad Mini MkII") - - def _tick(self): - self._soloTool.tick() - threading.Timer(0.1, self._tick).start() - def main(): args = sys.argv[1:] 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) - + soloTool = SoloTool() + soloTool.loadSession(args[0]) + + def tick(): + soloTool.tick() + threading.Timer(0.1, tick).start() + + midiController = MidiController(soloTool) + midiController.connect() + + try: + while(True): + time.sleep(0.1) + soloTool.tick() + except KeyboardInterrupt: + pass + finally: + midiController.disconnect() + if __name__ == '__main__': main() diff --git a/cli-project/test/solo_tool_cli_integrationtest.py b/cli-project/test/solo_tool_cli_integrationtest.py deleted file mode 100644 index c29a223..0000000 --- a/cli-project/test/solo_tool_cli_integrationtest.py +++ /dev/null @@ -1,41 +0,0 @@ -import pytest -import io -from contextlib import redirect_stdout - -from solo_tool_cli import SoloToolCLI -from solo_tool import SoloTool - -class MockMidiController: - def __init__(self, soloTool): - self.connected = False - - def connect(self): - self.connected = True - -@pytest.fixture -def soloTool(): - return SoloTool() - -@pytest.fixture -def mockMidi(soloTool): - return MockMidiController(soloTool) - -@pytest.fixture -def uut(soloTool, mockMidi): - return SoloToolCLI("test_session.json", soloToolOverride=soloTool, midiOverride=mockMidi, tickEnable=False) - -def test_connectMidi(uut, mockMidi): - expectedOutput = """\ -Supported device: Novation Launchpad Mini MkII -Connecting to MIDI device... -""" - - with io.StringIO() as buf, redirect_stdout(buf): - uut.input("midi") - assert not mockMidi.connected - - uut.input("midi connect") - assert mockMidi.connected - - assert buf.getvalue() == expectedOutput - diff --git a/cli-project/test/test.flac b/cli-project/test/test.flac Binary files differdeleted file mode 100644 index 9164735..0000000 --- a/cli-project/test/test.flac +++ /dev/null diff --git a/cli-project/test/test.mp3 b/cli-project/test/test.mp3 Binary files differdeleted file mode 100644 index 3c353b7..0000000 --- a/cli-project/test/test.mp3 +++ /dev/null diff --git a/cli-project/test/test_session.json b/cli-project/test/test_session.json deleted file mode 100644 index f48b792..0000000 --- a/cli-project/test/test_session.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "path" : "test.flac", - "ab_limits" : null - }, - { - "path" : "test.mp3", - "ab_limits" : [ - [0.1, 0.2], - [0.3, 0.4] - ] - } -] |