merge conflicts

app/models.py

@@ -8,6 +8,7 @@ import sys
 # PyQt imports
 
 # Third party imports
+import line_profiler
 from sqlalchemy import (
     bindparam,
     delete,
@@ -563,8 +564,9 @@ class PlaylistRows(dbtables.PlaylistRowsTable):
         )
 
     @staticmethod
+    @line_profiler.profile
     def update_plr_row_numbers(
-        session: Session, playlist_id: int, sqla_map: List[dict[str, int]]
+        session: Session, playlist_id: int, sqla_map: List[dict[str, int]], dummy_for_profiling=None
     ) -> None:
         """
         Take a {plrid: row_number} dictionary and update the row numbers accordingly

app/musicmuster.py

@@ -44,6 +44,7 @@ from PyQt6.QtWidgets import (
 )
 
 # Third party imports
+import line_profiler
 import pipeclient
 from pygame import mixer
 from sqlalchemy.exc import IntegrityError
@@ -1068,7 +1069,14 @@ 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.
         """

app/playlistmodel.py

@@ -26,6 +26,7 @@ from PyQt6.QtGui import (
 )
 
 # Third party imports
+import line_profiler
 import obswebsocket  # type: ignore
 
 # import snoop  # type: ignore
@@ -736,7 +737,14 @@ 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.
         """
@@ -975,7 +983,14 @@ 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