anna/emmental
anna
/
emmental
1
0
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases 12 Wiki Activity

db: Remove the GenreMap object 

We can now do everything it did and more through the Genre playlist
object.

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2021-10-17 21:58:55 -04:00
parent 847f182173
commit bba00b3d27
4 changed files with 13 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/__init__.py
View File

@ -31,7 +31,6 @@ def reset():
for mod in mods: mod.Table.reset()
genre.Map.reset()
user.Map.reset()
user.TempMap.reset()

49
db/genre.py
View File

@ -44,8 +44,17 @@ class GenreTable(playlist.Model):
" name TEXT UNIQUE, "
" sort TEXT, "
" FOREIGN KEY(plstateid) REFERENCES playlist_states(plstateid))")
sql.execute("CREATE INDEX IF NOT EXISTS genre_index "
"ON genres(name)")
sql.execute("CREATE TABLE IF NOT EXISTS genre_map "
"(genreid INTEGER, "
" trackid INTEGER, "
" FOREIGN KEY(genreid) REFERENCES genres(genreid), "
" FOREIGN KEY(trackid) REFERENCES tracks(trackid), "
" UNIQUE(genreid, trackid))")
sql.execute("CREATE INDEX IF NOT EXISTS genre_index ON genres(name)")
def do_drop(self):
sql.execute("DROP TABLE genres")
sql.execute("DROP TABLE genre_map")
def do_factory(self, row):
return Genre(row)
@ -59,40 +68,4 @@ class GenreTable(playlist.Model):
return sql.execute("SELECT * FROM genres WHERE name=?", [ name ])
class GenreMap(objects.Map):
def __init__(self):
objects.Map.__init__(self, "genre_map", Table.get, track.Table.get)
self.lookup_tracks = self.lookup_rhs
self.lookup_genres = self.lookup_lhs
def do_create(self):
sql.execute("CREATE TABLE IF NOT EXISTS genre_map "
"(genreid INTEGER, "
" trackid INTEGER, "
" FOREIGN KEY(genreid) REFERENCES genres(genreid), "
" FOREIGN KEY(trackid) REFERENCES tracks(trackid), "
" UNIQUE(genreid, trackid))")
def do_insert(self, genre, track):
sql.execute("INSERT INTO genre_map (genreid, trackid) "
"VALUES (?, ?)", [ genre.rowid, track.rowid ])
def do_delete(self, genre, track):
return sql.execute("DELETE FROM genre_map WHERE genreid=? AND trackid=?",
[ genre.rowid, track.rowid ])
def do_lookup_rhs(self, genre):
return sql.execute("SELECT trackid FROM genre_map "
"WHERE genreid=?", [ genre.rowid ])
def do_lookup_lhs(self, track):
return sql.execute("SELECT genreid FROM genre_map "
"WHERE trackid=?", [ track.rowid ])
def delete_track(self, track):
for genre in self.lookup_genres(track):
self.delete(genre, track)
Table = GenreTable()
Map = GenreMap()

61
db/test_genre.py
View File

@ -53,6 +53,7 @@ class TestGenreTable(unittest.TestCase):
self.assertIsInstance(db.genre.Table, db.genre.GenreTable)
db.sql.execute("SELECT genreid,plstateid,name,sort FROM genres")
db.sql.execute("SELECT genreid,trackid FROM genre_map")
def test_insert(self):
table = db.genre.GenreTable()
@ -69,63 +70,3 @@ class TestGenreTable(unittest.TestCase):
genre = db.genre.Table.insert("Test Genre")
self.assertEqual(db.genre.Table.lookup("Test Genre"), genre)
self.assertIsNone(db.genre.Table.lookup("none"))
class TestGenreMap(unittest.TestCase):
def setUp(self):
db.reset()
def test_genre_map_init(self):
self.assertIsInstance(db.genre.Map, db.genre.GenreMap)
self.assertEqual(db.genre.Map.map_lhs, db.genre.Table.get)
self.assertEqual(db.genre.Map.map_rhs, db.track.Table.get)
db.sql.execute("SELECT genreid,trackid FROM genre_map")
def test_genre_map_insert(self):
track = db.make_fake_track(1, 1.234, "Test Title", "/a/b.cde")
genre = db.genre.Table.find("Test Genre")
db.genre.Map.insert(genre, track)
with self.assertRaises(sqlite3.IntegrityError):
db.genre.Map.insert(genre, track)
def test_genre_map_delete(self):
track = db.make_fake_track(1, 1.234, "Test Title", "/a/b.cde")
genre = db.genre.Table.find("Test Genre")
db.genre.Map.insert(genre, track)
db.genre.Map.delete(genre, track)
self.assertEqual(db.genre.Map.lookup_tracks(genre), [ ])
def test_genre_map_lookup_tracks(self):
track1 = db.make_fake_track(1, 1.234, "Test Title", "/a/b.cde")
track2 = db.make_fake_track(2, 2.345, "Test Title 2", "/a/c.def")
genre = db.genre.Table.find("Test Genre")
db.genre.Map.insert(genre, track1)
db.genre.Map.insert(genre, track2)
lookup_res = db.genre.Map.lookup_tracks(genre)
self.assertEqual(lookup_res, [ track1, track2 ])
def test_genre_map_lookup_genres(self):
track = db.make_fake_track(1, 1.234, "Test Title", "/a/b.cde")
genre1 = db.genre.Table.find("Test Genre 1")
genre2 = db.genre.Table.find("Test Genre 2")
db.genre.Map.insert(genre1, track)
db.genre.Map.insert(genre2, track)
lookup_res = db.genre.Map.lookup_genres(track)
self.assertEqual(lookup_res, [ genre1, genre2 ])
def test_genre_map_delete_track(self):
track = db.make_fake_track(1, 1.234, "Test Title", "/a/b.cde")
genre1 = db.genre.Table.find("Test Genre 1")
genre2 = db.genre.Table.find("Test Genre 2")
db.genre.Map.insert(genre1, track)
db.genre.Map.insert(genre2, track)
db.genre.Map.delete_track(track)
self.assertEqual(db.genre.Map.lookup_genres(track), [ ])

2
scanner/test_task.py
View File

@ -58,7 +58,7 @@ class TestScannerFileTask(unittest.TestCase):
self.assertEqual(track.path, test_track01)
genre = db.genre.Table.lookup("Test")
self.assertEqual(db.genre.Map.lookup_tracks(genre), [ track ])
self.assertEqual(genre.get_track(0), track)
new = db.user.Table.find("New Tracks")
self.assertEqual(db.user.TempMap.lookup_tracks(new), [ track ])