Updated dependencies

Renamed GenericTarCompressor -> LZMACompressor
2.x-1.16
Szum123321 2020-06-30 15:52:32 +02:00
parent 3e17a64714
commit 92d2d3e2df
2 changed files with 16 additions and 12 deletions

View File

@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
minecraft_version=1.16.1 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 loader_version=0.8.8+build.202
#Fabric api #Fabric api
fabric_version=0.13.1+build.370-1.16 fabric_version=0.14.0+build.371-1.16
# Mod Properties # Mod Properties
mod_version = 1.2.2-1.16.1 mod_version = 1.2.3-1.16.1
maven_group = net.szum123321 maven_group = net.szum123321
archives_base_name = textile_backup archives_base_name = textile_backup

View File

@ -5,22 +5,22 @@ import net.szum123321.textile_backup.TextileBackup;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import java.io.*; import java.io.*;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files; import java.nio.file.Files;
public class GenericTarCompressor { public class LZMACompressor {
public static void createArchive(File in, File out, Class<? extends OutputStream> CompressorStreamClass, ServerCommandSource ctx, int coreLimit) { public static void createArchive(File in, File out, ServerCommandSource ctx) {
Utilities.log("Starting compression...", ctx); Utilities.info("Starting compression...", ctx);
long start = System.nanoTime(); long start = System.nanoTime();
try (FileOutputStream outStream = new FileOutputStream(out); try (FileOutputStream outStream = new FileOutputStream(out);
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outStream); 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)) { TarArchiveOutputStream arc = new TarArchiveOutputStream(compressorStream)) {
arc.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX); arc.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
@ -44,17 +44,21 @@ public class GenericTarCompressor {
arc.closeArchiveEntry(); arc.closeArchiveEntry();
} catch (IOException e) { } 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(); arc.finish();
} catch (IOException | IllegalAccessException | NoSuchMethodException | InstantiationException | InvocationTargetException e) { } catch (IOException e) {
TextileBackup.logger.error(e.toString()); TextileBackup.LOGGER.error("An exception occurred!", e);
Utilities.sendError("Something went wrong while compressing files!", ctx);
} }
long end = System.nanoTime(); long end = System.nanoTime();
Utilities.log("Compression took: " + ((end - start) / 1000000000.0) + "s", ctx); Utilities.info("Compression took: " + ((end - start) / 1000000000.0) + "s", ctx);
} }
} }