mirror of
https://github.com/containers/podman.git
synced 2025-10-20 04:34:01 +08:00
88af8852db
Added some tests to verify that files extractions works with different compression format. Created a decompressor interface with 2 main methods: reader(): returns an io.Reader for the specific compression algorithm copy(): extracts the compressed file into the file provided as param Created 5 decompressor types: - gzip: extract gzip files - xz: extract xz files - zip: extract zip files - generic: extract any other file using github.com/containers/image/v5/pkg/compression - uncompressed: only do a copy of the file Minor fix to the progress bar instances: added a call to bar.Abort(false) that happens before Progress.Wait() to avoid that it hangs when a bar is not set as completed although extraction is done. Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
57 lines
1.1 KiB
Go
57 lines
1.1 KiB
Go
package compression
|
|
|
|
import (
|
|
"compress/gzip"
|
|
"io"
|
|
"os"
|
|
|
|
crcOs "github.com/crc-org/crc/v2/pkg/os"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type gzDecompressor struct {
|
|
compressedFilePath string
|
|
compressedFile *os.File
|
|
gzReader *gzip.Reader
|
|
}
|
|
|
|
func newGzipDecompressor(compressedFilePath string) decompressor {
|
|
return &gzDecompressor{
|
|
compressedFilePath: compressedFilePath,
|
|
}
|
|
}
|
|
|
|
func (d *gzDecompressor) srcFilePath() string {
|
|
return d.compressedFilePath
|
|
}
|
|
|
|
func (d *gzDecompressor) reader() (io.Reader, error) {
|
|
srcFile, err := os.Open(d.compressedFilePath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
d.compressedFile = srcFile
|
|
|
|
gzReader, err := gzip.NewReader(srcFile)
|
|
if err != nil {
|
|
return gzReader, err
|
|
}
|
|
d.gzReader = gzReader
|
|
|
|
return gzReader, nil
|
|
}
|
|
|
|
func (*gzDecompressor) copy(w *os.File, r io.Reader) error {
|
|
_, err := crcOs.CopySparse(w, r)
|
|
return err
|
|
}
|
|
|
|
func (d *gzDecompressor) close() {
|
|
if err := d.compressedFile.Close(); err != nil {
|
|
logrus.Errorf("Unable to close gz file: %q", err)
|
|
}
|
|
if err := d.gzReader.Close(); err != nil {
|
|
logrus.Errorf("Unable to close gz file: %q", err)
|
|
}
|
|
}
|