forked from Wobbl/Wobuzz
Made it working again.
This commit is contained in:
parent
cf1b4bacd1
commit
6134c21ce4
3 changed files with 26 additions and 11 deletions
|
@ -4,6 +4,8 @@ import os
|
||||||
import sys
|
import sys
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
|
from wobuzz.player.playlist import Playlist
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
description = "A music player made by The Wobbler."
|
description = "A music player made by The Wobbler."
|
||||||
|
@ -20,24 +22,34 @@ def main():
|
||||||
app = Wobuzz()
|
app = Wobuzz()
|
||||||
|
|
||||||
if arguments.playlist:
|
if arguments.playlist:
|
||||||
app.library.temporary_playlist.clear()
|
playlist = Playlist(app, "Temporary Playlist")
|
||||||
app.library.temporary_playlist.view.clear()
|
|
||||||
app.library.temporary_playlist.load_from_m3u(arguments.playlist)
|
playlist.load_from_m3u(arguments.playlist)
|
||||||
app.library.temporary_playlist.view.load_tracks()
|
|
||||||
|
app.library.playlists.append(playlist)
|
||||||
|
|
||||||
|
if app.library.temporary_playlist in app.library.playlists:
|
||||||
|
app.library.playlists.remove(app.library.temporary_playlist)
|
||||||
|
app.library.temporary_playlist = playlist
|
||||||
|
|
||||||
if arguments.track:
|
if arguments.track:
|
||||||
app.library.temporary_playlist.clear()
|
|
||||||
app.library.temporary_playlist.view.clear()
|
|
||||||
|
|
||||||
# make track paths absolute
|
# make track paths absolute
|
||||||
tracks = []
|
tracks = []
|
||||||
|
|
||||||
for track in arguments.track:
|
for track in arguments.track:
|
||||||
tracks.append(os.path.abspath(track))
|
tracks.append(os.path.abspath(track))
|
||||||
|
|
||||||
app.library.temporary_playlist.load_from_paths(tracks)
|
playlist = Playlist(app, "Temporary Playlist")
|
||||||
app.library.temporary_playlist.view.load_tracks()
|
|
||||||
|
|
||||||
|
playlist.load_from_paths(tracks)
|
||||||
|
|
||||||
|
app.library.playlists.append(playlist)
|
||||||
|
|
||||||
|
if app.library.temporary_playlist in app.library.playlists:
|
||||||
|
app.library.playlists.remove(app.library.temporary_playlist)
|
||||||
|
app.library.temporary_playlist = playlist
|
||||||
|
|
||||||
|
app.post_init()
|
||||||
sys.exit(app.qt_app.exec())
|
sys.exit(app.qt_app.exec())
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ class Library:
|
||||||
self.library_docks = [self.main_library_dock]
|
self.library_docks = [self.main_library_dock]
|
||||||
|
|
||||||
self.playlists = []
|
self.playlists = []
|
||||||
|
self.temporary_playlist = None
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
self.load_playlists()
|
self.load_playlists()
|
||||||
|
@ -44,6 +45,9 @@ class Library:
|
||||||
|
|
||||||
playlist.load_from_m3u(path)
|
playlist.load_from_m3u(path)
|
||||||
|
|
||||||
|
if playlist.title == "Temporary Playlist":
|
||||||
|
self.temporary_playlist = playlist
|
||||||
|
|
||||||
self.load_playlist_views()
|
self.load_playlist_views()
|
||||||
|
|
||||||
def load_playlist_views(self):
|
def load_playlist_views(self):
|
||||||
|
|
|
@ -23,8 +23,6 @@ class Wobuzz:
|
||||||
self.player = Player(self)
|
self.player = Player(self)
|
||||||
self.gui = GUI(self)
|
self.gui = GUI(self)
|
||||||
|
|
||||||
self.post_init()
|
|
||||||
|
|
||||||
def post_init(self):
|
def post_init(self):
|
||||||
self.gui.track_control.track_progress_slider.post_init()
|
self.gui.track_control.track_progress_slider.post_init()
|
||||||
self.library.load()
|
self.library.load()
|
||||||
|
@ -37,4 +35,5 @@ class Wobuzz:
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
wobuzz = Wobuzz()
|
wobuzz = Wobuzz()
|
||||||
|
wobuzz.post_init()
|
||||||
sys.exit(wobuzz.qt_app.exec())
|
sys.exit(wobuzz.qt_app.exec())
|
||||||
|
|
Loading…
Add table
Reference in a new issue