app/config.py

@@ -65,6 +65,7 @@ class Config(object):
     MAX_MISSING_FILES_TO_REPORT = 10
     MILLISECOND_SIGFIGS = 0
     MYSQL_CONNECT = os.environ.get('MYSQL_CONNECT') or "mysql+mysqldb://musicmuster:musicmuster@localhost/musicmuster_v2"  # noqa E501
+    NORMALISE_ON_IMPORT = True
     NOTE_TIME_FORMAT = "%H:%M:%S"
     ROOT = os.environ.get('ROOT') or "/home/kae/music"
     IMPORT_DESTINATION = os.path.join(ROOT, "Singles")

app/models.py

@@ -4,7 +4,7 @@ import os.path
 import re
 import stackprinter                         # type: ignore
 
-from dbconfig import Session, scoped_session
+from dbconfig import Session
 
 from datetime import datetime
 from typing import List, Optional
@@ -61,8 +61,7 @@ class Carts(Base):
             f"name={self.name}, path={self.path}>"
         )
 
-    def __init__(self, session: scoped_session, cart_number: int,
+    def __init__(self, session: Session, cart_number: int, name: str = None,
-                 name: Optional[str] = None,
                  duration: int = None, path: str = None,
                  enabled: bool = True) -> None:
         """Create new cart"""
@@ -95,7 +94,7 @@ class NoteColours(Base):
         )
 
     @staticmethod
-    def get_colour(session: scoped_session, text: str) -> Optional[str]:
+    def get_colour(session: Session, text: str) -> Optional[str]:
         """
         Parse text and return colour string if matched, else None
         """
@@ -140,7 +139,7 @@ class Playdates(Base):
             f"lastplayed={self.lastplayed}>"
         )
 
-    def __init__(self, session: scoped_session, track_id: int) -> None:
+    def __init__(self, session: Session, track_id: int) -> None:
         """Record that track was played"""
 
         self.lastplayed = datetime.now()
@@ -149,7 +148,7 @@ class Playdates(Base):
         session.commit()
 
     @staticmethod
-    def last_played(session: scoped_session, track_id: int) -> Optional[datetime]:
+    def last_played(session: Session, track_id: int) -> Optional[datetime]:
         """Return datetime track last played or None"""
 
         last_played = session.execute(
@@ -165,7 +164,7 @@ class Playdates(Base):
             return None
 
     @staticmethod
-    def played_after(session: scoped_session, since: datetime) -> List["Playdates"]:
+    def played_after(session: Session, since: datetime) -> List["Playdates"]:
         """Return a list of Playdates objects since passed time"""
 
         return (
@@ -207,12 +206,12 @@ class Playlists(Base):
             f"is_templatee={self.is_template}>"
         )
 
-    def __init__(self, session: scoped_session, name: str) -> None:
+    def __init__(self, session: Session, name: str) -> None:
         self.name = name
         session.add(self)
         session.commit()
 
-    def close(self, session: scoped_session) -> None:
+    def close(self, session: Session) -> None:
         """Mark playlist as unloaded"""
 
         closed_idx = self.tab
@@ -228,7 +227,7 @@ class Playlists(Base):
 
     @classmethod
     def create_playlist_from_template(cls,
-                                      session: scoped_session,
+                                      session: Session,
                                       template: "Playlists",
                                       playlist_name: str) \
             -> "Playlists":
@@ -240,7 +239,7 @@ class Playlists(Base):
         return playlist
 
     @classmethod
-    def get_all(cls, session: scoped_session) -> List["Playlists"]:
+    def get_all(cls, session: Session) -> List["Playlists"]:
         """Returns a list of all playlists ordered by last use"""
 
         return (
@@ -254,7 +253,7 @@ class Playlists(Base):
         )
 
     @classmethod
-    def get_all_templates(cls, session: scoped_session) -> List["Playlists"]:
+    def get_all_templates(cls, session: Session) -> List["Playlists"]:
         """Returns a list of all templates ordered by name"""
 
         return (
@@ -268,7 +267,7 @@ class Playlists(Base):
         )
 
     @classmethod
-    def get_closed(cls, session: scoped_session) -> List["Playlists"]:
+    def get_closed(cls, session: Session) -> List["Playlists"]:
         """Returns a list of all closed playlists ordered by last use"""
 
         return (
@@ -285,7 +284,7 @@ class Playlists(Base):
         )
 
     @classmethod
-    def get_open(cls, session: scoped_session) -> List[Optional["Playlists"]]:
+    def get_open(cls, session: Session) -> List[Optional["Playlists"]]:
         """
         Return a list of loaded playlists ordered by tab order.
         """
@@ -300,14 +299,14 @@ class Playlists(Base):
             .all()
         )
 
