Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix schem file filters

Browse Source
This commit is contained in:
Jesse Boyd 2018-04-18 09:00:40 +10:00
parent 5298c5401f
commit bd346bc4c5
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
View File

@ -697,7 +697,9 @@ public class UtilityCommands extends MethodCommands {
m.send(actor); m.send(actor);
} }
protected static int getFiles(File dir, Actor actor, CommandContext args, @Range(min = 0) int page, int perPage, String formatName, boolean playerFolder, Consumer<File> forEachFile) { public static int getFiles(File dir, Actor actor, CommandContext args, @Range(min = 0) int page, int perPage, String formatName, boolean playerFolder, Consumer<File> forEachFile) {
Consumer<File> rootFunction = forEachFile;
int len = args.argsLength(); int len = args.argsLength();
List<String> filters = new ArrayList<>(); List<String> filters = new ArrayList<>();
@ -765,6 +767,16 @@ public class UtilityCommands extends MethodCommands {
return true; return true;
}; };
List<File> toFilter = new ArrayList<>();
if (!filters.isEmpty()) {
forEachFile = new DelegateConsumer<File>(forEachFile) {
@Override
public void accept(File file) {
toFilter.add(file);
}
};
}
if (formatName != null) { if (formatName != null) {
final ClipboardFormat cf = ClipboardFormat.findByAlias(formatName); final ClipboardFormat cf = ClipboardFormat.findByAlias(formatName);
forEachFile = new DelegateConsumer<File>(forEachFile) { forEachFile = new DelegateConsumer<File>(forEachFile) {
@ -781,7 +793,6 @@ public class UtilityCommands extends MethodCommands {
} }
}; };
} }
if (playerFolder) { if (playerFolder) {
if (listMine) { if (listMine) {
File playerDir = new File(dir, actor.getUniqueId() + dirFilter); File playerDir = new File(dir, actor.getUniqueId() + dirFilter);
@ -807,6 +818,10 @@ public class UtilityCommands extends MethodCommands {
File rel = new File(dir, dirFilter); File rel = new File(dir, dirFilter);
if (rel.exists()) allFiles(rel.listFiles(), false, forEachFile); if (rel.exists()) allFiles(rel.listFiles(), false, forEachFile);
} }
if (!filters.isEmpty() && !toFilter.isEmpty()) {
List<File> result = filter(toFilter, filters);
for (File file : result) rootFunction.accept(file);
}
return page; return page;
} }
@ -850,7 +865,7 @@ public class UtilityCommands extends MethodCommands {
return fileList; return fileList;
} }
private static void allFiles(File[] files, boolean recursive, Consumer<File> task) { public static void allFiles(File[] files, boolean recursive, Consumer<File> task) {
if (files == null || files.length == 0) return; if (files == null || files.length == 0) return;
for (File f : files) { for (File f : files) {
if (f.isDirectory()) { if (f.isDirectory()) {