jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move 'portraits' to parent of version config directory

This commit is contained in:
Jafea7 2025-05-04 21:15:22 +10:00
parent a78c9f182b
commit 49633d294c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/ctbrec/ui/action/AbstractPortraitAction.java
View File

@ -37,7 +37,7 @@ public abstract class AbstractPortraitAction {
protected File getPortraitFile(String portraitId) { protected File getPortraitFile(String portraitId) {
File configDir = Config.getInstance().getConfigDir(); 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); File output = new File(portraitDir, portraitId + '.' + FORMAT);
return output; return output;
} }

4
common/src/main/java/ctbrec/image/LocalPortraitStore.java
View File

@ -22,7 +22,7 @@ public record LocalPortraitStore(Config config) implements PortraitStore {
public Optional<byte[]> loadModelPortraitById(String portraitId) { public Optional<byte[]> loadModelPortraitById(String portraitId) {
if (StringUtil.isNotBlank(portraitId)) { if (StringUtil.isNotBlank(portraitId)) {
File configDir = config.getConfigDir(); File configDir = config.getConfigDir();
File portraitDir = new File(configDir, "portraits"); File portraitDir = new File(configDir.getParent(), "portraits");
File portraitFile = new File(portraitDir, portraitId + '.' + FORMAT); File portraitFile = new File(portraitDir, portraitId + '.' + FORMAT);
try { try {
return Optional.of(Files.readAllBytes(portraitFile.toPath())); 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 { private File getPortraitFile(String portraitId) throws IOException {
File configDir = config.getConfigDir(); File configDir = config.getConfigDir();
File portraitDir = new File(configDir, "portraits"); File portraitDir = new File(configDir.getParent(), "portraits");
Files.createDirectories(portraitDir.toPath()); Files.createDirectories(portraitDir.toPath());
return new File(portraitDir, portraitId + '.' + FORMAT); return new File(portraitDir, portraitId + '.' + FORMAT);
} }