Refactor code

Move the code related to local app checks into a seperate package.

internal/macapp/arch.go → internal/localcheck/arch.go

@@ -1,4 +1,4 @@
-package macapp
+package localcheck
 
 import (
 	"debug/macho"

internal/localcheck/local.go

@@ -0,0 +1,61 @@
+package localcheck
+
+import (
+	"debug/macho"
+	"os"
+	"path/filepath"
+
+	"howett.net/plist"
+)
+
+type executableDecoded struct {
+	CFBundleExecutable string
+}
+
+func getExecutableName(path string) (string, error) {
+	plistFile := filepath.Join(path, "Contents", "Info.plist")
+
+	f, err := os.Open(plistFile)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+
+	decoder := plist.NewDecoder(f)
+	var plistDecoded executableDecoded
+	err = decoder.Decode(&plistDecoded)
+	if err != nil {
+		return "", err
+	}
+
+	return plistDecoded.CFBundleExecutable, err
+}
+
+func GetArchitectures(path string) (Architectures, error) {
+	var (
+		arch = Architectures{}
+	)
+
+	executable, err := getExecutableName(path)
+	if err != nil {
+		return arch, err
+	}
+
+	// binary file path
+	binary := filepath.Join(path, "Contents", "MacOS", executable)
+
+	fat, err := macho.OpenFat(binary)
+	if err == nil {
+		// file is Mach-O universal
+		arch.LoadFromFat(fat.Arches)
+	} else {
+		// file is Mach-O
+		f, err := macho.Open(binary)
+		if err != nil {
+			return arch, err
+		}
+		arch.Load(f.Cpu)
+	}
+
+	return arch, nil
+}

internal/localcheck/local_test.go

@@ -0,0 +1,19 @@
+package localcheck
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestApplication_GetExecutableName(t *testing.T) {
+	exec, err := getExecutableName("/System/Applications/Maps.app")
+	assert.Nil(t, err)
+	assert.Equal(t, "Maps", exec)
+}
+
+func TestApplication_GetArchitectures(t *testing.T) {
+	arch, err := GetArchitectures("/System/Applications/Maps.app")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"Intel 64"}, arch)
+}

internal/macapp/macapp.go

@@ -1,15 +1,14 @@
 package macapp
 
 import (
-	"debug/macho"
 	"io/fs"
 	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
 	"strings"
 
-	"howett.net/plist"
+	"github.com/harryzcy/ascheck/internal/localcheck"
 )
 
 var (
@@ -30,55 +29,7 @@ func init() {
 type Application struct {
 	Name          string
 	Path          string
-	Architectures Architectures
-}
-
-type executableDecoded struct {
-	CFBundleExecutable string
-}
-
-func (a *Application) GetExecutableName() (string, error) {
-	plistFile := filepath.Join(a.Path, "Contents", "Info.plist")
-
-	f, err := os.Open(plistFile)
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-
-	decoder := plist.NewDecoder(f)
-	var plistDecoded executableDecoded
-	err = decoder.Decode(&plistDecoded)
-	if err != nil {
-		return "", err
-	}
-
-	return plistDecoded.CFBundleExecutable, err
-}
-
-func (a *Application) GetArchitectures() (Architectures, error) {
-	executable, err := a.GetExecutableName()
-	if err != nil {
-		return a.Architectures, err
-	}
-
-	// binary file path
-	binary := filepath.Join(a.Path, "Contents", "MacOS", executable)
-
-	fat, err := macho.OpenFat(binary)
-	if err == nil {
-		// file is Mach-O universal
-		a.Architectures.LoadFromFat(fat.Arches)
-	} else {
-		// file is Mach-O
-		f, err := macho.Open(binary)
-		if err != nil {
-			return a.Architectures, err
-		}
-		a.Architectures.Load(f.Cpu)
-	}
-
-	return a.Architectures, nil
+	Architectures localcheck.Architectures
 }
 
 // GetAllApplications returns all applications
@@ -119,7 +70,12 @@ func resolveApplication(dir string, f fs.FileInfo) (Application, error) {
 		Name: strings.TrimSuffix(f.Name(), ".app"),
 		Path: filepath.Join(dir, f.Name()),
 	}
-	app.GetArchitectures()
+
+	var err error
+	app.Architectures, err = localcheck.GetArchitectures(app.Path)
+	if err != nil {
+		return Application{}, err
+	}
 
 	return app, nil
 }

internal/macapp/macapp_test.go

@@ -6,25 +6,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestApplication_GetExecutableName(t *testing.T) {
-	app := Application{
-		Path: "/System/Applications/Maps.app",
-	}
-
-	exec, err := app.GetExecutableName()
-	assert.Nil(t, err)
-	assert.Equal(t, "Maps", exec)
-}
-
-func TestApplication_GetArchitectures(t *testing.T) {
-	app := Application{
-		Path: "/System/Applications/Maps.app",
-	}
-	arch, err := app.GetArchitectures()
-	assert.Nil(t, err)
-	assert.Equal(t, []string{"Intel 64"}, arch)
-}
-
 func TestGetAllApplications(t *testing.T) {
 	apps, err := GetAllApplications(nil)
 	assert.Nil(t, err)