simadb: do not fetch NULL genre

[mpd-sima.git] / sima / lib / simadb.py

diff --git a/sima/lib/simadb.py b/sima/lib/simadb.py
index ca2277d601d4c24c61e407fa02ee996f86beab92..07794dc6d24f079ea6cc5b11e234e6e02e15f4b4 100644 (file)
--- a/sima/lib/simadb.py
+++ b/sima/lib/simadb.py
@@ -49,6 +49,13 @@ class SimaDB:
             self._db_path, isolation_level=None)
         return connection
 
+    def get_info(self):
+        connection = self.get_database_connection()
+        info = connection.execute("""SELECT * FROM db_info
+                    WHERE name = "DB Version" LIMIT 1;""").fetchone()
+        connection.close()
+        return info
+
     def create_db(self):
         """ Set up a database
         """
@@ -535,7 +542,7 @@ class SimaDB:
                 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 > ?
+                WHERE history.last_play > ? AND genres.name NOT NULL
                 ORDER BY history.last_play DESC
                 """, (date.isoformat(' '),))
         genres = list()