Skip to content

add a flag to filter the schematics list #2898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Brokkonaut wants to merge 1 commit into
base: version/7.4.x
Choose a base branch
from
Open

add a flag to filter the schematics list #2898

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ public void formats(Actor actor) {
public void list(Actor actor,
@ArgFlag(name = 'p', desc = "Page to view.", def = "1")
int page,
@ArgFlag(name = 'f', desc = "Filter", def = "")
String filter,
@Switch(name = 'd', desc = "Sort by date, oldest first")
boolean oldFirst,
@Switch(name = 'n', desc = "Sort by date, newest first")
Expand All @@ -330,11 +332,14 @@ public void list(Actor actor,
pathComparator = Comparator.naturalOrder();
flag = "";
}
if (filter != null && !filter.isEmpty()) {
flag += " -f \"" + filter + "\"";
}
final String pageCommand = actor.isPlayer()
? "//schem list -p %page%" + flag : null;

WorldEditAsyncCommandBuilder.createAndSendMessage(actor,
new SchematicListTask(pathComparator, page, pageCommand),
new SchematicListTask(pathComparator, page, filter, pageCommand),
SubtleFormat.wrap("(Please wait... gathering schematic list.)"));
}

Expand Down Expand Up @@ -443,11 +448,13 @@ public Consumer<Actor> call() throws Exception {
private static class SchematicListTask implements Callable<Component> {
private final Comparator<Path> pathComparator;
private final int page;
private final String filter;
private final String pageCommand;

SchematicListTask(Comparator<Path> pathComparator, int page, String pageCommand) {
SchematicListTask(Comparator<Path> pathComparator, int page, String filter, String pageCommand) {
this.pathComparator = pathComparator;
this.page = page;
this.filter = filter;
this.pageCommand = pageCommand;
}

Expand All @@ -456,6 +463,10 @@ public Component call() throws Exception {
SchematicsManager schematicsManager = WorldEdit.getInstance().getSchematicsManager();
// Copy this to a mutable list, we're sorting it below.
List<Path> fileList = new ArrayList<>(schematicsManager.getSchematicPaths());
if (filter != null && !filter.isEmpty()) {
Path schematicsRoot = WorldEdit.getInstance().getSchematicsManager().getRoot();
fileList.removeIf(f -> !schematicsRoot.relativize(f).toString().contains(filter));
}

if (fileList.isEmpty()) {
return ErrorFormat.wrap("No schematics found.");
Expand Down
Loading