dugulp
/
textile_backup_chinese
mirror of https://github.com/dugulingping/textile_backup_chinese.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup now gives some output.

2.x-1.16
szymon 2020-08-02 20:53:49 +02:00
parent a1a745abbb
commit a8b8e92187
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/szum123321/textile_backup/commands/CleanupCommand.java
View File

@ -21,6 +21,7 @@ package net.szum123321.textile_backup.commands;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.LiteralText;
import net.szum123321.textile_backup.core.BackupHelper; import net.szum123321.textile_backup.core.BackupHelper;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
@ -31,7 +32,9 @@ public class CleanupCommand {
} }
private static int execute(ServerCommandSource source) { private static int execute(ServerCommandSource source) {
BackupHelper.executeFileLimit(source, Utilities.getLevelName(source.getMinecraftServer())); int a = BackupHelper.executeFileLimit(source, Utilities.getLevelName(source.getMinecraftServer()));
source.sendFeedback(new LiteralText("Deleted: " + a + " files."), false);
return 1; return 1;
} }

14
src/main/java/net/szum123321/textile_backup/core/BackupHelper.java
View File

@ -29,6 +29,7 @@ import java.time.ZoneOffset;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.atomic.AtomicInteger;
public class BackupHelper { public class BackupHelper {
public static Runnable create(BackupContext ctx) { public static Runnable create(BackupContext ctx) {
@ -57,8 +58,9 @@ public class BackupHelper {
return new MakeBackupRunnable(ctx); return new MakeBackupRunnable(ctx);
} }
public static void executeFileLimit(ServerCommandSource ctx, String worldName) { public static int executeFileLimit(ServerCommandSource ctx, String worldName) {
File root = getBackupRootPath(worldName); File root = getBackupRootPath(worldName);
AtomicInteger deletedFiles = new AtomicInteger();
if (root.isDirectory() && root.exists() && root.listFiles() != null) { if (root.isDirectory() && root.exists() && root.listFiles() != null) {
if (TextileBackup.config.maxAge > 0) { // delete files older that configured if (TextileBackup.config.maxAge > 0) { // delete files older that configured
@ -69,10 +71,12 @@ public class BackupHelper {
.filter(f -> Utilities.getFileCreationTime(f).isPresent()) // We check if we can get file's creation date so that the next line won't throw an exception .filter(f -> Utilities.getFileCreationTime(f).isPresent()) // We check if we can get file's creation date so that the next line won't throw an exception
.filter(f -> now.toEpochSecond(ZoneOffset.UTC) - Utilities.getFileCreationTime(f).get().toEpochSecond(ZoneOffset.UTC) > TextileBackup.config.maxAge) .filter(f -> now.toEpochSecond(ZoneOffset.UTC) - Utilities.getFileCreationTime(f).get().toEpochSecond(ZoneOffset.UTC) > TextileBackup.config.maxAge)
.forEach(f -> { .forEach(f -> {
if(f.delete()) if(f.delete()) {
Utilities.info("Deleting: " + f.getName(), ctx); Utilities.info("Deleting: " + f.getName(), ctx);
else deletedFiles.getAndIncrement();
} else {
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx); Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
}
}); });
} }
@ -90,6 +94,7 @@ public class BackupHelper {
if(f.delete()) { if(f.delete()) {
Utilities.info("Deleting: " + f.getName(), ctx); Utilities.info("Deleting: " + f.getName(), ctx);
deletedFiles.getAndIncrement();
} else { } else {
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx); Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
} }
@ -110,12 +115,15 @@ public class BackupHelper {
if(f.delete()) { if(f.delete()) {
Utilities.info("Deleting: " + f.getName(), ctx); Utilities.info("Deleting: " + f.getName(), ctx);
deletedFiles.getAndIncrement();
} else { } else {
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx); Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
} }
} }
} }
} }
return deletedFiles.get();
} }
private static boolean isFileOk(File f) {return f.exists() && f.isFile(); } private static boolean isFileOk(File f) {return f.exists() && f.isFile(); }