From e452df00e46f26aeda94bc2df503df00da99a70e Mon Sep 17 00:00:00 2001 From: "david.alvarez" Date: Wed, 10 Jun 2026 09:19:11 +0200 Subject: [PATCH] more style --- src/main/java/com/dostalgia/ConfigBuilder.java | 9 +++------ src/main/java/com/dostalgia/ConfigPatcher.java | 2 +- src/main/java/com/dostalgia/GameService.java | 2 +- src/main/java/com/dostalgia/GameStore.java | 3 +-- src/main/java/com/dostalgia/IgdbService.java | 2 +- src/main/java/com/dostalgia/PlatformDetector.java | 1 - src/main/java/com/dostalgia/UploadResource.java | 5 +---- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dostalgia/ConfigBuilder.java b/src/main/java/com/dostalgia/ConfigBuilder.java index 0db585f..6bce016 100644 --- a/src/main/java/com/dostalgia/ConfigBuilder.java +++ b/src/main/java/com/dostalgia/ConfigBuilder.java @@ -3,7 +3,9 @@ package com.dostalgia; import jakarta.enterprise.context.ApplicationScoped; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * Single source of truth for all DOSBox configuration generation. @@ -11,11 +13,6 @@ import java.util.*; @ApplicationScoped public class ConfigBuilder { - /** Priority: .cue (5) > .iso (4) > .ccd (3) > .img (2) > .bin (1) */ - private static final Map CD_FORMAT_PRIORITY = Map.of( - ".cue", 5, ".iso", 4, ".ccd", 3, ".img", 2, ".bin", 1 - ); - /** * Build a dosbox.conf for a game with a known executable. * @param relExe relative path to the executable inside the ZIP (e.g. "FALLOUT.EXE" or "FALLOUT/FALLOUT.EXE") diff --git a/src/main/java/com/dostalgia/ConfigPatcher.java b/src/main/java/com/dostalgia/ConfigPatcher.java index 2f94515..e5baa03 100644 --- a/src/main/java/com/dostalgia/ConfigPatcher.java +++ b/src/main/java/com/dostalgia/ConfigPatcher.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; public class ConfigPatcher { private static final Logger LOG = Logger.getLogger(ConfigPatcher.class.getName()); - private static final Pattern DRIVE_PATH = Pattern.compile("[A-Za-z]:(\\\\|/)[^\\s\"\\r\\n]+"); + private static final Pattern DRIVE_PATH = Pattern.compile("[A-Za-z]:([\\\\/])[^\\s\"\\r\\n]+"); /** Scan and fix absolute paths in all text files in the given directory. */ public void fixAbsolutePaths(Path extractDir) throws IOException { diff --git a/src/main/java/com/dostalgia/GameService.java b/src/main/java/com/dostalgia/GameService.java index fdf9635..58d7d00 100644 --- a/src/main/java/com/dostalgia/GameService.java +++ b/src/main/java/com/dostalgia/GameService.java @@ -81,7 +81,7 @@ public class GameService implements GameStore { // Detect bundle size try { Path bundlePath = gamesDir.resolve(game.getBundleFile()); - if (bundlePath != null && Files.exists(bundlePath)) { + if (Files.exists(bundlePath)) { game.setBundleSize(Files.size(bundlePath)); } } catch (IOException ignored) {} diff --git a/src/main/java/com/dostalgia/GameStore.java b/src/main/java/com/dostalgia/GameStore.java index 05b371c..4ba387f 100644 --- a/src/main/java/com/dostalgia/GameStore.java +++ b/src/main/java/com/dostalgia/GameStore.java @@ -1,7 +1,6 @@ package com.dostalgia; import java.io.IOException; -import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.util.List; @@ -10,7 +9,7 @@ import java.util.List; * Decouples consumers (IgdbService, GameController) from the concrete storage implementation. */ public interface GameStore { - Game load(String id) throws IOException, NoSuchFileException; + Game load(String id) throws IOException; void save(Game game) throws IOException; List list() throws IOException; void delete(String id) throws IOException; diff --git a/src/main/java/com/dostalgia/IgdbService.java b/src/main/java/com/dostalgia/IgdbService.java index 5691e00..d804b3a 100644 --- a/src/main/java/com/dostalgia/IgdbService.java +++ b/src/main/java/com/dostalgia/IgdbService.java @@ -28,7 +28,7 @@ public class IgdbService { private static final String TWITCH_AUTH = "https://id.twitch.tv/oauth2/token"; private static final String IGDB_API = "https://api.igdb.com/v4"; private static final String IMG_BASE = "https://images.igdb.com/igdb/image/upload"; - private static final String COVER_SIZE = "t_cover_big"; // ~264x352, good for grid display + private static final String COVER_SIZE = "t_cover_big"; private final HttpClient http = HttpClient.newHttpClient(); private final ObjectMapper mapper = new ObjectMapper(); diff --git a/src/main/java/com/dostalgia/PlatformDetector.java b/src/main/java/com/dostalgia/PlatformDetector.java index 8a39905..1add55d 100644 --- a/src/main/java/com/dostalgia/PlatformDetector.java +++ b/src/main/java/com/dostalgia/PlatformDetector.java @@ -49,7 +49,6 @@ public class PlatformDetector { sig2 = buf[peOffset + 1]; } else { try (var fis2 = Files.newInputStream(exePath)) { - fis2.skip(peOffset); sig1 = (byte) fis2.read(); sig2 = (byte) fis2.read(); } diff --git a/src/main/java/com/dostalgia/UploadResource.java b/src/main/java/com/dostalgia/UploadResource.java index 8d3d74c..86e8756 100644 --- a/src/main/java/com/dostalgia/UploadResource.java +++ b/src/main/java/com/dostalgia/UploadResource.java @@ -31,9 +31,6 @@ public class UploadResource { @Inject IgdbService igdb; - @Inject - ConfigBuilder config; - @Inject ZipService zip; @@ -202,7 +199,7 @@ public class UploadResource { } String fname = upload.fileName().toLowerCase(); - String ext = ""; + String ext; if (fname.endsWith(".jpg") || fname.endsWith(".jpeg")) ext = ".jpg"; else if (fname.endsWith(".png")) ext = ".png"; else if (fname.endsWith(".webp")) ext = ".webp";