Force zip for steam

client.go

@@ -2,6 +2,7 @@ package pufferpanel
 
 import (
 	"github.com/cavaliergopher/grab/v3"
+	"github.com/mholt/archiver/v3"
 	"net/http"
 	"os"
 )
@@ -17,14 +18,24 @@ func HttpGet(requestUrl string) (*http.Response, error) {
 }
 
 func HttpExtract(requestUrl, directory string) error {
-	//we will write this to temp so we can not keep so much in memory
+	//we will write this to temp so we can not keep so much in memoryf
+	response, err := grab.Get(os.TempDir(), requestUrl)
+	if err != nil {
+		return err
+	}
+	defer os.Remove(response.Filename)
+
+	err = Extract(nil, response.Filename, directory, "*", false, nil)
+	return err
+}
 
+func HttpExtractZip(requestUrl, directory string) error {
 	response, err := grab.Get(os.TempDir(), requestUrl)
 	if err != nil {
 		return err
 	}
 	defer os.Remove(response.Filename)
 
-	err = Extract(nil, response.Filename, directory, "*", false)
+	err = Extract(nil, response.Filename, directory, "*", false, archiver.DefaultZip)
 	return err
 }

compression.go

@@ -41,7 +41,7 @@ func DetermineIfSingleRoot(sourceFile string) (bool, error) {
 	return isSingleRoot, err
 }
 
-func Extract(fs FileServer, sourceFile, targetPath, filter string, skipRoot bool) error {
+func Extract(fs FileServer, sourceFile, targetPath, filter string, skipRoot bool, forcedType Walker) error {
 	if fs != nil {
 		sourceFile = filepath.Join(fs.Prefix(), sourceFile)
 	}
@@ -54,7 +54,15 @@ func Extract(fs FileServer, sourceFile, targetPath, filter string, skipRoot bool
 		}
 	}
 
-	return archiver.Walk(sourceFile, func(file archiver.File) (err error) {
+	if forcedType != nil {
+		return forcedType.Walk(sourceFile, walker(fs, targetPath, filter, skipRoot))
+	}
+
+	return archiver.Walk(sourceFile, walker(fs, targetPath, filter, skipRoot))
+}
+
+func walker(fs FileServer, targetPath, filter string, skipRoot bool) archiver.WalkFunc {
+	return func(file archiver.File) (err error) {
 		path := getCompressedItemName(file)
 
 		if !CompareWildcard(file.Name(), filter) {
@@ -103,7 +111,7 @@ func Extract(fs FileServer, sourceFile, targetPath, filter string, skipRoot bool
 		}
 
 		return
-	})
+	}
 }
 
 // getCompressedItemName Resolves headers in the event the wrapped interface fails
@@ -118,3 +126,7 @@ func getCompressedItemName(file archiver.File) string {
 		return file.Name()
 	}
 }
+
+type Walker interface {
+	Walk(archive string, walkFn archiver.WalkFunc) error
+}

operations/steamgamedl/steamgamedl.go

@@ -172,7 +172,7 @@ func downloadMetadata(env pufferpanel.Environment) error {
 		return err
 	}
 
-	err = pufferpanel.HttpExtract(SteamMetadataServerLink+metadataName, filepath.Join(env.GetRootDirectory(), ".steam"))
+	err = pufferpanel.HttpExtractZip(SteamMetadataServerLink+metadataName, filepath.Join(env.GetRootDirectory(), ".steam"))
 	if err != nil {
 		return err
 	}