From 92d2d3e2df6a03574cb69248b25694b2e84154dd Mon Sep 17 00:00:00 2001 From: Szum123321 Date: Tue, 30 Jun 2020 15:52:32 +0200 Subject: [PATCH] Updated dependencies Renamed GenericTarCompressor -> LZMACompressor --- gradle.properties | 6 ++--- ...TarCompressor.java => LZMACompressor.java} | 22 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) rename src/main/java/net/szum123321/textile_backup/core/compressors/{GenericTarCompressor.java => LZMACompressor.java} (64%) diff --git a/gradle.properties b/gradle.properties index dc8019d..a8b0637 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G minecraft_version=1.16.1 -yarn_mappings=1.16.1+build.4 +yarn_mappings=1.16.1+build.18 loader_version=0.8.8+build.202 #Fabric api -fabric_version=0.13.1+build.370-1.16 +fabric_version=0.14.0+build.371-1.16 # Mod Properties -mod_version = 1.2.2-1.16.1 +mod_version = 1.2.3-1.16.1 maven_group = net.szum123321 archives_base_name = textile_backup \ No newline at end of file diff --git a/src/main/java/net/szum123321/textile_backup/core/compressors/GenericTarCompressor.java b/src/main/java/net/szum123321/textile_backup/core/compressors/LZMACompressor.java similarity index 64% rename from src/main/java/net/szum123321/textile_backup/core/compressors/GenericTarCompressor.java rename to src/main/java/net/szum123321/textile_backup/core/compressors/LZMACompressor.java index 8b96f31..93ee013 100644 --- a/src/main/java/net/szum123321/textile_backup/core/compressors/GenericTarCompressor.java +++ b/src/main/java/net/szum123321/textile_backup/core/compressors/LZMACompressor.java @@ -5,22 +5,22 @@ import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.core.Utilities; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; +import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.utils.IOUtils; import java.io.*; -import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; -public class GenericTarCompressor { - public static void createArchive(File in, File out, Class CompressorStreamClass, ServerCommandSource ctx, int coreLimit) { - Utilities.log("Starting compression...", ctx); +public class LZMACompressor { + public static void createArchive(File in, File out, ServerCommandSource ctx) { + Utilities.info("Starting compression...", ctx); long start = System.nanoTime(); try (FileOutputStream outStream = new FileOutputStream(out); BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outStream); - OutputStream compressorStream = CompressorStreamClass.getDeclaredConstructor(OutputStream.class).newInstance(bufferedOutputStream);// CompressorStreamClass.getConstructor().newInstance(bufferedOutputStream); + XZCompressorOutputStream compressorStream = new XZCompressorOutputStream(bufferedOutputStream);// CompressorStreamClass.getConstructor().newInstance(bufferedOutputStream); TarArchiveOutputStream arc = new TarArchiveOutputStream(compressorStream)) { arc.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); @@ -44,17 +44,21 @@ public class GenericTarCompressor { arc.closeArchiveEntry(); } catch (IOException e) { - TextileBackup.logger.error(e.getMessage()); + TextileBackup.LOGGER.error("An exception occurred while trying to compress: " + path.getFileName(), e); + + Utilities.sendError("Something went wrong while compressing files!", ctx); } }); arc.finish(); - } catch (IOException | IllegalAccessException | NoSuchMethodException | InstantiationException | InvocationTargetException e) { - TextileBackup.logger.error(e.toString()); + } catch (IOException e) { + TextileBackup.LOGGER.error("An exception occurred!", e); + + Utilities.sendError("Something went wrong while compressing files!", ctx); } long end = System.nanoTime(); - Utilities.log("Compression took: " + ((end - start) / 1000000000.0) + "s", ctx); + Utilities.info("Compression took: " + ((end - start) / 1000000000.0) + "s", ctx); } } \ No newline at end of file