exo/game-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(StorageServiceImpl, StaticResourceServiceImpl): improve jar path handling for Windows and normalize path resolution

Browse Source
This commit is contained in:
extio-de
2026-06-27 15:51:43 +02:00
parent 2a8cdca80c
commit 8036c7c15a
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java
View File

@@ -28,14 +28,20 @@ public class StaticResourceServiceImpl implements StaticResourceService {
if (location == null) { if (location == null) {
try { try {
final URL url = StorageServiceImpl.class.getProtectionDomain().getCodeSource().getLocation(); final URL url = StorageServiceImpl.class.getProtectionDomain().getCodeSource().getLocation();
LOGGER.info("Code source location: {}", url);
Path parent; Path parent;
if (url.toString().startsWith("jar:nested:")) { if (url.toString().startsWith("jar:nested:")) {
parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent(); if (Objects.requireNonNullElse(System.getProperty("os.name"), "").toLowerCase().contains("windows")) {
parent = Paths.get(url.toString().substring("jar:nested:/".length(), url.toString().indexOf("/!"))).getParent();
} }
else { else {
parent = url.toURI().toPath().getParent(); parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent();
} }
final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : url.toURI().toPath().toAbsolutePath().normalize(); }
else {
parent = Paths.get(url.toURI()).getParent();
}
final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : Paths.get(url.toURI()).toAbsolutePath().normalize();
final String currentSubDir = jarPath.getFileName().toString(); final String currentSubDir = jarPath.getFileName().toString();
if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) { if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) {

11
src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java
View File

@@ -40,12 +40,17 @@ public class StorageServiceImpl implements StorageService {
final URL url = StorageServiceImpl.class.getProtectionDomain().getCodeSource().getLocation(); final URL url = StorageServiceImpl.class.getProtectionDomain().getCodeSource().getLocation();
Path parent; Path parent;
if (url.toString().startsWith("jar:nested:")) { if (url.toString().startsWith("jar:nested:")) {
parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent(); if (Objects.requireNonNullElse(System.getProperty("os.name"), "").toLowerCase().contains("windows")) {
parent = Paths.get(url.toString().substring("jar:nested:/".length(), url.toString().indexOf("/!"))).getParent();
} }
else { else {
parent = url.toURI().toPath().getParent(); parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent();
} }
final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : url.toURI().toPath().toAbsolutePath().normalize(); }
else {
parent = Paths.get(url.toURI()).getParent();
}
final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : Paths.get(url.toURI()).toAbsolutePath().normalize();
final String currentSubDir = jarPath.getFileName().toString(); final String currentSubDir = jarPath.getFileName().toString();
if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) { if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) {