From d7e454e8eebcf15d2a22566a3e7d308c032585bd Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sun, 20 Oct 2024 01:45:07 +0200 Subject: [PATCH] some super small tweaks --- music_assistant/server/controllers/cache.py | 7 +------ music_assistant/server/helpers/ffmpeg.py | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/music_assistant/server/controllers/cache.py b/music_assistant/server/controllers/cache.py index 441c3c6e..704c96b6 100644 --- a/music_assistant/server/controllers/cache.py +++ b/music_assistant/server/controllers/cache.py @@ -190,7 +190,6 @@ class CacheController(CoreController): query_parts.append(f"sub_key LIKE '%{key_filter}%'") query = "WHERE " + " AND ".join(query_parts) if query_parts else None await self.database.delete(DB_TABLE_CACHE, query=query) - await self.database.vacuum() self.logger.info("Clearing database DONE") async def auto_cleanup(self) -> None: @@ -206,10 +205,6 @@ class CacheController(CoreController): await self.database.delete(DB_TABLE_CACHE, {"id": db_row["id"]}) cleaned_records += 1 await asyncio.sleep(0) # yield to eventloop - if cleaned_records > 50: - self.logger.debug("Compacting database...") - await self.database.vacuum() - self.logger.debug("Compacting database done") self.logger.debug("Automatic cleanup finished (cleaned up %s records)", cleaned_records) async def _setup_database(self) -> None: @@ -248,7 +243,7 @@ class CacheController(CoreController): {"key": "version", "value": str(DB_SCHEMA_VERSION), "type": "str"}, ) await self.__create_database_indexes() - # compact db + # compact db (vacuum) at startup self.logger.debug("Compacting database...") try: await self.database.vacuum() diff --git a/music_assistant/server/helpers/ffmpeg.py b/music_assistant/server/helpers/ffmpeg.py index 74b1c127..3e390f65 100644 --- a/music_assistant/server/helpers/ffmpeg.py +++ b/music_assistant/server/helpers/ffmpeg.py @@ -124,6 +124,8 @@ class FFMpeg(AsyncProcess): try: async for chunk in TimedAsyncGenerator(self.audio_input, 300): audio_received = True + if self.proc and self.proc.returncode is not None: + raise AudioError("Parent process already exited") await self.write(chunk) generator_exhausted = True if not audio_received: -- 2.34.1