Support files that are larget than 2GB

Author: xxDark

src/main/java/software/coley/llzip/ZipCompressions.java

@@ -2,6 +2,7 @@
 
 import software.coley.llzip.part.LocalFileHeader;
 import software.coley.llzip.strategy.DeflateDecompressor;
+import software.coley.llzip.util.ByteData;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -203,7 +204,7 @@ static String getName(int method) {
 	 * @throws IOException
 	 * 		When the decompression failed.
 	 */
-	static ByteBuffer decompress(LocalFileHeader header) throws IOException {
+	static ByteData decompress(LocalFileHeader header) throws IOException {
 		int method = header.getCompressionMethod();
 		switch (method) {
 			case STRORED:

src/main/java/software/coley/llzip/ZipIO.java

@@ -3,15 +3,14 @@
 import software.coley.llzip.strategy.DefaultZipReaderStrategy;
 import software.coley.llzip.strategy.JvmZipReaderStrategy;
 import software.coley.llzip.strategy.ZipReaderStrategy;
+import software.coley.llzip.util.BufferData;
+import software.coley.llzip.util.ByteData;
+import software.coley.llzip.util.FileMapUtil;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 
 /**
  * IO wrappers for reading {@link ZipArchive} contents.
@@ -30,7 +29,7 @@ public class ZipIO {
 	 * @throws IOException
 	 * 		When the archive bytes cannot be read from, usually indicating a malformed zip.
 	 */
-	public static ZipArchive readStandard(ByteBuffer data) throws IOException {
+	public static ZipArchive readStandard(ByteData data) throws IOException {
 		return read(data, new DefaultZipReaderStrategy());
 	}
 
@@ -48,6 +47,7 @@ public static ZipArchive readStandard(ByteBuffer data) throws IOException {
 	public static ZipArchive readStandard(byte[] data) throws IOException {
 		return read(data, new DefaultZipReaderStrategy());
 	}
+
 	/**
 	 * Creates an archive using the {@link DefaultZipReaderStrategy}.
 	 *
@@ -75,7 +75,7 @@ public static ZipArchive readStandard(Path data) throws IOException {
 	 * @throws IOException
 	 * 		When the archive bytes cannot be read from, usually indicating a malformed zip.
 	 */
-	public static ZipArchive readJvm(ByteBuffer data) throws IOException {
+	public static ZipArchive readJvm(ByteData data) throws IOException {
 		return read(data, new JvmZipReaderStrategy());
 	}
 
@@ -122,11 +122,11 @@ public static ZipArchive readJvm(Path path) throws IOException {
 	 * @throws IOException
 	 * 		When the archive bytes cannot be read from, usually indicating a malformed zip.
 	 */
-	public static ZipArchive read(ByteBuffer data, ZipReaderStrategy strategy) throws IOException {
+	public static ZipArchive read(ByteData data, ZipReaderStrategy strategy) throws IOException {
 		if (data == null)
 			throw new IOException("Data is null!");
 		// The fixed size elements of a CDFH is 22 bytes (plus the variable size bits which can be 0)
-		if (data.remaining() < 22)
+		if (data.length() < 22)
 			throw new IOException("Not enough bytes to read Central-Directory-File-Header, minimum=22");
 		// Create instance
 		ZipArchive zip = new ZipArchive();
@@ -148,7 +148,7 @@ public static ZipArchive read(ByteBuffer data, ZipReaderStrategy strategy) throw
 	public static ZipArchive read(byte[] data, ZipReaderStrategy strategy) throws IOException {
 		if (data == null)
 			throw new IOException("Data is null!");
-		return read(ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN), strategy);
+		return read(BufferData.wrap(data), strategy);
 	}
 
 	/**
@@ -167,10 +167,6 @@ public static ZipArchive read(Path path, ZipReaderStrategy strategy) throws IOEx
 			throw new IOException("Data is null!");
 		if (!Files.isRegularFile(path))
 			throw new FileNotFoundException(path.toString());
-		ByteBuffer buffer;
-		try (FileChannel fc = FileChannel.open(path, StandardOpenOption.READ)) {
-			buffer = fc.map(FileChannel.MapMode.READ_ONLY, 0L, fc.size());
-		}
-		return read(buffer.order(ByteOrder.LITTLE_ENDIAN), strategy);
+		return read(FileMapUtil.map(path), strategy);
 	}
 }

src/main/java/software/coley/llzip/ZipPatterns.java

@@ -3,10 +3,10 @@
 import software.coley.llzip.part.CentralDirectoryFileHeader;
 import software.coley.llzip.part.EndOfCentralDirectory;
 import software.coley.llzip.part.LocalFileHeader;
-import software.coley.llzip.util.Buffers;
+import software.coley.llzip.util.ByteDataUtil;
 
 /**
- * Patterns for usage in {@link Buffers} methods.
+ * Patterns for usage in {@link ByteDataUtil} methods.
  *
  * @author Matt Coley
  */

src/main/java/software/coley/llzip/part/CentralDirectoryFileHeader.java

@@ -2,9 +2,9 @@
 
 import software.coley.llzip.ZipCompressions;
 import software.coley.llzip.strategy.Decompressor;
-import software.coley.llzip.util.Buffers;
+import software.coley.llzip.util.ByteData;
+import software.coley.llzip.util.ByteDataUtil;
 
-import java.nio.ByteBuffer;
 import java.util.Objects;
 
 /**
@@ -13,7 +13,7 @@
  * @author Matt Coley
  */
 public class CentralDirectoryFileHeader implements ZipPart, ZipRead {
-	private transient int offset = -1;
+	private transient long offset = -1L;
 	private transient LocalFileHeader linkedFileHeader;
 	// Zip spec elements
 	private int versionMadeBy;
@@ -32,40 +32,40 @@ public class CentralDirectoryFileHeader implements ZipPart, ZipRead {
 	private int internalFileAttributes;
 	private int externalFileAttributes;
 	private int relativeOffsetOfLocalHeader;
-	private ByteBuffer fileName;
-	private ByteBuffer extraField;
-	private ByteBuffer fileComment;
+	private ByteData fileName;
+	private ByteData extraField;
+	private ByteData fileComment;
 
 	private transient String fileNameCache;
 	private transient String fileCommentCache;
 
 	@Override
-	public void read(ByteBuffer data, int offset) {
+	public void read(ByteData data, long offset) {
 		this.offset = offset;
-		versionMadeBy = Buffers.readWord(data, offset + 4);
-		versionNeededToExtract = Buffers.readWord(data, offset + 6);
-		generalPurposeBitFlag = Buffers.readWord(data, offset + 8);
-		compressionMethod = Buffers.readWord(data, offset + 10);
-		lastModFileTime = Buffers.readWord(data, offset + 12);
-		lastModFileDate = Buffers.readWord(data, offset + 14);
-		crc32 = Buffers.readQuad(data, offset + 16);
-		compressedSize = Buffers.readQuad(data, offset + 20);
-		uncompressedSize = Buffers.readQuad(data, offset + 24);
-		fileNameLength = Buffers.readWord(data, offset + 28);
-		extraFieldLength = Buffers.readWord(data, offset + 30);
-		fileCommentLength = Buffers.readWord(data, offset + 32);
-		diskNumberStart = Buffers.readWord(data, offset + 34);
-		internalFileAttributes = Buffers.readWord(data, offset + 36);
-		externalFileAttributes = Buffers.readQuad(data, offset + 38);
-		relativeOffsetOfLocalHeader = Buffers.readQuad(data, offset + 42);
-		fileName = Buffers.slice(data, offset + 46, fileNameLength);
-		extraField = Buffers.slice(data, offset + 46 + fileNameLength, extraFieldLength);
-		fileComment = Buffers.slice(data, offset + 46 + fileNameLength + extraFieldLength, fileCommentLength);
+		versionMadeBy = ByteDataUtil.readWord(data, offset + 4);
+		versionNeededToExtract = ByteDataUtil.readWord(data, offset + 6);
+		generalPurposeBitFlag = ByteDataUtil.readWord(data, offset + 8);
+		compressionMethod = ByteDataUtil.readWord(data, offset + 10);
+		lastModFileTime = ByteDataUtil.readWord(data, offset + 12);
+		lastModFileDate = ByteDataUtil.readWord(data, offset + 14);
+		crc32 = ByteDataUtil.readQuad(data, offset + 16);
+		compressedSize = ByteDataUtil.readQuad(data, offset + 20);
+		uncompressedSize = ByteDataUtil.readQuad(data, offset + 24);
+		fileNameLength = ByteDataUtil.readWord(data, offset + 28);
+		extraFieldLength = ByteDataUtil.readWord(data, offset + 30);
+		fileCommentLength = ByteDataUtil.readWord(data, offset + 32);
+		diskNumberStart = ByteDataUtil.readWord(data, offset + 34);
+		internalFileAttributes = ByteDataUtil.readWord(data, offset + 36);
+		externalFileAttributes = ByteDataUtil.readQuad(data, offset + 38);
+		relativeOffsetOfLocalHeader = ByteDataUtil.readQuad(data, offset + 42);
+		fileName = data.sliceOf(offset + 46, fileNameLength);
+		extraField = data.sliceOf(offset + 46 + fileNameLength, extraFieldLength);
+		fileComment = data.sliceOf(offset + 46 + fileNameLength + extraFieldLength, fileCommentLength);
 	}
 
 	@Override
 	public int length() {
-		return 46 + Buffers.length(fileName) + Buffers.length(extraField) + Buffers.length(fileComment);
+		return 46 + (int) fileName.length() + (int) extraField.length() + (int) fileComment.length();
 	}
 
 	@Override
@@ -74,7 +74,7 @@ public PartType type() {
 	}
 
 	@Override
-	public int offset() {
+	public long offset() {
 		return offset;
 	}
 
@@ -366,15 +366,15 @@ public void setRelativeOffsetOfLocalHeader(int relativeOffsetOfLocalHeader) {
 	 *
 	 * @return File name.
 	 */
-	public ByteBuffer getFileName() {
+	public ByteData getFileName() {
 		return fileName;
 	}
 
 	/**
 	 * @param fileName
 	 * 		File name.
 	 */
-	public void setFileName(ByteBuffer fileName) {
+	public void setFileName(ByteData fileName) {
 		this.fileName = fileName;
 	}
 
@@ -387,7 +387,7 @@ public void setFileName(ByteBuffer fileName) {
 	public String getFileNameAsString() {
 		String fileNameCache = this.fileNameCache;
 		if (fileNameCache == null) {
-			return this.fileNameCache = Buffers.toString(fileName);
+			return this.fileNameCache = ByteDataUtil.toString(fileName);
 		}
 		return fileNameCache;
 	}
@@ -396,30 +396,30 @@ public String getFileNameAsString() {
 	 * @return May be used for extra compression information,
 	 * depending on the {@link #getCompressionMethod() compression method} used.
 	 */
-	public ByteBuffer getExtraField() {
+	public ByteData getExtraField() {
 		return extraField;
 	}
 
 	/**
 	 * @param extraField
 	 * 		Extra field bytes.
 	 */
-	public void setExtraField(ByteBuffer extraField) {
+	public void setExtraField(ByteData extraField) {
 		this.extraField = extraField;
 	}
 
 	/**
 	 * @return File comment.
 	 */
-	public ByteBuffer getFileComment() {
+	public ByteData getFileComment() {
 		return fileComment;
 	}
 
 	/**
 	 * @param fileComment
 	 * 		File comment.
 	 */
-	public void setFileComment(ByteBuffer fileComment) {
+	public void setFileComment(ByteData fileComment) {
 		this.fileComment = fileComment;
 	}
 
@@ -429,7 +429,7 @@ public void setFileComment(ByteBuffer fileComment) {
 	public String getFileCommentAsString() {
 		String fileCommentCache = this.fileCommentCache;
 		if (fileCommentCache == null) {
-			return this.fileCommentCache = Buffers.toString(fileComment);
+			return this.fileCommentCache = ByteDataUtil.toString(fileComment);
 		}
 		return fileCommentCache;
 	}
@@ -454,7 +454,7 @@ public String toString() {
 				", externalFileAttributes=" + externalFileAttributes +
 				", relativeOffsetOfLocalHeader=" + relativeOffsetOfLocalHeader +
 				", fileName='" + fileName + '\'' +
-				", extraField=" + Buffers.toString(extraField) +
+				", extraField=" + ByteDataUtil.toString(extraField) +
 				", fileComment='" + fileComment + '\'' +
 				'}';
 	}
@@ -483,7 +483,7 @@ public boolean equals(Object o) {
 				relativeOffsetOfLocalHeader == that.relativeOffsetOfLocalHeader &&
 				Objects.equals(linkedFileHeader, that.linkedFileHeader) &&
 				fileName.equals(that.fileName) &&
-				Buffers.equals(extraField, that.extraField) &&
+				ByteDataUtil.equals(extraField, that.extraField) &&
 				fileComment.equals(that.fileComment);
 	}