From 91b1572672f1f328be678612757ee2af564af06b Mon Sep 17 00:00:00 2001 From: Jafea7 Date: Sun, 4 May 2025 21:15:22 +1000 Subject: [PATCH] Move 'portraits' to parent of version config directory --- .../main/java/ctbrec/ui/action/AbstractPortraitAction.java | 2 +- common/src/main/java/ctbrec/image/LocalPortraitStore.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/action/AbstractPortraitAction.java b/client/src/main/java/ctbrec/ui/action/AbstractPortraitAction.java index f9aeef04..ad2ef769 100644 --- a/client/src/main/java/ctbrec/ui/action/AbstractPortraitAction.java +++ b/client/src/main/java/ctbrec/ui/action/AbstractPortraitAction.java @@ -37,7 +37,7 @@ public abstract class AbstractPortraitAction { protected File getPortraitFile(String portraitId) { File configDir = Config.getInstance().getConfigDir(); - File portraitDir = new File(configDir, "portraits"); + File portraitDir = new File(configDir.getParent(), "portraits"); File output = new File(portraitDir, portraitId + '.' + FORMAT); return output; } diff --git a/common/src/main/java/ctbrec/image/LocalPortraitStore.java b/common/src/main/java/ctbrec/image/LocalPortraitStore.java index 1f8bb5bb..de7eada9 100644 --- a/common/src/main/java/ctbrec/image/LocalPortraitStore.java +++ b/common/src/main/java/ctbrec/image/LocalPortraitStore.java @@ -22,7 +22,7 @@ public record LocalPortraitStore(Config config) implements PortraitStore { public Optional loadModelPortraitById(String portraitId) { if (StringUtil.isNotBlank(portraitId)) { File configDir = config.getConfigDir(); - File portraitDir = new File(configDir, "portraits"); + File portraitDir = new File(configDir.getParent(), "portraits"); File portraitFile = new File(portraitDir, portraitId + '.' + FORMAT); try { return Optional.of(Files.readAllBytes(portraitFile.toPath())); @@ -53,7 +53,7 @@ public record LocalPortraitStore(Config config) implements PortraitStore { private File getPortraitFile(String portraitId) throws IOException { File configDir = config.getConfigDir(); - File portraitDir = new File(configDir, "portraits"); + File portraitDir = new File(configDir.getParent(), "portraits"); Files.createDirectories(portraitDir.toPath()); return new File(portraitDir, portraitId + '.' + FORMAT); }