From 9b401ef56bfc7277f0952467a11de798accc6ae8 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Fri, 22 Nov 2024 14:33:06 -0600
Subject: [PATCH] IsInstalled() works

---
 example/main.go | 31 +++++++++++++++++++++++++------
 wit.go          | 16 +++++++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/example/main.go b/example/main.go
index 1fa70e0..28d85f8 100644
--- a/example/main.go
+++ b/example/main.go
@@ -10,6 +10,26 @@ import (
 func main() {
 	m := testMachine()
 	testPackages(m)
+
+	loop := m.Packages.SortByName()
+	for loop.Scan() {
+		p := loop.Package()
+		log.Info("installed package:", p.Name, p.Version, p.PkgName)
+	}
+
+	if m.IsInstalled("bash") {
+		log.Info("bash installed check worked")
+	} else {
+		log.Info("bash installed check failed")
+		panic("bash")
+	}
+
+	if m.IsInstalled("foo") {
+		log.Info("foo not-installed check failed")
+		panic("foo")
+	} else {
+		log.Info("foo not-installed check worked")
+	}
 }
 
 func testMachine() *zoopb.Machine {
@@ -20,14 +40,13 @@ func testMachine() *zoopb.Machine {
 }
 
 func testPackages(m *zoopb.Machine) {
-	var all *zoopb.Packages
-	all = new(zoopb.Packages)
+	m.Packages = new(zoopb.Packages)
 	// r = zoopb.LoadJSON("go.wit.com/lib/protobuf/zoopb")
 
 	new1 := new(zoopb.Package)
 	new1.Name = "bash"
 	new1.Version = "5.2.21"
-	if all.Append(new1) {
+	if m.Packages.Append(new1) {
 		log.Info("added", new1.Name, "ok")
 	} else {
 		log.Info("added", new1.Name, "failed")
@@ -36,17 +55,17 @@ func testPackages(m *zoopb.Machine) {
 	new2 := new(zoopb.Package)
 	new2.Name = "go-clone"
 	new2.Version = "0.6.8" // good version of the macos
-	if all.Append(new2) {
+	if m.Packages.Append(new2) {
 		log.Info("added", new2.Name, "ok")
 	} else {
 		log.Info("added", new2.Name, "failed")
 	}
 
-	if all.Append(new2) {
+	if m.Packages.Append(new2) {
 		log.Info("added", new2.Name, "ok (this is bad)")
 	} else {
 		log.Info("added", new2.Name, "failed (but ok)")
 	}
 
-	fmt.Println("packages are:", len(all.Packages))
+	fmt.Println("package count = ", m.Packages.Len())
 }
diff --git a/wit.go b/wit.go
index f2a14f5..0f68aae 100644
--- a/wit.go
+++ b/wit.go
@@ -11,6 +11,16 @@ var VERSION string
 var BUILDTIME string
 
 func (m *Machine) IsInstalled(name string) bool {
+	loop := m.Packages.SortByName()
+	for loop.Scan() {
+		p := loop.Package()
+		if name == p.Name {
+			// log.Info("package installed:", p.Name, p.Version, p.PkgName)
+			return true
+		}
+	}
+
+	// log.Info("package not-installed:", name)
 	return false
 }
 
@@ -117,10 +127,10 @@ func parsePackageInfo(lines string) *Package {
 	}
 
 	p := Package{
-		Name:     name,
-		Version:  version,
+		Name:    name,
+		Version: version,
 		PkgName: filename,
-		SrcPath:   gopath,
+		SrcPath: gopath,
 	}
 
 	return &p