Add bz2 compress support (#179)

Author: LinuxSuRen

cmd/install.go

@@ -187,8 +187,6 @@ func (o *installOption) installFromSource() (err error) {
 	return
 }
 
-
-
 func (o *installOption) buildGoSource() (binaryPath string, err error) {
 	gopath := sysos.Getenv("GOPATH")
 	if gopath == "" {

pkg/compress/bzip2.go

@@ -0,0 +1,51 @@
+package compress
+
+import (
+	"compress/bzip2"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+)
+
+// Bzip2 implements a compress which based is based on bzip2
+type Bzip2 struct {
+	additionBinaries []string
+}
+
+// NewBzip2 creates an instance of Bzip2
+func NewBzip2(additionBinaries []string) *Bzip2 {
+	return &Bzip2{additionBinaries: additionBinaries}
+}
+
+// make sure Bzip2 implements the interface Compress
+var _ Compress = &Bzip2{}
+
+// ExtractFiles extracts files from a target compress file
+func (x *Bzip2) ExtractFiles(sourceFile, targetName string) (err error) {
+	if targetName == "" {
+		err = errors.New("target filename is empty")
+		return
+	}
+	var f *os.File
+	if f, err = os.Open(sourceFile); err != nil {
+		return err
+	}
+	defer func() {
+		_ = f.Close()
+	}()
+
+	// Create a Bzip2 Reader
+	r := bzip2.NewReader(f)
+
+	var targetFile *os.File
+	if targetFile, err = os.OpenFile(fmt.Sprintf("%s/%s", filepath.Dir(sourceFile), targetName),
+		os.O_CREATE|os.O_RDWR, 0744); err != nil {
+		return
+	}
+	if _, err = io.Copy(targetFile, r); err != nil {
+		return
+	}
+	return
+}

pkg/compress/types.go

@@ -38,7 +38,15 @@ func GetCompressor(extension string, additionBinaries []string) Compress {
 		return NewXz(additionBinaries)
 	case ".zip":
 		return NewZip(additionBinaries)
-	default:
+	case ".gz", ".tar.gz":
 		return NewGZip(additionBinaries)
+	case ".bz2":
+		return NewBzip2(additionBinaries)
 	}
+	return nil
+}
+
+// IsSupport checks if the desired file extension
+func IsSupport(extension string) bool {
+	return GetCompressor(extension, nil) != nil
 }

pkg/compress/types_test.go

@@ -1,6 +1,7 @@
 package compress
 
 import (
+	"path"
 	"reflect"
 	"testing"
 )
@@ -17,7 +18,7 @@ func TestGetCompressor(t *testing.T) {
 	}{{
 		name: "unknown type",
 		args: args{extension: ".xdf"},
-		want: NewGZip(nil),
+		want: nil,
 	}, {
 		name: ".zip",
 		args: args{extension: ".zip"},
@@ -26,6 +27,10 @@ func TestGetCompressor(t *testing.T) {
 		name: ".xz",
 		args: args{extension: ".xz"},
 		want: NewXz(nil),
+	}, {
+		name: ".tar.gz",
+		args: args{extension: ".tar.gz"},
+		want: NewGZip(nil),
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -35,3 +40,33 @@ func TestGetCompressor(t *testing.T) {
 		})
 	}
 }
+
+func TestIsSupport(t *testing.T) {
+	type args struct {
+		extension string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{{
+		name: "supported extension: .tar.gz",
+		args: args{
+			extension: path.Ext("test.tar.gz"),
+		},
+		want: true,
+	}, {
+		name: "not supported extension: .ab",
+		args: args{
+			extension: path.Ext("test.ab"),
+		},
+		want: false,
+	}}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := IsSupport(tt.args.extension); got != tt.want {
+				t.Errorf("IsSupport() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/installer/check.go

@@ -6,6 +6,7 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/linuxsuren/http-downloader/pkg"
 	"github.com/linuxsuren/http-downloader/pkg/common"
+	"github.com/linuxsuren/http-downloader/pkg/compress"
 	"github.com/linuxsuren/http-downloader/pkg/exec"
 	"github.com/linuxsuren/http-downloader/pkg/net"
 	"github.com/linuxsuren/http-downloader/pkg/os"
@@ -27,12 +28,6 @@ const (
 	ProviderGitHub = "github"
 )
 
-var supportedPackages = []string{
-	"tar.gz",
-	"zip",
-	"tar.xz",
-}
-
 // CheckDepAndInstall checks the desired tools, install the missing packages
 func (o *Installer) CheckDepAndInstall(tools map[string]string) (err error) {
 	for tool, formula := range tools {
@@ -271,6 +266,8 @@ func (o *Installer) ProviderURLParse(path string, acceptPreRelease bool) (packag
 					}
 					o.Name = cfg.Binary
 				}
+			} else {
+				err = fmt.Errorf("failed to parse YAML file: %s, error: %v", matchedFile, err)
 			}
 		}
 	}
@@ -393,10 +390,5 @@ func getPackagingFormat(installer *Installer) string {
 }
 
 func hasPackageSuffix(packageURL string) bool {
-	for i := 0; i < len(supportedPackages); i++ {
-		if strings.HasSuffix(packageURL, supportedPackages[i]) {
-			return true
-		}
-	}
-	return false
+	return compress.IsSupport(path.Ext(packageURL))
 }