-    def mark_open(self, session: scoped_session, tab_index: int) -> None:
+    def mark_open(self, session: Session, tab_index: int) -> None:
         """Mark playlist as loaded and used now"""
 
         self.tab = tab_index
         self.last_used = datetime.now()
 
     @staticmethod
-    def move_tab(session: scoped_session, frm: int, to: int) -> None:
+    def move_tab(session: Session, frm: int, to: int) -> None:
         """Move tabs"""
 
         row_frm = session.execute(
@@ -327,7 +326,7 @@ class Playlists(Base):
         row_frm.tab = to
 
     @staticmethod
-    def save_as_template(session: scoped_session,
+    def save_as_template(session: Session,
                          playlist_id: int, template_name: str) -> None:
         """Save passed playlist as new template"""
 
@@ -358,7 +357,7 @@ class PlaylistRows(Base):
         )
 
     def __init__(self,
-                 session: scoped_session,
+                 session: Session,
                  playlist_id: int,
                  track_id: int,
                  row_number: int,
@@ -373,17 +372,8 @@ class PlaylistRows(Base):
         session.add(self)
         session.flush()
 
-    def append_note(self, extra_note: str) -> None:
-        """Append passed note to any existing note"""
-
-        current_note = self.note
-        if current_note:
-            self.note = current_note + '\n' + extra_note
-        else:
-            self.note = extra_note
-
     @staticmethod
-    def copy_playlist(session: scoped_session,
+    def copy_playlist(session: Session,
                       src_id: int,
                       dst_id: int) -> None:
         """Copy playlist entries"""
@@ -398,7 +388,7 @@ class PlaylistRows(Base):
                          plr.note)
 
     @staticmethod
-    def delete_plrids_not_in_list(session: scoped_session, playlist_id: int,
+    def delete_plrids_not_in_list(session: Session, playlist_id: int,
                                   plrids: List["PlaylistRows"]) -> None:
         """
         Delete rows in given playlist that have a higher row number
@@ -416,7 +406,7 @@ class PlaylistRows(Base):
         session.commit()
 
     @staticmethod
-    def fixup_rownumbers(session: scoped_session, playlist_id: int) -> None:
+    def fixup_rownumbers(session: Session, playlist_id: int) -> None:
         """
         Ensure the row numbers for passed playlist have no gaps
         """
@@ -434,7 +424,7 @@ class PlaylistRows(Base):
         session.commit()
 
     @staticmethod
-    def get_track_plr(session: scoped_session, track_id: int,
+    def get_track_plr(session: Session, track_id: int,
                       playlist_id: int) -> Optional["PlaylistRows"]:
         """Return first matching PlaylistRows object or None"""
 
@@ -448,7 +438,7 @@ class PlaylistRows(Base):
         ).first()
 
     @staticmethod
-    def get_last_used_row(session: scoped_session, playlist_id: int) -> Optional[int]:
+    def get_last_used_row(session: Session, playlist_id: int) -> Optional[int]:
         """Return the last used row for playlist, or None if no rows"""
 
         return session.execute(
@@ -457,7 +447,7 @@ class PlaylistRows(Base):
         ).scalar_one()
 
     @classmethod
-    def get_played_rows(cls, session: scoped_session,
+    def get_played_rows(cls, session: Session,
                         playlist_id: int) -> List[int]:
         """
         For passed playlist, return a list of rows that
@@ -476,7 +466,7 @@ class PlaylistRows(Base):
         return plrs
 
     @classmethod
-    def get_rows_with_tracks(cls, session: scoped_session,
+    def get_rows_with_tracks(cls, session: Session,
                              playlist_id: int) -> List[int]:
         """
         For passed playlist, return a list of rows that
@@ -495,10 +485,10 @@ class PlaylistRows(Base):
         return plrs
 
     @classmethod
-    def get_unplayed_rows(cls, session: scoped_session,
+    def get_unplayed_rows(cls, session: Session,
-                          playlist_id: int) -> List["PlaylistRows"]:
+                          playlist_id: int) -> List[int]:
         """
-        For passed playlist, return a list of playlist rows that
+        For passed playlist, return a list of track rows that
         have not been played.
         """
 
@@ -515,7 +505,7 @@ class PlaylistRows(Base):
         return plrs
 
     @staticmethod
-    def move_rows_down(session: scoped_session, playlist_id: int, starting_row: int,
+    def move_rows_down(session: Session, playlist_id: int, starting_row: int,
                        move_by: int) -> None:
         """
         Create space to insert move_by additional rows by incremented row
@@ -532,7 +522,7 @@ class PlaylistRows(Base):
         )
 
     @staticmethod
-    def indexed_by_id(session: scoped_session, plr_ids: List[int]) -> dict:
+    def indexed_by_id(session: Session, plr_ids: List[int]) -> dict:
         """
         Return a dictionary of playlist_rows indexed by their plr id from
         the passed plr_id list.
@@ -568,7 +558,7 @@ class Settings(Base):
         return f"<Settings(id={self.id}, name={self.name}, {value=}>"
 
     @classmethod
-    def get_int_settings(cls, session: scoped_session, name: str) -> "Settings":
+    def get_int_settings(cls, session: Session, name: str) -> "Settings":
         """Get setting for an integer or return new setting record"""
 
         int_setting: Settings
@@ -587,7 +577,7 @@ class Settings(Base):
 
         return int_setting
 
-    def update(self, session: scoped_session, data: "Settings"):
+    def update(self, session: Session, data: "Settings"):
         for key, value in data.items():
             assert hasattr(self, key)
             setattr(self, key, value)
@@ -619,7 +609,7 @@ class Tracks(Base):
 
     def __init__(
             self,
-            session: scoped_session,
+            session: Session,
             path: str,
             title: Optional[str] = None,
             artist: Optional[str] = None,
@@ -650,7 +640,7 @@ class Tracks(Base):
         return session.execute(select(cls)).scalars().all()
 
     @classmethod
-    def get_by_path(cls, session: scoped_session, path: str) -> "Tracks":
+    def get_by_path(cls, session: Session, path: str) -> "Tracks":
         """
         Return track with passed path, or None.
         """
@@ -666,7 +656,7 @@ class Tracks(Base):
             return None
 
     @classmethod
-    def search_artists(cls, session: scoped_session, text: str) -> List["Tracks"]:
+    def search_artists(cls, session: Session, text: str) -> List["Tracks"]:
         """Search case-insenstively for artists containing str"""
 
         return (
@@ -680,7 +670,7 @@ class Tracks(Base):
         )
 
     @classmethod
-    def search_titles(cls, session: scoped_session, text: str) -> List["Tracks"]:
+    def search_titles(cls, session: Session, text: str) -> List["Tracks"]:
         """Search case-insenstively for titles containing str"""
         return (
             session.execute(

app/musicmuster.py

@@ -932,7 +932,7 @@ class Window(QMainWindow, Ui_MainWindow):
             unplayed_plrs = PlaylistRows.get_unplayed_rows(
                 session, playlist_id)
             if helpers.ask_yes_no("Move tracks",
-                                  f"Move {len(unplayed_plrs)} tracks:"
+                                  f"Move {len(unplayed_playlist_rows)} tracks:"
                                   " Are you sure?"
                                   ):
                 self.move_playlist_rows(session, unplayed_plrs)

app/playlists.py

@@ -554,8 +554,7 @@ class PlaylistTab(QTableWidget):
 
         return [self._get_playlistrow_id(a) for a in self._get_selected_rows()]
 
-    def get_selected_playlistrows(self,
+    def get_selected_playlistrows(self, session: scoped_session) -> Optional[List]:
-                                  session: scoped_session) -> Optional[List]:
         """
         Return a list of PlaylistRows of the selected rows
         """
@@ -696,11 +695,7 @@ class PlaylistTab(QTableWidget):
         if existing_plr and ask_yes_no("Duplicate row",
                                        "Track already in playlist. "
                                        "Move to new location?"):
-            # Yes it is and we should reuse it
+            # Yes it is and we shoudl reuse it
-            # If we've been passed a note, we need to add that to the
-            # existing track
-            if note:
-                existing_plr.append_note(note)
             return self._move_row(session, existing_plr, row_number)
 
         # Build playlist_row object
@@ -1360,8 +1355,7 @@ class PlaylistTab(QTableWidget):
 
         return playlistrow_id
 
-    def _get_playlistrow_object(self, session: scoped_session,
+    def _get_playlistrow_object(self, session: scoped_session, row: int) -> int:
-                                row: int) -> int:
         """Return the playlistrow object associated with this row"""
 
         playlistrow_id = (self.item(row, USERDATA).data(self.PLAYLISTROW_ID))