From f3dea6c3497d17eb490e4229fe24e38129e43068 Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Fri, 3 Oct 2025 23:42:59 +0200
Subject: [PATCH] Fix cache data not persisting cross restarts/updates (#2479)

---
 Dockerfile                  | 4 ++--
 music_assistant/__main__.py | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 210d1566..eb21409f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,9 +68,9 @@ LABEL \
     io.hass.platform="${TARGETPLATFORM}" \
     io.hass.type="addon"
 
-VOLUME [ "/data"]
+VOLUME [ "/data" ]
 EXPOSE 8095
 
 WORKDIR $VIRTUAL_ENV
 
-ENTRYPOINT ["mass", "--data-dir", "/data"]
+ENTRYPOINT ["mass", "--data-dir", "/data", "--cache-dir", "/data/.cache"]
diff --git a/music_assistant/__main__.py b/music_assistant/__main__.py
index 67a7db1a..2746a107 100644
--- a/music_assistant/__main__.py
+++ b/music_assistant/__main__.py
@@ -6,7 +6,6 @@ import argparse
 import asyncio
 import logging
 import os
-import shutil
 import subprocess
 import sys
 import threading
@@ -59,7 +58,7 @@ def get_arguments() -> argparse.Namespace:
         "--cache-dir",
         metavar="path_to_cache_dir",
         default=default_cache_dir,
-        help="Directory that contains MusicAssistant cache data",
+        help="Directory that contains MusicAssistant cache data [optional]",
     )
     parser.add_argument(
         "--log-level",
@@ -194,12 +193,6 @@ def main() -> None:
     data_dir = args.data_dir
     cache_dir = args.cache_dir
 
-    # move legacy cache directory
-    old_cache_dir = os.path.join(data_dir, ".cache")
-    if os.path.isdir(old_cache_dir) and old_cache_dir != cache_dir:
-        with suppress(OSError):
-            shutil.move(old_cache_dir, cache_dir)
-
     os.makedirs(data_dir, exist_ok=True)
     os.makedirs(cache_dir, exist_ok=True)
 
-- 
2.34.1