Purge all mention of song pool

11 files changed, 34 insertions, 67 deletions

diff --git a/Makefile b/Makefile
index 59898a5..0fc9a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ clean:
 	touch .venv/touchfile
 
 web-deploy: .venv/touchfile
-	./.venv/bin/solo-tool-web --no-reload --port 8080 --refresh 0.5
+	./.venv/bin/solo-tool-web --no-reload --port 8080 --refresh 0.5 --session_path="https://files.0xf7.com"
 
 web-dev: .venv/touchfile
 	./.venv/bin/python web-project/src/solo_tool_web.py
diff --git a/deployment/solo-tool.service b/deployment/solo-tool.service
index e33a036..f3fa86f 100644
--- a/deployment/solo-tool.service
+++ b/deployment/solo-tool.service
@@ -4,8 +4,6 @@ After=network-online.target sound.target
 
 [Service]
 WorkingDirectory=/home/eddy/git/solo-tool
-Environment="SESSION_DIR=/home/eddy/music/sessions"
-Environment="SONG_POOL=/home/eddy/music/songs"
 ExecStart=/home/eddy/git/solo-tool/deployment/start-solo-tool.sh
 
 [Install]
diff --git a/solo-tool-project/src/solo_tool/session_manager.py b/solo-tool-project/src/solo_tool/session_manager.py
index bf6e218..2e99937 100644
--- a/solo-tool-project/src/solo_tool/session_manager.py
+++ b/solo-tool-project/src/solo_tool/session_manager.py
@@ -19,12 +19,8 @@ class SessionManager(Protocol):
     def saveSession(self, soloTool: SoloTool, key: str) -> None:
         raise NotImplementedError
 
-    @abstractmethod
-    def addSong(self, name: str, content: BinaryIO) -> None:
-        raise NotImplementedError
-
     @staticmethod
-    def _dict2st(session: dict, songPool: str, player) -> SoloTool:
+    def _dict2st(session: dict, player) -> SoloTool:
         st = SoloTool(player=player)
 
         for i, entry in enumerate(session):
@@ -48,8 +44,7 @@ class SessionManager(Protocol):
         return session
 
 class _FileSystemSessionManager(SessionManager):
-    def __init__(self, songPool: str, sessionPath: str):
-        self._songPool = Path(songPool)
+    def __init__(self, sessionPath: str):
         self._sessionPath = Path(sessionPath)
 
     def getSessions(self) -> list[str]:
@@ -58,23 +53,16 @@ class _FileSystemSessionManager(SessionManager):
     def loadSession(self, key: str, player=None) -> SoloTool:
         with open(self._sessionPath / f"{key}.json", "r") as f:
             session = json.load(f)
-        return SessionManager._dict2st(session, self._songPool, player)
+        return SessionManager._dict2st(session, player)
 
     def saveSession(self, soloTool: SoloTool, key: str) -> None:
         session = SessionManager._st2dict(soloTool)
         with open(self._sessionPath / f"{key}.json", "w") as f:
             json.dump(session, f)
 
-    def addSong(self, name: str, content: BinaryIO) -> None:
-        from shutil import copyfileobj
-        newSong = self._songPool / name
-        with open(newSong, "wb") as f:
-            copyfileobj(content, f)
-
 class _FileBrowserSessionManager(SessionManager):
-    def __init__(self, songPoolUrl: str, sessionUrl: str):
+    def __init__(self, sessionUrl: str):
         self._baseUrl = "https://files.0xf7.com"
-        self._songPool = songPoolUrl
         self._username = "solo-tool"
         self._password = "mwC0ML8vLpJLPCLHKuxkiOxtIaE"
         self._apiKey = self._getApiKey()
@@ -89,23 +77,20 @@ class _FileBrowserSessionManager(SessionManager):
         url = f"{self._baseUrl}/api/raw/sessions/{key}.json"
         response = requests.get(url, headers={"X-Auth":self._apiKey})
         response.raise_for_status()
-        return SessionManager._dict2st(json.loads(response.content), self._songPool, player=player)
+        return SessionManager._dict2st(json.loads(response.content), player=player)
 
     def saveSession(self, soloTool: SoloTool, key: str) -> None:
         pass
 
-    def addSong(self, name: str, content: BinaryIO) -> None:
-        pass
-
     def _getApiKey(self) -> str:
         response = requests.post(f"{self._baseUrl}/api/login", json={"username":self._username, "password":self._password})
         return response.content
 
