fix(cache): fix quality separation (#131)

Author: es3n1n

nowplaying/bot/reporter.py

@@ -1,3 +1,5 @@
+from traceback import format_exc
+
 from aiogram.exceptions import AiogramError
 from aiogram.types import BufferedInputFile
 from loguru import logger
@@ -39,6 +41,6 @@ async def report_error(message: str, exception: Exception | None = None) -> None
 
     logger.opt(exception=exception).error(message)
     try:
-        await report_to_dev(message + f'\nException: {exception}')
+        await report_to_dev(message + f'\n{format_exc()}')
     except AiogramError as exc:
         logger.opt(exception=exc).error('Unable to report to dev')

nowplaying/core/database.py

@@ -105,8 +105,13 @@ async def store_cached_file(
         pool = await self.get_pool()
         async with pool.acquire() as conn, conn.transaction():
             await conn.execute(
-                'INSERT INTO cached_files (uri, file_id, cached_by_user_id, quality_info) VALUES ($1, $2, $3, $4) '
-                'ON CONFLICT (uri) DO UPDATE SET file_id = $2, cached_by_user_id = $3, quality_info = $4',
+                'INSERT INTO cached_files (uri, file_id, cached_by_user_id, quality_info) '
+                'VALUES ($1, $2, $3, $4) '
+                'ON CONFLICT (uri, highest_available) DO UPDATE '
+                'SET '
+                'file_id = EXCLUDED.file_id, '
+                'cached_by_user_id = EXCLUDED.cached_by_user_id, '
+                'quality_info = EXCLUDED.quality_info;',
                 uri,
                 file_id,
                 cached_by_user_id,

nowplaying/core/database_init.py

@@ -13,10 +13,13 @@
 CREATE TABLE IF NOT EXISTS cached_files
 (
     id SERIAL PRIMARY KEY,
-    uri VARCHAR UNIQUE NOT NULL,
+    uri VARCHAR NOT NULL,
     file_id VARCHAR NOT NULL,
     cached_by_user_id BIGINT,
-    quality_info JSONB NOT NULL
+    quality_info JSONB NOT NULL,
+    highest_available BOOLEAN
+        GENERATED ALWAYS AS ((quality_info ->> 'highest_available')::BOOLEAN) STORED,
+    UNIQUE (uri, highest_available)
 );
 CREATE INDEX IF NOT EXISTS our_uri ON cached_files (uri);
 CREATE INDEX IF NOT EXISTS cached_by_user ON cached_files (cached_by_user_id);