From 21cf46a56a0120b2df928adaf67085b261454fef Mon Sep 17 00:00:00 2001 From: Szum123321 Date: Tue, 30 Aug 2022 13:28:30 +0200 Subject: [PATCH] Moved all filename paring into its own class --- .../commands/FileSuggestionProvider.java | 5 +- .../commands/manage/DeleteCommand.java | 46 +++--- .../commands/manage/ListBackupsCommand.java | 5 +- .../restore/RestoreBackupCommand.java | 3 +- .../textile_backup/core/Cleanup.java | 132 ++++++++---------- .../textile_backup/core/RestoreableFile.java | 118 ++++++++++++++++ .../textile_backup/core/Utilities.java | 86 ++---------- .../core/restore/RestoreContext.java | 7 +- .../core/restore/RestoreHelper.java | 85 ++--------- 9 files changed, 231 insertions(+), 256 deletions(-) create mode 100644 src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java diff --git a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java index 7cfa439..d7fcea5 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java +++ b/src/main/java/net/szum123321/textile_backup/commands/FileSuggestionProvider.java @@ -20,12 +20,12 @@ package net.szum123321.textile_backup.commands; import com.mojang.brigadier.LiteralMessage; import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.SuggestionProvider; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import net.minecraft.server.command.ServerCommandSource; import net.szum123321.textile_backup.Globals; +import net.szum123321.textile_backup.core.RestoreableFile; import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.restore.RestoreHelper; @@ -42,7 +42,7 @@ public final class FileSuggestionProvider implements SuggestionProvider getSuggestions(CommandContext ctx, SuggestionsBuilder builder) { String remaining = builder.getRemaining(); - for (RestoreHelper.RestoreableFile file : RestoreHelper.getAvailableBackups(ctx.getSource().getServer())) { + for (RestoreableFile file : RestoreHelper.getAvailableBackups(ctx.getSource().getServer())) { String formattedCreationTime = file.getCreationTime().format(Globals.defaultDateTimeFormatter); if (formattedCreationTime.startsWith(remaining)) { @@ -61,6 +61,7 @@ public final class FileSuggestionProvider implements SuggestionProvider stream = Files.list(root)) { - stream.filter(Utilities::isValidBackup) - .filter(file -> Utilities.getFileCreationTime(file).orElse(LocalDateTime.MIN).equals(dateTime)) - .findFirst().ifPresent(file -> { - if(Globals.INSTANCE.getLockedFile().filter(p -> p == file).isEmpty()) { - try { - Files.delete(file); - log.sendInfo(source, "File {} successfully deleted!", file); + RestoreableFile.applyOnFiles(root, Optional.empty(), + e -> { + log.sendError(source, "Couldn't find file by this name."); + log.sendHint(source, "Maybe try /backup list"); + }, + stream -> stream.filter(f -> f.getCreationTime().equals(dateTime)).map(RestoreableFile::getFile).findFirst() + ).ifPresent(file -> { + if(Globals.INSTANCE.getLockedFile().filter(p -> p == file).isEmpty()) { + try { + Files.delete((Path) file); + log.sendInfo(source, "File {} successfully deleted!", file); - if(Utilities.wasSentByPlayer(source)) - log.info("Player {} deleted {}.", source.getPlayer().getName(), file); - } catch (IOException e) { - log.sendError(source, "Something went wrong while deleting file!"); - } - } else { - log.sendError(source, "Couldn't delete the file because it's being restored right now."); - log.sendHint(source, "If you want to abort restoration then use: /backup killR"); + if(Utilities.wasSentByPlayer(source)) + log.info("Player {} deleted {}.", source.getPlayer().getName(), file); + } catch (IOException e) { + log.sendError(source, "Something went wrong while deleting file!"); } - }); - } catch (IOException ignored) { - log.sendError(source, "Couldn't find file by this name."); - log.sendHint(source, "Maybe try /backup list"); - } - + } else { + log.sendError(source, "Couldn't delete the file because it's being restored right now."); + log.sendHint(source, "If you want to abort restoration then use: /backup killR"); + } + } + ); return 0; } } diff --git a/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java b/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java index 42c49d9..22f363b 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/manage/ListBackupsCommand.java @@ -23,6 +23,7 @@ import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; +import net.szum123321.textile_backup.core.RestoreableFile; import net.szum123321.textile_backup.core.restore.RestoreHelper; import java.util.*; @@ -33,7 +34,7 @@ public class ListBackupsCommand { public static LiteralArgumentBuilder register() { return CommandManager.literal("list") .executes(ctx -> { StringBuilder builder = new StringBuilder(); - List backups = RestoreHelper.getAvailableBackups(ctx.getSource().getServer()); + List backups = RestoreHelper.getAvailableBackups(ctx.getSource().getServer()); if(backups.size() == 0) { builder.append("There a no backups available for this world."); @@ -42,7 +43,7 @@ public class ListBackupsCommand { builder.append(backups.get(0).toString()); } else { backups.sort(null); - Iterator iterator = backups.iterator(); + Iterator iterator = backups.iterator(); builder.append("Available backups:\n"); builder.append(iterator.next()); diff --git a/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java b/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java index a339735..2446f0a 100644 --- a/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java +++ b/src/main/java/net/szum123321/textile_backup/commands/restore/RestoreBackupCommand.java @@ -29,6 +29,7 @@ import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; import net.szum123321.textile_backup.commands.CommandExceptions; import net.szum123321.textile_backup.commands.FileSuggestionProvider; +import net.szum123321.textile_backup.core.RestoreableFile; import net.szum123321.textile_backup.core.restore.RestoreContext; import net.szum123321.textile_backup.core.restore.RestoreHelper; @@ -84,7 +85,7 @@ public class RestoreBackupCommand { throw CommandExceptions.DATE_TIME_PARSE_COMMAND_EXCEPTION_TYPE.create(e); } - Optional backupFile = RestoreHelper.findFileAndLockIfPresent(dateTime, source.getServer()); + Optional backupFile = RestoreHelper.findFileAndLockIfPresent(dateTime, source.getServer()); if(backupFile.isPresent()) { log.info("Found file to restore {}", backupFile.get().getFile().getFileName().toString()); diff --git a/src/main/java/net/szum123321/textile_backup/core/Cleanup.java b/src/main/java/net/szum123321/textile_backup/core/Cleanup.java index e3114fa..f7f022e 100644 --- a/src/main/java/net/szum123321/textile_backup/core/Cleanup.java +++ b/src/main/java/net/szum123321/textile_backup/core/Cleanup.java @@ -19,7 +19,7 @@ package net.szum123321.textile_backup.core; -import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.command.ServerCommandSource; import net.szum123321.textile_backup.Globals; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; @@ -30,7 +30,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.Comparator; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; @@ -43,106 +42,85 @@ public class Cleanup { Path root = Utilities.getBackupRootPath(worldName); int deletedFiles = 0; - if (Files.isDirectory(root) && Files.exists(root) && !isEmpty(root)) { - if (config.get().maxAge > 0) { // delete files older that configured - final long now = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); + if (!Files.isDirectory(root) || !Files.exists(root) || isEmpty(root)) return 0; - try(Stream stream = Files.list(root)) { - deletedFiles += stream - .filter(Utilities::isValidBackup)// We check if we can get file's creation date so that the next line won't throw an exception - .filter(f -> now - Utilities.getFileCreationTime(f).get().toEpochSecond(ZoneOffset.UTC) > config.get().maxAge) - .mapToInt(f -> deleteFile(f, ctx)) - .sum(); - } catch (IOException e) { - log.error("An exception occurred while trying to delete old files!", e); - } - } + if (config.get().maxAge > 0) { // delete files older that configured + final long now = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC); - final int noToKeep = config.get().backupsToKeep > 0 ? config.get().backupsToKeep : Integer.MAX_VALUE; - final long maxSize = config.get().maxSize > 0 ? config.get().maxSize * 1024: Long.MAX_VALUE; + deletedFiles += RestoreableFile.applyOnFiles(root, 0, + e -> log.error("An exception occurred while trying to delete old files!", e), + stream -> stream.filter(f -> now - f.getCreationTime().toEpochSecond(ZoneOffset.UTC) > config.get().maxAge) + .mapToInt(f -> deleteFile(f.getFile(), ctx)) + .sum() + ); + } - AtomicInteger currentNo = new AtomicInteger(countBackups(root)); - AtomicLong currentSize = new AtomicLong(countSize(root)); + final int noToKeep = config.get().backupsToKeep > 0 ? config.get().backupsToKeep : Integer.MAX_VALUE; + final long maxSize = config.get().maxSize > 0 ? config.get().maxSize * 1024: Long.MAX_VALUE; - try(Stream stream = Files.list(root)) { - deletedFiles += stream - .filter(Utilities::isValidBackup) - .sorted(Comparator.comparing(f -> Utilities.getFileCreationTime(f).get())) + long[] counts = count(root); + + AtomicInteger currentNo = new AtomicInteger((int) counts[0]); + AtomicLong currentSize = new AtomicLong(counts[1]); + + deletedFiles += RestoreableFile.applyOnFiles(root, 0, + e -> log.error("An exception occurred while trying to delete old files!", e), + stream -> stream.sequential() .takeWhile(f -> (currentNo.get() > noToKeep) || (currentSize.get() > maxSize)) + .map(RestoreableFile::getFile) .peek(f -> { - currentNo.decrementAndGet(); try { currentSize.addAndGet(-Files.size(f)); } catch (IOException e) { currentSize.set(0); + return; } + currentNo.decrementAndGet(); }) .mapToInt(f -> deleteFile(f, ctx)) - .sum(); - } catch (IOException e) { - log.error("An exception occurred while trying to delete old files!", e); - } - } + .sum()); return deletedFiles; } - private static int countBackups(Path path) { - try(Stream stream = Files.list(path)) { - return (int) stream - .filter(Utilities::isValidBackup) - .count(); - } catch (IOException e) { - log.error("Error while counting files!", e); - } - return 0; - } + private static long[] count(Path root) { + long n = 0, size = 0; - private static long countSize(Path path) { - try(Stream stream = Files.list(path)) { - return stream - .filter(Utilities::isValidBackup) - .mapToLong(f -> { - try { - return Files.size(f); - } catch (IOException e) { - log.error("Couldn't delete a file!", e); - return 0; - } - }) - .sum(); - } catch (IOException e) { - log.error("Error while counting files!", e); - } - return 0; - } - - private static boolean isEmpty(Path path) { - if (Files.isDirectory(path)) { - try (Stream entries = Files.list(path)) { - return entries.findFirst().isEmpty(); - } catch (IOException e) { - return false; + try(Stream stream = Files.list(root)) { + var it = stream.flatMap(f -> RestoreableFile.build(f).stream()).iterator(); + while(it.hasNext()) { + var f = it.next(); + try { + size += Files.size(f.getFile()); + } catch (IOException e) { + log.error("Couldn't get size of " + f.getFile(), e); + continue; + } + n++; } + } catch (IOException e) { + log.error("Error while counting files!", e); } - return false; + return new long[]{n, size}; + } + + private static boolean isEmpty(Path root) { + if (!Files.isDirectory(root)) return false; + return RestoreableFile.applyOnFiles(root, false, e -> {}, s -> s.findFirst().isEmpty()); } //1 -> ok, 0 -> err private static int deleteFile(Path f, ServerCommandSource ctx) { - if(Globals.INSTANCE.getLockedFile().filter(p -> p == f).isEmpty()) { - try { - Files.delete(f); - log.sendInfoAL(ctx, "Deleting: {}", f); - } catch (IOException e) { - if(Utilities.wasSentByPlayer(ctx)) log.sendError(ctx, "Something went wrong while deleting: {}.", f); - log.error("Something went wrong while deleting: {}.", f, e); - return 0; - } - return 1; + if(Globals.INSTANCE.getLockedFile().filter(p -> p == f).isPresent()) return 0; + try { + Files.delete(f); + log.sendInfoAL(ctx, "Deleted: {}", f); + } catch (IOException e) { + if(Utilities.wasSentByPlayer(ctx)) log.sendError(ctx, "Something went wrong while deleting: {}.", f); + log.error("Something went wrong while deleting: {}.", f, e); + return 0; } - - return 0; + return 1; } } \ No newline at end of file diff --git a/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java b/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java new file mode 100644 index 0000000..2725470 --- /dev/null +++ b/src/main/java/net/szum123321/textile_backup/core/RestoreableFile.java @@ -0,0 +1,118 @@ +/* + * A simple backup mod for Fabric + * Copyright (C) 2022 Szum123321 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package net.szum123321.textile_backup.core; + +import net.szum123321.textile_backup.Globals; +import net.szum123321.textile_backup.config.ConfigPOJO; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.FileTime; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Arrays; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Stream; + +import static java.nio.file.LinkOption.NOFOLLOW_LINKS; + +public class RestoreableFile implements Comparable { + private final Path file; + private final ConfigPOJO.ArchiveFormat archiveFormat; + private final LocalDateTime creationTime; + private final String comment; + + private RestoreableFile(Path file, ConfigPOJO.ArchiveFormat archiveFormat, LocalDateTime creationTime, String comment) { + this.file = file; + this.archiveFormat = archiveFormat; + this.creationTime = creationTime; + this.comment = comment; + } + + public static T applyOnFiles(Path root, T def, Consumer errorConsumer, Function, T> streamConsumer) { + try (Stream stream = Files.list(root)) { + return streamConsumer.apply(stream.flatMap(f -> RestoreableFile.build(f).stream())); + } catch (IOException e) { + errorConsumer.accept(e); + } + return def; + } + + public static Optional build(Path file) throws NoSuchElementException { + if(!Files.exists(file) || !Files.isRegularFile(file)) return Optional.empty(); + + String filename = file.getFileName().toString(); + + var format = Arrays.stream(ConfigPOJO.ArchiveFormat.values()) + .filter(f -> filename.endsWith(f.getCompleteString())) + .findAny() + .orElse(null); + + if(Objects.isNull(format)) return Optional.empty(); + + int parsed_pos = filename.length() - format.getCompleteString().length(); + + String comment = null; + + if(filename.contains("#")) { + comment = filename.substring(filename.indexOf("#"), parsed_pos); + parsed_pos -= comment.length() - 1; + } + + var time_string = filename.substring(0, parsed_pos); + + try { + return Optional.of(new RestoreableFile(file, format, LocalDateTime.from(Utilities.getDateTimeFormatter().parse(time_string)), comment)); + } catch (Exception ignored) {} + + try { + return Optional.of(new RestoreableFile(file, format, LocalDateTime.from(Globals.defaultDateTimeFormatter.parse(time_string)), comment)); + } catch (Exception ignored) {} + + try { + FileTime fileTime = Files.readAttributes(file, BasicFileAttributes.class, NOFOLLOW_LINKS).creationTime(); + return Optional.of(new RestoreableFile(file, format, LocalDateTime.ofInstant(fileTime.toInstant(), ZoneOffset.systemDefault()), comment)); + } catch (IOException ignored) {} + + return Optional.empty(); + } + + public Path getFile() { return file; } + + public ConfigPOJO.ArchiveFormat getArchiveFormat() { return archiveFormat; } + + public LocalDateTime getCreationTime() { return creationTime; } + + public String getComment() { return comment; } + + @Override + public int compareTo(@NotNull RestoreableFile o) { return creationTime.compareTo(o.creationTime); } + + public String toString() { + return this.getCreationTime().format(Globals.defaultDateTimeFormatter) + (comment != null ? "#" + comment : ""); + } +} diff --git a/src/main/java/net/szum123321/textile_backup/core/Utilities.java b/src/main/java/net/szum123321/textile_backup/core/Utilities.java index c38304d..45b3a15 100644 --- a/src/main/java/net/szum123321/textile_backup/core/Utilities.java +++ b/src/main/java/net/szum123321/textile_backup/core/Utilities.java @@ -25,11 +25,9 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.world.World; -import net.szum123321.textile_backup.Globals; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; import net.szum123321.textile_backup.config.ConfigHelper; -import net.szum123321.textile_backup.config.ConfigPOJO; import net.szum123321.textile_backup.mixin.MinecraftServerSessionAccessor; import org.apache.commons.io.file.SimplePathVisitor; import org.jetbrains.annotations.NotNull; @@ -40,13 +38,8 @@ import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.attribute.FileTime; import java.time.*; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.Optional; - -import static java.nio.file.LinkOption.NOFOLLOW_LINKS; public class Utilities { private final static ConfigHelper config = ConfigHelper.INSTANCE; @@ -72,20 +65,7 @@ public class Utilities { .getSession() .getWorldDirectory(World.OVERWORLD); } - - public static Path getBackupRootPath(String worldName) { - Path path = Path.of(config.get().backupDirectoryPath).toAbsolutePath(); - if (config.get().perWorldBackup) path = path.resolve(worldName); - - try { - Files.createDirectories(path); - } catch (IOException e) { - //I REALLY shouldn't be handling this here - } - - return path; - } public static void deleteDirectory(Path path) throws IOException { Files.walkFileTree(path, new SimplePathVisitor() { @@ -121,6 +101,20 @@ public class Utilities { return System.getProperty("os.name").toLowerCase().contains("win"); } + public static Path getBackupRootPath(String worldName) { + Path path = Path.of(config.get().backupDirectoryPath).toAbsolutePath(); + + if (config.get().perWorldBackup) path = path.resolve(worldName); + + try { + Files.createDirectories(path); + } catch (IOException e) { + //I REALLY shouldn't be handling this here + } + + return path; + } + public static boolean isBlacklisted(Path path) { if(isWindows()) { //hotfix! if (path.getFileName().toString().equals("session.lock")) return true; @@ -129,58 +123,6 @@ public class Utilities { return config.get().fileBlacklist.stream().anyMatch(path::startsWith); } - public static Optional getArchiveExtension(String fileName) { - String[] parts = fileName.split("\\."); - - return Arrays.stream(ConfigPOJO.ArchiveFormat.values()) - .filter(format -> format.getLastPiece().equals(parts[parts.length - 1])) - .findAny(); - } - - public static Optional getArchiveExtension(Path f) { - return getArchiveExtension(f.getFileName().toString()); - } - - public static Optional getFileCreationTime(Path file) { - if(getArchiveExtension(file).isEmpty()) return Optional.empty(); - try { - FileTime fileTime = Files.readAttributes(file, BasicFileAttributes.class, NOFOLLOW_LINKS).creationTime(); - return Optional.of(LocalDateTime.ofInstant(fileTime.toInstant(), ZoneOffset.systemDefault())); - } catch (IOException ignored) {} - - String fileExtension = getArchiveExtension(file).get().getCompleteString(); - - try { - return Optional.of( - LocalDateTime.from( - Utilities.getDateTimeFormatter().parse( - file.getFileName().toString().split(fileExtension)[0].split("#")[0] - ))); - } catch (Exception ignored) {} - - try { - return Optional.of( - LocalDateTime.from( - Globals.defaultDateTimeFormatter.parse( - file.getFileName().toString().split(fileExtension)[0].split("#")[0] - ))); - } catch (Exception ignored) {} - - return Optional.empty(); - } - - public static boolean isValidBackup(Path f) { - return getArchiveExtension(f).isPresent() && getFileCreationTime(f).isPresent() && isFileOk(f); - } - - public static boolean isFileOk(File f) { - return f.exists() && f.isFile(); - } - - public static boolean isFileOk(Path f) { - return Files.exists(f) && Files.isRegularFile(f); - } - public static DateTimeFormatter getDateTimeFormatter() { return DateTimeFormatter.ofPattern(config.get().dateTimeFormat); } diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java index 2e597b3..f5391a5 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreContext.java @@ -22,16 +22,17 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.szum123321.textile_backup.core.ActionInitiator; +import net.szum123321.textile_backup.core.RestoreableFile; import javax.annotation.Nullable; -public record RestoreContext(RestoreHelper.RestoreableFile restoreableFile, +public record RestoreContext(RestoreableFile restoreableFile, MinecraftServer server, @Nullable String comment, ActionInitiator initiator, ServerCommandSource commandSource) { public static final class Builder { - private RestoreHelper.RestoreableFile file; + private RestoreableFile file; private MinecraftServer server; private String comment; private ServerCommandSource serverCommandSource; @@ -43,7 +44,7 @@ public record RestoreContext(RestoreHelper.RestoreableFile restoreableFile, return new Builder(); } - public Builder setFile(RestoreHelper.RestoreableFile file) { + public Builder setFile(RestoreableFile file) { this.file = file; return this; } diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java index 085dc6d..5102e52 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java @@ -23,18 +23,14 @@ import net.szum123321.textile_backup.Globals; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; import net.szum123321.textile_backup.config.ConfigHelper; -import net.szum123321.textile_backup.config.ConfigPOJO; import net.szum123321.textile_backup.core.ActionInitiator; +import net.szum123321.textile_backup.core.RestoreableFile; import net.szum123321.textile_backup.core.Utilities; -import org.jetbrains.annotations.NotNull; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; public class RestoreHelper { private final static TextileLogger log = new TextileLogger(TextileBackup.MOD_NAME); @@ -43,16 +39,11 @@ public class RestoreHelper { public static Optional findFileAndLockIfPresent(LocalDateTime backupTime, MinecraftServer server) { Path root = Utilities.getBackupRootPath(Utilities.getLevelName(server)); - Optional optionalFile; - try (Stream stream = Files.list(root)) { - optionalFile = stream - .map(RestoreableFile::newInstance) - .flatMap(Optional::stream) - .filter(rf -> rf.getCreationTime().equals(backupTime)) - .findFirst(); - } catch (IOException e) { - throw new RuntimeException(e); - } + Optional optionalFile = + RestoreableFile.applyOnFiles(root, Optional.empty(), + e -> log.error("An error occurred while trying to lock file!", e), + s -> s.filter(rf -> rf.getCreationTime().equals(backupTime)) + .findFirst()); optionalFile.ifPresent(r -> Globals.INSTANCE.setLockedFile(r.getFile())); @@ -79,66 +70,8 @@ public class RestoreHelper { public static List getAvailableBackups(MinecraftServer server) { Path root = Utilities.getBackupRootPath(Utilities.getLevelName(server)); - try (Stream stream = Files.list(root)) { - return stream.filter(Utilities::isValidBackup) - .map(RestoreableFile::newInstance) - .flatMap(Optional::stream) - .collect(Collectors.toList()); - } catch (IOException e) { - log.error("Error while listing available backups", e); - return new LinkedList<>(); - } - } - - public static class RestoreableFile implements Comparable { - private final Path file; - private final ConfigPOJO.ArchiveFormat archiveFormat; - private final LocalDateTime creationTime; - private final String comment; - - private RestoreableFile(Path file) throws NoSuchElementException { - this.file = file; - archiveFormat = Utilities.getArchiveExtension(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file extension!")); - String extension = archiveFormat.getCompleteString(); - creationTime = Utilities.getFileCreationTime(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file creation time!")); - - final String filename = file.getFileName().toString(); - - if(filename.split("#").length > 1) this.comment = filename.split("#")[1].split(extension)[0]; - else this.comment = null; - } - - public static Optional newInstance(Path file) { - try { - return Optional.of(new RestoreableFile(file)); - } catch (NoSuchElementException ignored) {} - - return Optional.empty(); - } - - public Path getFile() { - return file; - } - - public ConfigPOJO.ArchiveFormat getArchiveFormat() { - return archiveFormat; - } - - public LocalDateTime getCreationTime() { - return creationTime; - } - - public String getComment() { - return comment; - } - - @Override - public int compareTo(@NotNull RestoreHelper.RestoreableFile o) { - return creationTime.compareTo(o.creationTime); - } - - public String toString() { - return this.getCreationTime().format(Globals.defaultDateTimeFormatter) + (comment != null ? "#" + comment : ""); - } + return RestoreableFile.applyOnFiles(root, List.of(), + e -> log.error("Error while listing available backups", e), + s -> s.collect(Collectors.toList())); } } \ No newline at end of file