From 996cb765b90f259d1e6d94824caf36615036a64b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 14 Sep 2019 12:58:42 +1000 Subject: [PATCH] Add RAC+Zstd support to cmd/ractool --- cmd/ractool/main.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/ractool/main.go b/cmd/ractool/main.go index b5daf0d7..fc390ce6 100644 --- a/cmd/ractool/main.go +++ b/cmd/ractool/main.go @@ -194,6 +194,7 @@ import ( "github.com/google/wuffs/lib/rac" "github.com/google/wuffs/lib/raczlib" + "github.com/google/wuffs/lib/raczstd" ) // TODO: a flag to use a disk-backed (not memory-backed) TempFile. @@ -375,12 +376,10 @@ func decode(inFile *os.File) error { r := &rac.Reader{ ReadSeeker: rs, CompressedSize: compressedSize, - } - switch *codecFlag { - case "zlib": - r.CodecReaders = []rac.CodecReader{&raczlib.CodecReader{}} - default: - return errors.New("unsupported -codec") + CodecReaders: []rac.CodecReader{ + &raczlib.CodecReader{}, + &raczstd.CodecReader{}, + }, } // The r.Close method might need to wait for its goroutines to shut down @@ -449,6 +448,8 @@ func encode(r io.Reader) error { switch *codecFlag { case "zlib": w.CodecWriter = &raczlib.CodecWriter{} + case "zstd": + w.CodecWriter = &raczstd.CodecWriter{} default: return errors.New("unsupported -codec") }