imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use environment for download link

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-06 03:21:49 +01:00
parent 7e8e3d63ef
commit e886a3600b
7 changed files with 123 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dev/kruhlmann/imgfloat/config/SystemEnvironmentValidator.java
View File

@@ -40,6 +40,12 @@ public class SystemEnvironmentValidator {
@Value("${IMGFLOAT_INITIAL_TWITCH_USERNAME_SYSADMIN:#{null}}")
private String initialSysadmin;
@Value("${IMGFLOAT_GITHUB_OWNER:#{null}}")
private String githubOwner;
@Value("${IMGFLOAT_GITHUB_REPO:#{null}}")
private String githubRepo;
private long maxUploadBytes;
private long maxRequestBytes;
@@ -70,6 +76,8 @@ public class SystemEnvironmentValidator {
checkString(twitchClientSecret, "TWITCH_CLIENT_SECRET", missing);
checkString(assetsPath, "IMGFLOAT_ASSETS_PATH", missing);
checkString(previewsPath, "IMGFLOAT_PREVIEWS_PATH", missing);
checkString(githubOwner, "IMGFLOAT_GITHUB_OWNER", missing);
checkString(githubRepo, "IMGFLOAT_GITHUB_REPO", missing);
if (!missing.isEmpty()) {
throw new IllegalStateException("Missing or invalid environment variables:\n" + missing);
@@ -84,6 +92,8 @@ public class SystemEnvironmentValidator {
log.info(" - IMGFLOAT_INITIAL_TWITCH_USERNAME_SYSADMIN: {}", initialSysadmin);
log.info(" - IMGFLOAT_ASSETS_PATH: {}", assetsPath);
log.info(" - IMGFLOAT_PREVIEWS_PATH: {}", previewsPath);
log.info(" - IMGFLOAT_GITHUB_OWNER: {}", githubOwner);
log.info(" - IMGFLOAT_GITHUB_REPO: {}", githubRepo);
}
private void checkString(String value, String name, StringBuilder missing) {

5
src/main/java/dev/kruhlmann/imgfloat/controller/ViewController.java
View File

@@ -9,6 +9,7 @@ import dev.kruhlmann.imgfloat.model.Settings;
import dev.kruhlmann.imgfloat.service.AuthorizationService;
import dev.kruhlmann.imgfloat.service.ChannelDirectoryService;
import dev.kruhlmann.imgfloat.service.GitInfoService;
import dev.kruhlmann.imgfloat.service.GithubReleaseService;
import dev.kruhlmann.imgfloat.service.SettingsService;
import dev.kruhlmann.imgfloat.service.VersionService;
import dev.kruhlmann.imgfloat.util.LogSanitizer;
@@ -29,6 +30,7 @@ public class ViewController {
private final GitInfoService gitInfoService;
private final ObjectMapper objectMapper;
private final AuthorizationService authorizationService;
private final GithubReleaseService githubReleaseService;
private final long uploadLimitBytes;
public ViewController(
@@ -38,6 +40,7 @@ public class ViewController {
GitInfoService gitInfoService,
ObjectMapper objectMapper,
AuthorizationService authorizationService,
GithubReleaseService githubReleaseService,
long uploadLimitBytes
) {
this.channelDirectoryService = channelDirectoryService;
@@ -46,6 +49,7 @@ public class ViewController {
this.gitInfoService = gitInfoService;
this.objectMapper = objectMapper;
this.authorizationService = authorizationService;
this.githubReleaseService = githubReleaseService;
this.uploadLimitBytes = uploadLimitBytes;
}
@@ -129,6 +133,7 @@ public class ViewController {
private void addVersionAttributes(Model model) {
model.addAttribute("version", versionService.getVersion());
model.addAttribute("releaseVersion", versionService.getReleaseVersion());
model.addAttribute("downloadBaseUrl", githubReleaseService.getDownloadBaseUrl());
model.addAttribute("buildCommitShort", gitInfoService.getShortCommitSha());
model.addAttribute("buildCommitUrl", gitInfoService.getCommitUrl());
}

45
src/main/java/dev/kruhlmann/imgfloat/service/GithubReleaseService.java Normal file
View File

@@ -0,0 +1,45 @@
package dev.kruhlmann.imgfloat.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@Component
public class GithubReleaseService {
private static final Logger LOG = LoggerFactory.getLogger(GithubReleaseService.class);
private final VersionService versionService;
private final String githubOwner;
private final String githubRepo;
public GithubReleaseService(
VersionService versionService,
@Value("${IMGFLOAT_GITHUB_OWNER:#{null}}") String githubOwner,
@Value("${IMGFLOAT_GITHUB_REPO:#{null}}") String githubRepo
) {
this.versionService = versionService;
this.githubOwner = githubOwner;
this.githubRepo = githubRepo;
}
public String getDownloadBaseUrl() {
validateConfiguration();
String releaseTag = versionService.getReleaseTag();
return String.format(
"https://github.com/%s/%s/releases/download/%s/",
githubOwner.trim(),
githubRepo.trim(),
releaseTag
);
}
private void validateConfiguration() {
if (!StringUtils.hasText(githubOwner) || !StringUtils.hasText(githubRepo)) {
LOG.error("GitHub download configuration is missing (owner={}, repo={})", githubOwner, githubRepo);
throw new IllegalStateException("Missing GitHub owner or repo configuration for download links");
}
}
}

59
src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
View File

@@ -2,9 +2,12 @@ package dev.kruhlmann.imgfloat.service;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -13,23 +16,38 @@ import org.springframework.stereotype.Component;
public class VersionService {
private static final Logger LOG = LoggerFactory.getLogger(VersionService.class);
private final String version;
private static final Pattern PACKAGE_VERSION_PATTERN = Pattern.compile("\"version\"\\s*:\\s*\"([^\"]+)\"");
private final String serverVersion;
private final String clientVersion;
private final String releaseVersion;
public VersionService() {
this.version = resolveVersion();
this.releaseVersion = normalizeReleaseVersion(this.version);
this.serverVersion = resolveServerVersion();
this.clientVersion = resolveClientVersion();
this.releaseVersion = normalizeReleaseVersion(this.clientVersion);
}
public String getVersion() {
return version;
return serverVersion;
}
public String getReleaseVersion() {
return releaseVersion;
}
private String resolveVersion() {
public String getReleaseTag() {
if (releaseVersion == null || releaseVersion.isBlank()) {
return "latest";
}
if ("latest".equalsIgnoreCase(releaseVersion)) {
return "latest";
}
String normalized = releaseVersion.startsWith("v") ? releaseVersion.substring(1) : releaseVersion;
return "v" + normalized;
}
private String resolveServerVersion() {
String pomVersion = getPomVersion();
if (pomVersion != null && !pomVersion.isBlank()) {
return pomVersion;
@@ -43,6 +61,15 @@ public class VersionService {
return "unknown";
}
private String resolveClientVersion() {
String packageJsonVersion = getPackageJsonVersion();
if (packageJsonVersion != null && !packageJsonVersion.isBlank()) {
return packageJsonVersion;
}
return serverVersion;
}
private String normalizeReleaseVersion(String baseVersion) {
if (baseVersion == null || baseVersion.isBlank()) {
return "latest";
@@ -131,4 +158,26 @@ public class VersionService {
}
return null;
}
private String getPackageJsonVersion() {
Path packageJsonPath = Paths.get("package.json");
if (!Files.exists(packageJsonPath) || !Files.isRegularFile(packageJsonPath)) {
return null;
}
try {
String packageJson = Files.readString(packageJsonPath, StandardCharsets.UTF_8);
Matcher matcher = PACKAGE_VERSION_PATTERN.matcher(packageJson);
if (matcher.find()) {
String version = matcher.group(1);
if (version != null && !version.isBlank()) {
return version.trim();
}
}
} catch (IOException e) {
LOG.warn("Unable to read version from package.json", e);
}
return null;
}
}

12
src/main/resources/templates/fragments/downloads.html
View File

@@ -10,9 +10,7 @@
<span class="badge soft recommended-badge hidden">Recommended</span>
</div>
<p class="muted">Apple Silicon build (ARM64)</p>
<a
class="button block"
th:href="'https://github.com/Kruhlmann/imgfloat-j/releases/download/' + ${releaseVersion} + '/Imgfloat-' + ${releaseVersion} + '-arm64.dmg'"
<a class="button block" th:href="${downloadBaseUrl + 'Imgfloat-' + releaseVersion + '-arm64.dmg'}"
>Download DMG</a
>
</div>
@@ -22,9 +20,7 @@
<span class="badge soft recommended-badge hidden">Recommended</span>
</div>
<p class="muted">Installer for Windows 10 and 11</p>
<a
class="button block"
th:href="'https://github.com/Kruhlmann/imgfloat-j/releases/download/' + ${releaseVersion} + '/Imgfloat.Setup.' + ${releaseVersion} + '.exe'"
<a class="button block" th:href="${downloadBaseUrl + 'Imgfloat-Setup-' + releaseVersion + '.exe'}"
>Download EXE</a
>
</div>
@@ -34,9 +30,7 @@
<span class="badge soft recommended-badge hidden">Recommended</span>
</div>
<p class="muted">AppImage for most distributions</p>
<a
class="button block"
th:href="'https://github.com/Kruhlmann/imgfloat-j/releases/download/' + ${releaseVersion} + '/Imgfloat-' + ${releaseVersion} + '.AppImage'"
<a class="button block" th:href="${downloadBaseUrl + 'Imgfloat-' + releaseVersion + '.AppImage'}"
>Download AppImage</a
>
</div>