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

Partial redesign of RestoreHelper. It now uses RestoreableFile everywhere. 

RestoreableFile is now comparable
56-bugfix
szymon 2020-11-30 10:25:16 +01:00
parent 0ef89c2a88
commit aac63d45ac
1 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java
View File

@ -18,10 +18,14 @@
package net.szum123321.textile_backup.core.restore; package net.szum123321.textile_backup.core.restore;
import net.minecraft.network.MessageType;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText;
import net.minecraft.util.Util;
import net.szum123321.textile_backup.ConfigHandler;
import net.szum123321.textile_backup.Statics; import net.szum123321.textile_backup.Statics;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
import org.jetbrains.annotations.NotNull;
import java.io.File; import java.io.File;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -30,24 +34,28 @@ import java.util.List;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
public class RestoreHelper { public class RestoreHelper {
public static Optional<File> findFileAndLockIfPresent(LocalDateTime backupTime, MinecraftServer server) { public static Optional<RestoreableFile> findFileAndLockIfPresent(LocalDateTime backupTime, MinecraftServer server) {
File root = Utilities.getBackupRootPath(Utilities.getLevelName(server)); File root = Utilities.getBackupRootPath(Utilities.getLevelName(server));
Optional<File> optionalFile = Arrays.stream(root.listFiles()) Optional<RestoreableFile> optionalFile = Arrays.stream(root.listFiles())
.filter(Utilities::isValidBackup) .map(RestoreableFile::newInstance)
.filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime)) .flatMap(o -> o.map(Stream::of).orElseGet(Stream::empty))
.filter(rf -> rf.getCreationTime().equals(backupTime))
.findFirst(); .findFirst();
optionalFile.ifPresent(file -> Statics.untouchableFile = file); optionalFile.ifPresent(file -> Statics.untouchableFile = file.getFile());
return optionalFile; return optionalFile;
} }
public static AwaitThread create(File backupFile, MinecraftServer server, String comment) { public static AwaitThread create(RestoreableFile backupFile, MinecraftServer server, String comment) {
server.getPlayerManager().getPlayerList() MutableText message = Statics.LOGGER.getPrefixText().shallowCopy();
.forEach(serverPlayerEntity -> serverPlayerEntity.sendMessage(new LiteralText("Warning! The server is going to shut down in " + Statics.CONFIG.restoreDelay + " seconds!"), false)); message.append("Warning! The server is going to shut down in " + Statics.CONFIG.restoreDelay + " seconds!");
server.getPlayerManager().broadcastChatMessage(message, MessageType.GAME_INFO, Util.NIL_UUID);
Statics.globalShutdownBackupFlag.set(false); Statics.globalShutdownBackupFlag.set(false);
@ -62,17 +70,22 @@ public class RestoreHelper {
return Arrays.stream(root.listFiles()) return Arrays.stream(root.listFiles())
.filter(Utilities::isValidBackup) .filter(Utilities::isValidBackup)
.map(RestoreableFile::new) .map(RestoreableFile::newInstance)
.flatMap(o -> o.map(Stream::of).orElseGet(Stream::empty))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public static class RestoreableFile { public static class RestoreableFile implements Comparable<RestoreableFile> {
private final File file;
private final ConfigHandler.ArchiveFormat archiveFormat;
private final LocalDateTime creationTime; private final LocalDateTime creationTime;
private final String comment; private final String comment;
protected RestoreableFile(File file) { private RestoreableFile(File file) throws NoSuchElementException {
String extension = Utilities.getFileExtension(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file extention")).getString(); this.file = file;
this.creationTime = Utilities.getFileCreationTime(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file creation time.")); archiveFormat = Utilities.getArchiveExtension(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file extension!"));
String extension = archiveFormat.getString();
creationTime = Utilities.getFileCreationTime(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file creation time!"));
final String filename = file.getName(); final String filename = file.getName();
@ -83,6 +96,22 @@ public class RestoreHelper {
} }
} }
public static Optional<RestoreableFile> newInstance(File file) {
try {
return Optional.of(new RestoreableFile(file));
} catch (NoSuchElementException ignored) {}
return Optional.empty();
}
public File getFile() {
return file;
}
public ConfigHandler.ArchiveFormat getArchiveFormat() {
return archiveFormat;
}
public LocalDateTime getCreationTime() { public LocalDateTime getCreationTime() {
return creationTime; return creationTime;
} }
@ -91,8 +120,13 @@ public class RestoreHelper {
return comment; return comment;
} }
@Override
public int compareTo(@NotNull RestoreHelper.RestoreableFile o) {
return creationTime.compareTo(o.creationTime);
}
public String toString() { public String toString() {
return this.getCreationTime().format(Statics.defaultDateTimeFormatter) + (comment != null ? "#" + comment : ""); return this.getCreationTime().format(Statics.defaultDateTimeFormatter) + (comment != null ? "#" + comment : "");
} }
} }
} }