Skip to content

Commit 64635f7

Browse files
committed
Some cleanup
1 parent 03d017e commit 64635f7

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package software.coley.llzip;
22

3+
import software.coley.llzip.format.model.CentralDirectoryFileHeader;
4+
import software.coley.llzip.format.model.EndOfCentralDirectory;
5+
import software.coley.llzip.format.model.ZipArchive;
36
import software.coley.llzip.format.read.ForwardScanZipReaderStrategy;
47
import software.coley.llzip.format.read.JvmZipReaderStrategy;
58
import software.coley.llzip.format.read.NaiveLocalFileZipReaderStrategy;
69
import software.coley.llzip.format.read.ZipReaderStrategy;
7-
import software.coley.llzip.format.model.ZipArchive;
810
import software.coley.llzip.util.BufferData;
911
import software.coley.llzip.util.ByteData;
1012
import software.coley.llzip.util.FileMapUtil;
@@ -16,6 +18,11 @@
1618

1719
/**
1820
* IO wrappers for reading {@link ZipArchive} contents.
21+
* <ul>
22+
* <li>For JAR files or anything intended to be read by the JVM use the JVM operations which use {@link JvmZipReaderStrategy}.</li>
23+
* <li>For regular ZIP files use {@link ForwardScanZipReaderStrategy}.</li>
24+
* <li>For ZIP files without {@link CentralDirectoryFileHeader} or {@link EndOfCentralDirectory} items, use {@link NaiveLocalFileZipReaderStrategy}</li>
25+
* </ul>
1926
*
2027
* @author Matt Coley
2128
*/

src/main/java/software/coley/llzip/format/compression/DeflateDecompressor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
public class DeflateDecompressor implements Decompressor {
1919
@Override
20-
public ByteData decompress(LocalFileHeader header, ByteData bytes) throws IOException {
20+
public ByteData decompress(LocalFileHeader header, ByteData data) throws IOException {
2121
if (header.getCompressionMethod() != ZipCompressions.DEFLATED)
2222
throw new IOException("LocalFileHeader contents not using 'Deflated'!");
2323
Inflater inflater = new Inflater(true);
@@ -26,14 +26,14 @@ public ByteData decompress(LocalFileHeader header, ByteData bytes) throws IOExce
2626
byte[] output = new byte[1024];
2727
byte[] buffer = new byte[1024];
2828
long position = 0L;
29-
long length = bytes.length();
29+
long length = data.length();
3030
do {
3131
if (inflater.needsInput()) {
3232
int remaining = (int) Math.min(buffer.length, length);
3333
if (remaining == 0) {
3434
break;
3535
}
36-
bytes.get(position, buffer, 0, remaining);
36+
data.get(position, buffer, 0, remaining);
3737
length -= remaining;
3838
position += remaining;
3939
inflater.setInput(buffer, 0, remaining);

src/main/java/software/coley/llzip/format/model/AbstractZipFileHeader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ public ByteData getFileName() {
224224
* File name.
225225
*/
226226
public void setFileName(ByteData fileName) {
227+
if (this.fileName != fileName)
228+
fileNameCache = null;
227229
this.fileName.set(fileName);
228230
}
229231

0 commit comments

Comments
 (0)