From c3de83c6b92d369c295e1a0081b50aa45564c99b Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Sat, 13 Aug 2022 16:34:56 +0200 Subject: [PATCH] Renamed "gameyfin.root" to "gameyfin.sources" --- .../java/de/grimsi/gameyfin/config/FilesystemConfig.java | 2 +- .../java/de/grimsi/gameyfin/service/LibraryService.java | 3 +-- .../META-INF/additional-spring-configuration-metadata.json | 2 +- docker/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 7 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 2c7aa59..5b9cf98 100644 --- a/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java +++ b/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java @@ -18,7 +18,7 @@ import java.util.stream.StreamSupport; @Configuration public class FilesystemConfig { - @Value("#{'${gameyfin.root}'.split(',')[0]}") + @Value("#{'${gameyfin.sources}'.split(',')[0]}") private String firstLibraryPath; @Autowired diff --git a/backend/src/main/java/de/grimsi/gameyfin/service/LibraryService.java b/backend/src/main/java/de/grimsi/gameyfin/service/LibraryService.java index c0e1efd..f5c7308 100644 --- a/backend/src/main/java/de/grimsi/gameyfin/service/LibraryService.java +++ b/backend/src/main/java/de/grimsi/gameyfin/service/LibraryService.java @@ -29,9 +29,8 @@ import static de.grimsi.gameyfin.util.FilenameUtil.hasGameArchiveExtension; @RequiredArgsConstructor public class LibraryService { - @Value("${gameyfin.root}") + @Value("${gameyfin.sources}") private List libraryFolders; - private final IgdbWrapper igdbWrapper; private final DetectedGameRepository detectedGameRepository; private final UnmappableFileRepository unmappableFileRepository; diff --git a/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 41bd021..e346e41 100644 --- a/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1,7 +1,7 @@ { "properties": [ { - "name": "gameyfin.root", + "name": "gameyfin.sources", "type": "java.lang.String[]", "description": "List of directories Gameyfin should scan for games." } diff --git a/docker/Dockerfile b/docker/Dockerfile index c6077b7..743516b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,10 @@ FROM openjdk:18 -ENV GAMEYFIN_ROOT=/opt/gameyfin-library +ENV GAMEYFIN_SOURCES=/opt/gameyfin-library RUN groupadd gameyfin && useradd gameyfin -g gameyfin && \ - mkdir -p /opt/gameyfin ${GAMEYFIN_ROOT} && \ - chown -R gameyfin:gameyfin /opt/gameyfin ${GAMEYFIN_ROOT} + mkdir -p /opt/gameyfin ${GAMEYFIN_SOURCES} && \ + chown -R gameyfin:gameyfin /opt/gameyfin ${GAMEYFIN_SOURCES} USER gameyfin:gameyfin