Skip to content

Add seek(::ReadableFile, 0) and readavailable() #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2021
Merged

Add seek(::ReadableFile, 0) and readavailable() #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/ZipFile.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,20 @@ function position(f::ReadableFile)
f._pos
end

function Base.seek(io::ReadableFile, n::Integer)
# It's not possible to seek the compressed stream without an extra
# compression index, so only support seeking to the start.
n == 0 || throw(ArgumentError("Cannot efficiently seek zip stream to nonzero offset $n"))
io._datapos = -1
io._currentcrc32 = 0
io._pos = 0
io._zpos = 0
return io
end

# Needed for use as `src` in `write(dst::IO, src::IO)`.
Base.readavailable(io::ZipFile.ReadableFile) = read(io)

# Write nb elements located at p into f.
function unsafe_write(f::WritableFile, p::Ptr{UInt8}, nb::UInt)
# zlib doesn't like 0 length writes
Expand Down
5 changes: 5 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ dir = ZipFile.Reader(filename)
@test String(read!(dir.files[1], Array{UInt8}(undef, length(s1)))) == s1
@test String(read!(dir.files[1], Array{UInt8}(undef, length(s2)))) == s2
@test eof(dir.files[1])
@test_throws ArgumentError seek(dir.files[1], 1)
# Can seek back to start
seek(dir.files[1], 0)
# Test readavailable()
@test String(readavailable(dir.files[1])) == s1*s2
close(dir)


Expand Down