From 3b71041b66e997aae28030cc71333db468ea48c7 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 10 Jan 2025 20:37:49 +0000 Subject: [PATCH] Remove profiling calls (again) --- app/models.py | 7 +------ app/musicmuster.py | 4 +--- app/playlistmodel.py | 20 +++----------------- app/playlists.py | 6 +----- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/app/models.py b/app/models.py index d7e8949..ff3d26e 100644 --- a/app/models.py +++ b/app/models.py @@ -10,7 +10,6 @@ import sys # PyQt imports # Third party imports -import line_profiler from sqlalchemy import ( bindparam, delete, @@ -246,9 +245,7 @@ class Playlists(dbtables.PlaylistsTable): """Returns a list of all templates ordered by name""" return session.scalars( - select(cls) - .where(cls.is_template.is_(True)) - .order_by(cls.name) + select(cls).where(cls.is_template.is_(True)).order_by(cls.name) ).all() @classmethod @@ -577,12 +574,10 @@ class PlaylistRows(dbtables.PlaylistRowsTable): ) @staticmethod - @line_profiler.profile def update_plr_row_numbers( session: Session, playlist_id: int, sqla_map: List[dict[str, int]], - dummy_for_profiling: Optional[int] = None, ) -> None: """ Take a {plrid: row_number} dictionary and update the row numbers accordingly diff --git a/app/musicmuster.py b/app/musicmuster.py index a0b05fc..f9edfbc 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -44,7 +44,6 @@ from PyQt6.QtWidgets import ( ) # Third party imports -import line_profiler from pygame import mixer from sqlalchemy.orm.session import Session import stackprinter # type: ignore @@ -1140,8 +1139,7 @@ class Window(QMainWindow, Ui_MainWindow): else: webbrowser.get("browser").open_new_tab(url) - @line_profiler.profile - def paste_rows(self, dummy_for_profiling: Optional[int] = None) -> None: + def paste_rows(self) -> None: """ Paste earlier cut rows. """ diff --git a/app/playlistmodel.py b/app/playlistmodel.py index cb2c05e..0e25d12 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -26,7 +26,6 @@ from PyQt6.QtGui import ( ) # Third party imports -import line_profiler import obswebsocket # type: ignore # import snoop # type: ignore @@ -772,9 +771,7 @@ class PlaylistModel(QAbstractTableModel): return None - def load_data( - self, session: db.session, dummy_for_profiling: Optional[int] = None - ) -> None: + def load_data(self, session: db.session) -> None: """ Same as refresh data, but only used when creating playslit. Distinguishes profile time between initial load and other @@ -821,13 +818,7 @@ class PlaylistModel(QAbstractTableModel): self.update_track_times() self.invalidate_rows(row_numbers) - @line_profiler.profile - def move_rows( - self, - from_rows: list[int], - to_row_number: int, - dummy_for_profiling: Optional[int] = None, - ) -> None: + def move_rows(self, from_rows: list[int], to_row_number: int) -> None: """ Move the playlist rows given to to_row and below. """ @@ -892,13 +883,11 @@ class PlaylistModel(QAbstractTableModel): self.update_track_times() self.invalidate_rows(list(row_map.keys())) - @line_profiler.profile def move_rows_between_playlists( self, from_rows: list[int], to_row_number: int, to_playlist_id: int, - dummy_for_profiling: Optional[int] = None, ) -> None: """ Move the playlist rows given to to_row and below of to_playlist. @@ -1071,10 +1060,7 @@ class PlaylistModel(QAbstractTableModel): # Update display self.invalidate_row(track_sequence.previous.row_number) - @line_profiler.profile - def refresh_data( - self, session: db.session, dummy_for_profiling: Optional[int] = None - ) -> None: + def refresh_data(self, session: db.session) -> None: """ Populate self.playlist_rows with playlist data diff --git a/app/playlists.py b/app/playlists.py index 5daec74..7edd1a1 100644 --- a/app/playlists.py +++ b/app/playlists.py @@ -33,7 +33,6 @@ from PyQt6.QtWidgets import ( ) # Third party imports -import line_profiler # App imports from audacity_controller import AudacityController @@ -378,10 +377,7 @@ class PlaylistTab(QTableView): # Deselect edited line self.clear_selection() - @line_profiler.profile - def dropEvent( - self, event: Optional[QDropEvent], dummy_for_profiling: Optional[int] = None - ) -> None: + def dropEvent(self, event: Optional[QDropEvent]) -> None: """ Move dropped rows """