Alex/textile_backup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced ZipArchiveInputStream based zip decompressor with one based on ZipFile (might be useful for partial restore, but no promise)

Browse Source
This commit is contained in:
Szum123321 2021-11-27 20:11:43 +01:00
parent 50e465fc17
commit 9caf851783
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/szum123321/textile_backup/core/restore/decompressors/ZipDecompressor.java
View File

@ -21,8 +21,7 @@ package net.szum123321.textile_backup.core.restore.decompressors;
import net.szum123321.textile_backup.TextileBackup; import net.szum123321.textile_backup.TextileBackup;
import net.szum123321.textile_backup.TextileLogger; import net.szum123321.textile_backup.TextileLogger;
import net.szum123321.textile_backup.core.Utilities; import net.szum123321.textile_backup.core.Utilities;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import java.io.*; import java.io.*;
@ -36,17 +35,8 @@ public class ZipDecompressor {
public static void decompress(File inputFile, File target) { public static void decompress(File inputFile, File target) {
Instant start = Instant.now(); Instant start = Instant.now();
try (FileInputStream fileInputStream = new FileInputStream(inputFile); try(ZipFile zipFile = new ZipFile(inputFile)) {
BufferedInputStream bufferedInputStream = new BufferedInputStream(fileInputStream); zipFile.getEntries().asIterator().forEachRemaining(entry -> {
ZipArchiveInputStream zipInputStream = new ZipArchiveInputStream((bufferedInputStream))) {
ZipArchiveEntry entry;
while ((entry = zipInputStream.getNextZipEntry()) != null) {
if(!zipInputStream.canReadEntryData(entry)){
log.error("Something when wrong while trying to decompress {}", entry.getName());
continue;
}
File file = target.toPath().resolve(entry.getName()).toFile(); File file = target.toPath().resolve(entry.getName()).toFile();
if(entry.isDirectory()) { if(entry.isDirectory()) {
@ -59,13 +49,13 @@ public class ZipDecompressor {
} else { } else {
try (OutputStream outputStream = Files.newOutputStream(file.toPath()); try (OutputStream outputStream = Files.newOutputStream(file.toPath());
BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) { BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(outputStream)) {
IOUtils.copy(zipInputStream, bufferedOutputStream); IOUtils.copy(zipFile.getInputStream(entry), bufferedOutputStream);
} catch (IOException e) { } catch (IOException e) {
log.error("An exception occurred while trying to decompress file: {}", file.getName(), e); log.error("An exception occurred while trying to decompress file: {}", entry.getName(), e);
} }
} }
} }
} });
} catch (IOException e) { } catch (IOException e) {
log.error("An exception occurred! ", e); log.error("An exception occurred! ", e);
} }