Fix cache data not persisting cross restarts/updates (#2479)

diff --git a/Dockerfile b/Dockerfile
index 210d1566b38e4e1d7b72a26be27df592014f39cf..eb21409fffb7acede50f0c214b0342f444a6a9b7 100644 (file)
--- 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 67a7db1af022cd39f41f543c7aaf9588e29b5afd..2746a107cd9ee5c1b1c556ee68e1fdd89b7bf854 100644 (file)
--- 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)