-def getSessionManager(songPool: str, sessionPath: str) -> SessionManager:
+def getSessionManager(sessionPath: str) -> SessionManager:
     from re import search
     match = search(r"^([a-z0-9]+://)", sessionPath)
     if not match or match.group(0) == "file://":
-        return _FileSystemSessionManager(songPool, sessionPath)
+        return _FileSystemSessionManager(sessionPath)
     elif match.group(0) in ["http://", "https://"]:
-        return _FileBrowserSessionManager(songPool, sessionPath)
+        return _FileBrowserSessionManager(sessionPath)
 
diff --git a/solo-tool-project/test/fixtures.py b/solo-tool-project/test/fixtures.py
index 3306388..1f2299f 100644
--- a/solo-tool-project/test/fixtures.py
+++ b/solo-tool-project/test/fixtures.py
@@ -10,12 +10,6 @@ def mockPlayer():
     return MockPlayer()
 
 @pytest.fixture
-def songPool(tmp_path):
-    path = tmp_path / "songs"
-    os.mkdir(path)
-    return path
-
-@pytest.fixture
 def sessionPath(tmp_path):
     path = tmp_path / "sessions"
     os.mkdir(path)
@@ -26,11 +20,13 @@ def soloTool(mockPlayer):
     return SoloTool(player=mockPlayer)
 
 @pytest.fixture
-def testSongs(songPool):
+def testSongs(tmp_path):
+    path = tmp_path / "songs"
+    os.mkdir(path)
     songs = [
-        songPool / "test.flac",
-        songPool / "test.mp3",
-        songPool / "test.mp4"
+        path / "test.flac",
+        path / "test.mp3",
+        path / "test.mp4"
     ]
 
     for song in songs:
diff --git a/solo-tool-project/test/handlers_integrationtest.py b/solo-tool-project/test/handlers_integrationtest.py
index 85050d6..6696f86 100644
--- a/solo-tool-project/test/handlers_integrationtest.py
+++ b/solo-tool-project/test/handlers_integrationtest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from fixtures import soloTool, testSongs, mockPlayer, songPool
+from fixtures import soloTool, testSongs, mockPlayer
 
 from solo_tool.handlers import keyPointRelative
 
diff --git a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
index be8ed88..1a99cd4 100644
--- a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
+++ b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
@@ -2,7 +2,7 @@ import pytest
 from mido import Message
 
 from solo_tool.midi_controller_launchpad_mini import MidiController
-from fixtures import songPool, soloTool, mockPlayer, testSongs
+from fixtures import soloTool, mockPlayer, testSongs
 
 LED_RED = 3
 LED_YELLOW = 126
diff --git a/solo-tool-project/test/session_manager_unittest.py b/solo-tool-project/test/session_manager_unittest.py
index bb40fdf..690bec0 100644
--- a/solo-tool-project/test/session_manager_unittest.py
+++ b/solo-tool-project/test/session_manager_unittest.py
@@ -3,7 +3,7 @@ from json import loads
 import os
 
 from solo_tool.session_manager import getSessionManager, _FileSystemSessionManager, _FileBrowserSessionManager
-from fixtures import songPool, soloTool, mockPlayer, testSongs, sessionPath
+from fixtures import soloTool, mockPlayer, testSongs, sessionPath
 
 @pytest.fixture
 def testSessionFile(sessionPath, testSongs):
@@ -23,8 +23,8 @@ def testSessionFile(sessionPath, testSongs):
     return sessionFile
 
 @pytest.fixture
-def sessionManager(sessionPath, songPool):
-    return getSessionManager(str(songPool), str(sessionPath))
+def sessionManager(sessionPath):
+    return getSessionManager(str(sessionPath))
 
 def test_loadSession(sessionManager, mockPlayer, testSessionFile):
     sessions = sessionManager.getSessions()
