From 30f5a3e84e1bf5086eaf723df126132090ed7b80 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Fri, 16 Sep 2022 09:19:58 -0700 Subject: [PATCH] revert back to flate instead of zstd --- go.mod | 1 - go.sum | 2 -- src/compress/compress.go | 19 ++++++++----------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 4df1c1f..9492798 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/denisbrodbeck/machineid v1.0.1 github.com/kalafut/imohash v1.0.2 - github.com/klauspost/compress v1.15.9 github.com/schollz/cli/v2 v2.2.1 github.com/schollz/logger v1.2.0 github.com/schollz/mnemonicode v1.0.1 diff --git a/go.sum b/go.sum index ce9d791..d585298 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,6 @@ github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbj github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= github.com/kalafut/imohash v1.0.2 h1:j/cUPa15YvXv7abJlM+kdJIycbBMpmO7WqhPl4YB76I= github.com/kalafut/imohash v1.0.2/go.mod h1:PjHBF0vpo1q7zMqiTn0qwSTQU2wDn5QIe8S8sFQuZS8= -github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= diff --git a/src/compress/compress.go b/src/compress/compress.go index e78757e..3343822 100644 --- a/src/compress/compress.go +++ b/src/compress/compress.go @@ -2,10 +2,9 @@ package compress import ( "bytes" + "compress/flate" "io" - "github.com/klauspost/compress/zstd" - log "github.com/schollz/logger" ) @@ -31,24 +30,22 @@ func Decompress(src []byte) []byte { return deCompressedData.Bytes() } -// compress uses zstd to compress a byte slice to a corresponding level +// compress uses flate to compress a byte slice to a corresponding level func compress(src []byte, dest io.Writer, level int) { - compressor, err := zstd.NewWriter(dest, zstd.WithEncoderLevel(zstd.EncoderLevelFromZstd(level))) + compressor, err := flate.NewWriter(dest, level) if err != nil { - panic(err) + log.Debugf("error level data: %v", err) + return } - if _, err = compressor.Write(src); err != nil { + if _, err := compressor.Write(src); err != nil { log.Debugf("error writing data: %v", err) } compressor.Close() } -// decompress uses zstd to decompress an io.Reader +// compress uses flate to decompress an io.Reader func decompress(src io.Reader, dest io.Writer) { - decompressor, err := zstd.NewReader(src) - if err != nil { - panic(err) - } + decompressor := flate.NewReader(src) if _, err := io.Copy(dest, decompressor); err != nil { log.Debugf("error copying data: %v", err) }