mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quotes work different in bash and PowerShell and there is no way of quoting strings that work for both

This commit is contained in:
Reinhard Pointner 2017-02-27 20:07:28 +08:00
parent e902d999cd
commit 3415e31a2c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/net/filebot/format/ExpressionFormatFunctions.java
View File

@ -14,6 +14,8 @@ import java.util.Objects;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Stream; import java.util.stream.Stream;
import com.sun.jna.Platform;
import groovy.lang.Closure; import groovy.lang.Closure;
import groovy.util.XmlSlurper; import groovy.util.XmlSlurper;
import net.filebot.ApplicationFolder; import net.filebot.ApplicationFolder;
@ -59,9 +61,15 @@ public class ExpressionFormatFunctions {
} }
public static String quote(Object c1, Object... cN) { public static String quote(Object c1, Object... cN) {
String q = String.valueOf('"'); return Platform.isWindows() ? quote_ps(c1, cN) : quote_sh(c1, cN);
String r = "\\" + q; }
return stream(c1, null, cN).map(Objects::toString).map(s -> q + s.replace(q, r) + q).collect(joining(" "));
public static String quote_sh(Object c1, Object... cN) {
return stream(c1, null, cN).map(Objects::toString).map(s -> "'" + s.replace("'", "'\"'\"'") + "'").collect(joining(" "));
}
public static String quote_ps(Object c1, Object... cN) {
return stream(c1, null, cN).map(Objects::toString).map(s -> "@'\n" + s + "\n'@").collect(joining(" "));
} }
public static Map<String, String> csv(Object path) throws IOException { public static Map<String, String> csv(Object path) throws IOException {