Pass blob readers to unarchivers rather than having a dedicated blob unarchiver.

Author: mitchell-as

internal/unarchiver/targzblob.go

@@ -1,10 +1,12 @@
 package updater
 
 import (
+	"bytes"
 	"crypto/sha256"
 	"fmt"
 	"io"
 	"net"
+	"runtime"
 
 	"github.com/ActiveState/cli/internal/analytics"
 	anaConst "github.com/ActiveState/cli/internal/analytics/constants"
@@ -16,6 +18,7 @@ import (
 	"github.com/ActiveState/cli/internal/logging"
 	"github.com/ActiveState/cli/internal/retryhttp"
 	"github.com/ActiveState/cli/internal/rtutils/ptr"
+	"github.com/ActiveState/cli/internal/unarchiver"
 )
 
 const CfgUpdateTag = "update_tag"
@@ -73,8 +76,11 @@ func (f *Fetcher) Fetch(update *UpdateInstaller, targetDir string) error {
 		return errs.Wrap(err, msg)
 	}
 
-	a := blobUnarchiver(b)
-	if err := a.Unarchive(targetDir); err != nil {
+	ua := unarchiver.NewTarGz()
+	if runtime.GOOS == "windows" {
+		ua = unarchiver.NewZip()
+	}
+	if err := ua.Unarchive(bytes.NewBuffer(b), targetDir); err != nil {
 		msg := "Unarchiving failed"
 		f.analyticsEvent(update.AvailableUpdate.Version, msg)
 		return errs.Wrap(err, msg)

internal/unarchiver/zipblob.go

@@ -3,12 +3,6 @@
 
 package updater
 
-import "github.com/ActiveState/cli/internal/unarchiver"
-
-func blobUnarchiver(blob []byte) *unarchiver.TarGzBlob {
-	return unarchiver.NewTarGzBlob(blob)
-}
-
 func checkAdmin() error {
 	return nil
 }

internal/updater/fetcher.go

@@ -4,13 +4,8 @@ import (
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/installation"
 	"github.com/ActiveState/cli/internal/osutils"
-	"github.com/ActiveState/cli/internal/unarchiver"
 )
 
-func blobUnarchiver(blob []byte) *unarchiver.ZipBlob {
-	return unarchiver.NewZipBlob(blob)
-}
-
 func checkAdmin() error {
 	installContext, err := installation.GetContext()
 	if err != nil {