From 31b7eb34eecdd9ce5c101412640a72093b3be065 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 17 Nov 2022 16:36:16 -0800 Subject: [PATCH] archive: allow selecting different formats when writing compressed file (MR 25) --- internal/archive/archive.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/internal/archive/archive.go b/internal/archive/archive.go index fd14f4a..bafafb6 100644 --- a/internal/archive/archive.go +++ b/internal/archive/archive.go @@ -223,19 +223,26 @@ func (archive *Archive) addFile(source string, dest string) error { } func (archive *Archive) writeCompressed(path string, mode os.FileMode) error { - // TODO: support other compression formats, based on deviceinfo fd, err := os.Create(path) if err != nil { return err } - gz := gzip.NewWriter(fd) + var compressor io.WriteCloser - if _, err = io.Copy(gz, archive.buf); err != nil { + switch archive.compress_format { + case FormatGzip: + compressor = gzip.NewWriter(fd) + default: + log.Print("Unknown or no compression format set, using gzip") + compressor = gzip.NewWriter(fd) + } + + if _, err = io.Copy(compressor, archive.buf); err != nil { return err } - if err := gz.Close(); err != nil { + if err := compressor.Close(); err != nil { return err }