From e6ed869bac4a2c2e8dbee964171e6a97d1ea6262 Mon Sep 17 00:00:00 2001 From: Simon Grimme <9295182+grimsi@users.noreply.github.com> Date: Sat, 15 Oct 2022 02:01:39 +0200 Subject: [PATCH 1/3] Check OS before hiding internal folder --- .../gameyfin/config/FilesystemConfig.java | 17 +++++++++++------ frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- 3 files changed, 14 insertions(+), 9 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 54801b2..71f9ba9 100644 --- a/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java +++ b/backend/src/main/java/de/grimsi/gameyfin/config/FilesystemConfig.java @@ -10,18 +10,16 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.context.event.EventListener; import org.springframework.core.env.*; -import org.springframework.util.PropertyPlaceholderHelper; import org.springframework.util.StringUtils; -import javax.annotation.PostConstruct; import javax.sql.DataSource; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.LinkOption; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import java.util.Locale; import java.util.Properties; import java.util.stream.StreamSupport; @@ -48,9 +46,11 @@ public class FilesystemConfig { */ @EventListener(ApplicationReadyEvent.class) public void hideInternalFolderOnDOS() throws IOException { + if (!isRunningOnWindows()) return; + Path internalFolder = Paths.get("%s/%s".formatted(firstLibraryPath, INTERNAL_FOLDER_NAME)); - if(!Files.exists(internalFolder) || !Files.isDirectory(internalFolder)) return; + if (!Files.exists(internalFolder) || !Files.isDirectory(internalFolder)) return; Files.setAttribute(internalFolder, "dos:hidden", Boolean.TRUE, LinkOption.NOFOLLOW_LINKS); } @@ -59,11 +59,11 @@ public class FilesystemConfig { public void setConfigurableEnvironment(ConfigurableEnvironment env) { Properties props = new Properties(); - if(!StringUtils.hasText(dbPath)) { + if (!StringUtils.hasText(dbPath)) { props.setProperty("gameyfin.db", "%s/%s/db".formatted(firstLibraryPath, INTERNAL_FOLDER_NAME)); } - if(!StringUtils.hasText(cachePath)) { + if (!StringUtils.hasText(cachePath)) { props.setProperty("gameyfin.cache", "%s/%s/cache".formatted(firstLibraryPath, INTERNAL_FOLDER_NAME)); } @@ -72,6 +72,7 @@ public class FilesystemConfig { /** * This bean is needed so Spring initializes the data source after we are done messing with the configuration environment + * * @return DataSource */ @ConfigurationProperties(prefix = "spring.datasource") @@ -101,4 +102,8 @@ public class FilesystemConfig { return props; } + private boolean isRunningOnWindows() { + return System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows"); + } + } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7f2a857..ef089f2 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "1.2.2-SNAPSHOT", + "version": "1.2.3-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frontend", - "version": "1.2.2-SNAPSHOT", + "version": "1.2.3-SNAPSHOT", "dependencies": { "@angular/animations": "^14.0.0", "@angular/cdk": "^14.1.0", diff --git a/frontend/package.json b/frontend/package.json index bfe88ad..cf5b2db 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "1.2.2-SNAPSHOT", + "version": "1.2.3-SNAPSHOT", "scripts": { "ng": "ng", "start": "ng serve", From 3bcd234b08b225e887eea178b7af248fc15ef77c Mon Sep 17 00:00:00 2001 From: Simon Grimme <9295182+grimsi@users.noreply.github.com> Date: Sat, 15 Oct 2022 10:27:12 +0200 Subject: [PATCH 2/3] Disable 'optimizeCodegen' in maven profobuf build step --- backend/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/pom.xml b/backend/pom.xml index e94de98..224107c 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -208,6 +208,7 @@ true + false ${project.basedir}/src/main/resources/proto From 99734aa0f046c482200dd18d6f7600d0ad009601 Mon Sep 17 00:00:00 2001 From: Simon Grimme <9295182+grimsi@users.noreply.github.com> Date: Sat, 15 Oct 2022 10:27:37 +0200 Subject: [PATCH 3/3] Update Spring Boot version to 2.7.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eced1d..4ad5c44 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.1 + 2.7.4