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

Changes getListFromCommaSeparatedStringList to reduce its responsibility
All checks were successful
KnarCraft/FFmpegConvert/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Kristian Knarvik 2020-05-12 09:50:03 +02:00
parent f59152a819
commit b78aa7eb42
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/knarcraft/ffmpegconverter/Main.java
View File

@ -111,11 +111,11 @@ class Main {
String[] subtitleLang = new String[]{"eng", "*"}; String[] subtitleLang = new String[]{"eng", "*"};
boolean toStereo = true; boolean toStereo = true;
boolean preventSigns = true; boolean preventSigns = true;
if (input.size() > 0 && ListUtil.getListFromCommaSeparatedStringList(input, 0) != null) { if (input.size() > 0 && ListUtil.getListFromCommaSeparatedString(input.get(0)) != null) {
audioLang = ListUtil.getListFromCommaSeparatedStringList(input, 0); audioLang = ListUtil.getListFromCommaSeparatedString(input.get(0));
} }
if (input.size() > 1 && ListUtil.getListFromCommaSeparatedStringList(input, 1) != null) { if (input.size() > 1 && ListUtil.getListFromCommaSeparatedString(input.get(1)) != null) {
subtitleLang = ListUtil.getListFromCommaSeparatedStringList(input, 1); subtitleLang = ListUtil.getListFromCommaSeparatedString(input.get(1));
} }
if (input.size() > 2) { if (input.size() > 2) {
toStereo = Boolean.parseBoolean(input.get(2)); toStereo = Boolean.parseBoolean(input.get(2));

15
src/main/java/net/knarcraft/ffmpegconverter/utility/ListUtil.java
View File

@ -65,18 +65,15 @@ public final class ListUtil {
/** /**
* Gets a list from a comma separated string at index in list * Gets a list from a comma separated string at index in list
* *
* @param list <p>A list of tokens.</p> * @param string <p>A string which may include commas.</p>
* @param index <p>The index of the token containing comma separated entries.</p>
* @return <p>A string list.</p> * @return <p>A string list.</p>
*/ */
public static String[] getListFromCommaSeparatedStringList(List<String> list, int index) { public static String[] getListFromCommaSeparatedString(String string) {
String[] result = null; String[] result;
if (list.size() > index) { if (string.contains(",")) {
if (list.get(index).contains(",")) { result = string.split(",");
result = list.get(index).split(",");
} else { } else {
result = new String[]{list.get(index)}; result = new String[]{string};
}
} }
return result; return result;
} }

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

@ -78,9 +78,9 @@ public class ListUtilTest {
inputList.add("some test string"); inputList.add("some test string");
inputList.add("some,test,string"); inputList.add("some,test,string");
inputList.add("some te,st string"); inputList.add("some te,st string");
String[] result1 = ListUtil.getListFromCommaSeparatedStringList(inputList, 0); String[] result1 = ListUtil.getListFromCommaSeparatedString(inputList.get(0));
String[] result2 = ListUtil.getListFromCommaSeparatedStringList(inputList, 1); String[] result2 = ListUtil.getListFromCommaSeparatedString(inputList.get(1));
String[] result3 = ListUtil.getListFromCommaSeparatedStringList(inputList, 2); String[] result3 = ListUtil.getListFromCommaSeparatedString(inputList.get(2));
assertArrayEquals(new String[]{"some test string"}, result1); assertArrayEquals(new String[]{"some test string"}, result1);
assertArrayEquals(new String[]{"some", "test", "string"}, result2); assertArrayEquals(new String[]{"some", "test", "string"}, result2);
assertArrayEquals(new String[]{"some te", "st string"}, result3); assertArrayEquals(new String[]{"some te", "st string"}, result3);