Compare commits

...

2 Commits

Author SHA1 Message Date
Keith Edmunds
2a6dfc8b63 Fix can't add track to header row 2023-02-10 08:43:04 +00:00
Keith Edmunds
424709ca74 Fix startup issues after refactor 2023-02-10 08:42:41 +00:00
2 changed files with 11 additions and 7 deletions

View File

@ -1826,7 +1826,7 @@ class DbDialog(QDialog):
class DownloadCSV(QDialog): class DownloadCSV(QDialog):
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(*args, **kwargs) super().__init__()
self.ui = Ui_DateSelect() self.ui = Ui_DateSelect()
self.ui.setupUi(self) self.ui.setupUi(self)
@ -1838,7 +1838,7 @@ class DownloadCSV(QDialog):
class SelectPlaylistDialog(QDialog): class SelectPlaylistDialog(QDialog):
def __init__(self, parent=None, playlists=None, session=None): def __init__(self, parent=None, playlists=None, session=None):
super().__init__(*args, **kwargs) super().__init__()
if playlists is None: if playlists is None:
return return

View File

@ -270,7 +270,7 @@ class PlaylistTab(QTableWidget):
plr_id = self._get_playlistrow_id(row_number) plr_id = self._get_playlistrow_id(row_number)
plr = session.get(PlaylistRows, plr_id) plr = session.get(PlaylistRows, plr_id)
track_id = plr.track_id track_id = plr.track_id
track_row = track_id > 0 track_row = track_id is not None
header_row = not track_row header_row = not track_row
if track_row: if track_row:
current = ( current = (
@ -555,8 +555,12 @@ class PlaylistTab(QTableWidget):
plr_id = self._get_playlistrow_id(row) plr_id = self._get_playlistrow_id(row)
plr_item = session.get(PlaylistRows, plr_id) plr_item = session.get(PlaylistRows, plr_id)
item = self.item(row, note_column) item = self.item(row, note_column)
if not plr_item or not plr_item.note or not item: if not item:
return False return False
if not plr_item:
return False
if not plr_item.note:
plr_item.note = ''
item.setText(plr_item.note) item.setText(plr_item.note)
# Connect signal so we know when cell has changed. # Connect signal so we know when cell has changed.
@ -1254,7 +1258,7 @@ class PlaylistTab(QTableWidget):
_ = self._set_item_text(row, ROW_NOTES, plr.note) _ = self._set_item_text(row, ROW_NOTES, plr.note)
start_gap_item = self._set_item_text(row, START_GAP, start_gap_item = self._set_item_text(row, START_GAP,
track.start_gap) str(track.start_gap))
if track.start_gap and track.start_gap >= 500: if track.start_gap and track.start_gap >= 500:
start_gap_item.setBackground(QColor(Config.COLOUR_LONG_START)) start_gap_item.setBackground(QColor(Config.COLOUR_LONG_START))
@ -2043,8 +2047,8 @@ class PlaylistTab(QTableWidget):
_ = self._set_item_text(row, TITLE, track.title) _ = self._set_item_text(row, TITLE, track.title)
_ = self._set_item_text(row, ARTIST, track.artist) _ = self._set_item_text(row, ARTIST, track.artist)
_ = self._set_item_text(row, DURATION, track.duration) _ = self._set_item_text(row, DURATION, ms_to_mmss(track.duration))
_ = self._set_item_text(row, BITRATE, track.bitrate) _ = self._set_item_text(row, BITRATE, str(track.bitrate))
self.update_display(session) self.update_display(session)