From d871fc14cb57ca221dc2e46aba21d86690ae4e7d Mon Sep 17 00:00:00 2001 From: Szum123321 Date: Sun, 27 Nov 2022 23:09:21 +0100 Subject: [PATCH] moved hash-related stuff core.digest package. Renamed XorSeaHash to BalticHash :). --- src/main/java/net/szum123321/textile_backup/Globals.java | 2 +- .../core/create/FileInputStreamSupplier.java | 3 ++- .../core/create/compressors/AbstractCompressor.java | 1 + .../core/{XorSeaHash.java => digest/BalticHash.java} | 2 +- .../textile_backup/core/digest/FileTreeHashBuilder.java | 2 +- .../szum123321/textile_backup/core/{ => digest}/Hash.java | 2 +- .../textile_backup/core/digest/HashingInputStream.java | 7 +++---- .../textile_backup/core/digest/HashingOutputStream.java | 2 +- .../core/restore/decompressors/GenericTarDecompressor.java | 4 ++-- .../core/restore/decompressors/ZipDecompressor.java | 4 ++-- 10 files changed, 15 insertions(+), 14 deletions(-) rename src/main/java/net/szum123321/textile_backup/core/{XorSeaHash.java => digest/BalticHash.java} (98%) rename src/main/java/net/szum123321/textile_backup/core/{ => digest}/Hash.java (94%) diff --git a/src/main/java/net/szum123321/textile_backup/Globals.java b/src/main/java/net/szum123321/textile_backup/Globals.java index cf4b0eb..10fc9ec 100644 --- a/src/main/java/net/szum123321/textile_backup/Globals.java +++ b/src/main/java/net/szum123321/textile_backup/Globals.java @@ -19,7 +19,7 @@ package net.szum123321.textile_backup; import net.minecraft.server.MinecraftServer; -import net.szum123321.textile_backup.core.Hash; +import net.szum123321.textile_backup.core.digest.Hash; import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.XorSeaHash; import net.szum123321.textile_backup.core.create.MakeBackupRunnable; diff --git a/src/main/java/net/szum123321/textile_backup/core/create/FileInputStreamSupplier.java b/src/main/java/net/szum123321/textile_backup/core/create/FileInputStreamSupplier.java index 46a302f..2e2ac40 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/FileInputStreamSupplier.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/FileInputStreamSupplier.java @@ -20,7 +20,8 @@ package net.szum123321.textile_backup.core.create; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; -import net.szum123321.textile_backup.core.FileTreeHashBuilder; +import net.szum123321.textile_backup.core.digest.FileTreeHashBuilder; +import net.szum123321.textile_backup.core.digest.HashingInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java b/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java index 5c6db3d..38c742a 100644 --- a/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java +++ b/src/main/java/net/szum123321/textile_backup/core/create/compressors/AbstractCompressor.java @@ -26,6 +26,7 @@ import net.szum123321.textile_backup.core.create.BackupContext; import net.szum123321.textile_backup.core.create.BrokenFileHandler; import net.szum123321.textile_backup.core.create.FileInputStreamSupplier; import net.szum123321.textile_backup.core.create.InputSupplier; +import net.szum123321.textile_backup.core.digest.FileTreeHashBuilder; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/net/szum123321/textile_backup/core/XorSeaHash.java b/src/main/java/net/szum123321/textile_backup/core/digest/BalticHash.java similarity index 98% rename from src/main/java/net/szum123321/textile_backup/core/XorSeaHash.java rename to src/main/java/net/szum123321/textile_backup/core/digest/BalticHash.java index 1b74483..99feb74 100644 --- a/src/main/java/net/szum123321/textile_backup/core/XorSeaHash.java +++ b/src/main/java/net/szum123321/textile_backup/core/digest/BalticHash.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.szum123321.textile_backup.core; +package net.szum123321.textile_backup.core.digest; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/net/szum123321/textile_backup/core/digest/FileTreeHashBuilder.java b/src/main/java/net/szum123321/textile_backup/core/digest/FileTreeHashBuilder.java index e0bb1ba..90ce907 100644 --- a/src/main/java/net/szum123321/textile_backup/core/digest/FileTreeHashBuilder.java +++ b/src/main/java/net/szum123321/textile_backup/core/digest/FileTreeHashBuilder.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.szum123321.textile_backup.core; +package net.szum123321.textile_backup.core.digest; import net.szum123321.textile_backup.Globals; diff --git a/src/main/java/net/szum123321/textile_backup/core/Hash.java b/src/main/java/net/szum123321/textile_backup/core/digest/Hash.java similarity index 94% rename from src/main/java/net/szum123321/textile_backup/core/Hash.java rename to src/main/java/net/szum123321/textile_backup/core/digest/Hash.java index e562cb4..f662d95 100644 --- a/src/main/java/net/szum123321/textile_backup/core/Hash.java +++ b/src/main/java/net/szum123321/textile_backup/core/digest/Hash.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.szum123321.textile_backup.core; +package net.szum123321.textile_backup.core.digest; public interface Hash { void update(byte b); diff --git a/src/main/java/net/szum123321/textile_backup/core/digest/HashingInputStream.java b/src/main/java/net/szum123321/textile_backup/core/digest/HashingInputStream.java index becfb3d..7240f0a 100644 --- a/src/main/java/net/szum123321/textile_backup/core/digest/HashingInputStream.java +++ b/src/main/java/net/szum123321/textile_backup/core/digest/HashingInputStream.java @@ -16,19 +16,18 @@ * along with this program. If not, see . */ -package net.szum123321.textile_backup.core.create; +package net.szum123321.textile_backup.core.digest; import net.szum123321.textile_backup.Globals; import net.szum123321.textile_backup.core.DataLeftException; -import net.szum123321.textile_backup.core.FileTreeHashBuilder; -import net.szum123321.textile_backup.core.Hash; +import net.szum123321.textile_backup.core.create.BrokenFileHandler; import org.jetbrains.annotations.NotNull; import java.io.*; import java.nio.file.Path; //This class calculates a hash of the file on the input stream, submits it to FileTreeHashBuilder. -//In case the whole underlying stream hasn't been read, also puts it into BrokeFileHandler +//In case the underlying stream hasn't been read completely in, puts it into BrokeFileHandler public class HashingInputStream extends FilterInputStream { private final Path path; private final Hash hasher = Globals.CHECKSUM_SUPPLIER.get(); diff --git a/src/main/java/net/szum123321/textile_backup/core/digest/HashingOutputStream.java b/src/main/java/net/szum123321/textile_backup/core/digest/HashingOutputStream.java index 4ce9887..33545ec 100644 --- a/src/main/java/net/szum123321/textile_backup/core/digest/HashingOutputStream.java +++ b/src/main/java/net/szum123321/textile_backup/core/digest/HashingOutputStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package net.szum123321.textile_backup.core.restore; +package net.szum123321.textile_backup.core.digest; import net.szum123321.textile_backup.Globals; import net.szum123321.textile_backup.core.FileTreeHashBuilder; diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/GenericTarDecompressor.java b/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/GenericTarDecompressor.java index 65878d3..cbd50af 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/GenericTarDecompressor.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/GenericTarDecompressor.java @@ -20,9 +20,9 @@ package net.szum123321.textile_backup.core.restore.decompressors; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; -import net.szum123321.textile_backup.core.FileTreeHashBuilder; +import net.szum123321.textile_backup.core.digest.FileTreeHashBuilder; import net.szum123321.textile_backup.core.Utilities; -import net.szum123321.textile_backup.core.restore.HashingOutputStream; +import net.szum123321.textile_backup.core.digest.HashingOutputStream; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.compressors.CompressorException; diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java b/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java index e085cd0..9475716 100644 --- a/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java +++ b/src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java @@ -20,9 +20,9 @@ package net.szum123321.textile_backup.core.restore.decompressors; import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileLogger; -import net.szum123321.textile_backup.core.FileTreeHashBuilder; +import net.szum123321.textile_backup.core.digest.FileTreeHashBuilder; import net.szum123321.textile_backup.core.Utilities; -import net.szum123321.textile_backup.core.restore.HashingOutputStream; +import net.szum123321.textile_backup.core.digest.HashingOutputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.compress.utils.IOUtils;