Fixed some bugs related to the property files

backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,9 @@
+{
+  "properties": [
+    {
+      "name": "gameyfin.root",
+      "type": "java.lang.String[]",
+      "description": "List of directories Gameyfin should scan for games."
+    }
+  ]
+}

backend/src/main/resources/application-dev.yml

@@ -1,8 +1,6 @@
 gameyfin:
   user: admin
   password: password
-  cache: ${gameyfin.root}\.gameyfin\cache
-  db: ${gameyfin.root}\.gameyfin\db
 
 logging:
   level:

backend/src/main/resources/config/database.properties

@@ -1,13 +0,0 @@
-# This file contains properties related to the database configuration
-#
-#
-spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.datasource.db-name=gameyfin_db
-spring.datasource.url=jdbc:h2:file:${gameyfin.db}/${spring.datasource.db-name}
-spring.datasource.username=gfadmin
-spring.datasource.password=gameyfin
-spring.datasource.driverClassName=org.h2.Driver
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.open-in-view=true
-spring.jpa.properties.hibernate.event.merge.entity_copy_observer=allow

backend/src/main/resources/config/database.yml

@@ -0,0 +1,18 @@
+spring:
+  jpa:
+    open-in-view: 'true'
+    properties:
+      hibernate:
+        enable_lazy_load_no_trans: 'true'
+        event:
+          merge:
+            entity_copy_observer: allow
+    database-platform: org.hibernate.dialect.H2Dialect
+    hibernate:
+      ddl-auto: update
+  datasource:
+    username: gfadmin
+    url: jdbc:h2:file:${gameyfin.db}/${spring.datasource.db-name}
+    driverClassName: org.h2.Driver
+    db-name: gameyfin_db
+    password: gameyfin

backend/src/main/resources/config/gameyfin.properties

@@ -1,28 +0,0 @@
-# This file contains properties related to the configuration of Gameyfin
-#
-#
-# Username and password for the web interface
-gameyfin.user=
-gameyfin.password=
-
-# Root folder of your game library
-gameyfin.root=
-# Folders where gameyfin will store cached images and the database
-gameyfin.cache=${gameyfin.root}/.gameyfin/cache
-gameyfin.db=${gameyfin.root}/.gameyfin/db
-
-# File extensions which gameyfin will recognize as game files
-gameyfin.file-extensions=iso, zip, rar, 7z, exe
-
-# List of IGDB platform enums to limit search results. For possible values see: https://api-docs.igdb.com/#platform
-gameyfin.igdb.config.preferred-platforms=6
-
-# Twitch Client ID and Client Secret
-gameyfin.igdb.api.client-id=
-gameyfin.igdb.api.client-secret=
-
-# The IGDB API has a rate limit of 4 req/s
-gameyfin.igdb.api.max-requests-per-second=4
-
-# According to the docs, there is a maximum of 8 concurrent requests, but in my tests the actual limit was 4 and even then it sometimes failed, so I set it to 2 to be sure
-gameyfin.igdb.api.max-concurrent-requests=2

backend/src/main/resources/config/gameyfin.yml

@@ -0,0 +1,19 @@
+gameyfin:
+  user:
+  password:
+
+  root: //NAS-Simon/Öffentlich/Spiele, C:/gameyfin-library
+
+  db: ./.gameyfin/db
+  cache: ./.gameyfin/cache
+
+  file-extensions: iso, zip, rar, 7z, exe
+
+  igdb:
+    api:
+      client-id:
+      client-secret:
+      max-concurrent-requests: 2
+      max-requests-per-second: 4
+    config:
+      preferred-platforms: 6

backend/src/main/resources/config/secure.properties

@@ -1,19 +0,0 @@
-# This file contains properties that are *NOT* safe to override by the user
-# In theory a user should not be able to override them since they will be loaded from the classpath at launch, overriding existing user properties with the same key
-#
-#
-# System Info
-application.name=Gameyfin
-application.version=@project.version@
-# API
-server.servlet.context-path=/
-# Spring Actuator
-management.endpoints.enabled-by-default=false
-management.endpoint.health.enabled=true
-# Server
-server.error.include-stacktrace=never
-spring.mvc.async.request-timeout=-1
-# Jackson JSON Mapping
-spring.jackson.default-property-inclusion=non_null
-spring.jackson.mapper.accept-case-insensitive-enums=true
-spring.jackson.deserialization.fail-on-unknown-properties=false

backend/src/main/resources/config/secure.yml

@@ -0,0 +1,27 @@
+application:
+  version: '@project.version@'
+  name: Gameyfin
+
+server:
+  servlet:
+    context-path: /
+  error:
+    include-stacktrace: never
+
+spring:
+  jackson:
+    deserialization:
+      fail-on-unknown-properties: false
+    default-property-inclusion: non_null
+    mapper:
+      accept-case-insensitive-enums: true
+  mvc:
+    async:
+      request-timeout: -1
+
+management:
+  endpoint:
+    health:
+      enabled: true
+  endpoints:
+    enabled-by-default: false