Session manager tests passing

2 files changed, 18 insertions, 18 deletions

diff --git a/solo-tool-project/src/solo_tool/session_manager.py b/solo-tool-project/src/solo_tool/session_manager.py
index a4dabc0..9744b57 100644
--- a/solo-tool-project/src/solo_tool/session_manager.py
+++ b/solo-tool-project/src/solo_tool/session_manager.py
@@ -1,29 +1,30 @@
 import json
+from . import SoloTool
 
-def loadSession(file, songList, abController):
-    jsonStr = file.read()
-    session = json.loads(jsonStr)
+def loadSession(file: str) -> SoloTool:
+    with open(file, "r") as f:
+        session = json.load(f)
 
-    songList.clear()
-    abController.clear()
+    st = SoloTool()
 
-    for entry in session:
+    for i, entry in enumerate(session):
         songPath = entry["path"]
-        abLimits = entry["ab_limits"]
-        songList.append(songPath)
+        keyPoints = entry["key_points"]
 
-        if abLimits is not None:
-            for l in abLimits:
-                abController.storeLimits(l[0], l[1], songPath)
+        st.addSong(songPath)
+        st._keyPoints[i] = keyPoints
+
+    return st
         
-def saveSession(file, songList, abController):
-    session = list()
+def saveSession(soloTool: SoloTool, file: str) -> None:
+    session = []
 
-    for s in songList:
+    for i, song in enumerate(soloTool.songs):
         entry = {
-            "path": s,
-            "ab_limits" : abController.getStoredLimits(s)
+            "path": song,
+            "key_points" : soloTool._keyPoints[i]
         }
         session.append(entry)
 
-    file.write(json.dumps(session))
+    with open(file, "w") as f:
+        json.dump(session, f)
diff --git a/solo-tool-project/src/solo_tool/solo_tool.py b/solo-tool-project/src/solo_tool/solo_tool.py
index 97c3495..147a7b9 100644
--- a/solo-tool-project/src/solo_tool/solo_tool.py
+++ b/solo-tool-project/src/solo_tool/solo_tool.py
@@ -1,6 +1,5 @@
 import os
 
-from .session_manager import loadSession, saveSession
 from .notifier import Notifier
 from .player_vlc import Player