j62
/
ctbrec
2
2
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases 3 Wiki Activity

Fix one directory per group

This commit is contained in:
0xb00bface 2023-11-15 22:22:16 +01:00
parent 0bd2ad6a4b
commit 41d32ad681
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
5.2.3
========================
* Fix one directory per group
5.2.2 5.2.2
======================== ========================
* Fix: MyFreeCams model state updates * Fix: MyFreeCams model state updates

15
common/src/main/java/ctbrec/Config.java
View File

@ -277,6 +277,9 @@ public class Config {
case ONE_PER_MODEL -> { case ONE_PER_MODEL -> {
return new File(getSettings().recordingsDir, model.getSanitizedNamed()); return new File(getSettings().recordingsDir, model.getSanitizedNamed());
} }
case ONE_PER_GROUP -> {
return new File(getSettings().recordingsDir, getGroupOrModelName(model));
}
case ONE_PER_RECORDING -> { case ONE_PER_RECORDING -> {
File modelDir = new File(getSettings().recordingsDir, model.getSanitizedNamed()); File modelDir = new File(getSettings().recordingsDir, model.getSanitizedNamed());
return new File(modelDir, formattedDate); return new File(modelDir, formattedDate);
@ -287,6 +290,18 @@ public class Config {
} }
} }
private String getGroupOrModelName(Model model) {
try {
Optional<ModelGroup> modelGroup = getSettings().modelGroups.stream().filter(mg -> mg.getModelUrls().contains(model.getUrl())).findFirst();
if (modelGroup.isPresent()) {
return modelGroup.get().getName().replaceAll("[^a-zA-Z0-9.-]", "_");
}
} catch (Exception ex) {
// Nothing
}
return model.getSanitizedNamed();
}
public String getServerUrl() { public String getServerUrl() {
String scheme = getSettings().transportLayerSecurity ? "https" : "http"; String scheme = getSettings().transportLayerSecurity ? "https" : "http";
int port = getSettings().httpPort; int port = getSettings().httpPort;