db: Convert the LibraryTable into a table.Model
I actually turn it into a playlist.Model, which is a table.Model that handles playlist states for us. 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
84ad195716
commit
e6a65f8fe3
|
|
@ -25,12 +25,11 @@ def make_fake_track(trackno, length, title, path, lib="/a/b/c", art="Test Artist
|
|||
length, title, pathlib.Path(path))
|
||||
|
||||
def reset():
|
||||
mods = [ state ]
|
||||
mods = [ library, state ]
|
||||
|
||||
for mod in mods: mod.Table.reset()
|
||||
|
||||
mods = [ artist, album, disc, genre, decade, year,
|
||||
library, track, user ]
|
||||
mods = [ artist, album, disc, genre, decade, year, track, user ]
|
||||
|
||||
for mod in mods: mod.Table.drop()
|
||||
for mod in mods: mod.Table.do_create()
|
||||
|
|
|
|||
|
|
@ -6,80 +6,60 @@
|
|||
# +-----------+-----------+---------+------+
|
||||
import pathlib
|
||||
from gi.repository import GObject
|
||||
from .sql import commit
|
||||
from .sql import execute
|
||||
from . import objects
|
||||
from . import state
|
||||
from . import sql
|
||||
from . import playlist
|
||||
from . import track
|
||||
|
||||
class Library(objects.Row):
|
||||
def __lt__(self, rhs): return self.path < rhs.path
|
||||
def __gt__(self, rhs): return self.path > rhs.path
|
||||
def __str__(self): return str(self.path)
|
||||
|
||||
def do_get_column(self, column):
|
||||
return execute(f"SELECT {column} FROM libraries "
|
||||
"WHERE libraryid=?", [ self.rowid ])
|
||||
|
||||
def tracks(self):
|
||||
cursor = execute(f"SELECT trackid FROM tracks "
|
||||
"WHERE libraryid=?", [ self.rowid ])
|
||||
return [ track.Track(row["trackid"]) for row in cursor.fetchall() ]
|
||||
class Library(playlist.Playlist):
|
||||
def __init__(self, row):
|
||||
playlist.Playlist.__init__(self, row)
|
||||
self._path = pathlib.Path(row["path"])
|
||||
self._enabled = row["enabled"]
|
||||
|
||||
@GObject.Property
|
||||
def playlist_state(self):
|
||||
return state.Table.get(self.get_column("plstateid"))
|
||||
def name(self): return str(self._path)
|
||||
|
||||
@GObject.Property
|
||||
def path(self):
|
||||
return pathlib.Path(self.get_column("path"))
|
||||
def path(self): return self._path
|
||||
|
||||
@GObject.Property(type=bool,default=False)
|
||||
def enabled(self):
|
||||
return bool(self.get_column("enabled"))
|
||||
@GObject.Property(type=bool,default=True)
|
||||
def enabled(self): return self._enabled
|
||||
|
||||
@enabled.setter
|
||||
def enabled(self, newval):
|
||||
execute("UPDATE libraries "
|
||||
"SET enabled=? "
|
||||
"WHERE libraryid=?", [ newval, self.rowid ])
|
||||
commit()
|
||||
sql.execute("UPDATE libraries SET enabled=? WHERE libraryid=?",
|
||||
[ newval, self.rowid ])
|
||||
sql.commit()
|
||||
self._enabled = newval
|
||||
|
||||
def tracks(self):
|
||||
cursor = sql.execute(f"SELECT trackid FROM tracks "
|
||||
"WHERE libraryid=?", [ self.rowid ])
|
||||
return [ track.Track(row["trackid"]) for row in cursor.fetchall() ]
|
||||
|
||||
|
||||
class LibraryTable(objects.Table):
|
||||
|
||||
class LibraryTable(playlist.Model):
|
||||
def __init__(self):
|
||||
objects.Table.__init__(self, "libraries", Library)
|
||||
playlist.Model.__init__(self, "libraries", "path")
|
||||
|
||||
def do_create(self):
|
||||
execute("CREATE TABLE IF NOT EXISTS libraries "
|
||||
"(libraryid INTEGER PRIMARY KEY, "
|
||||
" plstateid INTEGER NOT NULL, "
|
||||
" enabled INTEGER DEFAULT 1, "
|
||||
" path TEXT UNIQUE, "
|
||||
" FOREIGN KEY (plstateid) REFERENCES playlist_states(plstateid))")
|
||||
sql.execute("CREATE TABLE IF NOT EXISTS libraries "
|
||||
"(libraryid INTEGER PRIMARY KEY, "
|
||||
" plstateid INTEGER NOT NULL, "
|
||||
" enabled INTEGER DEFAULT 1, "
|
||||
" path TEXT UNIQUE, "
|
||||
" FOREIGN KEY (plstateid) REFERENCES playlist_states(plstateid))")
|
||||
|
||||
def do_insert(self, path):
|
||||
plstate = state.Table.insert(random=False, loop=False)
|
||||
return execute("INSERT INTO libraries (plstateid, path) "
|
||||
"VALUES (?, ?)",
|
||||
[ plstate.rowid, str(path) ])
|
||||
def do_factory(self, row):
|
||||
return Library(row)
|
||||
|
||||
def do_delete(self, library):
|
||||
for t in library.tracks():
|
||||
track.Table.delete(t)
|
||||
state.Table.delete(library.playlist_state)
|
||||
return execute("DELETE FROM libraries WHERE libraryid=?", [ int(library) ])
|
||||
|
||||
def do_get(self, rowid):
|
||||
return execute("SELECT libraryid FROM libraries "
|
||||
"WHERE libraryid=?", [ rowid ])
|
||||
|
||||
def do_get_all(self):
|
||||
return execute("SELECT libraryid FROM libraries")
|
||||
def do_insert(self, plstate, path):
|
||||
return sql.execute("INSERT INTO libraries (plstateid, path) "
|
||||
"VALUES (?, ?)", [ plstate.rowid, str(path) ])
|
||||
|
||||
def do_lookup(self, path):
|
||||
return execute("SELECT libraryid FROM libraries "
|
||||
"WHERE path=?", [ str(path) ])
|
||||
return sql.execute("SELECT * FROM libraries WHERE path=?", [ str(path) ])
|
||||
|
||||
|
||||
Table = LibraryTable()
|
||||
|
|
|
|||
|
|
@ -6,74 +6,67 @@ import unittest
|
|||
from gi.repository import GObject
|
||||
|
||||
|
||||
class TestLibrary(unittest.TestCase):
|
||||
def setUp(self):
|
||||
db.reset()
|
||||
|
||||
def test_init(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertIsInstance(library, db.playlist.Playlist)
|
||||
self.assertEqual(library.get_property("name"), "/a/b/c")
|
||||
|
||||
def test_path(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertIsInstance(library._path, pathlib.Path)
|
||||
self.assertEqual(library.get_property("path"), library._path)
|
||||
|
||||
def test_enabled(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertTrue(library._enabled)
|
||||
self.assertTrue(library.get_property("enabled"))
|
||||
|
||||
library.enabled = False
|
||||
self.assertFalse(library._enabled)
|
||||
|
||||
|
||||
class TestLibraryTable(unittest.TestCase):
|
||||
def setUp(self):
|
||||
db.reset()
|
||||
|
||||
def test_library_table_init(self):
|
||||
def test_init(self):
|
||||
table = db.library.LibraryTable()
|
||||
self.assertIsInstance(table, db.playlist.Model)
|
||||
self.assertIsInstance(table, db.table.Model)
|
||||
self.assertEqual(table.table, "libraries")
|
||||
self.assertEqual(table.order, "path")
|
||||
|
||||
self.assertIsInstance(db.library.Table, db.library.LibraryTable)
|
||||
db.sql.execute("SELECT libraryid,plstateid,enabled,path FROM libraries")
|
||||
|
||||
def test_library_table_insert(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertIsInstance(library, db.library.Library)
|
||||
self.assertIsInstance(library, db.objects.Row)
|
||||
def test_insert(self):
|
||||
table = db.library.LibraryTable()
|
||||
library = table.insert(pathlib.Path("/a/b/c"))
|
||||
|
||||
self.assertEqual(library.path, pathlib.Path("/a/b/c"))
|
||||
self.assertEqual(str(library), "/a/b/c")
|
||||
self.assertTrue(library.enabled)
|
||||
self.assertIsInstance(library.playlist_state, db.state.PlaylistState)
|
||||
self.assertIsInstance(library, db.library.Library)
|
||||
self.assertIsInstance(library._plstate, db.state.PlaylistState)
|
||||
self.assertEqual(library._path, pathlib.Path("/a/b/c"))
|
||||
self.assertTrue(library._enabled)
|
||||
|
||||
with self.assertRaises(sqlite3.IntegrityError):
|
||||
db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
|
||||
def test_library_table_delete(self):
|
||||
library = db.library.Table.find(pathlib.Path("/a/b/c"))
|
||||
state = library.playlist_state
|
||||
track = db.make_fake_track(1, 1.234, "Test 1", "/a/b/c/1.ext",
|
||||
lib=library.path)
|
||||
def test_delete(self):
|
||||
table = db.library.LibraryTable()
|
||||
library = table.insert(pathlib.Path("/a/b/c"))
|
||||
state = library.plist_state
|
||||
|
||||
db.library.Table.delete(library)
|
||||
table.delete(library)
|
||||
self.assertIsNone(db.library.Table.lookup(pathlib.Path("/a/b/c")))
|
||||
self.assertIsNone(db.state.Table.get(state.rowid))
|
||||
self.assertIsNone(db.track.Table.get(int(track)))
|
||||
|
||||
def test_library_table_get(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertEqual(db.library.Table.get(1), library)
|
||||
self.assertIsNone(db.library.Table.get(2))
|
||||
def test_lookup(self):
|
||||
table = db.library.LibraryTable()
|
||||
library = table.insert(pathlib.Path("/a/b/c"))
|
||||
|
||||
def test_library_table_get_all(self):
|
||||
lib1 = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
lib2 = db.library.Table.insert(pathlib.Path("/d/e/f"))
|
||||
self.assertEqual(db.library.Table.get_all(), [ lib1, lib2 ])
|
||||
|
||||
def test_library_table_lookup(self):
|
||||
library = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertEqual(db.library.Table.lookup(pathlib.Path("/a/b/c")), library)
|
||||
self.assertIsNone(db.library.Table.lookup(pathlib.Path("/a/b/d")))
|
||||
|
||||
def test_library_compare(self):
|
||||
abc = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
efg = db.library.Table.insert(pathlib.Path("/e/f/g"))
|
||||
|
||||
self.assertTrue(abc < efg)
|
||||
self.assertTrue(efg > abc)
|
||||
|
||||
self.assertFalse(abc > efg)
|
||||
self.assertFalse(efg < abc)
|
||||
|
||||
def test_library_enabled(self):
|
||||
abc = db.library.Table.insert(pathlib.Path("/a/b/c"))
|
||||
self.assertTrue(abc.enabled)
|
||||
|
||||
abc.set_property("enabled", False)
|
||||
self.assertFalse(abc.enabled)
|
||||
|
||||
def test_library_tracks(self):
|
||||
library = db.library.Table.find(pathlib.Path("/a/b/c"))
|
||||
track1 = db.make_fake_track(1, 1.234, "Test 1", "/a/b/c/1.ext",
|
||||
lib=library.path)
|
||||
track2 = db.make_fake_track(2, 2.345, "Test 1", "/a/b/c/2.ext",
|
||||
lib=library.path)
|
||||
self.assertEqual(library.tracks(), [ track1, track2 ])
|
||||
self.assertEqual(table.lookup(pathlib.Path("/a/b/c")), library)
|
||||
self.assertIsNone(table.lookup(pathlib.Path("/a/b/d")))
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class Track(objects.Row):
|
|||
|
||||
@GObject.Property
|
||||
def library(self):
|
||||
return library.Library(self.get_column("libraryid"))
|
||||
return library.Table.get(self.get_column("libraryid"))
|
||||
|
||||
@GObject.Property
|
||||
def artist(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 (?,?,?,?,?,?,?,?,?,?)",
|
||||
[ int(library), int(artist), int(album), int(disc),
|
||||
[ library.rowid, int(artist), int(album), int(disc),
|
||||
int(year.decade), int(year), number, length, title, str(path) ])
|
||||
|
||||
def do_delete(self, track):
|
||||
|
|
|
|||
|
|
@ -111,7 +111,8 @@ class UpdateAllButton(ScannerButton):
|
|||
ScannerButton.__init__(self, queue, "view-refresh")
|
||||
|
||||
def do_clicked(self):
|
||||
for library in db.library.Table.get_all():
|
||||
for i in range(db.library.Table.get_n_items()):
|
||||
library = db.library.Table.get_item(i)
|
||||
self.queue.push(task.CheckSchedulerTask(library))
|
||||
self.queue.push(task.DirectoryTask(library, library.path))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue