KnarCraft/FFmpegConvert
KnarCraft/FFmpegConvert
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Changes the parser to allow argument shorthands of any length

Browse Source
This commit is contained in:
Kristian Knarvik 2021-01-25 22:05:57 +01:00
parent 1e3544f793
commit a0b5b65054
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/knarcraft/ffmpegconverter/utility/Parser.java
View File

@ -56,8 +56,8 @@ public final class Parser {
String argumentName = currentToken.substring(2); String argumentName = currentToken.substring(2);
foundArguments = ListUtil.getMatching(converterArguments, (item) -> item.getName().equals(argumentName)); foundArguments = ListUtil.getMatching(converterArguments, (item) -> item.getName().equals(argumentName));
} else if (currentToken.startsWith("-")) { } else if (currentToken.startsWith("-")) {
char argumentShorthand = currentToken.substring(1).charAt(0); String argumentShorthand = currentToken.substring(1);
foundArguments = ListUtil.getMatching(converterArguments, (item) -> item.getShorthand() == argumentShorthand); foundArguments = ListUtil.getMatching(converterArguments, (item) -> item.getShorthand().equals(argumentShorthand));
} else { } else {
throw new IllegalArgumentException("Unexpected value when not given an argument."); throw new IllegalArgumentException("Unexpected value when not given an argument.");
} }

6
src/test/java/net/knarcraft/ffmpegconverter/utility/ParserTest.java
View File

@ -18,9 +18,9 @@ public class ParserTest {
@Before @Before
public void setUp() { public void setUp() {
validArguments = new ArrayList<>(); validArguments = new ArrayList<>();
validArguments.add(new ConverterArgument("anargument", 'a', true, ConverterArgumentValue.STRING)); validArguments.add(new ConverterArgument("anargument", "a", true, ConverterArgumentValue.STRING));
validArguments.add(new ConverterArgument("turnoff", 't', false, ConverterArgumentValue.BOOLEAN)); validArguments.add(new ConverterArgument("turnoff", "t", false, ConverterArgumentValue.BOOLEAN));
validArguments.add(new ConverterArgument("turnon", 'o', false, ConverterArgumentValue.BOOLEAN)); validArguments.add(new ConverterArgument("turnon", "o", false, ConverterArgumentValue.BOOLEAN));
} }
@Test @Test