kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

All test_queries tests pass

Browse Source
This commit is contained in:
Keith Edmunds 2025-04-13 10:29:54 +01:00
parent a8791f925d
commit d596792375
3 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ds.py
View File

@ -1051,13 +1051,13 @@ def playdates_get_last(track_id: int, limit: int = 5) -> str:
) )
def playdates_update(track_id: int) -> None: def playdates_update(track_id: int, when: dt.datetime | None = None) -> None:
""" """
Update playdates for passed track Update playdates for passed track
""" """
with db.Session() as session: with db.Session() as session:
_ = Playdates(session, track_id) _ = Playdates(session, track_id, when)
def playdates_between_dates( def playdates_between_dates(

2
app/models.py
View File

@ -153,7 +153,7 @@ class NoteColours(dbtables.NoteColoursTable):
class Playdates(dbtables.PlaydatesTable): class Playdates(dbtables.PlaydatesTable):
def __init__( def __init__(
self, session: Session, track_id: int, when: Optional[dt.datetime] = None self, session: Session, track_id: int, when: dt.datetime | None = None
) -> None: ) -> None:
"""Record that track was played""" """Record that track was played"""

37
tests/test_queries.py
View File

@ -10,12 +10,12 @@ import unittest
# App imports # App imports
from app.models import ( from app.models import (
db, db,
Playdates,
Tracks, Tracks,
) )
from classes import ( from classes import (
Filter, Filter,
) )
import ds
class MyTestCase(unittest.TestCase): class MyTestCase(unittest.TestCase):
@ -25,10 +25,8 @@ class MyTestCase(unittest.TestCase):
db.create_all() db.create_all()
with db.Session() as session:
# Create some track entries # Create some track entries
_ = Tracks(**dict( track1_meta = dict(
session=session,
artist="a", artist="a",
bitrate=0, bitrate=0,
duration=100, duration=100,
@ -37,9 +35,9 @@ class MyTestCase(unittest.TestCase):
silence_at=0, silence_at=0,
start_gap=0, start_gap=0,
title="abc" title="abc"
)) )
track2 = Tracks(**dict( _ = ds.track_create(track1_meta)
session=session, track2_meta = dict(
artist="a", artist="a",
bitrate=0, bitrate=0,
duration=100, duration=100,
@ -48,12 +46,13 @@ class MyTestCase(unittest.TestCase):
silence_at=0, silence_at=0,
start_gap=0, start_gap=0,
title="xyz" title="xyz"
)) )
track2_id = track2.id track2 = ds.track_create(track2_meta)
# Add playdates # Add playdates
# Track 2 played just over a year ago # Track 2 played just over a year ago
just_over_a_year_ago = dt.datetime.now() - dt.timedelta(days=367) just_over_a_year_ago = dt.datetime.now() - dt.timedelta(days=367)
_ = Playdates(session, track2_id, when=just_over_a_year_ago) ds.playdates_update(track2.track_id, when=just_over_a_year_ago)
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
@ -76,8 +75,7 @@ class MyTestCase(unittest.TestCase):
filter = Filter(path="alpha", last_played_comparator="never") filter = Filter(path="alpha", last_played_comparator="never")
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 1 assert len(results) == 1
assert 'alpha' in results[0].path assert 'alpha' in results[0].path
@ -86,8 +84,7 @@ class MyTestCase(unittest.TestCase):
filter = Filter(path="xray", last_played_comparator="never") filter = Filter(path="xray", last_played_comparator="never")
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 0 assert len(results) == 0
def test_played_over_a_year_ago(self): def test_played_over_a_year_ago(self):
@ -95,8 +92,7 @@ class MyTestCase(unittest.TestCase):
filter = Filter(last_played_unit="years", last_played_number=1) filter = Filter(last_played_unit="years", last_played_number=1)
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 1 assert len(results) == 1
assert 'zulu' in results[0].path assert 'zulu' in results[0].path
@ -105,8 +101,7 @@ class MyTestCase(unittest.TestCase):
filter = Filter(last_played_unit="years", last_played_number=2) filter = Filter(last_played_unit="years", last_played_number=2)
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 0 assert len(results) == 0
def test_never_played(self): def test_never_played(self):
@ -114,8 +109,7 @@ class MyTestCase(unittest.TestCase):
filter = Filter(last_played_comparator="never") filter = Filter(last_played_comparator="never")
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 1 assert len(results) == 1
assert 'alpha' in results[0].path assert 'alpha' in results[0].path
@ -124,7 +118,6 @@ class MyTestCase(unittest.TestCase):
filter = Filter(last_played_comparator="Any time") filter = Filter(last_played_comparator="Any time")
with db.Session() as session: results = ds.tracks_filtered(filter)
results = Tracks.get_filtered_tracks(session, filter)
assert len(results) == 1 assert len(results) == 1
assert 'zulu' in results[0].path assert 'zulu' in results[0].path