Merge pull request #76 from guerda/feat_logfmt

Logfmt and recently added albums fix

Author: guerda

app.py

@@ -7,11 +7,18 @@
 from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
+from logfmter import Logfmter
 from pydantic_settings import BaseSettings
 
 from beetsstatistics import AlbumSort, BeetsStatistics, DBNotFoundError, DBQueryError
 
-logger = logging.getLogger("uvicorn.error")
+log_format = "%(asctime)s [%(levelname)-7s] [%(name)-12s] %(name)s - %(message)s"
+date_format = "%H:%M:%S"
+console_handler = logging.StreamHandler()
+console_handler.setFormatter(Logfmter(keys=["at", "name", "asctime"]))
+logging.basicConfig(level=logging.INFO, handlers=[console_handler])
+
+logger = logging.getLogger("beets-statistics")
 
 
 class InitializationError(Exception):
@@ -66,7 +73,13 @@ async def get_general_stats(
         format_count, lossless, lossy, unknown = beets_statistics.get_track_formats()
 
         recently_added_albums = beets_statistics.get_recently_added_albums()
-    except (DBQueryError, DBNotFoundError) as e:
+    except DBNotFoundError as e:
+        logger.error("Could not find database", exc_info=e)
+        raise HTTPException(
+            status_code=500, detail="Could not find database: {}".format(e)
+        )
+    except DBQueryError as e:
+        logger.error("Could not query general statistics", exc_info=e)
         raise HTTPException(
             status_code=500, detail="Could not query general statistics: {}".format(e)
         )

beetsstatistics.py

@@ -63,6 +63,22 @@ def close(self):
         if self.connection:
             self.connection.close()
 
+    def convert_row_to_album(self, album):
+        return_album = Album()
+        return_album.id = album["album_id"]
+        return_album.mb_albumid = album["mb_albumid"]
+        return_album.title = album["album"]
+        return_album.tracks = album["tracks"]
+        return_album.track_total = album["tracktotal"]
+        return_album.complete_percentage = album["complete"]
+        return_album.album_artist = album["albumartist"]
+        return_album.genre = album["genre"]
+        return_album.year = album["year"]
+        return_album.original_year = album["original_year"]
+        return_album.barcode = album["barcode"]
+        # id |artpath|added |albumartist |albumartist_sort|albumartist_credit|albumartists|albumartists_sort |albumartists_credit|album |genre |style|discogs_albumid|discogs_artistid|discogs_labelid|year|month|day|disctotal|comp|mb_albumid|mb_albumartistid|albumtype|albumtypes|label |barcode |mb_releasegroupid |release_group_title |asin|catalognum|script|language|country|albumstatus|albumdisambig|releasegroupdisambig|rg_album_gain|rg_album_peak|r128_album_gain|original_year|original_month|original_day|
+        return return_album
+
     def get_albums_from_db(self, sort_by: AlbumSort = AlbumSort.ARTIST):
         connection = self.get_db_connection()
         cursor = connection.cursor()
@@ -92,19 +108,7 @@ def get_albums_from_db(self, sort_by: AlbumSort = AlbumSort.ARTIST):
 
         result = []
         for album in albums:
-            return_album = Album()
-            return_album.id = album["album_id"]
-            return_album.mb_albumid = album["mb_albumid"]
-            return_album.title = album["album"]
-            return_album.tracks = album["tracks"]
-            return_album.track_total = album["tracktotal"]
-            return_album.complete_percentage = album["complete"]
-            return_album.album_artist = album["albumartist"]
-            return_album.genre = album["genre"]
-            return_album.year = album["year"]
-            return_album.original_year = album["original_year"]
-            return_album.barcode = album["barcode"]
-            # id |artpath|added |albumartist |albumartist_sort|albumartist_credit|albumartists|albumartists_sort |albumartists_credit|album |genre |style|discogs_albumid|discogs_artistid|discogs_labelid|year|month|day|disctotal|comp|mb_albumid|mb_albumartistid|albumtype|albumtypes|label |barcode |mb_releasegroupid |release_group_title |asin|catalognum|script|language|country|albumstatus|albumdisambig|releasegroupdisambig|rg_album_gain|rg_album_peak|r128_album_gain|original_year|original_month|original_day|
+            return_album = self.convert_row_to_album(album)
 
             result.append(return_album)
         return result
@@ -406,21 +410,31 @@ def get_recently_added_albums(self):
         try:
             cursor = self.get_db_connection().cursor()
             query = """select
-                            a.id,
-                            a.album,
-                            a.albumartist,
-                            a.mb_albumid,
-                            a.mb_year,
-                            a.genre,
-                            
-                        
-                        from albums a order by a.added desc 
+                            i.album_id,
+                            i.album,
+                            count(i.track) as tracks,
+                            max(i.tracktotal) as tracktotal,
+                            ifnull(round(count(i.track)/ cast(max(i.tracktotal) as float), 2) * 100, 0) as complete,
+                            a.*
+                        from
+                            albums a
+                        left join
+                            items i on
+                            i.album_id = a.id
+                        where
+                            album_id is not null
+                        group by
+                            i.album_id
+                        order by a.added desc 
                         limit 10;"""
             cursor.execute(query)
             results = cursor.fetchall()
 
             cursor.close()
-            return results
+
+            result_albums = [ self.convert_row_to_album(album) for album in results ]
+
+            return result_albums
         except sqlite3.Error as e:
             raise DBQueryError from e
 

pyproject.toml

@@ -9,6 +9,7 @@ dependencies = [
     "humanize",
     "pydantic",
     "pydantic-settings",
+    "logfmter>=0.0.10",
 ]
 
 [tool.pytest.ini_options]