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

Resolve relative files against $HOME

This commit is contained in:
Reinhard Pointner 2016-11-11 19:07:00 +08:00
parent 5dd26ba347
commit 020aa5e10b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package net.filebot.format; package net.filebot.format;
import static java.util.Collections.*;
import static java.util.stream.Collectors.*; import static java.util.stream.Collectors.*;
import static net.filebot.Settings.*;
import static net.filebot.util.RegularExpressions.*; import static net.filebot.util.RegularExpressions.*;
import java.io.File; import java.io.File;
@ -14,6 +16,8 @@ import java.util.stream.Stream;
import groovy.lang.Closure; import groovy.lang.Closure;
import groovy.util.XmlSlurper; import groovy.util.XmlSlurper;
import net.filebot.ApplicationFolder;
import net.filebot.mac.MacAppUtilities;
import net.filebot.util.FileUtilities; import net.filebot.util.FileUtilities;
/** /**
@ -76,11 +80,25 @@ public class ExpressionFormatFunctions {
} }
public static List<String> readLines(String path) throws IOException { public static List<String> readLines(String path) throws IOException {
return FileUtilities.readLines(new File(path)); return FileUtilities.readLines(getFile(path));
} }
public static Object readXml(String path) throws Exception { public static Object readXml(String path) throws Exception {
return new XmlSlurper().parse(new File(path)); return new XmlSlurper().parse(getFile(path));
}
public static File getFile(String path) {
File f = new File(path);
if (!f.isAbsolute()) {
f = ApplicationFolder.UserHome.resolve(path);
}
if (isMacSandbox()) {
MacAppUtilities.askUnlockFolders(null, singleton(f));
}
return f;
} }
} }