db: Convert the ArtistTable into a playlist.Model
Implements: Issue #11 (Cache database items fields) Implements: Issue #14 (Convert Tables into Gio.ListModels) Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
This commit is contained in:
parent
f7907e4142
commit
0728579cc4
|
|
@ -26,11 +26,11 @@ def make_fake_track(trackno, length, title, path, lib="/a/b/c", art="Test Artist
|
|||
length, title, pathlib.Path(path))
|
||||
|
||||
def reset():
|
||||
mods = [ genre, decade, year, library, state ]
|
||||
mods = [ artist, genre, decade, year, library, state ]
|
||||
|
||||
for mod in mods: mod.Table.reset()
|
||||
|
||||
mods = [ artist, album, disc, track, user ]
|
||||
mods = [ album, disc, track, user ]
|
||||
|
||||
for mod in mods: mod.Table.drop()
|
||||
for mod in mods: mod.Table.do_create()
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class Album(objects.Tag):
|
|||
|
||||
@GObject.Property
|
||||
def artist(self):
|
||||
return artist.Artist(self.get_column("artistid"))
|
||||
return artist.Table.get(self.get_column("artistid"))
|
||||
|
||||
@GObject.Property
|
||||
def playlist_state(self):
|
||||
|
|
@ -56,7 +56,7 @@ class AlbumTable(objects.Table):
|
|||
plstate = state.Table.insert(random=False, loop=False)
|
||||
return execute("INSERT INTO albums (artistid, plstateid, name, sort) "
|
||||
"VALUES (?, ?, ?, ?)",
|
||||
[ int(artist), plstate.rowid, name, name.casefold() ])
|
||||
[ artist.rowid, plstate.rowid, name, name.casefold() ])
|
||||
|
||||
def do_delete(self, album):
|
||||
state.Table.delete(album.playlist_state)
|
||||
|
|
@ -68,7 +68,7 @@ class AlbumTable(objects.Table):
|
|||
|
||||
def do_lookup(self, artist, name):
|
||||
return execute("SELECT albumid FROM albums "
|
||||
"WHERE (artistid=? AND name=?)", [ int(artist), name ])
|
||||
"WHERE (artistid=? AND name=?)", [ artist.rowid, name ])
|
||||
|
||||
|
||||
Table = AlbumTable()
|
||||
|
|
|
|||
64
db/artist.py
64
db/artist.py
|
|
@ -10,57 +10,47 @@
|
|||
# | name -> artistid |
|
||||
# +------------------+
|
||||
from gi.repository import GObject
|
||||
from .sql import execute
|
||||
from . import album
|
||||
from . import objects
|
||||
from . import state
|
||||
from . import playlist
|
||||
from . import sql
|
||||
|
||||
class Artist(objects.Tag):
|
||||
def do_get_column(self, column):
|
||||
return execute(f"SELECT {column} FROM artists "
|
||||
"WHERE artistid=?", [ self.rowid ])
|
||||
class Artist(playlist.ParentPlaylist):
|
||||
def __init__(self, row):
|
||||
playlist.ParentPlaylist.__init__(self, row)
|
||||
self._name = row["name"]
|
||||
|
||||
@GObject.Property
|
||||
def playlist_state(self):
|
||||
return state.Table.get(self.get_column("plstateid"))
|
||||
def name(self): return self._name
|
||||
|
||||
def albums(self):
|
||||
cursor = execute(f"SELECT albumid FROM albums "
|
||||
"WHERE artistid=?", [ self.rowid ])
|
||||
return [ album.Album(row["albumid"]) for row in cursor.fetchall() ]
|
||||
def get_child_table(self): return album.Table
|
||||
|
||||
|
||||
class ArtistTable(objects.Table):
|
||||
class ArtistTable(playlist.Model):
|
||||
def __init__(self):
|
||||
objects.Table.__init__(self, "artists", Artist)
|
||||
playlist.Model.__init__(self, "artists", "sort")
|
||||
|
||||
def do_create(self):
|
||||
execute("CREATE TABLE IF NOT EXISTS artists "
|
||||
"(artistid INTEGER PRIMARY KEY, "
|
||||
" plstateid INTEGER NOT NULL, "
|
||||
" name TEXT UNIQUE, "
|
||||
" sort TEXT, "
|
||||
" FOREIGN KEY(plstateid) REFERENCES playlist_states(plstateid))")
|
||||
execute("CREATE INDEX IF NOT EXISTS artist_index "
|
||||
"ON artists(name)")
|
||||
sql.execute("CREATE TABLE IF NOT EXISTS artists "
|
||||
"(artistid INTEGER PRIMARY KEY, "
|
||||
" plstateid INTEGER NOT NULL, "
|
||||
" name TEXT UNIQUE, "
|
||||
" sort TEXT, "
|
||||
" FOREIGN KEY(plstateid) REFERENCES playlist_states(plstateid))")
|
||||
sql.execute("CREATE INDEX IF NOT EXISTS artist_index ON artists(name)")
|
||||
|
||||
def do_insert(self, name, sort):
|
||||
plstate = state.Table.insert(random=False, loop=False)
|
||||
return execute("INSERT INTO artists (plstateid, name, sort) "
|
||||
"VALUES (?, ?, ?)",
|
||||
[ plstate.rowid, name, sort.casefold() ])
|
||||
def do_factory(self, row):
|
||||
return Artist(row)
|
||||
|
||||
def do_delete(self, artist):
|
||||
state.Table.delete(artist.playlist_state)
|
||||
return execute("DELETE FROM artists WHERE artistid=?", [ int(artist) ])
|
||||
def do_insert(self, plstate, name, sort):
|
||||
return sql.execute("INSERT INTO artists (plstateid, name, sort) "
|
||||
"VALUES (?, ?, ?)",
|
||||
[ plstate.rowid, name, sort.casefold() ])
|
||||
|
||||
def do_get(self, rowid):
|
||||
return execute("SELECT artistid FROM artists "
|
||||
"WHERE artistid=?", [ rowid ])
|
||||
def do_lookup(self, name):
|
||||
return sql.execute("SELECT * FROM artists WHERE name=?", [ name ])
|
||||
|
||||
def do_lookup(self, name, sort=None):
|
||||
return execute("SELECT artistid FROM artists "
|
||||
"WHERE name=?", [ name ])
|
||||
def find(self, name, sort):
|
||||
return res if (res := self.lookup(name)) else self.insert(name, sort)
|
||||
|
||||
|
||||
Table = ArtistTable()
|
||||
|
|
|
|||
|
|
@ -4,57 +4,42 @@ import sqlite3
|
|||
import unittest
|
||||
from gi.repository import GObject
|
||||
|
||||
|
||||
class TestArtistTable(unittest.TestCase):
|
||||
def on_row_inserted(self, table, row):
|
||||
self.row_inserted = row
|
||||
|
||||
def on_row_deleted(self, table, row):
|
||||
self.row_deleted = row
|
||||
|
||||
class TestArtist(unittest.TestCase):
|
||||
def setUp(self):
|
||||
db.reset()
|
||||
|
||||
def test_artist_table_init(self):
|
||||
def test_init(self):
|
||||
artist = db.artist.Table.find("Test Artist", "Test Sort")
|
||||
self.assertIsInstance(artist, db.playlist.ParentPlaylist)
|
||||
self.assertEqual(artist.get_property("name"), "Test Artist")
|
||||
self.assertEqual(artist.get_child_table(), db.album.Table)
|
||||
|
||||
|
||||
class TestArtistTable(unittest.TestCase):
|
||||
def setUp(self):
|
||||
db.reset()
|
||||
|
||||
def test_init(self):
|
||||
table = db.artist.ArtistTable()
|
||||
self.assertIsInstance(table, db.playlist.Model)
|
||||
self.assertEqual(table.table, "artists")
|
||||
self.assertEqual(table.order, "sort")
|
||||
|
||||
self.assertIsInstance(db.artist.Table, db.artist.ArtistTable)
|
||||
db.sql.execute("SELECT artistid,plstateid,name,sort FROM artists")
|
||||
|
||||
def test_artist_table_insert(self):
|
||||
db.artist.Table.connect("row-inserted", self.on_row_inserted)
|
||||
def test_insert(self):
|
||||
table = db.artist.ArtistTable()
|
||||
artist = table.insert("Test Artist", "Test Sort")
|
||||
|
||||
artist = db.artist.Table.insert("Test Artist", "Test Sort")
|
||||
self.assertIsInstance(artist, db.artist.Artist)
|
||||
self.assertIsInstance(artist, db.objects.Tag)
|
||||
self.assertEqual(self.row_inserted, artist)
|
||||
|
||||
self.assertEqual(artist.name, "Test Artist")
|
||||
self.assertEqual(artist.sort, "test sort")
|
||||
self.assertIsInstance(artist.playlist_state, db.state.PlaylistState)
|
||||
self.assertEqual(artist._name, "Test Artist")
|
||||
|
||||
with self.assertRaises(sqlite3.IntegrityError):
|
||||
db.artist.Table.insert("Test Artist", "Test Sort")
|
||||
|
||||
def test_artist_table_delete(self):
|
||||
artist = db.artist.Table.find("Test Artist", "Test Sort")
|
||||
state = artist.playlist_state
|
||||
db.artist.Table.connect("row-deleted", self.on_row_deleted)
|
||||
|
||||
db.artist.Table.delete(artist)
|
||||
self.assertIsNone(db.artist.Table.lookup("Test Artist"))
|
||||
self.assertIsNone(db.state.Table.get(state.rowid))
|
||||
|
||||
def test_artist_table_get(self):
|
||||
artist = db.artist.Table.insert("Test Artist", "Test Sort")
|
||||
self.assertEqual(db.artist.Table.get(1), artist)
|
||||
self.assertIsNone(db.artist.Table.get(2))
|
||||
|
||||
def test_artist_table_lookup(self):
|
||||
artist = db.artist.Table.insert("Test Artist", "Test Sort")
|
||||
self.assertEqual(db.artist.Table.lookup("Test Artist"), artist)
|
||||
self.assertIsNone(db.artist.Table.lookup("none"))
|
||||
|
||||
def test_artist_albums(self):
|
||||
artist = db.artist.Table.find("Test Artist", "Test Sort")
|
||||
a = db.album.Table.find(artist, "A")
|
||||
b = db.album.Table.find(artist, "B")
|
||||
self.assertEqual(artist.albums(), [ a, b ])
|
||||
def test_lookup(self):
|
||||
table = db.artist.ArtistTable()
|
||||
artist = table.insert("Test Artist", "Test Sort")
|
||||
self.assertEqual(table.lookup("Test Artist"), artist)
|
||||
self.assertIsNone(table.lookup("none"))
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class Track(objects.Row):
|
|||
|
||||
@GObject.Property
|
||||
def artist(self):
|
||||
return artist.Artist(self.get_column("artistid"))
|
||||
return artist.Table.get(self.get_column("artistid"))
|
||||
|
||||
@GObject.Property
|
||||
def album(self):
|
||||
|
|
@ -124,7 +124,7 @@ class TrackTable(objects.Table):
|
|||
return execute("INSERT INTO tracks (libraryid, artistid, albumid, discid, "
|
||||
"decadeid, yearid, number, length, title, path) "
|
||||
"VALUES (?,?,?,?,?,?,?,?,?,?)",
|
||||
[ library.rowid, int(artist), int(album), int(disc),
|
||||
[ library.rowid, artist.rowid, int(album), int(disc),
|
||||
decade.rowid, year.rowid, number, length, title, str(path) ])
|
||||
|
||||
def do_delete(self, track):
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class TestScannerFileTask(unittest.TestCase):
|
|||
self.assertIsNone(ft.run_task())
|
||||
|
||||
artist = db.artist.Table.lookup("Test Artist")
|
||||
self.assertEqual(artist.sort, "artist, test")
|
||||
self.assertIsNotNone(artist)
|
||||
|
||||
album = db.album.Table.lookup(artist, "Test Album")
|
||||
self.assertIsNotNone(album)
|
||||
|
|
|
|||
Loading…
Reference in New Issue