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

Pass Closure as FileFilter

This commit is contained in:
Reinhard Pointner 2016-10-16 01:11:53 +08:00
parent 618832f092
commit e119d00b52
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/net/filebot/cli/ScriptShellMethods.java
View File

@ -9,6 +9,7 @@ import static net.filebot.media.XattrMetaInfo.*;
import static net.filebot.util.FileUtilities.*; import static net.filebot.util.FileUtilities.*;
import java.io.File; import java.io.File;
import java.io.FileFilter;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -25,6 +26,7 @@ import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import groovy.lang.Closure; import groovy.lang.Closure;
import groovy.lang.Range; import groovy.lang.Range;
@ -77,7 +79,7 @@ public class ScriptShellMethods {
} }
public static List<File> listFiles(File self, Closure<?> closure) { public static List<File> listFiles(File self, Closure<?> closure) {
return DefaultGroovyMethods.findAll(FileUtilities.getChildren(self), closure); return FileUtilities.getChildren(self, (FileFilter) DefaultTypeTransformation.castToType(closure, FileFilter.class), null);
} }
public static boolean isVideo(File self) { public static boolean isVideo(File self) {
@ -117,7 +119,7 @@ public class ScriptShellMethods {
} }
public static boolean hasFile(File self, Closure<?> closure) { public static boolean hasFile(File self, Closure<?> closure) {
return DefaultGroovyMethods.find(FileUtilities.getChildren(self), closure) != null; return listFiles(self, closure).size() > 0;
} }
public static List<File> listTree(File self, int maxDepth) { public static List<File> listTree(File self, int maxDepth) {