Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-18 00:25:29 +01:00
Code Issues Projects Releases Wiki Activity

Implemented /plan search

Browse Source
This commit is contained in:
Risto Lahtela 2020-08-30 22:54:13 +03:00
parent 6f2cd157ff
commit adcd8cf258
3 changed files with 34 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java
View File

@ -98,9 +98,10 @@ public class PlanCommand {
.colorScheme(colors)
.subcommand(serverCommand())
.subcommand(serversCommand())
.subcommand(networkCommand())
.subcommand(playerCommand())
.subcommand(playersCommand())
.subcommand(networkCommand())
.subcommand(searchCommand())
.subcommand(jsonCommand())
.subcommand(registerCommand())
@ -182,6 +183,16 @@ public class PlanCommand {
.build();
}
private Subcommand searchCommand() {
return Subcommand.builder()
.aliases("search")
.requirePermission("plan.search")
.description("Search for a player name")
.inDepthDescription("List all matching player names to given part of a name.")
.onCommand(dataUtilityCommands::onSearch)
.build();
}
private Subcommand networkCommand() {
return Subcommand.builder()
.aliases("network", "netw")

25
Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java
View File

@ -35,9 +35,7 @@ import com.djrapitops.plan.storage.database.queries.objects.UserIdentifierQuerie
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import java.util.function.Consumer;
@Singleton
@ -178,5 +176,26 @@ public class DataUtilityCommands {
}
}
public void onSearch(CMDSender sender, Arguments arguments) {
String searchingFor = arguments.concatenate(" ");
if (searchingFor.trim().isEmpty()) {
throw new IllegalArgumentException("The search string can not be empty" /* TODO */);
}
ensureDatabaseIsOpen();
List<String> names = dbSystem.getDatabase().query(UserIdentifierQueries.fetchMatchingPlayerNames(searchingFor));
Collections.sort(names);
sender.send(locale.getString(CommandLang.HEADER_SEARCH, names.isEmpty() ? 0 : names.size(), searchingFor));
StringBuilder asTableString = new StringBuilder();
int i = 0;
for (String name : names) {
asTableString.append(name).append(i != 0 && i % 5 == 0 ? '\n' : "::");
i++;
}
sender.send(sender.getFormatter().table(asTableString.toString(), "::"));
}
}

112
Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/SearchCommand.java
View File

@ -1,112 +0,0 @@
/*
* This file is part of Player Analytics (Plan).
*
* Plan is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License v3 as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Plan is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
*/
package com.djrapitops.plan.commands.subcommands;
import com.djrapitops.plan.exceptions.database.DBOpException;
import com.djrapitops.plan.processing.Processing;
import com.djrapitops.plan.settings.Permissions;
import com.djrapitops.plan.settings.locale.Locale;
import com.djrapitops.plan.settings.locale.lang.CmdHelpLang;
import com.djrapitops.plan.settings.locale.lang.CommandLang;
import com.djrapitops.plan.settings.locale.lang.DeepHelpLang;
import com.djrapitops.plan.settings.locale.lang.ManageLang;
import com.djrapitops.plan.storage.database.DBSystem;
import com.djrapitops.plan.storage.database.Database;
import com.djrapitops.plan.storage.database.queries.objects.UserIdentifierQueries;
import com.djrapitops.plan.utilities.logging.ErrorLogger;
import com.djrapitops.plugin.command.CommandNode;
import com.djrapitops.plugin.command.CommandType;
import com.djrapitops.plugin.command.Sender;
import com.djrapitops.plugin.logging.L;
import com.djrapitops.plugin.utilities.Verify;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* This SubCommand is used to search for a user.
*
* @author Rsl1122
*/
@Singleton
public class SearchCommand extends CommandNode {
private final Locale locale;
private final Processing processing;
private final DBSystem dbSystem;
private final ErrorLogger errorLogger;
@Inject
public SearchCommand(
Locale locale,
Processing processing,
DBSystem dbSystem,
ErrorLogger errorLogger) {
super("search", Permissions.SEARCH.getPermission(), CommandType.PLAYER_OR_ARGS);
this.locale = locale;
this.processing = processing;
this.dbSystem = dbSystem;
this.errorLogger = errorLogger;
setArguments("<text>");
setShortHelp(locale.getString(CmdHelpLang.SEARCH));
setInDepthHelp(locale.getArray(DeepHelpLang.SEARCH));
}
@Override
public void onCommand(Sender sender, String commandLabel, String[] args) {
Database.State dbState = dbSystem.getDatabase().getState();
if (dbState != Database.State.OPEN) {
sender.sendMessage(locale.getString(CommandLang.FAIL_DATABASE_NOT_OPEN, dbState.name()));
return;
}
Verify.isTrue(args.length >= 1,
() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, Arrays.toString(this.getArguments()))));
sender.sendMessage(locale.getString(ManageLang.PROGRESS_START));
runSearchTask(args, sender);
}
private void runSearchTask(String[] args, Sender sender) {
processing.submitNonCritical(() -> {
try {
String searchFor = args[0];
List<String> names = dbSystem.getDatabase().query(UserIdentifierQueries.fetchMatchingPlayerNames(searchFor));
Collections.sort(names);
boolean empty = Verify.isEmpty(names);
sender.sendMessage(locale.getString(CommandLang.HEADER_SEARCH, empty ? 0 : names.size(), searchFor));
// Results
if (!empty) {
String message = names.toString();
sender.sendMessage(message.substring(1, message.length() - 1));
}
sender.sendMessage(">");
} catch (DBOpException e) {
sender.sendMessage("§cDatabase error occurred: " + e.getMessage());
errorLogger.log(L.ERROR, this.getClass(), e);
}
});
}
}