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

Improve DEBUG messages

Browse Source
This commit is contained in:
Keith Edmunds 2021-04-10 11:22:34 +01:00
parent ee0bfceeae
commit 69ba659d73
1 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/playlists.py
View File

@ -89,7 +89,7 @@ class Playlist(QTableWidget):
item = self.itemAt(event.pos()) item = self.itemAt(event.pos())
if item is not None: if item is not None:
row = item.row() row = item.row()
DEBUG(f"Right-click on row {row}") DEBUG(f"playlist.eventFilter(): Right-click on row {row}")
self.menu = QMenu(self) self.menu = QMenu(self)
if row not in self.meta_get_notes(): if row not in self.meta_get_notes():
act_setnext = self.menu.addAction("Set next") act_setnext = self.menu.addAction("Set next")
@ -110,13 +110,13 @@ class Playlist(QTableWidget):
notes_rows = self.meta_get_notes() notes_rows = self.meta_get_notes()
if row in notes_rows: if row in notes_rows:
# TODO # TODO
DEBUG("Delete notes not yet implemented") DEBUG("playlist.delete_row(): Delete notes not yet implemented")
elif row == self.meta_get_current(): elif row == self.meta_get_current():
# TODO # TODO
DEBUG("Can't delete playing track") DEBUG("playlist.delete_row(): Can't delete playing track")
elif row == self.meta_get_next(): elif row == self.meta_get_next():
# TODO # TODO
DEBUG("Can't delete next track") DEBUG("playlist.delete_row(): Can't delete next track")
else: else:
track_title = self.item(row, self.COL_TITLE).text() track_title = self.item(row, self.COL_TITLE).text()
@ -128,7 +128,7 @@ class Playlist(QTableWidget):
msg.setDefaultButton(QMessageBox.Cancel) msg.setDefaultButton(QMessageBox.Cancel)
msg.setWindowTitle("Delete row") msg.setWindowTitle("Delete row")
if msg.exec() == QMessageBox.Yes: if msg.exec() == QMessageBox.Yes:
DEBUG(f"Delete row {row}") DEBUG(f"playlist.delete_row(): Delete row {row}")
track_id = int(self.item(row, self.COL_INDEX).text()) track_id = int(self.item(row, self.COL_INDEX).text())
PlaylistTracks.remove_track(self.playlist_id, track_id) PlaylistTracks.remove_track(self.playlist_id, track_id)
self.removeRow(row) self.removeRow(row)
@ -148,7 +148,7 @@ class Playlist(QTableWidget):
row = self.currentRow() row = self.currentRow()
if row < 0: if row < 0:
row = self.rowCount() row = self.rowCount()
DEBUG(f"row={row}") DEBUG(f"playlist.add_note(): row={row}")
note_id = Notes.add_note(self.playlist_id, row, text) note_id = Notes.add_note(self.playlist_id, row, text)
# TODO: this largely duplicates what's in add_to_playlist() # TODO: this largely duplicates what's in add_to_playlist()
@ -172,10 +172,14 @@ class Playlist(QTableWidget):
row = self.currentRow() row = self.currentRow()
if row < 0: if row < 0:
row = self.rowCount() row = self.rowCount()
DEBUG(f"row={row}") DEBUG(
f"currentRow={self.currentRow()} "
f"hasSeleciont={self.selectionModel().hasSelection()}"
)
self.insertRow(row) self.insertRow(row)
if isinstance(data, Tracks): if isinstance(data, Tracks):
DEBUG(f"add_to_playlist: track.id={data.id}")
track = data track = data
item = QTableWidgetItem(str(track.id)) item = QTableWidgetItem(str(track.id))
self.setItem(row, self.COL_INDEX, item) self.setItem(row, self.COL_INDEX, item)
@ -189,9 +193,9 @@ class Playlist(QTableWidget):
self.setItem(row, self.COL_DURATION, item) self.setItem(row, self.COL_DURATION, item)
item = QTableWidgetItem(track.path) item = QTableWidgetItem(track.path)
self.setItem(row, self.COL_PATH, item) self.setItem(row, self.COL_PATH, item)
DEBUG(f"add_to_playlist: track.id={track.id}")
else: else:
# This is a note # This is a note
DEBUG(f"add_to_playlist: note.id={data.id}")
item = QTableWidgetItem(str(data.id)) item = QTableWidgetItem(str(data.id))
self.setItem(row, self.COL_INDEX, item) self.setItem(row, self.COL_INDEX, item)
item = QTableWidgetItem(data.note) item = QTableWidgetItem(data.note)
@ -346,7 +350,7 @@ class Playlist(QTableWidget):
Return True if successful else False. Return True if successful else False.
""" """
DEBUG(f"load_playlist({plid})") DEBUG(f"load_playlist(plid={plid})")
p = Playlists.get_playlist_by_id(plid) p = Playlists.get_playlist_by_id(plid)
self.playlist_id = plid self.playlist_id = plid
@ -369,7 +373,6 @@ class Playlist(QTableWidget):
# Now add data in row order # Now add data in row order
for item in sorted(data, key=lambda x: x[0]): for item in sorted(data, key=lambda x: x[0]):
DEBUG(f"Adding {item}")
self.add_to_playlist(item[1], repaint=False) self.add_to_playlist(item[1], repaint=False)
# Set the first non-notes row as next track to play # Set the first non-notes row as next track to play
@ -440,8 +443,6 @@ class Playlist(QTableWidget):
def meta_set_current(self, row): def meta_set_current(self, row):
"Mark row as current track" "Mark row as current track"
DEBUG(f"meta_set_current({row})")
old_current = self.meta_get_current() old_current = self.meta_get_current()
if old_current is not None: if old_current is not None:
self.meta_clear(old_current) self.meta_clear(old_current)
@ -450,8 +451,6 @@ class Playlist(QTableWidget):
def meta_set_next(self, row): def meta_set_next(self, row):
"Mark row as next track" "Mark row as next track"
DEBUG(f"meta_set_next({row})")
old_next = self.meta_get_next() old_next = self.meta_get_next()
if old_next is not None: if old_next is not None:
self.meta_clear(old_next) self.meta_clear(old_next)
@ -659,7 +658,7 @@ class Playlist(QTableWidget):
if self.item(row, self.COL_INDEX): if self.item(row, self.COL_INDEX):
id = int(self.item(row, self.COL_INDEX).text()) id = int(self.item(row, self.COL_INDEX).text())
else: else:
DEBUG(f"(no COL_INDEX data in row {row}") DEBUG(f"(playlist.save(): no COL_INDEX data in row {row}")
continue continue
if row in note_rows: if row in note_rows:
notes[id] = (row, self.item(row, self.COL_NOTE).text()) notes[id] = (row, self.item(row, self.COL_NOTE).text())
@ -679,30 +678,30 @@ class Playlist(QTableWidget):
# Note ids to remove from db # Note ids to remove from db
for id in set(db_notes.keys()) - set(notes.keys()): for id in set(db_notes.keys()) - set(notes.keys()):
DEBUG(f"Delete note.id={id} from database") DEBUG(f"playlist.save(): Delete note.id={id} from database")
# Note ids to add to db # Note ids to add to db
for id in set(notes.keys()) - set(db_notes.keys()): for id in set(notes.keys()) - set(db_notes.keys()):
DEBUG(f"Add note.id={id} to database") DEBUG(f"playlist.save(): Add note.id={id} to database")
# Notes to update in db # Notes to update in db
for id in set(notes.keys()) & set(db_notes.keys()): for id in set(notes.keys()) & set(db_notes.keys()):
if notes[id] != db_notes[id]: if notes[id] != db_notes[id]:
DEBUG(f"Update db note.id={id} in database") DEBUG(f"playlist.save(): Update db note.id={id} in database")
Notes.update_note(id, row=notes[id][0], text=notes[id][1]) Notes.update_note(id, row=notes[id][0], text=notes[id][1])
# Track ids to remove from db # Track ids to remove from db
for id in set(db_tracks.keys()) - set(tracks.keys()): for id in set(db_tracks.keys()) - set(tracks.keys()):
DEBUG(f"Delete track.id={id} from database") DEBUG(f"playlist.save(): Delete track.id={id} from database")
# Track ids to add to db # Track ids to add to db
for id in set(tracks.keys()) - set(db_tracks.keys()): for id in set(tracks.keys()) - set(db_tracks.keys()):
DEBUG(f"Add track.id={id} to database") DEBUG(f"playlist.save(): Add track.id={id} to database")
# Tracks to update in db # Tracks to update in db
for id in set(tracks.keys()) & set(db_tracks.keys()): for id in set(tracks.keys()) & set(db_tracks.keys()):
if tracks[id] != db_tracks[id]: if tracks[id] != db_tracks[id]:
DEBUG(f"Update db track.id={id} in database") DEBUG(f"playlist.save(): Update db track.id={id} in database")
PlaylistTracks.update_track_row( PlaylistTracks.update_track_row(
self.playlist_id, track_id=id, self.playlist_id, track_id=id,
old_row=db_tracks[id], new_row=tracks[id] old_row=db_tracks[id], new_row=tracks[id]
@ -714,17 +713,16 @@ class Playlist(QTableWidget):
for column in range(self.columnCount()): for column in range(self.columnCount()):
name = f"playlist_col_{str(column)}_width" name = f"playlist_col_{str(column)}_width"
record = Settings.get_int(name) record = Settings.get_int(name)
DEBUG(f"column={column}, name={name}, record.f_int={record.f_int}")
if record.f_int is not None: if record.f_int is not None:
print("setting column width") print("setting column width")
self.setColumnWidth(column, record.f_int) self.setColumnWidth(column, record.f_int)
def set_row_bold(self, row, bold=True): def set_row_bold(self, row, bold=True):
bold = QFont() boldfont = QFont()
bold.setBold(bold) boldfont.setBold(bold)
for j in range(self.columnCount()): for j in range(self.columnCount()):
if self.item(row, j): if self.item(row, j):
self.item(row, j).setFont(bold) self.item(row, j).setFont(boldfont)
def set_row_colour(self, row, colour): def set_row_colour(self, row, colour):
for j in range(self.columnCount()): for j in range(self.columnCount()):
@ -762,19 +760,6 @@ class Playlist(QTableWidget):
else: else:
self.next_track = None self.next_track = None
try:
DEBUG(f"tracks_changed() previous={self.previous_track.id}")
except AttributeError:
DEBUG("tracks_changed() previous=None")
try:
DEBUG(f"tracks_changed() current={self.current_track.id}")
except AttributeError:
DEBUG("tracks_changed() current=None")
try:
DEBUG(f"tracks_changed() next={self.next_track.id}")
except AttributeError:
DEBUG("tracks_changed() next=None")
# Update display # Update display
self.repaint() self.repaint()