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 17:03:47 +00:00
parent 3cc90f8c11
commit 9c67b9bd8e
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/playlists.py
View File

@ -1161,69 +1161,69 @@ class PlaylistTab(QTableWidget):
session, self.playlist_id) if p.row_number is not None session, self.playlist_id) if p.row_number is not None
] ]
def _get_row_artist(self, row: int) -> str: def _get_row_artist(self, row_number: int) -> str:
"""Return artist on this row or None if none""" """Return artist on this row_number or None if none"""
item_artist = self.item(row, ARTIST) item_artist = self.item(row_number, ARTIST)
if not item_artist: if not item_artist:
return "" return ""
return item_artist.text() return item_artist.text()
def _get_row_duration(self, row: int) -> int: def _get_row_duration(self, row_number: int) -> int:
"""Return duration associated with this row""" """Return duration associated with this row_number"""
duration_userdata = self._get_row_userdata(row, self.ROW_DURATION) duration_udata = self._get_row_userdata(row_number, self.ROW_DURATION)
if not duration_userdata: if not duration_udata:
return 0 return 0
else: else:
return int(duration_userdata) return int(duration_udata)
def _get_row_note(self, row: int) -> str: def _get_row_note(self, row_number: int) -> str:
"""Return note on this row or null string if none""" """Return note on this row_number or null string if none"""
track_id = self._get_row_track_id(row) track_id = self._get_row_track_id(row_number)
if track_id: if track_id:
item_note = self.item(row, ROW_NOTES) item_note = self.item(row_number, ROW_NOTES)
else: else:
item_note = self.item(row, HEADER_NOTES_COLUMN) item_note = self.item(row_number, HEADER_NOTES_COLUMN)
if not item_note: if not item_note:
return "" return ""
return item_note.text() return item_note.text()
def _get_row_path(self, row: int) -> str: def _get_row_path(self, row_number: int) -> str:
""" """
Return path of track associated with this row or null string Return path of track associated with this row_number or null string
""" """
path = str(self._get_row_userdata(row, self.TRACK_PATH)) path = str(self._get_row_userdata(row_number, self.TRACK_PATH))
if not path: if not path:
return "" return ""
return path return path
def _get_row_plr(self, session: scoped_session, def _get_row_plr(self, session: scoped_session,
row: int) -> Optional[PlaylistRows]: row_number: int) -> Optional[PlaylistRows]:
""" """
Return PlaylistRows object for this row Return PlaylistRows object for this row_number
""" """
return session.get(PlaylistRows, self._get_row_plr_id(row)) return session.get(PlaylistRows, self._get_row_plr_id(row_number))
def _get_row_plr_id(self, row: int) -> int: def _get_row_plr_id(self, row_number: int) -> int:
"""Return the plr_id associated with this row or 0""" """Return the plr_id associated with this row_number or 0"""
plr_id = self._get_row_userdata(row, self.PLAYLISTROW_ID) plr_id = self._get_row_userdata(row_number, self.PLAYLISTROW_ID)
if not plr_id: if not plr_id:
return 0 return 0
else: else:
return int(plr_id) return int(plr_id)
def _get_row_start_time(self, row: int) -> Optional[datetime]: def _get_row_start_time(self, row_number: int) -> Optional[datetime]:
"""Return row start time as string or None""" """Return row_number start time as string or None"""
start_time_item = self.item(row, START_TIME) start_time_item = self.item(row_number, START_TIME)
if not start_time_item: if not start_time_item:
return None return None
@ -1233,54 +1233,54 @@ class PlaylistTab(QTableWidget):
except ValueError: except ValueError:
return None return None
def _get_row_title(self, row: int) -> Optional[str]: def _get_row_title(self, row_number: int) -> Optional[str]:
"""Return title on this row or None if none""" """Return title on this row_number or None if none"""
# Header rows may have note in TITLE row so check for track_id # Header rows may have note in TITLE row so check for track_id
if not self._get_row_track_id(row): if not self._get_row_track_id(row_number):
return None return None
item_title = self.item(row, TITLE) item_title = self.item(row_number, TITLE)
if not item_title: if not item_title:
return None return None
return item_title.text() return item_title.text()
def _get_row_track(self, session: scoped_session, def _get_row_track(self, session: scoped_session,
row: int) -> Optional[Tracks]: row_number: int) -> Optional[Tracks]:
"""Return the track associated with this row or None""" """Return the track associated with this row_number or None"""
track_id = self._get_row_track_id(row) track_id = self._get_row_track_id(row_number)
if track_id: if track_id:
return session.get(Tracks, track_id) return session.get(Tracks, track_id)
else: else:
return None return None
def _get_row_track_id(self, row: int) -> int: def _get_row_track_id(self, row_number: int) -> int:
"""Return the track_id associated with this row or None""" """Return the track_id associated with this row_number or None"""
track_id = self._get_row_userdata(row, self.ROW_TRACK_ID) track_id = self._get_row_userdata(row_number, self.ROW_TRACK_ID)
if not track_id: if not track_id:
return 0 return 0
else: else:
return int(track_id) return int(track_id)
def _get_row_track_path(self, row: int) -> str: def _get_row_track_path(self, row_number: int) -> str:
"""Return the track path associated with this row or '' """ """Return the track path associated with this row_number or '' """
path = self._get_row_userdata(row, self.TRACK_PATH) path = self._get_row_userdata(row_number, self.TRACK_PATH)
if not path: if not path:
return "" return ""
else: else:
return str(path) return str(path)
def _get_row_userdata(self, row: int, def _get_row_userdata(self, row_number: int,
role: int) -> Optional[Union[str, int]]: role: int) -> Optional[Union[str, int]]:
""" """
Return the specified userdata, if any. Return the specified userdata, if any.
""" """
userdata_item = self.item(row, USERDATA) userdata_item = self.item(row_number, USERDATA)
if not userdata_item: if not userdata_item:
return None return None
@ -1297,7 +1297,7 @@ class PlaylistTab(QTableWidget):
return ' [' + duration + caveat + ']' return ' [' + duration + caveat + ']'
def _get_selected_row(self) -> Optional[int]: def _get_selected_row(self) -> Optional[int]:
"""Return row number of first selected row, or None if none selected""" """Return row_number number of first selected row, or None if none selected"""
if not self.selectionModel().hasSelection(): if not self.selectionModel().hasSelection():
return None return None
@ -1310,7 +1310,7 @@ class PlaylistTab(QTableWidget):
# Use a set to deduplicate result (a selected row will have all # Use a set to deduplicate result (a selected row will have all
# items in that row selected) # items in that row selected)
return sorted( return sorted(
[row for row in set([a.row() for a in self.selectedItems()])] [row_number for row_number in set([a.row() for a in self.selectedItems()])]
) )
def _info_row(self, track_id: int) -> None: def _info_row(self, track_id: int) -> None: