feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

improve clearlog output when no rows are found

Browse Source
This commit is contained in:
Brokkonaut
2018-08-13 16:12:03 +02:00
parent 572df51d28
commit c997fb9db9
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/diddiz/LogBlock/CommandsHandler.java
View File

@ -853,21 +853,15 @@ public class CommandsHandler implements CommandExecutor {
rs = state.executeQuery("SELECT count(*) " + params.getFrom() + params.getWhere()); rs = state.executeQuery("SELECT count(*) " + params.getFrom() + params.getWhere());
int deleted = rs.next() ? rs.getInt(1) : 0; int deleted = rs.next() ? rs.getInt(1) : 0;
rs.close(); rs.close();
if (deleted == 0) {
if (!params.silent) {
sender.sendMessage(ChatColor.GREEN.toString() + deleted + " entries found.");
}
return;
}
if (!params.silent && askClearLogs && sender instanceof Player) { if (!params.silent && askClearLogs && sender instanceof Player) {
sender.sendMessage(ChatColor.DARK_AQUA + "Searching " + params.getTitle() + ":"); sender.sendMessage(ChatColor.DARK_AQUA + "Searching " + params.getTitle() + ":");
sender.sendMessage(ChatColor.GREEN.toString() + deleted + " entries found."); sender.sendMessage(ChatColor.GREEN.toString() + deleted + " entries found.");
if (!logblock.getQuestioner().ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) { if (deleted == 0 || !logblock.getQuestioner().ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
sender.sendMessage(ChatColor.RED + "ClearLog aborted"); sender.sendMessage(ChatColor.RED + "ClearLog aborted");
return; return;
} }
} }
if (dumpDeletedLog) { if (deleted > 0 && dumpDeletedLog) {
final String time = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(System.currentTimeMillis()); final String time = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(System.currentTimeMillis());
try { try {
File outFile = new File(dumpFolder, (time + " " + tableName + " " + params.getTitle() + ".sql").replace(':', '.').replace('/', '_').replace('\\', '_')); File outFile = new File(dumpFolder, (time + " " + tableName + " " + params.getTitle() + ".sql").replace(':', '.').replace('/', '_').replace('\\', '_'));
@ -938,7 +932,9 @@ public class CommandsHandler implements CommandExecutor {
return; return;
} }
} }
state.executeUpdate("DELETE " + deleteFromTables + params.getFrom() + params.getWhere()); if (deleted > 0) {
state.executeUpdate("DELETE " + deleteFromTables + params.getFrom() + params.getWhere());
}
sender.sendMessage(ChatColor.GREEN + "Cleared out table " + tableName + ". Deleted " + deleted + " entries."); sender.sendMessage(ChatColor.GREEN + "Cleared out table " + tableName + ". Deleted " + deleted + " entries.");
} catch (final Exception ex) { } catch (final Exception ex) {
if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) { if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {