From: kaliko Date: Mon, 3 May 2021 07:41:14 +0000 (+0200) Subject: Add genres tables to the database, update Genre plugin (related to #48) X-Git-Tag: 0.18.0~66 X-Git-Url: http://git.kaliko.me/?a=commitdiff_plain;h=5cbf72d42c713c5a719fa407e6969f0a84fdfe21;p=mpd-sima.git Add genres tables to the database, update Genre plugin (related to #48) --- diff --git a/sima/lib/db.py b/sima/lib/db.py index 91cf037..ca2277d 100644 --- a/sima/lib/db.py +++ b/sima/lib/db.py @@ -17,8 +17,6 @@ # # """SQlite database library - -https://stackoverflow.com/questions/62818662/sqlite-foreign-key-reverse-cascade-delete """ __DB_VERSION__ = 4 @@ -51,10 +49,6 @@ class SimaDB: self._db_path, isolation_level=None) return connection - def close_database_connection(self, connection): - """Close the database connection.""" - connection.close() - def create_db(self): """ Set up a database """ @@ -85,7 +79,7 @@ class SimaDB: 'FOREIGN KEY(albumartist) REFERENCES albumartists(id))') connection.execute( # HISTORY 'CREATE TABLE IF NOT EXISTS history (id INTEGER PRIMARY KEY, ' - 'last_play TIMESTAMP, track integer, ' + 'last_play TIMESTAMP, track INTEGER, ' 'FOREIGN KEY(track) REFERENCES tracks(id))') connection.execute( # BLOCKLIST 'CREATE TABLE IF NOT EXISTS blocklist (id INTEGER PRIMARY KEY, ' @@ -93,8 +87,16 @@ class SimaDB: 'FOREIGN KEY(artist) REFERENCES artists(id), ' 'FOREIGN KEY(album) REFERENCES albums(id), ' 'FOREIGN KEY(track) REFERENCES tracks(id))') + connection.execute( # Genres (Many-to-many) + 'CREATE TABLE IF NOT EXISTS genres ' + '(id INTEGER PRIMARY KEY, name VARCHAR(100))') + connection.execute( # Junction Genres Tracks + """CREATE TABLE IF NOT EXISTS tracks_genres + ( track INTEGER, genre INTEGER, + FOREIGN KEY(track) REFERENCES tracks(id) + FOREIGN KEY(genre) REFERENCES genres(id))""") # Create cleanup triggers: - # DELETE history → Tracks table + # DELETE history → Tracks / Tracks_genres tables connection.execute(''' CREATE TRIGGER IF NOT EXISTS del_history_cleanup_tracks AFTER DELETE ON history @@ -102,6 +104,16 @@ class SimaDB: (SELECT count(*) FROM blocklist WHERE track=old.track) = 0) BEGIN DELETE FROM tracks WHERE id = old.track; + DELETE FROM tracks_genres WHERE track = old.track; + END; + ''') + # DELETE Tracks_Genres → Genres table + connection.execute(''' + CREATE TRIGGER IF NOT EXISTS del_tracks_genres_cleanup_genres + AFTER DELETE ON tracks_genres + WHEN ((SELECT count(*) FROM tracks_genres WHERE genre=old.genre) = 0) + BEGIN + DELETE FROM genres WHERE id = old.genre; END; ''') # DELETE Tracks → Artists table @@ -167,7 +179,7 @@ class SimaDB: DELETE FROM albums WHERE id = old.album; END; ''') - self.close_database_connection(connection) + connection.close() def drop_all(self): connection = self.get_database_connection() @@ -188,7 +200,7 @@ class SimaDB: ' WHERE blocklist.id = ?', (blid,)) connection.commit() if not with_connection: - self.close_database_connection(connection) + connection.close() def _get_album(self, album, connection): if album.mbid: @@ -214,11 +226,11 @@ class SimaDB: rows = self._get_album(album, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not add: if not with_connection: - self.close_database_connection(connection) + connection.close() return None connection.execute( "INSERT INTO albums (name, mbid) VALUES (?, ?)", @@ -227,11 +239,10 @@ class SimaDB: rows = self._get_album(album, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] - print('damned: %s' % album.mbid) if not with_connection: - self.close_database_connection(connection) + connection.close() return None def _get_albumartist(self, artist, connection): @@ -258,11 +269,11 @@ class SimaDB: rows = self._get_albumartist(artist, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not add: if not with_connection: - self.close_database_connection(connection) + connection.close() return None connection.execute( "INSERT INTO albumartists (name, mbid) VALUES (?, ?)", @@ -271,10 +282,10 @@ class SimaDB: rows = self._get_albumartist(artist, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not with_connection: - self.close_database_connection(connection) + connection.close() def _get_artist(self, artist, connection): if artist.mbid: @@ -299,11 +310,11 @@ class SimaDB: rows = self._get_artist(artist, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not add: if not with_connection: - self.close_database_connection(connection) + connection.close() return None connection.execute( "INSERT INTO artists (name, mbid) VALUES (?, ?)", @@ -312,15 +323,46 @@ class SimaDB: rows = self._get_artist(artist, connection) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not with_connection: - self.close_database_connection(connection) + connection.close() + + def get_genre(self, genre, with_connection=None, add=True): + """get genre from the database. + if not in database insert new entry. + + :param str genre: genre as a string + :param sqlite3.Connection with_connection: SQLite connection + """ + if with_connection: + connection = with_connection + else: + connection = self.get_database_connection() + rows = connection.execute( + "SELECT id FROM genres WHERE name = ?", (genre,)) + for row in rows: + if not with_connection: + connection.close() + return row[0] + if not add: + if not with_connection: + connection.close() + return None + connection.execute( + "INSERT INTO genres (name) VALUES (?)", (genre,)) + connection.commit() + rows = connection.execute( + "SELECT id FROM genres WHERE name = ?", (genre,)) + for row in rows: + if not with_connection: + connection.close() + return row[0] def get_track(self, track, with_connection=None, add=True): - """Get a track from Tracks table, add if not existing, - Attention: use Track() object!! - if not in database insert new entry.""" + """Get a track id from Tracks table, add if not existing, + :param sima.lib.track.Track track: track to use + :param bool add: add non existing track to database""" if not track.file: raise SimaDBError('Got a track with no file attribute: %r' % track) if with_connection: @@ -331,9 +373,10 @@ class SimaDB: "SELECT * FROM tracks WHERE file = ?", (track.file,)) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not add: # Not adding non existing track + connection.close() return None # Get an artist record or None if track.artist: @@ -360,17 +403,30 @@ class SimaDB: (art_id, albart_id, alb_id, track.title, track.musicbrainz_trackid, track.file)) connection.commit() + # Add track id to junction tables + self._add_tracks_genres(track, connection) rows = connection.execute( "SELECT id FROM tracks WHERE file = ?", (track.file,)) for row in rows: if not with_connection: - self.close_database_connection(connection) + connection.close() return row[0] if not with_connection: - connection.commit() - self.close_database_connection(connection) + connection.close() return None + def _add_tracks_genres(self, track, connection): + if not track.genres: + return None + rows = connection.execute( + "SELECT id FROM tracks WHERE file = ?", (track.file,)) + trk_id = rows.fetchone()[0] + for genre in track.genres: + # add genre + gen_id = self.get_genre(genre) + connection.execute("""INSERT INTO tracks_genres (track, genre) + VALUES (?, ?)""", (trk_id, gen_id)) + def add_history(self, track, date=None): """Record last play date of track (ie. not a real exhautive play history). :param track sima.lib.track.Track: track to add to history""" @@ -386,7 +442,7 @@ class SimaDB: connection.execute("UPDATE history SET last_play = ? " " WHERE track = ?", (date, track_id,)) connection.commit() - self.close_database_connection(connection) + connection.close() def purge_history(self, duration=__HIST_DURATION__): """Remove old entries in history @@ -397,7 +453,7 @@ class SimaDB: " < datetime('now', '-%i hours')" % duration) connection.execute('VACUUM') connection.commit() - self.close_database_connection(connection) + connection.close() def fetch_albums_history(self, needle=None, duration=__HIST_DURATION__): """ @@ -466,8 +522,30 @@ class SimaDB: hist.append(artist) # No need to go further continue hist.append(artist) + connection.close() return hist + def fetch_genres_history(self, duration=__HIST_DURATION__, limit=20): + date = datetime.utcnow() - timedelta(hours=duration) + connection = self.get_database_connection() + rows = connection.execute(""" + SELECT genres.name, artists.name + FROM history + JOIN tracks ON history.track = tracks.id + LEFT OUTER JOIN tracks_genres ON tracks_genres.track = tracks.id + LEFT OUTER JOIN artists ON tracks.artist = artists.id + LEFT OUTER JOIN genres ON genres.id = tracks_genres.genre + WHERE history.last_play > ? + ORDER BY history.last_play DESC + """, (date.isoformat(' '),)) + genres = list() + for row in rows: + genres.append(row) + if len({g[0] for g in genres}) >= limit: + break + connection.close() + return genres + def fetch_history(self, artist=None, duration=__HIST_DURATION__): """Fetches tracks history, more recent first :param sima.lib.meta.Artist artist: limit history to this artist @@ -530,7 +608,10 @@ class SimaDB: connection.commit() rows = connection.execute( "SELECT id FROM blocklist WHERE track = ?", (track_id,)) - return rows.fetchone()[0] + bl = rows.fetchone()[0] + if not with_connection: + connection.close() + return bl def get_bl_album(self, album, with_connection=None, add=True): """Add an album to blocklist @@ -552,7 +633,10 @@ class SimaDB: connection.commit() rows = connection.execute( "SELECT id FROM blocklist WHERE album = ?", (album_id,)) - return rows.fetchone()[0] + bl = rows.fetchone()[0] + if not with_connection: + connection.close() + return bl def get_bl_artist(self, artist, with_connection=None, add=True): """Add an artist to blocklist @@ -574,7 +658,10 @@ class SimaDB: connection.commit() rows = connection.execute( "SELECT id FROM blocklist WHERE artist = ?", (artist_id,)) - return rows.fetchone()[0] + bl = rows.fetchone()[0] + if not with_connection: + connection.close() + return bl def delete_bl(self, track=None, album=None, artist=None): if not (track or album or artist): @@ -590,6 +677,7 @@ class SimaDB: if not blid: return self._remove_blocklist_id(blid, with_connection=connection) + connection.close() # VIM MODLINE diff --git a/sima/plugins/internal/genre.py b/sima/plugins/internal/genre.py index 808d96d..43aabf7 100644 --- a/sima/plugins/internal/genre.py +++ b/sima/plugins/internal/genre.py @@ -63,15 +63,14 @@ class Genre(AdvancedPlugin): raise PluginException('MPD >= 0.21 required') def fetch_genres(self): - pldepth = 4 - nbgenres = 2 - current_titles = self.player.playlist[-pldepth:] - genres = [] - for track in current_titles: - if not track.genres: - self.log.debug('No genre found in %s', track) - continue - genres.extend(track.genres) + """Fetches ,at most, nb-depth genre from history, + and returns the nbgenres most present""" + depth = 10 # nb of genre to fetch from history for analysis + nbgenres = 2 # nb of genre to return + genres = [g[0] for g in self.sdb.fetch_genres_history(limit=depth)] + if not genres: + self.log.debug('No genre found in current track history') + return [] genres_analysis = Counter(genres) if genres_analysis.most_common(): self.log.debug('Most common genres: %s', genres_analysis.most_common()) diff --git a/tests/test_simadb.py b/tests/test_simadb.py index 52e3e44..3be8758 100644 --- a/tests/test_simadb.py +++ b/tests/test_simadb.py @@ -14,6 +14,7 @@ DEVOLT = { 'albumartist': 'Devolt', 'albumartistsort': 'Devolt', 'artist': 'Devolt', + 'genre': ['Rock'], 'date': '2011-12-01', 'disc': '1/1', 'file': 'music/Devolt/2011-Grey/03-Devolt - Crazy.mp3', @@ -97,7 +98,8 @@ class Test_00DB(Main): # recent first, oldest last hist = list() for i in range(1, 5): # starts at 1 to ensure records are in the past - trk = Track(file=f'/foo/bar.{i}', name='{i}-baz', album='foolbum') + trk = Track(file=f'/foo/bar.{i}', name=f'{i}-baz', + album='foolbum', genre=f'{i}') hist.append(trk) last = CURRENT - datetime.timedelta(minutes=i) self.db.add_history(trk, date=last) @@ -305,5 +307,20 @@ class Test_01BlockList(Main): conn.close() +class Test_02Genre(Main): + + def test_genre(self): + conn = self.db.get_database_connection() + self.db.get_genre('Post-Rock', with_connection=conn) + genres = list() + for i in range(1, 15): # starts at 1 to ensure records are in the past + trk = Track(file=f'/foo/bar.{i}', name=f'{i}-baz', + album='foolbum', artist=f'{i}-art', genre=f'{i}') + genres.append(f'{i}') + last = CURRENT - datetime.timedelta(minutes=i) + self.db.add_history(trk, date=last) + genre_hist = self.db.fetch_genres_history(limit=10) + self.assertEqual([g[0] for g in genre_hist], genres[:10]) + # VIM MODLINE # vim: ai ts=4 sw=4 sts=4 expandtab fileencoding=utf8