From c4c0ef065bc0e3e5d96ab5d961ffa0b435cfd37a Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Thu, 21 Nov 2024 18:26:33 +0000 Subject: [PATCH] Merge and restart profiling --- app/musicmuster.py | 6 ------ app/playlistmodel.py | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index dd800f9..46a84a0 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -1069,14 +1069,8 @@ class Window(QMainWindow, Ui_MainWindow): else: webbrowser.get("browser").open_new_tab(url) -<<<<<<< HEAD - def paste_rows(self) -> None: -||||||| 40b5fc0 - def paste_rows(self, dummy_for_profiling=None) -> None: -======= @line_profiler.profile def paste_rows(self, dummy_for_profiling=None) -> None: ->>>>>>> dev """ Paste earlier cut rows. """ diff --git a/app/playlistmodel.py b/app/playlistmodel.py index 7cc6a5e..86c91bd 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -737,14 +737,7 @@ class PlaylistModel(QAbstractTableModel): self.update_track_times() self.invalidate_rows(row_numbers) -<<<<<<< HEAD def move_rows(self, from_rows: list[int], to_row_number: int) -> None: -||||||| 40b5fc0 - def move_rows(self, from_rows: list[int], to_row_number: int, dummy_for_profiling=None) -> None: -======= - @line_profiler.profile - def move_rows(self, from_rows: list[int], to_row_number: int, dummy_for_profiling=None) -> None: ->>>>>>> dev """ Move the playlist rows given to to_row and below. """ @@ -983,14 +976,8 @@ class PlaylistModel(QAbstractTableModel): # Update display self.invalidate_row(track_sequence.previous.row_number) -<<<<<<< HEAD - def refresh_data(self, session: db.session) -> None: -||||||| 40b5fc0 - def refresh_data(self, session: db.session, dummy_for_profiling=None) -> None: -======= @line_profiler.profile def refresh_data(self, session: db.session, dummy_for_profiling=None) -> None: ->>>>>>> dev """Populate self.playlist_rows with playlist data""" # We used to clear self.playlist_rows each time but that's