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

This might repair #32

2.x-1.16
szymon 2020-08-02 11:11:05 +02:00
parent 2c3c972324
commit 584f03b834
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.concurrent.atomic.AtomicInteger; import java.util.Iterator;
public class BackupHelper { public class BackupHelper {
public static Runnable create(MinecraftServer server, ServerCommandSource ctx, boolean save, String comment) { public static Runnable create(MinecraftServer server, ServerCommandSource ctx, boolean save, String comment) {
@ -76,35 +76,42 @@ public class BackupHelper {
} }
if (TextileBackup.config.backupsToKeep > 0 && root.listFiles().length > TextileBackup.config.backupsToKeep) { if (TextileBackup.config.backupsToKeep > 0 && root.listFiles().length > TextileBackup.config.backupsToKeep) {
AtomicInteger i = new AtomicInteger(root.listFiles().length); int i = root.listFiles().length;
Arrays.stream(root.listFiles()) Iterator<File> it = Arrays.stream(root.listFiles())
.filter(BackupHelper::isFileOk) .filter(BackupHelper::isFileOk)
.filter(f -> Utilities.getFileCreationTime(f).isPresent()) .filter(f -> Utilities.getFileCreationTime(f).isPresent())
.sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get())) .sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get()))
.takeWhile(f -> i.get() > TextileBackup.config.backupsToKeep) .iterator();
.forEach(f -> {
if(f.delete())
Utilities.info("Deleting: " + f.getName(), ctx);
else
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
i.getAndDecrement(); while(i > TextileBackup.config.backupsToKeep && it.hasNext()) {
}); File f = it.next();
if(f.delete()) {
Utilities.info("Deleting: " + f.getName(), ctx);
} else {
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
}
i--;
}
} }
if (TextileBackup.config.maxSize > 0 && FileUtils.sizeOfDirectory(root) / 1024 > TextileBackup.config.maxSize) { if (TextileBackup.config.maxSize > 0 && FileUtils.sizeOfDirectory(root) / 1024 > TextileBackup.config.maxSize) {
Arrays.stream(root.listFiles()) Iterator<File> it =Arrays.stream(root.listFiles())
.filter(BackupHelper::isFileOk) .filter(BackupHelper::isFileOk)
.filter(f -> Utilities.getFileCreationTime(f).isPresent()) .filter(f -> Utilities.getFileCreationTime(f).isPresent())
.sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get())) .sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get()))
.takeWhile(f -> FileUtils.sizeOfDirectory(root) / 1024 > TextileBackup.config.maxSize) .iterator();
.forEach(f -> {
if(f.delete()) while(FileUtils.sizeOfDirectory(root) / 1024 > TextileBackup.config.maxSize && it.hasNext()) {
File f = it.next();
if(f.delete()) {
Utilities.info("Deleting: " + f.getName(), ctx); Utilities.info("Deleting: " + f.getName(), ctx);
else } else {
Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx); Utilities.sendError("Something went wrong while deleting: " + f.getName(), ctx);
}); }
}
} }
} }
} }