app/ds.py

@@ -428,6 +428,7 @@ def tracks_filtered(filter: Filter) -> list[TrackDTO]:
                 last_played = record.playdates[0].lastplayed
             else:
                 last_played = None
+            last_played
             dto = TrackDTO(
                 artist=record.artist,
                 bitrate=record.bitrate,

app/playlistrow.py

@@ -39,7 +39,6 @@ class FadeGraphGenerator(QObject):
         self.task_completed.emit()
 
 
-@singleton
 class FadegraphThreadController(QObject):
     def __init__(self):
         super().__init__()

tests/test_ds.py

@@ -8,6 +8,7 @@ import unittest
 # App imports
 from app import playlistmodel
 from app import ds
+from dbmanager import db
 from classes import PlaylistDTO
 from helpers import get_all_track_metadata
 from playlistmodel import PlaylistModel
@@ -34,7 +35,7 @@ class MyTestCase(unittest.TestCase):
     def setUp(self):
         """Runs before each test"""
 
-        ds.db.create_all()
+        db.create_all()
 
     def playlist_create_and_model(
         self, playlist_name: str
@@ -90,7 +91,7 @@ class MyTestCase(unittest.TestCase):
     def tearDown(self):
         """Runs after each test"""
 
-        ds.db.drop_all()
+        db.drop_all()
 
     def test_add_track_to_header(self):
         """Add a track to a header row"""

tests/test_file_importer.py

@@ -21,6 +21,7 @@ from pytestqt.plugin import QtBot  # type: ignore
 
 # App imports
 from app import ds, musicmuster
+from dbmanager import db
 from config import Config
 from file_importer import FileImporter
 
@@ -45,7 +46,7 @@ class MyTestCase(unittest.TestCase):
     def setUpClass(cls):
         """Runs once before any test in this class"""
 
-        ds.db.create_all()
+        db.create_all()
 
         cls.widget = musicmuster.Window()
 
@@ -64,7 +65,7 @@ class MyTestCase(unittest.TestCase):
     def tearDownClass(cls):
         """Runs once after all tests"""
 
-        ds.db.drop_all()
+        db.drop_all()
         shutil.rmtree(cls.musicstore)
         shutil.rmtree(cls.import_source)
 

tests/test_misc.py

@@ -7,15 +7,16 @@ import unittest
 import pytest
 
 # App imports
+from dbmanager import db
 import ds
 
 
 class TestMMMisc(unittest.TestCase):
     def setUp(self):
-        ds.db.create_all()
+        db.create_all()
 
     def tearDown(self):
-        ds.db.drop_all()
+        db.drop_all()
 
     def test_log_exception(self):
         """Test deliberate exception"""

tests/test_playlistmodel.py

@@ -9,6 +9,7 @@ from PyQt6.QtCore import Qt, QModelIndex
 # App imports
 from app.helpers import get_all_track_metadata
 from app import ds, playlistmodel
+from dbmanager import db
 from classes import (
     InsertTrack,
     TrackAndPlaylist,
@@ -29,7 +30,7 @@ class TestMMMiscTracks(unittest.TestCase):
             "testdata/wrb.flac",
         ]
 
-        ds.db.create_all()
+        db.create_all()
 
         # Create a playlist and model
         self.playlist = ds.playlist_create(PLAYLIST_NAME, template_id=0)
@@ -50,7 +51,7 @@ class TestMMMiscTracks(unittest.TestCase):
             )
 
     def tearDown(self):
-        ds.db.drop_all()
+        db.drop_all()
 
     def test_8_row_playlist(self):
         # Test auto-created playlist
@@ -97,10 +98,10 @@ class TestMMMiscNoPlaylist(unittest.TestCase):
     ]
 
     def setUp(self):
-        ds.db.create_all()
+        db.create_all()
 
     def tearDown(self):
-        ds.db.drop_all()
+        db.drop_all()
 
     def test_insert_track_new_playlist(self):
         # insert a track into a new playlist
@@ -136,7 +137,7 @@ class TestMMMiscRowMove(unittest.TestCase):
     ROWS_TO_CREATE = 11
 
     def setUp(self):
-        ds.db.create_all()
+        db.create_all()
 
         self.playlist = ds.playlist_create(self.PLAYLIST_NAME, template_id=0)
         self.model = playlistmodel.PlaylistModel(
@@ -152,7 +153,7 @@ class TestMMMiscRowMove(unittest.TestCase):
             )
 
     def tearDown(self):
-        ds.db.drop_all()
+        db.drop_all()
 
     def test_insert_header_row_end(self):
         # insert header row at end of playlist

tests/test_queries.py

@@ -8,6 +8,7 @@ import unittest
 # Third party imports
 
 # App imports
+from dbmanager import db
 from classes import (
     Filter,
 )
@@ -19,7 +20,7 @@ class MyTestCase(unittest.TestCase):
     def setUpClass(cls):
         """Runs once before any test in this class"""
 
-        ds.db.create_all()
+        db.create_all()
 
         # Create some track entries
         track1_meta = dict(
@@ -54,7 +55,7 @@ class MyTestCase(unittest.TestCase):
     def tearDownClass(cls):
         """Runs once after all tests"""
 
-        ds.db.drop_all()
+        db.drop_all()
 
     def setUp(self):
         """Runs before each test"""

tests/test_ui.py

@@ -10,6 +10,7 @@ from pytestqt.plugin import QtBot  # type: ignore
 
 # App imports
 from app import playlistmodel, utilities
+from dbmanager import db
 from app import ds, musicmuster
 from classes import InsertTrack
 
@@ -40,7 +41,7 @@ def with_updown(function):
 @pytest.mark.usefixtures("qtbot_adapter")
 class MyTestCase(unittest.TestCase):
     def up(self):
-        ds.db.create_all()
+        db.create_all()
         self.widget = musicmuster.Window()
         # self.widget.show()
 
@@ -71,7 +72,7 @@ class MyTestCase(unittest.TestCase):
         )
 
     def down(self):
-        ds.db.drop_all()
+        db.drop_all()
 
     @with_updown
     def test_init(self):