dugulp
/
textile_backup_chinese
mirror of https://github.com/dugulingping/textile_backup_chinese.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added CRC32 calculation to Stored entries in Zip (caused exceptions)

56-bugfix
szymon 2020-12-02 21:06:46 +01:00
parent eba22e8464
commit b68640b37f
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/szum123321/textile_backup/core/create/compressors/ParallelZipCompressor.java
View File

@ -24,7 +24,9 @@ import org.apache.commons.compress.archivers.zip.*;
import org.apache.commons.compress.parallel.InputStreamSupplier; import org.apache.commons.compress.parallel.InputStreamSupplier;
import java.io.*; import java.io.*;
import java.nio.file.Files;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
/* /*
@ -50,10 +52,14 @@ public class ParallelZipCompressor extends ZipCompressor {
protected void addEntry(File file, String entryName, OutputStream arc) throws IOException { protected void addEntry(File file, String entryName, OutputStream arc) throws IOException {
ZipArchiveEntry entry = (ZipArchiveEntry)((ZipArchiveOutputStream)arc).createArchiveEntry(file, entryName); ZipArchiveEntry entry = (ZipArchiveEntry)((ZipArchiveOutputStream)arc).createArchiveEntry(file, entryName);
if(ZipCompressor.isDotDat(file.getName())) if(ZipCompressor.isDotDat(file.getName())) {
entry.setMethod(ZipEntry.STORED); entry.setMethod(ZipArchiveOutputStream.STORED);
else entry.setSize(file.length());
entry.setMethod(ZipEntry.DEFLATED); entry.setCompressedSize(file.length());
CRC32 sum = new CRC32();
sum.update(Files.readAllBytes(file.toPath()));
entry.setCrc(sum.getValue());
} else entry.setMethod(ZipEntry.DEFLATED);
entry.setTime(System.currentTimeMillis()); entry.setTime(System.currentTimeMillis());

10
src/main/java/net/szum123321/textile_backup/core/create/compressors/ZipCompressor.java
View File

@ -27,7 +27,9 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.IOUtils;
import java.io.*; import java.io.*;
import java.nio.file.Files;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.zip.CRC32;
public class ZipCompressor extends AbstractCompressor { public class ZipCompressor extends AbstractCompressor {
public static ZipCompressor getInstance() { public static ZipCompressor getInstance() {
@ -51,8 +53,14 @@ public class ZipCompressor extends AbstractCompressor {
try (FileInputStream fileInputStream = new FileInputStream(file)){ try (FileInputStream fileInputStream = new FileInputStream(file)){
ZipArchiveEntry entry = (ZipArchiveEntry)((ZipArchiveOutputStream)arc).createArchiveEntry(file, entryName); ZipArchiveEntry entry = (ZipArchiveEntry)((ZipArchiveOutputStream)arc).createArchiveEntry(file, entryName);
if(isDotDat(file.getName())) if(isDotDat(file.getName())) {
entry.setMethod(ZipArchiveOutputStream.STORED); entry.setMethod(ZipArchiveOutputStream.STORED);
entry.setSize(file.length());
entry.setCompressedSize(file.length());
CRC32 sum = new CRC32();
sum.update(Files.readAllBytes(file.toPath()));
entry.setCrc(sum.getValue());
}
((ZipArchiveOutputStream)arc).putArchiveEntry(entry); ((ZipArchiveOutputStream)arc).putArchiveEntry(entry);