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

Change row to row_number

Browse Source
This commit is contained in:
Keith Edmunds 2023-03-12 16:22:59 +00:00
parent 4094b63f44
commit 669125794f
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
app/playlists.py
View File

@ -527,19 +527,19 @@ class PlaylistTab(QTableWidget):
Insert passed playlist row (plr) into playlist tab.
"""
row = plr.row_number
row_number = plr.row_number
bold = True
self.insertRow(row)
_ = self._set_row_plr_id(row, plr.id)
self.insertRow(row_number)
_ = self._set_row_plr_id(row_number, plr.id)
if plr.track:
self._update_row_track_info(session, row, plr.track)
self._update_row_track_info(session, row_number, plr.track)
if played:
bold = False
_ = self._set_row_userdata(row, self.PLAYED, True)
_ = self._set_row_userdata(row_number, self.PLAYED, True)
if plr.note is None:
plr.note = ""
self._set_row_note_text(session, row, plr.note)
self._set_row_note_text(session, row_number, plr.note)
else:
# This is a section header so it must have note text
if plr.note is None:
@ -549,14 +549,14 @@ class PlaylistTab(QTableWidget):
return
# Use one QTableWidgetItem to span all columns from column 1
self._set_row_header_text(session, row, plr.note)
self.setSpan(row, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
self._set_row_header_text(session, row_number, plr.note)
self.setSpan(row_number, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
# Save (or clear) track_id
_ = self._set_row_track_id(row, 0)
_ = self._set_row_track_id(row_number, 0)
# Set bold as needed
self._set_row_bold(row, bold)
self._set_row_bold(row_number, bold)
def insert_track(self, session: scoped_session, track: Tracks,
note: str = "", repaint: bool = True) -> None:
@ -648,7 +648,7 @@ class PlaylistTab(QTableWidget):
# Update start/stop times
self._update_start_end_times()
# Update hidden tracks*
# Update hidden tracks
QTimer.singleShot(Config.HIDE_AFTER_PLAYING_OFFSET,
self.hide_or_show_played_tracks)
@ -711,11 +711,11 @@ class PlaylistTab(QTableWidget):
Unmark next track
"""
row = self._get_next_track_row_number()
if not row:
row_number = self._get_next_track_row_number()
if not row_number:
return
self.musicmuster.clear_next()
self._set_row_colour_default(row)
self._set_row_colour_default(row_number)
self.clear_selection()
def save_playlist(self, session: scoped_session) -> None:
@ -727,11 +727,11 @@ class PlaylistTab(QTableWidget):
"""
# Ensure all row plrs have correct row number and playlist_id
for row in range(self.rowCount()):
plr = self._get_row_plr(session, row)
for row_number in range(self.rowCount()):
plr = self._get_row_plr(session, row_number)
if not plr:
continue
plr.row_number = row
plr.row_number = row_number
plr.playlist_id = self.playlist_id
# Any rows in the database for this playlist that has a row
@ -791,27 +791,27 @@ class PlaylistTab(QTableWidget):
return
# select first row if none selected
if len(selected_rows) == 0:
row = 0
row_number = 0
else:
row = selected_rows[0] + 1
if row >= self.rowCount():
row = 0
row_number = selected_rows[0] + 1
if row_number >= self.rowCount():
row_number = 0
# Don't select section headers
wrapped = False
track_id = self._get_row_track_id(row)
track_id = self._get_row_track_id(row_number)
while not track_id:
row += 1
if row >= self.rowCount():
row_number += 1
if row_number >= self.rowCount():
if wrapped:
# we're already wrapped once, so there are no
# non-headers
return
row = 0
row_number = 0
wrapped = True
track_id = self._get_row_track_id(row)
track_id = self._get_row_track_id(row_number)
self.selectRow(row)
self.selectRow(row_number)
def select_previous_row(self) -> None:
"""
@ -826,35 +826,35 @@ class PlaylistTab(QTableWidget):
# select last row if none selected
last_row = self.rowCount() - 1
if len(selected_rows) == 0:
row = last_row
row_number = last_row
else:
row = selected_rows[0] - 1
if row < 0:
row = last_row
row_number = selected_rows[0] - 1
if row_number < 0:
row_number = last_row
# Don't select section headers
wrapped = False
track_id = self._get_row_track_id(row)
track_id = self._get_row_track_id(row_number)
while not track_id:
row -= 1
if row < 0:
row_number -= 1
if row_number < 0:
if wrapped:
# we're already wrapped once, so there are no
# non-notes
return
row = last_row
row_number = last_row
wrapped = True
track_id = self._get_row_track_id(row)
track_id = self._get_row_track_id(row_number)
self.selectRow(row)
self.selectRow(row_number)
def set_selected_as_next(self) -> None:
"""Sets the select track as next to play"""
row = self._get_selected_row()
if row is not None:
row_number = self._get_selected_row()
if row_number is not None:
with Session() as session:
self._set_next(session, row)
self._set_next(session, row_number)
def tab_visible(self) -> None:
"""Called when tab becomes visible"""
@ -867,12 +867,13 @@ class PlaylistTab(QTableWidget):
# # ########## Internally called functions ##########
def _add_track(self, row: int) -> None:
def _add_track(self, row_number: int) -> None:
"""Add a track to a section header making it a normal track row"""
print(f"_add_track({row_number=})")
with Session() as session:
# Add track to playlist row
plr = self._get_row_plr(session, row)
plr = self._get_row_plr(session, row_number)
if not plr:
return