Skip to content

Commit

Permalink
Replace internal use of lazy structures, add option in JvmZipReader t…
Browse files Browse the repository at this point in the history
…o try a base offset of 0 by default
  • Loading branch information
Col-E committed Jan 13, 2025
1 parent 548a501 commit b076448
Show file tree
Hide file tree
Showing 34 changed files with 822 additions and 764 deletions.
34 changes: 34 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Auto detect text files and perform LF normalization
* text=auto

# Java sources
*.java text diff=java eol=lf
*.gradle text diff=java eol=lf

# These files are text and should be normalized (Convert crlf => lf)
*.css text diff=css eol=lf
*.html text diff=html eol=lf
*.md text diff=markdown eol=lf
*.js text eol=lf
*.csv text eol=lf
*.json text eol=lf
*.properties text eol=lf
*.svg text eol=lf
*.xml text eol=lf
*.yaml text eol=lf
*.yml text eol=lf
*.toml text eol=lf
*.lang text eol=lf

# These files are binary and should be left untouched
*.png binary
*.gif binary
*.jpg binary
*.jpeg binary

# Common build-tool wrapper scripts
mvnw text eol=lf
gradlew text eol=lf
*.sh text eol=lf
*.bat text eol=crlf
*.cmd text eol=crlf
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.coley</groupId>
<artifactId>lljzip</artifactId>
<version>2.6.2</version>
<version>2.7.0</version>

<name>LL Java ZIP</name>
<description>Lower level ZIP support for Java</description>
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/software/coley/lljzip/ZipIO.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import software.coley.lljzip.format.model.CentralDirectoryFileHeader;
import software.coley.lljzip.format.model.EndOfCentralDirectory;
import software.coley.lljzip.format.model.ZipArchive;
import software.coley.lljzip.format.read.*;
import software.coley.lljzip.format.read.AdaptingZipReader;
import software.coley.lljzip.format.read.ForwardScanZipReader;
import software.coley.lljzip.format.read.JvmZipReader;
import software.coley.lljzip.format.read.NaiveLocalFileZipReader;
import software.coley.lljzip.format.read.ZipReader;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand Down Expand Up @@ -172,7 +176,8 @@ public static ZipArchive readJvm(Path path) throws IOException {
*
* @return Archive from path.
*
* @throws IOException When the archive cannot be read.
* @throws IOException
* When the archive cannot be read.
*/
public static ZipArchive readAdaptingIO(Path path) throws IOException {
ZipArchive archive = new ZipArchive();
Expand Down
Loading

0 comments on commit b076448

Please sign in to comment.