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

Clean up direct references to playlist tab from musicmuster

Browse Source
This commit is contained in:
Keith Edmunds 2024-12-28 10:06:33 +00:00
parent 7ce07c1cc7
commit e55fab71cf
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/musicmuster.py
View File

@ -567,7 +567,7 @@ class Window(QMainWindow, Ui_MainWindow):
def debug(self): def debug(self):
"""Invoke debugger""" """Invoke debugger"""
visible_playlist_id = self.active_tab().playlist_id visible_playlist_id = self.selection.playlist_id
print(f"Active playlist id={visible_playlist_id}") print(f"Active playlist id={visible_playlist_id}")
import ipdb # type: ignore import ipdb # type: ignore
@ -579,7 +579,7 @@ class Window(QMainWindow, Ui_MainWindow):
""" """
with db.Session() as session: with db.Session() as session:
playlist_id = self.active_tab().playlist_id playlist_id = self.selection.playlist_id
playlist = session.get(Playlists, playlist_id) playlist = session.get(Playlists, playlist_id)
if playlist: if playlist:
if helpers.ask_yes_no( if helpers.ask_yes_no(
@ -655,7 +655,7 @@ class Window(QMainWindow, Ui_MainWindow):
track_sequence.current = None track_sequence.current = None
# Tell playlist previous track has finished # Tell playlist previous track has finished
self.active_tab().previous_track_ended() self.active_base_model().previous_track_ended()
# Reset clocks # Reset clocks
self.frame_fade.setStyleSheet("") self.frame_fade.setStyleSheet("")
@ -677,10 +677,7 @@ class Window(QMainWindow, Ui_MainWindow):
def export_playlist_tab(self) -> None: def export_playlist_tab(self) -> None:
"""Export the current playlist to an m3u file""" """Export the current playlist to an m3u file"""
if not self.active_tab(): playlist_id = self.selection.playlist_id
return
playlist_id = self.active_tab().playlist_id
with db.Session() as session: with db.Session() as session:
# Get output filename # Get output filename
@ -747,11 +744,11 @@ class Window(QMainWindow, Ui_MainWindow):
Pass import files call to file_importer module Pass import files call to file_importer module
""" """
# We need to keep a referent to the FileImporter else it will be # We need to keep a reference to the FileImporter else it will be
# garbage collected while import threads are still running # garbage collected while import threads are still running
self.importer = FileImporter( self.importer = FileImporter(
self.active_base_model(), self.active_base_model(),
self.active_tab().source_model_selected_row_number(), self.selection.rows[0],
) )
self.importer.do_import() self.importer.do_import()
@ -766,17 +763,17 @@ class Window(QMainWindow, Ui_MainWindow):
ok = dlg.exec() ok = dlg.exec()
if ok: if ok:
self.active_base_model().insert_row( self.active_base_model().insert_row(
proposed_row_number=self.active_tab().source_model_selected_row_number(), proposed_row_number=self.selection.rows[0],
note=dlg.textValue(), note=dlg.textValue(),
) )
def insert_track(self) -> None: def insert_track(self) -> None:
"""Show dialog box to select and add track from database""" """Show dialog box to select and add track from database"""
new_row_number = ( if self.selection.rows:
self.active_tab().source_model_selected_row_number() new_row_number = self.selection.rows[0]
or self.active_base_model().rowCount() else:
) new_row_number = self.active_base_model().rowCount()
with db.Session() as session: with db.Session() as session:
dlg = TrackSelectDialog( dlg = TrackSelectDialog(
parent=self, parent=self,

10
app/playlists.py
View File

@ -930,14 +930,6 @@ class PlaylistTab(QTableView):
except ApplicationError as e: except ApplicationError as e:
show_warning(self.musicmuster, "Audacity error", str(e)) show_warning(self.musicmuster, "Audacity error", str(e))
def previous_track_ended(self) -> None:
"""
Called when track ends
"""
# Let the model know
self.get_base_model().previous_track_ended()
def _remove_comments(self) -> None: def _remove_comments(self) -> None:
""" """
Remove comments from selected rows Remove comments from selected rows
@ -1049,7 +1041,7 @@ class PlaylistTab(QTableView):
def _selected_row_indexes(self) -> List[QModelIndex]: def _selected_row_indexes(self) -> List[QModelIndex]:
""" """
Return a list of indexes of column 1 of selected rows Return a list of indexes of column 0 of selected rows
""" """
sm = self.selectionModel() sm = self.selectionModel()