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

Refacor gitinfo service

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-06 09:55:35 +01:00
parent e2d3b0975c
commit 580119d97b
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/dev/kruhlmann/imgfloat/service/ChannelDirectoryService.java
View File

@@ -44,10 +44,9 @@ public class ChannelDirectoryService {
private final MediaDetectionService mediaDetectionService; private final MediaDetectionService mediaDetectionService;
private final MediaOptimizationService mediaOptimizationService; private final MediaOptimizationService mediaOptimizationService;
private final SettingsService settingsService; private final SettingsService settingsService;
private final long uploadLimitBytes;
@Autowired @Autowired
private long uploadLimitBytes;
public ChannelDirectoryService( public ChannelDirectoryService(
ChannelRepository channelRepository, ChannelRepository channelRepository,
AssetRepository assetRepository, AssetRepository assetRepository,
@@ -55,7 +54,8 @@ public class ChannelDirectoryService {
AssetStorageService assetStorageService, AssetStorageService assetStorageService,
MediaDetectionService mediaDetectionService, MediaDetectionService mediaDetectionService,
MediaOptimizationService mediaOptimizationService, MediaOptimizationService mediaOptimizationService,
SettingsService settingsService SettingsService settingsService,
long uploadLimitBytes
) { ) {
this.channelRepository = channelRepository; this.channelRepository = channelRepository;
this.assetRepository = assetRepository; this.assetRepository = assetRepository;
@@ -64,6 +64,7 @@ public class ChannelDirectoryService {
this.mediaDetectionService = mediaDetectionService; this.mediaDetectionService = mediaDetectionService;
this.mediaOptimizationService = mediaOptimizationService; this.mediaOptimizationService = mediaOptimizationService;
this.settingsService = settingsService; this.settingsService = settingsService;
this.uploadLimitBytes = uploadLimitBytes;
} }
public Channel getOrCreateChannel(String broadcaster) { public Channel getOrCreateChannel(String broadcaster) {
@@ -154,8 +155,10 @@ public class ChannelDirectoryService {
.orElse("asset_" + System.currentTimeMillis()); .orElse("asset_" + System.currentTimeMillis());
boolean isAudio = optimized.mediaType().startsWith("audio/"); boolean isAudio = optimized.mediaType().startsWith("audio/");
double width = optimized.width() > 0 ? optimized.width() : isAudio ? 400 : 640; double defaultWidth = isAudio ? 400 : 640;
double height = optimized.height() > 0 ? optimized.height() : isAudio ? 80 : 360; double defaultHeight = isAudio ? 80 : 360;
double width = optimized.width() > 0 ? optimized.width() : defaultWidth;
double height = optimized.height() > 0 ? optimized.height() : defaultHeight;
Asset asset = new Asset(channel.getBroadcaster(), safeName, "", width, height); Asset asset = new Asset(channel.getBroadcaster(), safeName, "", width, height);
asset.setOriginalMediaType(mediaType); asset.setOriginalMediaType(mediaType);

8
src/main/java/dev/kruhlmann/imgfloat/service/GitInfoService.java
View File

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class GitInfoService { public class GitInfoService {
private static final String FALLBACK_GIT_SHA = "unknown";
private static final Logger LOG = LoggerFactory.getLogger(GitInfoService.class); private static final Logger LOG = LoggerFactory.getLogger(GitInfoService.class);
private static final String COMMIT_URL_PREFIX = "https://github.com/Kruhlmann/imgfloat-j/commit/"; private static final String COMMIT_URL_PREFIX = "https://github.com/Kruhlmann/imgfloat-j/commit/";
@@ -46,7 +46,7 @@ public class GitInfoService {
} }
public String getCommitUrl() { public String getCommitUrl() {
if (commitSha == null || commitSha.isBlank() || "unknown".equalsIgnoreCase(commitSha)) { if (commitSha == null || commitSha.isBlank() || FALLBACK_GIT_SHA.equalsIgnoreCase(commitSha)) {
return null; return null;
} }
return COMMIT_URL_PREFIX + commitSha; return COMMIT_URL_PREFIX + commitSha;
@@ -118,9 +118,9 @@ public class GitInfoService {
private String defaultValue(String value) { private String defaultValue(String value) {
if (value == null || value.isBlank()) { if (value == null || value.isBlank()) {
return "unknown"; return FALLBACK_GIT_SHA;
} }
return "unknown".equalsIgnoreCase(value) ? "unknown" : value; return value;
} }
private record CommitInfo(String fullSha, String shortSha) {} private record CommitInfo(String fullSha, String shortSha) {}