kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

V3 WIP Black

Browse Source
This commit is contained in:
Keith Edmunds 2023-11-05 08:03:02 +00:00
parent a35905dee8
commit a8ac67b9e3
4 changed files with 111 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/classes.py
View File

@ -1,14 +1,14 @@
from dataclasses import dataclass from dataclasses import dataclass
from datetime import datetime, timedelta from datetime import datetime, timedelta
from typing import Any, Optional from typing import Optional
from PyQt6.QtCore import pyqtSignal, QObject, QThread from PyQt6.QtCore import pyqtSignal, QObject, QThread
import numpy as np import numpy as np
import pyqtgraph as pg # type: ignore import pyqtgraph as pg # type: ignore
from config import Config from config import Config
from dbconfig import scoped_session, Session from dbconfig import scoped_session
from models import PlaylistRows, Tracks from models import PlaylistRows
import helpers import helpers
@ -213,7 +213,7 @@ class AddFadeCurve(QObject):
cnp_tracks = dict( cnp_tracks = dict(
CurrentTrack = PlaylistTrack(), CurrentTrack=PlaylistTrack(),
NextTrack = PlaylistTrack(), NextTrack=PlaylistTrack(),
PreviousTrack = PlaylistTrack(), PreviousTrack=PlaylistTrack(),
) )

175
app/musicmuster.py
View File

