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

Fixup track start/end times

Browse Source
This commit is contained in:
Keith Edmunds 2023-03-05 20:21:27 +00:00
commit e80a74cc40
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/playlists.py
View File

@ -897,6 +897,7 @@ class PlaylistTab(QTableWidget):
self._set_row_colour_default(plr.row_number) self._set_row_colour_default(plr.row_number)
_ = self._set_row_note_colour(session, row, plr.note) _ = self._set_row_note_colour(session, row, plr.note)
self._update_row_track_info(session, row, track) self._update_row_track_info(session, row, track)
self._update_start_end_times()
self.clear_selection() self.clear_selection()
def _build_context_menu(self, item: QTableWidgetItem) -> None: def _build_context_menu(self, item: QTableWidgetItem) -> None:
@ -1415,6 +1416,7 @@ class PlaylistTab(QTableWidget):
if not plr: if not plr:
return return
plr.played = False plr.played = False
self._update_start_end_times()
def _move_row(self, session: scoped_session, plr: PlaylistRows, def _move_row(self, session: scoped_session, plr: PlaylistRows,
new_row_number: int) -> None: new_row_number: int) -> None:
@ -1513,10 +1515,24 @@ class PlaylistTab(QTableWidget):
# Set note text in correct column for section head # Set note text in correct column for section head
_ = self._set_item_text(row, HEADER_NOTES_COLUMN, plr.note) _ = self._set_item_text(row, HEADER_NOTES_COLUMN, plr.note)
<<<<<<< HEAD
_ = self._set_row_note_colour(session, row, plr.note, _ = self._set_row_note_colour(session, row, plr.note,
section_header=True) section_header=True)
||||||| c5f89db
note_colour = NoteColours.get_colour(session, plr.note)
if not note_colour:
note_colour = Config.COLOUR_NOTES_PLAYLIST
self._set_row_colour(row, QColor(note_colour))
=======
_ = self._set_row_note_colour(session, row, plr.note,
section_header=True)
self._update_start_end_times()
>>>>>>> dev
self.clear_selection() self.clear_selection()
# Set track start/end times after track list is populated
QTimer.singleShot(0, self._update_start_end_times)
def _rescan(self, row: int, track_id: int) -> None: def _rescan(self, row: int, track_id: int) -> None:
"""Rescan track""" """Rescan track"""
@ -2120,7 +2136,6 @@ class PlaylistTab(QTableWidget):
""" Update track start and end times """ """ Update track start and end times """
with Session() as session: with Session() as session:
section_start_rows: List[PlaylistRows] = []
current_track_end_time = self._get_current_track_end_time() current_track_end_time = self._get_current_track_end_time()
current_track_row = self._get_current_track_row_number() current_track_row = self._get_current_track_row_number()
current_track_start_time = self._get_current_track_start_time() current_track_start_time = self._get_current_track_start_time()