test

app/app_info.go

@@ -5,8 +5,8 @@ import (
 	"harmonybinary/info"
 	"harmonybinary/pkg"
 	"harmonybinary/utils"
-	"io/ioutil"
 	"os"
+	"path"
 )
 
 func OpenFile(filepath string) (*info.App, error) {
@@ -29,9 +29,8 @@ func getHapFile(dir string) (filePath string, err error) {
 		return "", err
 	}
 	for _, f := range files {
-		fs, _ := ioutil.ReadFile(f)
-		fileType := utils.GetFileType(fs)
-		if fileType == pkg.FileTypeHap {
+		ext := path.Ext(f)
+		if ext == pkg.FileTypeHap {
 			return f, nil
 		}
 	}

hap/hap_info.go

@@ -4,8 +4,8 @@ import (
 	"harmonybinary/info"
 	"harmonybinary/pkg"
 	"harmonybinary/utils"
-	"io/ioutil"
 	"os"
+	"path"
 )
 
 func OpenFile(filepath string) (*info.App, error) {
@@ -20,6 +20,9 @@ func OpenFile(filepath string) (*info.App, error) {
 		return nil, err
 	}
 	a, err := info.GetAppInfo(apkFilePath)
+	if err != nil {
+		return nil, err
+	}
 	return a, nil
 }
 func getApkFile(dir string) (filePath string, err error) {
@@ -28,10 +31,9 @@ func getApkFile(dir string) (filePath string, err error) {
 		return "", err
 	}
 	for _, f := range files {
-		f, _ := ioutil.ReadFile(f)
-		fileType := utils.GetFileType(f)
-		if fileType == pkg.FileTypeApk {
-			return fileType, nil
+		ext := path.Ext(f)
+		if ext == pkg.FileTypeApk {
+			return f, nil
 		}
 	}
 	return

info/info.go

@@ -16,7 +16,7 @@ type App struct {
 	Perms        []string `json:"perms"`
 }
 
-func GetAppInfo(apkFilePath string) (a *App, err error) {
+func GetAppInfo(apkFilePath string) (*App, error) {
 	p, err := apk.OpenFile(apkFilePath)
 	if err != nil {
 		return nil, errors.New(fmt.Sprintf("打开apk(%s)出错:%s", apkFilePath, err.Error()))
@@ -35,7 +35,7 @@ func GetAppInfo(apkFilePath string) (a *App, err error) {
 			appLabel = ""
 		}
 	}
-	a.Name = appLabel
+	a := &App{Name: appLabel}
 	s, err := p.Manifest().VersionName.String()
 	if err == nil {
 		a.Version = s
@@ -55,5 +55,5 @@ func GetAppInfo(apkFilePath string) (a *App, err error) {
 			a.Perms = append(a.Perms, s2)
 		}
 	}
-	return
+	return a, nil
 }

pkg/code_type.go

@@ -1,6 +1,6 @@
 package pkg
 
 const (
-	FileTypeHap = "hap"
-	FileTypeApk = "apk"
+	FileTypeHap = ".hap"
+	FileTypeApk = ".apk"
 )

test/app_test.go

@@ -0,0 +1,15 @@
+package test
+
+import (
+	"fmt"
+	"harmonybinary/app"
+	"testing"
+)
+
+func TestApp(t *testing.T) {
+	a, err := app.OpenFile("./123.app")
+	if err != nil {
+		fmt.Println(err)
+	}
+	fmt.Println(a)
+}

test/hap_test.go

@@ -2,12 +2,12 @@ package test
 
 import (
 	"fmt"
-	"harmonybinary/app"
+	"harmonybinary/hap"
 	"testing"
 )
 
 func TestHap(t *testing.T) {
-	a, err := app.OpenFile("./c.hap")
+	a, err := hap.OpenFile("./c.hap")
 	if err != nil {
 		fmt.Println(err)
 	}

utils/fileType.go

@@ -11,8 +11,7 @@ import (
 var fileTypeMap sync.Map
 
 func init() {
-	fileTypeMap.Store("00736861706500636f6c", "apk")  //apk (APK)
-	fileTypeMap.Store("504b03040a0000080000", "hap")  //hap (HAP)
+	fileTypeMap.Store("504b03040a0000080000", "apk")  //apk (APK)
 	fileTypeMap.Store("ffd8ffe000104a464946", "jpg")  //JPEG (jpg)
 	fileTypeMap.Store("89504e470d0a1a0a0000", "png")  //PNG (png)
 	fileTypeMap.Store("47494638396126026f01", "gif")  //GIF (gif)