From fbfb0b5459cc6c42cd9b9e0067eb53a327c692ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kr=C3=BChlmann?= Date: Tue, 6 Jan 2026 10:05:00 +0100 Subject: [PATCH] Refactor and code smells --- .../imgfloat/service/GitInfoService.java | 1 + .../imgfloat/service/VersionService.java | 2 +- .../imgfloat/service/media/AssetContent.java | 9 +--- .../media/MediaOptimizationService.java | 1 - .../service/media/OptimizedAsset.java | 43 ++++++++++--------- src/main/node/app.js | 4 +- src/main/resources/static/css/styles.css | 5 +-- 7 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java b/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java index 73ac501..960366c 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; @Component public class GitInfoService { + private static final String FALLBACK_GIT_SHA = "unknown"; private static final Logger LOG = LoggerFactory.getLogger(GitInfoService.class); private static final String COMMIT_URL_PREFIX = "https://github.com/Kruhlmann/imgfloat-j/commit/"; diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java index 22c2e29..813af5d 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java @@ -1,8 +1,8 @@ package dev.kruhlmann.imgfloat.service; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.io.FileNotFoundException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java index 3aa4394..8c74c61 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/AssetContent.java @@ -4,14 +4,12 @@ import java.util.Arrays; import java.util.Objects; public record AssetContent(byte[] bytes, String mediaType) { - @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; AssetContent that = (AssetContent) o; - return Arrays.equals(bytes, that.bytes) - && Objects.equals(mediaType, that.mediaType); + return Arrays.equals(bytes, that.bytes) && Objects.equals(mediaType, that.mediaType); } @Override @@ -23,9 +21,6 @@ public record AssetContent(byte[] bytes, String mediaType) { @Override public String toString() { - return "AssetContent{" + - "bytes=" + Arrays.toString(bytes) + - ", mediaType='" + mediaType + '\'' + - '}'; + return "AssetContent{" + "bytes=" + Arrays.toString(bytes) + ", mediaType='" + mediaType + '\'' + '}'; } } diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java index e800ff5..272b730 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/MediaOptimizationService.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.file.Files; import java.util.List; -import java.util.Optional; import javax.imageio.IIOImage; import javax.imageio.ImageIO; import javax.imageio.ImageWriteParam; diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java b/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java index 492758a..7541b9f 100644 --- a/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java +++ b/src/main/java/dev/kruhlmann/imgfloat/service/media/OptimizedAsset.java @@ -3,24 +3,19 @@ package dev.kruhlmann.imgfloat.service.media; import java.util.Arrays; import java.util.Objects; -public record OptimizedAsset( - byte[] bytes, - String mediaType, - int width, - int height, - byte[] previewBytes -) { - +public record OptimizedAsset(byte[] bytes, String mediaType, int width, int height, byte[] previewBytes) { @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; OptimizedAsset that = (OptimizedAsset) o; - return width == that.width - && height == that.height - && Arrays.equals(bytes, that.bytes) - && Arrays.equals(previewBytes, that.previewBytes) - && Objects.equals(mediaType, that.mediaType); + return ( + width == that.width && + height == that.height && + Arrays.equals(bytes, that.bytes) && + Arrays.equals(previewBytes, that.previewBytes) && + Objects.equals(mediaType, that.mediaType) + ); } @Override @@ -33,12 +28,20 @@ public record OptimizedAsset( @Override public String toString() { - return "OptimizedAsset{" + - "bytes=" + Arrays.toString(bytes) + - ", mediaType='" + mediaType + '\'' + - ", width=" + width + - ", height=" + height + - ", previewBytes=" + Arrays.toString(previewBytes) + - '}'; + return ( + "OptimizedAsset{" + + "bytes=" + + Arrays.toString(bytes) + + ", mediaType='" + + mediaType + + '\'' + + ", width=" + + width + + ", height=" + + height + + ", previewBytes=" + + Arrays.toString(previewBytes) + + '}' + ); } } diff --git a/src/main/node/app.js b/src/main/node/app.js index a121674..3194824 100644 --- a/src/main/node/app.js +++ b/src/main/node/app.js @@ -1,6 +1,8 @@ +const path = require("node:path"); + const { app, BrowserWindow } = require("electron"); const { autoUpdater } = require("electron-updater"); -const path = require("path"); + const initialWindowWidthPx = 960; const initialWindowHeightPx = 640; diff --git a/src/main/resources/static/css/styles.css b/src/main/resources/static/css/styles.css index 9fb6d66..07297a4 100644 --- a/src/main/resources/static/css/styles.css +++ b/src/main/resources/static/css/styles.css @@ -1762,6 +1762,7 @@ button:disabled:hover { position: relative; padding-right: 48px !important; font-variant-numeric: tabular-nums; + -moz-appearance: textfield; } .number-input::-webkit-outer-spin-button, @@ -1770,10 +1771,6 @@ button:disabled:hover { margin: 0; } -.number-input { - -moz-appearance: textfield; -} - .number-input:focus { border-color: #7c3aed; box-shadow: 0 0 0 3px rgba(124, 58, 237, 0.25);