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

Minor optimizations

This commit is contained in:
Reinhard Pointner 2016-10-17 16:55:15 +08:00
parent 6da827f0ad
commit 803413fb01
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/net/filebot/util/FileUtilities.java
View File

@ -473,12 +473,12 @@ public final class FileUtilities {
return listFiles(folders, FILE_WALK_MAX_DEPTH, FOLDERS, order); return listFiles(folders, FILE_WALK_MAX_DEPTH, FOLDERS, order);
} }
public static List<File> listFiles(Iterable<File> folders, int maxDepth, FileFilter filter, Comparator<File> order) { public static List<File> listFiles(Iterable<File> folders, int depth, FileFilter filter, Comparator<File> order) {
List<File> sink = new ArrayList<File>(); List<File> sink = new ArrayList<File>();
for (File it : folders) { for (File it : folders) {
if (it.isDirectory()) { if (it.isDirectory()) {
listFiles(it, sink, 0, maxDepth, filter, order); listFiles(it, sink, depth, filter, order);
} }
if (filter.accept(it)) { if (filter.accept(it)) {
@ -489,19 +489,17 @@ public final class FileUtilities {
return sink; return sink;
} }
private static void listFiles(File folder, List<File> sink, int depth, int maxDepth, FileFilter filter, Comparator<File> order) { private static void listFiles(File folder, List<File> sink, int depth, FileFilter filter, Comparator<File> order) {
if (depth > maxDepth) { if (depth < 0) {
return; return;
} }
for (File it : getChildren(folder, NOT_HIDDEN, order)) { for (File it : getChildren(folder, f -> !f.isHidden() && (f.isDirectory() || filter.accept(f)), order)) {
if (it.isDirectory()) { if (it.isDirectory()) {
listFiles(it, sink, depth + 1, maxDepth, filter, order); listFiles(it, sink, depth - 1, filter, order);
} }
if (filter.accept(it)) { sink.add(it);
sink.add(it);
}
} }
} }