aboutsummaryrefslogtreecommitdiffstats
path: root/solo-tool-project/src/solo_tool/solo_tool.py
diff options
context:
space:
mode:
Diffstat (limited to 'solo-tool-project/src/solo_tool/solo_tool.py')
-rw-r--r--solo-tool-project/src/solo_tool/solo_tool.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/solo-tool-project/src/solo_tool/solo_tool.py b/solo-tool-project/src/solo_tool/solo_tool.py
index 92b5595..63fb7f9 100644
--- a/solo-tool-project/src/solo_tool/solo_tool.py
+++ b/solo-tool-project/src/solo_tool/solo_tool.py
@@ -1,12 +1,10 @@
import os
-from pathlib import Path
from .notifier import Notifier
from .player_mpv import Player
class SoloTool:
- def __init__(self, songPool: str, player=None):
- self._songPool = Path(songPool)
+ def __init__(self, player=None):
self._player = Player() if player is None else player
self._notifier = Notifier(self._player)
self._songs = []
@@ -21,7 +19,7 @@ class SoloTool:
previousSong = self._song
self._song = index
self._player.pause()
- self._player.setCurrentSong(self._songPool / self._songs[index])
+ self._player.setCurrentSong(self._songs[index])
self._notifier.notify(Notifier.CURRENT_SONG_EVENT, index)
previousKp = self._keyPoint
@@ -40,13 +38,10 @@ class SoloTool:
def songs(self) -> list[str]:
return self._songs.copy()
- def addSong(self, fileName: str) -> None:
- path = self._songPool / fileName
- if not os.path.isfile(path):
- raise FileNotFoundError(path)
+ def addSong(self, path: str) -> None:
if path in self._songs:
return
- self._songs.append(fileName)
+ self._songs.append(path)
self._keyPoints.append([])
self._notifier.notify(Notifier.SONG_LIST_EVENT, self.songs)
if self.song is None: