From 881b4a3d1d2785f6e1a3c7ad38ee0f7975487f43 Mon Sep 17 00:00:00 2001
From: grimsi <9295182+grimsi@users.noreply.github.com>
Date: Wed, 17 Aug 2022 15:03:23 +0200
Subject: [PATCH] Fix "gameyfin.cache" and "gameyfin.db" properties are ignored

---
 .../gameyfin/config/FilesystemConfig.java      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java b/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java
index 5b9cf98..41078ba 100644
--- a/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java
+++ b/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java
@@ -9,6 +9,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.*;
 import org.springframework.util.PropertyPlaceholderHelper;
+import org.springframework.util.StringUtils;
 
 import javax.sql.DataSource;
 import java.util.Arrays;
@@ -21,14 +22,27 @@ public class FilesystemConfig {
     @Value("#{'${gameyfin.sources}'.split(',')[0]}")
     private String firstLibraryPath;
 
+    @Value("${gameyfin.db}")
+    private String dbPath;
+
+    @Value("${gameyfin.cache}")
+    private String cachePath;
+
     @Autowired
     Environment env;
 
     @Autowired
     public void setConfigurableEnvironment(ConfigurableEnvironment env) {
         Properties props = new Properties();
-        props.setProperty("gameyfin.db", "%s/.gameyfin/db".formatted(firstLibraryPath));
-        props.setProperty("gameyfin.cache", "%s/.gameyfin/cache".formatted(firstLibraryPath));
+
+        if(!StringUtils.hasText(dbPath)) {
+            props.setProperty("gameyfin.db", "%s/.gameyfin/db".formatted(firstLibraryPath));
+        }
+
+        if(StringUtils.hasText(cachePath)) {
+            props.setProperty("gameyfin.cache", "%s/.gameyfin/cache".formatted(firstLibraryPath));
+        }
+
         env.getPropertySources().addFirst(new PropertiesPropertySource("gameyfinFilesystemProperties", props));
     }