@ -387,7 +387,7 @@ class Window(QMainWindow, Ui_MainWindow):
Clear next track Clear next track
""" """
cnp_tracks['NextTrack'] = PlaylistTrack() cnp_tracks["NextTrack"] = PlaylistTrack()
self.update_headers() self.update_headers()
def clear_selection(self) -> None: def clear_selection(self) -> None:
@ -708,13 +708,13 @@ class Window(QMainWindow, Ui_MainWindow):
# self.current_track.playlist_tab.play_ended() # self.current_track.playlist_tab.play_ended()
# Reset fade graph # Reset fade graph
if cnp_tracks['CurrentTrack'].fade_graph: if cnp_tracks["CurrentTrack"].fade_graph:
cnp_tracks['CurrentTrack'].fade_graph.clear() cnp_tracks["CurrentTrack"].fade_graph.clear()
# Reset PlaylistTrack objects # Reset PlaylistTrack objects
if cnp_tracks['CurrentTrack'].track_id: if cnp_tracks["CurrentTrack"].track_id:
cnp_tracks['PreviousTrack'] = cnp_tracks['CurrentTrack'] cnp_tracks["PreviousTrack"] = cnp_tracks["CurrentTrack"]
cnp_tracks['CurrentTrack'] = PlaylistTrack() cnp_tracks["CurrentTrack"] = PlaylistTrack()
# Reset clocks # Reset clocks
self.frame_fade.setStyleSheet("") self.frame_fade.setStyleSheet("")
@ -785,11 +785,14 @@ class Window(QMainWindow, Ui_MainWindow):
times a second; this function has much better resolution. times a second; this function has much better resolution.
""" """
if cnp_tracks['CurrentTrack'].track_id is None or cnp_tracks['CurrentTrack'].start_time is None: if (
cnp_tracks["CurrentTrack"].track_id is None
or cnp_tracks["CurrentTrack"].start_time is None
):
return 0 return 0
now = datetime.now() now = datetime.now()
track_start = cnp_tracks['CurrentTrack'].start_time track_start = cnp_tracks["CurrentTrack"].start_time
elapsed_seconds = (now - track_start).total_seconds() elapsed_seconds = (now - track_start).total_seconds()
return int(elapsed_seconds * 1000) return int(elapsed_seconds * 1000)
@ -942,7 +945,8 @@ class Window(QMainWindow, Ui_MainWindow):
plrs_to_move = [ plrs_to_move = [
plr plr
for plr in playlistrows for plr in playlistrows
if plr.id not in [cnp_tracks['CurrentTrack'].plr_id, cnp_tracks['NextTrack'].plr_id] if plr.id
not in [cnp_tracks["CurrentTrack"].plr_id, cnp_tracks["NextTrack"].plr_id]
] ]
rows_to_delete = [ rows_to_delete = [
@ -1150,70 +1154,69 @@ class Window(QMainWindow, Ui_MainWindow):
""" """
# If there is no next track set, return. # If there is no next track set, return.
if not cnp_tracks['NextTrack'].track_id: if not cnp_tracks["NextTrack"].track_id:
log.debug("musicmuster.play_next(): no next track selected") log.debug("musicmuster.play_next(): no next track selected")
return return
if not cnp_tracks['NextTrack'].path: if not cnp_tracks["NextTrack"].path:
log.debug("musicmuster.play_next(): no path for next track") log.debug("musicmuster.play_next(): no path for next track")
return return
with Session() as session: # If there's currently a track playing, fade it.
# If there's currently a track playing, fade it. self.stop_playing(fade=True)
self.stop_playing(fade=True)
# Move next track to current track. # Move next track to current track.
# stop_playing() above has called end_of_track_actions() # stop_playing() above has called end_of_track_actions()
# which will have populated self.previous_track # which will have populated self.previous_track
cnp_tracks['CurrentTrack'] = cnp_tracks['NextTrack'] cnp_tracks["CurrentTrack"] = cnp_tracks["NextTrack"]
# Clear next track # Clear next track
self.clear_next() self.clear_next()
# Set current track playlist_tab colour # Set current track playlist_tab colour
# TODO Reimplement without reference to self.current_track.playlist_tab # TODO Reimplement without reference to self.current_track.playlist_tab
# current_tab = self.current_track.playlist_tab # current_tab = self.current_track.playlist_tab
# if current_tab: # if current_tab:
# self.set_tab_colour(current_tab, QColor(Config.COLOUR_CURRENT_TAB)) # self.set_tab_colour(current_tab, QColor(Config.COLOUR_CURRENT_TAB))
# Restore volume if -3dB active # Restore volume if -3dB active
if self.btnDrop3db.isChecked(): if self.btnDrop3db.isChecked():
self.btnDrop3db.setChecked(False) self.btnDrop3db.setChecked(False)
# Play (new) current track # Play (new) current track
if not cnp_tracks['CurrentTrack'].path: if not cnp_tracks["CurrentTrack"].path:
return return
cnp_tracks['CurrentTrack'].start() cnp_tracks["CurrentTrack"].start()
self.music.play(cnp_tracks['CurrentTrack'].path, position) self.music.play(cnp_tracks["CurrentTrack"].path, position)
# Ensure 100% volume # Ensure 100% volume
# For as-yet unknown reasons. sometimes the volume gets # For as-yet unknown reasons. sometimes the volume gets
# reset to zero within 200mS or so of starting play. This # reset to zero within 200mS or so of starting play. This
# only happened since moving to Debian 12, which uses # only happened since moving to Debian 12, which uses
# Pipewire for sound (which may be irrelevant). # Pipewire for sound (which may be irrelevant).
for _ in range(3): for _ in range(3):
if self.music.player: if self.music.player:
volume = self.music.player.audio_get_volume() volume = self.music.player.audio_get_volume()
if volume < Config.VOLUME_VLC_DEFAULT: if volume < Config.VOLUME_VLC_DEFAULT:
self.music.set_volume() self.music.set_volume()
log.error(f"Reset from {volume=}") log.error(f"Reset from {volume=}")
break break
sleep(0.1) sleep(0.1)
# Show closing volume graph # Show closing volume graph
if cnp_tracks['CurrentTrack'].fade_graph: if cnp_tracks["CurrentTrack"].fade_graph:
cnp_tracks['CurrentTrack'].fade_graph.plot() cnp_tracks["CurrentTrack"].fade_graph.plot()
# Notify model # Notify model
self.active_model().current_track_started() self.active_model().current_track_started()
# Note that track is now playing # Note that track is now playing
self.playing = True self.playing = True
# Disable play next controls # Disable play next controls
self.disable_play_next_controls() self.disable_play_next_controls()
# Update headers # Update headers
self.update_headers() self.update_headers()
def preview(self) -> None: def preview(self) -> None:
""" """
@ -1227,7 +1230,7 @@ class Window(QMainWindow, Ui_MainWindow):
track_path = self.active_tab().get_selected_row_track_path() track_path = self.active_tab().get_selected_row_track_path()
if not track_path: if not track_path:
# Otherwise get path to next track to play # Otherwise get path to next track to play
track_path = cnp_tracks['NextTrack'].path track_path = cnp_tracks["NextTrack"].path
if not track_path: if not track_path:
self.btnPreview.setChecked(False) self.btnPreview.setChecked(False)
return return
@ -1541,23 +1544,23 @@ class Window(QMainWindow, Ui_MainWindow):
# self.next_track.set_plr(session, next_plr) # self.next_track.set_plr(session, next_plr)
# self.signals.set_next_track_signal.emit(next_plr.playlist_id) # self.signals.set_next_track_signal.emit(next_plr.playlist_id)
# # Update headers # # Update headers
# self.update_headers() # self.update_headers()
# TODO: reimlement # TODO: reimlement
# # Set playlist tab colours # # Set playlist tab colours
# self._set_next_track_playlist_tab_colours(old_next_track) # self._set_next_track_playlist_tab_colours(old_next_track)
# if next_plr_id: # if next_plr_id:
# # Populate 'info' tabs with Wikipedia info, but queue it # # Populate 'info' tabs with Wikipedia info, but queue it
# # because it isn't quick # # because it isn't quick
# if self.next_track.title: # if self.next_track.title:
# QTimer.singleShot( # QTimer.singleShot(
# 0, # 0,
# lambda: self.tabInfolist.open_in_wikipedia( # lambda: self.tabInfolist.open_in_wikipedia(
# self.next_track.title # self.next_track.title
# ), # ),
# ) # )
def _set_next_track_playlist_tab_colours( def _set_next_track_playlist_tab_colours(
self, old_next_track: Optional[PlaylistTrack] self, old_next_track: Optional[PlaylistTrack]
@ -1603,14 +1606,14 @@ class Window(QMainWindow, Ui_MainWindow):
# Update volume fade curve # Update volume fade curve
if ( if (
cnp_tracks['CurrentTrack'].track_id cnp_tracks["CurrentTrack"].track_id
and cnp_tracks['CurrentTrack'].fade_graph and cnp_tracks["CurrentTrack"].fade_graph
and cnp_tracks['CurrentTrack'].start_time and cnp_tracks["CurrentTrack"].start_time
): ):
play_time = ( play_time = (
datetime.now() - cnp_tracks['CurrentTrack'].start_time datetime.now() - cnp_tracks["CurrentTrack"].start_time
).total_seconds() * 1000 ).total_seconds() * 1000
cnp_tracks['CurrentTrack'].fade_graph.tick(play_time) cnp_tracks["CurrentTrack"].fade_graph.tick(play_time)
def tick_500ms(self) -> None: def tick_500ms(self) -> None:
""" """
@ -1642,22 +1645,22 @@ class Window(QMainWindow, Ui_MainWindow):
# starting play. # starting play.
if ( if (
self.music.player self.music.player
and cnp_tracks['CurrentTrack'].start_time and cnp_tracks["CurrentTrack"].start_time
and ( and (
self.music.player.is_playing() self.music.player.is_playing()
or (datetime.now() - cnp_tracks['CurrentTrack'].start_time) or (datetime.now() - cnp_tracks["CurrentTrack"].start_time)
< timedelta(microseconds=Config.PLAY_SETTLE) < timedelta(microseconds=Config.PLAY_SETTLE)
) )
): ):
playtime = self.get_playtime() playtime = self.get_playtime()
time_to_fade = cnp_tracks['CurrentTrack'].fade_at - playtime time_to_fade = cnp_tracks["CurrentTrack"].fade_at - playtime
time_to_silence = cnp_tracks['CurrentTrack'].silence_at - playtime time_to_silence = cnp_tracks["CurrentTrack"].silence_at - playtime
# Elapsed time # Elapsed time
self.label_elapsed_timer.setText( self.label_elapsed_timer.setText(
helpers.ms_to_mmss(playtime) helpers.ms_to_mmss(playtime)
+ " / " + " / "
+ helpers.ms_to_mmss(cnp_tracks['CurrentTrack'].duration) + helpers.ms_to_mmss(cnp_tracks["CurrentTrack"].duration)
) )
# Time to fade # Time to fade
@ -1700,14 +1703,14 @@ class Window(QMainWindow, Ui_MainWindow):
Update last / current / next track headers Update last / current / next track headers
""" """
if cnp_tracks['PreviousTrack'].title and cnp_tracks['PreviousTrack'].artist: if cnp_tracks["PreviousTrack"].title and cnp_tracks["PreviousTrack"].artist:
self.hdrPreviousTrack.setText( self.hdrPreviousTrack.setText(
f"{cnp_tracks['PreviousTrack'].title} - {cnp_tracks['PreviousTrack'].artist}" f"{cnp_tracks['PreviousTrack'].title} - {cnp_tracks['PreviousTrack'].artist}"
) )
else: else:
self.hdrPreviousTrack.setText("") self.hdrPreviousTrack.setText("")
if cnp_tracks['CurrentTrack'].title and cnp_tracks['CurrentTrack'].artist: if cnp_tracks["CurrentTrack"].title and cnp_tracks["CurrentTrack"].artist:
self.hdrCurrentTrack.setText( self.hdrCurrentTrack.setText(
f"{cnp_tracks['CurrentTrack'].title.replace('&', '&&')} - " f"{cnp_tracks['CurrentTrack'].title.replace('&', '&&')} - "
f"{cnp_tracks['CurrentTrack'].artist.replace('&', '&&')}" f"{cnp_tracks['CurrentTrack'].artist.replace('&', '&&')}"
@ -1715,7 +1718,7 @@ class Window(QMainWindow, Ui_MainWindow):
else: else:
self.hdrCurrentTrack.setText("") self.hdrCurrentTrack.setText("")
if cnp_tracks['NextTrack'].title and cnp_tracks['NextTrack'].artist: if cnp_tracks["NextTrack"].title and cnp_tracks["NextTrack"].artist:
self.hdrNextTrack.setText( self.hdrNextTrack.setText(
f"{cnp_tracks['NextTrack'].title.replace('&', '&&')} - " f"{cnp_tracks['NextTrack'].title.replace('&', '&&')} - "
f"{cnp_tracks['NextTrack'].artist.replace('&', '&&')}" f"{cnp_tracks['NextTrack'].artist.replace('&', '&&')}"

26
app/playlistmodel.py
View File

@ -191,10 +191,10 @@ class PlaylistModel(QAbstractTableModel):
if file_is_unreadable(prd.path): if file_is_unreadable(prd.path):
return QBrush(QColor(Config.COLOUR_UNREADABLE)) return QBrush(QColor(Config.COLOUR_UNREADABLE))
# Current track # Current track
if prd.plrid == cnp_tracks['CurrentTrack'].plr_id: if prd.plrid == cnp_tracks["CurrentTrack"].plr_id:
return QBrush(QColor(Config.COLOUR_CURRENT_PLAYLIST)) return QBrush(QColor(Config.COLOUR_CURRENT_PLAYLIST))
# Next track # Next track
if prd.plrid == cnp_tracks['NextTrack'].plr_id: if prd.plrid == cnp_tracks["NextTrack"].plr_id:
return QBrush(QColor(Config.COLOUR_NEXT_PLAYLIST)) return QBrush(QColor(Config.COLOUR_NEXT_PLAYLIST))
# Individual cell colouring # Individual cell colouring
@ -231,28 +231,28 @@ class PlaylistModel(QAbstractTableModel):
""" """
# Sanity check # Sanity check
if not cnp_tracks['CurrentTrack'].track_id: if not cnp_tracks["CurrentTrack"].track_id:
log.error( log.error(
"playlistmodel:current_track_started called with no current track" "playlistmodel:current_track_started called with no current track"
) )
return return
if cnp_tracks['CurrentTrack'].plr_rownum is None: if cnp_tracks["CurrentTrack"].plr_rownum is None:
log.error( log.error(
"playlistmodel:current_track_started called with no row number " "playlistmodel:current_track_started called with no row number "
f"({self.current_track=})" f"({cnp_tracks['CurrentTrack']=})"
) )
return return
# Update display # Update display
self.invalidate_row(cnp_tracks['CurrentTrack'].plr_rownum) self.invalidate_row(cnp_tracks["CurrentTrack"].plr_rownum)
# Update track times # Update track times
# TODO # TODO
# Update Playdates in database # Update Playdates in database
with Session() as session: with Session() as session:
Playdates(session, cnp_tracks['CurrentTrack'].track_id) Playdates(session, cnp_tracks["CurrentTrack"].track_id)
plr = session.get(PlaylistRows, cnp_tracks['CurrentTrack'].plr_id) plr = session.get(PlaylistRows, cnp_tracks["CurrentTrack"].plr_id)
if plr: if plr:
plr.played = True plr.played = True
@ -268,7 +268,11 @@ class PlaylistModel(QAbstractTableModel):
try: try:
# Find next row after current track # Find next row after current track
next_row = min( next_row = min(
[a for a in unplayed_rows if a > cnp_tracks['CurrentTrack'].plr_rownum] [
a
for a in unplayed_rows
if a > cnp_tracks["CurrentTrack"].plr_rownum
]
) )
except ValueError: except ValueError:
# Find first unplayed track # Find first unplayed track
@ -587,7 +591,7 @@ class PlaylistModel(QAbstractTableModel):
# Update cnp_tracks # Update cnp_tracks
with Session() as session: with Session() as session:
cnp_tracks['NextTrack'] = PlaylistTrack() cnp_tracks["NextTrack"] = PlaylistTrack()
try: try:
plrid = self.playlist_rows[row_number].plrid plrid = self.playlist_rows[row_number].plrid
except IndexError: except IndexError:
@ -604,7 +608,7 @@ class PlaylistModel(QAbstractTableModel):
# Check track is readable # Check track is readable
if file_is_unreadable(plr.track.path): if file_is_unreadable(plr.track.path):
return return
cnp_tracks['NextTrack'].set_plr(session, plr) cnp_tracks["NextTrack"].set_plr(session, plr)
self.signals.next_track_changed_signal.emit() self.signals.next_track_changed_signal.emit()
self.invalidate_row(row_number) self.invalidate_row(row_number)

2
app/playlists.py
View File

@ -1292,7 +1292,7 @@ class PlaylistTab(QTableView):
# for row_number in range(starting_row, self.rowCount()): # for row_number in range(starting_row, self.rowCount()):
# if row_number not in track_rows or row_number in played_rows: # if row_number not in track_rows or row_number in played_rows:
# continue # continue
# plr = self._get_row_plr(session, row_number) # plr = selWIP V3: play track workingf._get_row_plr(session, row_number)
# if not plr: # if not plr:
# continue # continue
# if file_is_unreadable(plr.track.path): # if file_is_unreadable(plr.track.path):