@@ -64,20 +64,9 @@ def test_loadAndSaveEmptySession(sessionManager, sessionPath, soloTool, tmp_path
 
     assert reloadedTool.songs == []
     
-def test_uploadSong(sessionManager, songPool, tmp_path):
-    song = tmp_path / "song-to-be-uploaded.mp3"
-    song.touch()
-    
-    expected = songPool / "song-to-be-uploaded.mp3"
-    assert not expected.exists()
-
-    with open(song, "rb") as f:
-        sessionManager.addSong("song-to-be-uploaded.mp3", f)
-    assert expected.exists()
-
 def test_sessionManagerFactory():
-    assert type(getSessionManager("", "/some_absolute_dir")) is _FileSystemSessionManager
-    assert type(getSessionManager("", "file:///some_dir_with_protocol")) is _FileSystemSessionManager
-    assert type(getSessionManager("", "some_relative_dir")) is _FileSystemSessionManager
-    assert type(getSessionManager("", "http://some_server")) is _FileBrowserSessionManager
-    assert type(getSessionManager("", "https://some_secure_server")) is _FileBrowserSessionManager
+    assert type(getSessionManager("/some_absolute_dir")) is _FileSystemSessionManager
+    assert type(getSessionManager("file:///some_dir_with_protocol")) is _FileSystemSessionManager
+    assert type(getSessionManager("some_relative_dir")) is _FileSystemSessionManager
+    assert type(getSessionManager("http://some_server")) is _FileBrowserSessionManager
+    assert type(getSessionManager("https://some_secure_server")) is _FileBrowserSessionManager
diff --git a/solo-tool-project/test/solo_tool_integrationtest.py b/solo-tool-project/test/solo_tool_integrationtest.py
index 7b274a3..b92cd85 100644
--- a/solo-tool-project/test/solo_tool_integrationtest.py
+++ b/solo-tool-project/test/solo_tool_integrationtest.py
@@ -1,4 +1,4 @@
-from fixtures import soloTool as uut, songPool, mockPlayer, testSongs
+from fixtures import soloTool as uut, mockPlayer, testSongs
 
 def test_playerControls(uut, mockPlayer):
     assert not mockPlayer.playing
diff --git a/solo-tool-project/test/solo_tool_keypoints_integrationtest.py b/solo-tool-project/test/solo_tool_keypoints_integrationtest.py
index 3db86f5..f79103d 100644
--- a/solo-tool-project/test/solo_tool_keypoints_integrationtest.py
+++ b/solo-tool-project/test/solo_tool_keypoints_integrationtest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from fixtures import soloTool as uut, songPool, mockPlayer, testSongs
+from fixtures import soloTool as uut, mockPlayer, testSongs
 
 def test_keyPointAndSongSelection(uut, mockPlayer, testSongs):
     def checkJump(before, expectedAfter):
diff --git a/solo-tool-project/test/solo_tool_songs_integrationtest.py b/solo-tool-project/test/solo_tool_songs_integrationtest.py
index 0acfc2b..caa4a30 100644
--- a/solo-tool-project/test/solo_tool_songs_integrationtest.py
+++ b/solo-tool-project/test/solo_tool_songs_integrationtest.py
@@ -1,6 +1,6 @@
 import pytest
 
-from fixtures import soloTool as uut, songPool, mockPlayer, testSongs
+from fixtures import soloTool as uut, mockPlayer, testSongs
 
 def test_songSelectionFlow(uut, mockPlayer, testSongs):
     # Initially, song list is empty and no song is selected
diff --git a/web-project/src/solo_tool_web.py b/web-project/src/solo_tool_web.py
index ace19b1..e3ed4c0 100644
--- a/web-project/src/solo_tool_web.py
+++ b/web-project/src/solo_tool_web.py
@@ -116,9 +116,9 @@ def landingPage():
     for name, soloTool in sessions.items():
         ui.button(name, on_click=partial(ui.navigate.to, f"/{name}"))
 
-def start(port, refresh, reload, session_path, song_path):
+def start(port, refresh, reload, session_path):
     global sessionManager
-    sessionManager = getSessionManager(song_path, session_path)
+    sessionManager = getSessionManager(session_path)
 
     for key in sessionManager.getSessions():
         songTool = sessionManager.loadSession(key)
@@ -137,11 +137,10 @@ def start(port, refresh, reload, session_path, song_path):
 @click.option("--refresh", type=float, default=0.5, help="Refresh interval in seconds.")
 @click.option("--reload/--no-reload", default=True, help="Auto-reload when files change.")
 @click.option("--session_path", default="/home/eddy/music/sessions", help="Look for sessions in this location.")
-@click.option("--song_path", default="/home/eddy/music/songs", help="Look for songs in this location.")
-def main(port, refresh, reload, session_path, song_path):
-    start(port, refresh, reload, session_path, song_path)
+def main(port, refresh, reload, session_path):
+    start(port, refresh, reload, session_path)
 
 # Hardcoded dev settings
 if __name__ in {"__main__", "__mp_main__"}:
-    #start(8080, 0.5, True, "https://files.0xf7.com", "https://files.0xf7.com/api/public/dl/NR1j-os8/guitar-practice/solo-tool/songs")
-    start(8080, 0.5, True, "/home/eddy/music/sessions", "/home/eddy/music/songs")
+    #start(8080, 0.5, True, "https://files.0xf7.com")
+    start(8080, 0.5, True, "/home/eddy/music/sessions")