Purge all mention of song pool

1 files changed, 8 insertions, 23 deletions

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)