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

Replace default value syntax with orElse function

This commit is contained in:
0xb00bface 2023-02-19 17:29:07 +01:00
parent af7c36c65a
commit 9e82b61df7
10 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/antlr4/ctbrec/variableexpansion/antlr/PostProcessing.g4
View File

@ -7,9 +7,7 @@ functionCall: '$' identifier '(' (expression (',' expression)*)? ')';
text: CH+?;
identifier: CH+?;
parameter: text;
variable: '${' identifier ('(' parameter ')')? ('?' expression)? '}';
variable: '${' identifier '}';
expression
: text

2
common/src/main/java/ctbrec/Settings.java
View File

@ -66,7 +66,7 @@ public class Settings {
public int defaultPriority = 50;
public boolean determineResolution = false;
public List<String> disabledSites = new ArrayList<>();
public String downloadFilename = "${modelSanitizedName}-${localDateTime}";
public String downloadFilename = "${modelSanitizedName}-$format(${localDateTime})";
public List<EventHandlerConfiguration> eventHandlers = new ArrayList<>();
public boolean eventsSuspended = false;
public boolean fastScrollSpeed = true;

14
common/src/main/java/ctbrec/recorder/postprocessing/Move.java
View File

@ -1,22 +1,22 @@
package ctbrec.recorder.postprocessing;
import static ctbrec.io.IoUtils.*;
import ctbrec.Recording;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Objects;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ctbrec.Recording;
import static ctbrec.io.IoUtils.deleteEmptyParents;
public class Move extends AbstractPlaceholderAwarePostProcessor {
private static final Logger LOG = LoggerFactory.getLogger(Move.class);
public static final String PATH_TEMPLATE = "path.template";
public static final String DEFAULT = "${modelSanitizedName}" + File.separatorChar + "${localDateTime}";
public static final String DEFAULT = "${modelSanitizedName}" + File.separatorChar + "$format(${localDateTime})";
@Override
public String getName() {

14
common/src/main/java/ctbrec/recorder/postprocessing/Rename.java
View File

@ -1,20 +1,20 @@
package ctbrec.recorder.postprocessing;
import ctbrec.Recording;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ctbrec.Recording;
public class Rename extends AbstractPlaceholderAwarePostProcessor {
private static final Logger LOG = LoggerFactory.getLogger(Rename.class);
public static final String FILE_NAME_TEMPLATE = "filename.template";
public static final String DEFAULT = "${modelSanitizedName}_${localDateTime}.${fileSuffix}";
public static final String DEFAULT_DIR = "${modelSanitizedName}_${localDateTime}";
public static final String DEFAULT = "${modelSanitizedName}_$format(${localDateTime}).${fileSuffix}";
public static final String DEFAULT_DIR = "${modelSanitizedName}_$format(${localDateTime})";
@Override
public String getName() {

7
common/src/main/java/ctbrec/variableexpansion/ParserVisitor.java
View File

@ -22,6 +22,7 @@ public class ParserVisitor extends PostProcessingBaseVisitor<String> {
functions.put("format", new Format());
functions.put("capitalize", new Capitalize());
functions.put("sanitize", new Sanitize());
functions.put("orElse", new OrElse());
}
@Override
@ -44,11 +45,7 @@ public class ParserVisitor extends PostProcessingBaseVisitor<String> {
if (value != null && value.isPresent()) { // NOSONAR
return value.get().toString();
} else {
if (ctx.expression() != null) {
return visitExpression(ctx.expression());
} else {
return "";
}
return "";
}
}

7
common/src/main/java/ctbrec/variableexpansion/functions/Format.java
View File

@ -4,6 +4,7 @@ import ctbrec.variableexpansion.VarArgsFunction;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Optional;
public class Format implements VarArgsFunction<Object, String> {
@ -16,7 +17,11 @@ public class Format implements VarArgsFunction<Object, String> {
}
ZonedDateTime zdt;
if (p[0] instanceof String date) {
zdt = ZonedDateTime.parse(date);
try {
zdt = ZonedDateTime.parse(date);
} catch (DateTimeParseException e) {
return "";
}
} else {
zdt = (ZonedDateTime) p[0];
}

22
common/src/main/java/ctbrec/variableexpansion/functions/OrElse.java Normal file
View File

@ -0,0 +1,22 @@
package ctbrec.variableexpansion.functions;
import ctbrec.StringUtil;
import ctbrec.variableexpansion.VarArgsFunction;
import java.util.Optional;
public class OrElse implements VarArgsFunction<Object, String> {
@Override
public String apply(Object... params) {
if (params.length < 2) {
throw new IllegalArgumentException("OrElse needs two parameters");
}
Optional<String> result = Optional.ofNullable(params[0]).map(String::valueOf);
if (result.isPresent() && StringUtil.isNotBlank(result.get())) {
return result.get();
} else {
return String.valueOf(params[1]);
}
}
}

10
common/src/test/java/ctbrec/recorder/postprocessing/AbstractPlaceholderAwarePostProcessorTest.java
View File

@ -137,20 +137,20 @@ class AbstractPlaceholderAwarePostProcessorTest extends AbstractPpTest {
@Test
void testPlaceholderDefaultValues() {
String input = "asdf_${modelGroupName?${modelSanitizedName?anonymous}}_asdf";
String input = "asdf_$orElse(${modelGroupName},$orElse(${modelSanitizedName},anonymous))_asdf";
PostProcessingContext ctx = createPostProcessingContext(rec, null, config);
ctx.getRecording().getModel().setName(null);
assertEquals("asdf_anonymous_asdf", placeHolderAwarePp.fillInPlaceHolders(input, ctx));
input = "asdf_${modelGroupName?$format(${utcDateTime},yyyy)}_asdf";
input = "asdf_$orElse(${modelGroupName},$format(${utcDateTime},yyyy))_asdf";
int year = LocalDate.now().getYear();
assertEquals("asdf_" + year + "_asdf", placeHolderAwarePp.fillInPlaceHolders(input, ctx));
ctx.getRecording().setStartDate(null);
input = "asdf_${modelGroupName?${utcDateTime(yyyy)?anonymous}}_asdf";
input = "asdf_$orElse(${modelGroupName},$orElse($format(${utcDateTime},yyyy),anonymous))_asdf";
assertEquals("asdf_anonymous_asdf", placeHolderAwarePp.fillInPlaceHolders(input, ctx));
input = "asdf_${modelGroupName?${utcDateTime?anonymous}}_asdf";
input = "asdf_$orElse(${modelGroupName},$orElse($format(${utcDateTime}),anonymous))_asdf";
assertEquals("asdf_anonymous_asdf", placeHolderAwarePp.fillInPlaceHolders(input, ctx));
}
@ -166,7 +166,7 @@ class AbstractPlaceholderAwarePostProcessorTest extends AbstractPpTest {
String input = "$upper(${modelName})";
assertEquals("MOCKITA BOOBILICIOUS", placeHolderAwarePp.fillInPlaceHolders(input, createPostProcessingContext(rec, null, config)));
input = "$upper(${doesNotExist?mockita boobilicious})";
input = "$upper($orElse(${doesNotExist},mockita boobilicious))";
assertEquals("MOCKITA BOOBILICIOUS", placeHolderAwarePp.fillInPlaceHolders(input, createPostProcessingContext(rec, null, config)));
}
}

34
common/src/test/java/ctbrec/recorder/postprocessing/AbstractPpTest.java
View File

@ -1,21 +1,5 @@
package ctbrec.recorder.postprocessing;
import static java.nio.charset.StandardCharsets.*;
import static java.nio.file.StandardOpenOption.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Instant;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.MockedStatic;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.Recording;
@ -24,6 +8,20 @@ import ctbrec.recorder.Recorder;
import ctbrec.recorder.RecordingManager;
import ctbrec.sites.Site;
import ctbrec.sites.chaturbate.Chaturbate;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.mockito.MockedStatic;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Instant;
import static java.nio.file.StandardOpenOption.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
public abstract class AbstractPpTest {
Path baseDir;
@ -46,8 +44,8 @@ public abstract class AbstractPpTest {
originalDir = new File(recDir.toFile(), "original");
postProcessedDir = new File(recDir.toFile(), "postProcessed");
Files.createDirectories(original.getParentFile().toPath());
Files.write(original.toPath(), "foobar".getBytes(UTF_8), CREATE_NEW, WRITE, TRUNCATE_EXISTING);
Files.write(postProcessed.toPath(), "foobar".getBytes(UTF_8), CREATE_NEW, WRITE, TRUNCATE_EXISTING);
Files.writeString(original.toPath(), "foobar", CREATE_NEW, WRITE, TRUNCATE_EXISTING);
Files.writeString(postProcessed.toPath(), "foobar", CREATE_NEW, WRITE, TRUNCATE_EXISTING);
Files.createDirectories(originalDir.toPath());
FileUtils.touch(new File(originalDir, "playlist.m3u8"));
}

17
common/src/test/java/ctbrec/recorder/postprocessing/RenameSingleFileTest.java
View File

@ -1,18 +1,17 @@
package ctbrec.recorder.postprocessing;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.Recording;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
import ctbrec.Config;
import ctbrec.Model;
import ctbrec.Recording;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
class RenameSingleFileTest extends AbstractPpTest {
@ -68,6 +67,6 @@ class RenameSingleFileTest extends AbstractPpTest {
assertEquals("rename", pp.toString());
pp.getConfig().put(Rename.FILE_NAME_TEMPLATE, Rename.DEFAULT);
assertEquals("rename [${modelSanitizedName}_${localDateTime}.${fileSuffix}]", pp.toString());
assertEquals("rename [" + Rename.DEFAULT + "]", pp.toString());
}
}