8000 Support decompressor plugins by jspanjers · Pull Request #427 · rubyzip/rubyzip · GitHub
[go: up one dir, main page]
Skip to content

Support decompressor plugins #427

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 21 commits into from
Feb 1, 2020
Merged

Support decompressor plugins #427

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e50fa4a
Remove unused variables from deflater_test
jspanjers Dec 29, 2019
0b7b78d
Encapsulate Zlib errors within DecompressionError
jspanjers Dec 29, 2019
c897bbd
Add Entry#encrypted?
jspanjers Dec 21, 2019
e072c57
Add Entry#incomplete?
jspanjers Dec 21, 2019
4a4c553
Move :eof from InputStream to AbastractInputStream
jspanjers Dec 23, 2019
1b6aeb2
Replace Decompressor#input_finished? with #eof
jspanjers Dec 23, 2019
d20a683
Rework Inflater#produce_input to use sysread
jspanjers Dec 23, 2019
8f7c5ca
Drop #produce_input from Decompressor class
jspanjers Dec 23, 2019
4e28f72
Untangle encryption and decompression
jspanjers Dec 21, 2019
b80ce3c
Make decryption generic for all compression methods
jspanjers Dec 21, 2019
dd74bc0
Cleanup NullDecompressor
jspanjers Jan 5, 2020
4ac8373
Cleanup Inflater
jspanjers Dec 23, 2019
2bbcec0
Cleanup PassTruDecompressor
jspanjers Dec 29, 2019
5707c52
Move PassTruDecompressor#decompressed_size to Decompressor
jspanjers Dec 29, 2019
cda7127
Add Decompressor#input_stream
jspanjers Jan 8, 2020
00b525d
Fix returned outbuf for Inflater#sysread
jspanjers Jan 5, 2020
c66277d
Rename Decompressor#sysread to #read
jspanjers Jan 5, 2020
456bd4d
Mimic IO#read return values in Decompressor#read
jspanjers Jan 5, 2020
2b72683
Define compression methods
jspanjers Dec 29, 2019
a5d068d
Support Decompressor plugins
jspanjers Dec 20, 2019
0b9433c
Add test for unsupported decompression, e.g bzip2
jspanjers Jan 5, 2020
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
Prev Previous commit
Next Next commit
Fix returned outbuf for Inflater#sysread
  • Loading branch information
@jspanjers
jspanjers committed Jan 26, 2020
commit 00b525d76e295bab19b69c6f3481d60cfda9ca0f
10 changes: 5 additions & 5 deletions lib/zip/inflater.rb
View file
Open in desktop
5972
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ def initialize(*args)
@has_returned_empty_string = false
end

def sysread(length = nil, buf = '')
def sysread(length = nil, outbuf = '')
while length.nil? || (@buffer.bytesize < length)
break if input_finished?
@buffer << produce_input(buf)
@buffer << produce_input
end

return value_when_finished if eof?

@buffer.slice!(0...(length || @buffer.bytesize))
outbuf.replace(@buffer.slice!(0...(length || @buffer.bytesize)))
end

def eof
Expand All @@ -27,10 +27,10 @@ def eof

private

def produce_input(buf = '')
def produce_input
retried = 0
begin
@zlib_inflater.inflate(input_stream.read(Decompressor::CHUNK_SIZE, buf))
@zlib_inflater.inflate(input_stream.read(Decompressor::CHUNK_SIZE))
rescue Zlib::BufError
raise if retried >= 5 # how many times should we retry?
retried += 1
Expand Down
0