feat: vendor bodgit/sevenzip package to remove go4.org dependency
Vendored the sevenzip package to eliminate dependency chain: - sevenzip -> go4.org -> 25+ Google/Cloud/telemetry packages Changes: - Added internal/sevenzip/ with full package source - Inlined go4.org/readerutil into multireaderat.go - Updated all internal imports to use bookhoard/internal/sevenzip - Preserved .cb7 comic archive support This reduces bloat by ~4.9 MB and removes unused telemetry dependencies while maintaining all functionality.
This commit is contained in:
@@ -0,0 +1,77 @@
|
||||
// Package deflate implements the Deflate decompressor.
|
||||
package deflate
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"sync"
|
||||
|
||||
"bookhoard/internal/sevenzip/internal/util"
|
||||
"github.com/klauspost/compress/flate"
|
||||
)
|
||||
|
||||
type readCloser struct {
|
||||
c io.Closer
|
||||
fr io.ReadCloser
|
||||
}
|
||||
|
||||
var (
|
||||
//nolint:gochecknoglobals
|
||||
flateReaderPool sync.Pool
|
||||
|
||||
errAlreadyClosed = errors.New("deflate: already closed")
|
||||
errNeedOneReader = errors.New("deflate: need exactly one reader")
|
||||
)
|
||||
|
||||
func (rc *readCloser) Close() error {
|
||||
if rc.c == nil || rc.fr == nil {
|
||||
return errAlreadyClosed
|
||||
}
|
||||
|
||||
if err := errors.Join(rc.fr.Close(), rc.c.Close()); err != nil {
|
||||
return fmt.Errorf("deflate: error closing: %w", err)
|
||||
}
|
||||
|
||||
flateReaderPool.Put(rc.fr)
|
||||
rc.c, rc.fr = nil, nil
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (rc *readCloser) Read(p []byte) (int, error) {
|
||||
if rc.c == nil || rc.fr == nil {
|
||||
return 0, errAlreadyClosed
|
||||
}
|
||||
|
||||
n, err := rc.fr.Read(p)
|
||||
if err != nil && !errors.Is(err, io.EOF) {
|
||||
err = fmt.Errorf("deflate: error reading: %w", err)
|
||||
}
|
||||
|
||||
return n, err
|
||||
}
|
||||
|
||||
// NewReader returns a new DEFLATE io.ReadCloser.
|
||||
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
|
||||
if len(readers) != 1 {
|
||||
return nil, errNeedOneReader
|
||||
}
|
||||
|
||||
fr, ok := flateReaderPool.Get().(io.ReadCloser)
|
||||
if ok {
|
||||
frf, ok := fr.(flate.Resetter)
|
||||
if ok {
|
||||
if err := frf.Reset(util.ByteReadCloser(readers[0]), nil); err != nil {
|
||||
return nil, fmt.Errorf("deflate: error resetting: %w", err)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
fr = flate.NewReader(util.ByteReadCloser(readers[0]))
|
||||
}
|
||||
|
||||
return &readCloser{
|
||||
c: readers[0],
|
||||
fr: fr,
|
||||
}, nil
|
||||
}
|
||||
Reference in New Issue
Block a user