From b2bd8ef784bb03c603e05c9c17a0d6b3a0d3acf7 Mon Sep 17 00:00:00 2001 From: EKNr1 Date: Sun, 26 Jan 2025 14:07:00 +0100 Subject: [PATCH] Made it work with relative paths also. --- wobuzz/command_line.py | 10 +++++++++- wobuzz/library/library.py | 2 +- wobuzz/main.py | 2 -- wobuzz/player/playlist.py | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/wobuzz/command_line.py b/wobuzz/command_line.py index c4c9785..08e5efa 100644 --- a/wobuzz/command_line.py +++ b/wobuzz/command_line.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 +import os import sys import argparse @@ -27,7 +28,14 @@ def main(): if arguments.track: app.library.temporary_playlist.clear() app.library.temporary_playlist.view.clear() - app.library.temporary_playlist.load_from_paths(arguments.track) + + # make track paths absolute + tracks = [] + + for track in arguments.track: + tracks.append(os.path.abspath(track)) + + app.library.temporary_playlist.load_from_paths(tracks) app.library.temporary_playlist.view.load_tracks() app.player.current_playlist = app.library.temporary_playlist diff --git a/wobuzz/library/library.py b/wobuzz/library/library.py index 459826e..482df6f 100644 --- a/wobuzz/library/library.py +++ b/wobuzz/library/library.py @@ -22,7 +22,7 @@ class Library: self.playlists = [self.temporary_playlist] def load(self): - path_playlists = f"{self.app.settings.library_path}/playlists" + path_playlists = os.path.expanduser(f"{self.app.settings.library_path}/playlists") if not os.path.exists(path_playlists): os.makedirs(path_playlists) diff --git a/wobuzz/main.py b/wobuzz/main.py index 10dfea7..ce67244 100644 --- a/wobuzz/main.py +++ b/wobuzz/main.py @@ -17,8 +17,6 @@ class Wobuzz: self.utils = Utils(self) - os.chdir(self.utils.home_path) - self.settings = load_dataclass_json(Settings, self.utils.settings_location, self, True, True) self.settings.set_attribute_change_event(self.on_settings_change) diff --git a/wobuzz/player/playlist.py b/wobuzz/player/playlist.py index 604db73..ffb3378 100644 --- a/wobuzz/player/playlist.py +++ b/wobuzz/player/playlist.py @@ -112,7 +112,7 @@ class Playlist: for track in self.tracks: wbz_data += f"{track.path}\n" - wbz = open(f"{self.app.settings.library_path}/playlists/{self.title.replace(" ", "_")}.wbz.m3u", "w") + wbz = open(os.path.expanduser(f"{self.app.settings.library_path}/playlists/{self.title.replace(" ", "_")}.wbz.m3u"), "w") wbz.write(wbz_data) wbz.close()