AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-14 22:37:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2855: tokenize 应支持变量插值 (#2858)

Browse Source 
* Fix #2855: tokenize 应支持变量插值

* update

* update

* update

* update

* update
This commit is contained in:
Glavo 2024-02-27 21:12:51 +08:00 committed by GitHub
parent 559aefd6b6
commit 030fba4630
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 169 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@ -430,7 +430,7 @@ public class DefaultLauncher extends Launcher {
// To guarantee that when failed to generate launch command line, we will not call pre-launch command
List<String> rawCommandLine = command.commandLine.asList();
if (StringUtils.isNotBlank(options.getWrapper())) {
rawCommandLine.addAll(0, StringUtils.parseCommand(options.getWrapper(), getEnvVars()));
rawCommandLine.addAll(0, StringUtils.tokenize(options.getWrapper(), getEnvVars()));
}
if (command.tempNativeFolder != null) {
@ -452,7 +452,7 @@ public class DefaultLauncher extends Launcher {
File runDirectory = repository.getRunDirectory(version.getId());
if (StringUtils.isNotBlank(options.getPreLaunchCommand())) {
ProcessBuilder builder = new ProcessBuilder(StringUtils.parseCommand(options.getPreLaunchCommand(), getEnvVars())).directory(runDirectory);
ProcessBuilder builder = new ProcessBuilder(StringUtils.tokenize(options.getPreLaunchCommand(), getEnvVars())).directory(runDirectory);
builder.environment().putAll(getEnvVars());
SystemUtils.callExternalProcess(builder);
}
@ -683,7 +683,7 @@ public class DefaultLauncher extends Launcher {
if (StringUtils.isNotBlank(options.getPostExitCommand())) {
try {
ProcessBuilder builder = new ProcessBuilder(StringUtils.parseCommand(options.getPostExitCommand(), getEnvVars())).directory(options.getGameDir());
ProcessBuilder builder = new ProcessBuilder(StringUtils.tokenize(options.getPostExitCommand(), getEnvVars())).directory(options.getGameDir());
builder.environment().putAll(getEnvVars());
SystemUtils.callExternalProcess(builder);
} catch (Throwable e) {

88
HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
View File

@ -207,12 +207,45 @@ public final class StringUtils {
return false;
}
private static boolean isVarNameStart(char ch) {
return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_';
}
private static boolean isVarNamePart(char ch) {
return isVarNameStart(ch) || (ch >= '0' && ch <= '9');
}
private static int findVarEnd(String str, int offset) {
if (offset < str.length() - 1 && isVarNameStart(str.charAt(offset))) {
int end = offset + 1;
while (end < str.length()) {
if (!isVarNamePart(str.charAt(end))) {
break;
}
end++;
}
return end;
}
return -1;
}
public static List<String> tokenize(String str) {
return tokenize(str, null);
}
public static List<String> tokenize(String str, Map<String, String> vars) {
if (isBlank(str)) {
return new ArrayList<>();
} else {
}
if (vars == null) {
vars = Collections.emptyMap();
}
// Split the string with ' and space cleverly.
ArrayList<String> parts = new ArrayList<>();
int varEnd;
boolean hasValue = false;
StringBuilder current = new StringBuilder(str.length());
@ -234,9 +267,18 @@ public final class StringUtils {
c = str.charAt(i++);
if (c == '"') {
break;
} else if (c == '\\' && i < str.length()) {
} else if (c == '`' && i < str.length()) {
c = str.charAt(i++);
switch (c) {
case 'a':
c = '\u0007';
break;
case 'b':
c = '\b';
break;
case 'f':
c = '\f';
break;
case 'n':
c = '\n';
break;
@ -249,11 +291,18 @@ public final class StringUtils {
case 'v':
c = '\u000b';
break;
case 'a':
c = '\u0007';
break;
}
current.append(c);
} else if (c == '$' && (varEnd = findVarEnd(str, i)) >= 0) {
String key = str.substring(i, varEnd);
String value = vars.get(key);
if (value != null) {
current.append(value);
} else {
current.append('$').append(key);
}
i = varEnd;
} else {
current.append(c);
}
@ -265,6 +314,17 @@ public final class StringUtils {
hasValue = false;
}
i++;
} else if (c == '$' && (varEnd = findVarEnd(str, i + 1)) >= 0) {
hasValue = true;
String key = str.substring(i + 1, varEnd);
String value = vars.get(key);
if (value != null) {
current.append(value);
} else {
current.append('$').append(key);
}
i = varEnd;
} else {
hasValue = true;
current.append(c);
@ -277,24 +337,6 @@ public final class StringUtils {
return parts;
}
}
public static List<String> parseCommand(String command, Map<String, String> env) {
StringBuilder stringBuilder = new StringBuilder(command);
for (Map.Entry<String, String> entry : env.entrySet()) {
String key = "$" + entry.getKey();
int i = 0;
while (true) {
i = stringBuilder.indexOf(key, i);
if (i == -1) {
break;
}
stringBuilder.replace(i, i + key.length(), entry.getValue());
}
}
return tokenize(stringBuilder.toString());
}
public static String parseColorEscapes(String original) {
if (original.indexOf('\u00A7') < 0)

67
HMCLCore/src/test/java/org/jackhuang/hmcl/util/TokenizerTest.java
View File

@ -1,40 +1,61 @@
package org.jackhuang.hmcl.util;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
public class TokenizerTest {
private void test(String source, String... expected) {
Assertions.assertEquals(Arrays.asList(expected), StringUtils.tokenize(source));
}
import static org.junit.jupiter.api.Assertions.assertEquals;
public final class TokenizerTest {
@Test
public void textTokenizer() {
test(
"\"C:/Program Files/Bellsoft/JDK-11/bin.java.exe\" -version \"a.b.c\" something else",
"C:/Program Files/Bellsoft/JDK-11/bin.java.exe", "-version", "a.b.c", "something", "else"
assertEquals(
Arrays.asList("C:/Program Files/Bellsoft/JDK-11/bin.java.exe", "-version", "a.b.c", "something", "else"),
StringUtils.tokenize("\"C:/Program Files/Bellsoft/JDK-11/bin.java.exe\" -version \"a.b.c\" something else")
);
test(
"\"Another\"Text something else",
"AnotherText", "something", "else"
assertEquals(
Arrays.asList("AnotherText", "something", "else"),
StringUtils.tokenize("\"Another\"Text something else")
);
test(
"Text without quote",
"Text", "without", "quote"
assertEquals(
Arrays.asList("Text", "without", "quote"),
StringUtils.tokenize("Text without quote")
);
test(
"Text with multiple spaces",
"Text", "with", "multiple", "spaces"
assertEquals(
Arrays.asList("Text", "with", "multiple", "spaces"),
StringUtils.tokenize("Text with multiple spaces")
);
test(
"Text with empty part ''",
"Text", "with", "empty", "part", ""
assertEquals(
Arrays.asList("Text", "with", "empty", "part", ""),
StringUtils.tokenize("Text with empty part ''")
);
test(
"head\"abc\\n\\\\\\\"\"end",
"headabc\n\\\"end"
assertEquals(
Arrays.asList("headabc\n`\"$end"),
StringUtils.tokenize("head\"abc`n```\"\"$end")
);
String instName = "1.20.4";
String instDir = "C:\\Program Files (x86)\\Minecraft\\";
Map<String, String> env = new HashMap<>();
env.put("INST_NAME", instName);
env.put("INST_DIR", instDir);
env.put("EMPTY", "");
assertEquals(
Arrays.asList("cd", instDir),
StringUtils.tokenize("cd $INST_DIR", env)
);
assertEquals(
Arrays.asList("Text", "with", "empty", "part", ""),
StringUtils.tokenize("Text with empty part $EMPTY", env)
);
assertEquals(
Arrays.asList("head", "1.20.4", "$UNKNOWN", instDir, "", instDir + instName + "$UNKNOWN" + instDir + "$INST_DIR\n$UNKNOWN $$"),
StringUtils.tokenize("head $INST_NAME $UNKNOWN $INST_DIR $EMPTY $INST_DIR$INST_NAME$UNKNOWN\"$INST_DIR`$INST_DIR`n$UNKNOWN $EMPTY$\"$", env)
);
}
}