Merge pull request #11 from typomedia/v0.3.0

v0.3.0

Author: typomedia

README.md

@@ -23,7 +23,7 @@ All data will be stored in a single `patchouli.boltdb` file in the current worki
 
 ## Cross compile
 
-    make compile
+    make cross
 
 ## Technology
 
@@ -35,14 +35,9 @@ All data will be stored in a single `patchouli.boltdb` file in the current worki
 
 ## Todo
 
-- [ ] add delete functionality
 - [ ] add a login page
-- [ ] add a `toml` config file
-- [ ] email notifications
+- [ ] add a global search
 - [ ] protect api used by the frontend
-- [ ] optimize json/csv export
-- [ ] add json/csv import api
-- [ ] refactor some quirky code
 - [ ] write some tests...
 
 ## Systemd
@@ -61,4 +56,4 @@ If not running in a container, change the `User` and `Group` for security reason
 Patchouli is licensed under the [GNU General Public License v3.0](LICENSE).
 
 ---
-Copyright © 2024 Typomedia Foundation. All rights reserved.
+Copyright © 2025 Typomedia Foundation. All rights reserved.

app/app.go

@@ -20,7 +20,7 @@ type Application struct {
 func new() *Application {
 	app = &Application{}
 	app.Name = "Patchouli"
-	app.Version = "0.2.1"
+	app.Version = "0.3.0"
 	app.Author = "Philipp Speck <[email protected]>"
 	app.Description = "Patch Management Planner"
 	err := app.LoadConfig()

app/handler/api/htmx/operator.go

@@ -39,6 +39,9 @@ func Operator(c *fiber.Ctx) error {
 		if err != nil {
 			return err
 		}
+		if operator.Inactive {
+			continue
+		}
 		Operators = append(Operators, operator)
 	}
 

app/handler/api/htmx/operators.go

@@ -26,6 +26,9 @@ func Operators(c *fiber.Ctx) error {
 		if err != nil {
 			return err
 		}
+		if operator.Inactive {
+			continue
+		}
 		Operators = append(Operators, operator)
 	}
 

app/handler/machine/list.go

@@ -1,9 +1,12 @@
 package machine
 
 import (
+	"cmp"
 	"github.com/gofiber/fiber/v2"
 	"github.com/typomedia/patchouli/app/store/boltdb"
 	"github.com/typomedia/patchouli/app/structs"
+	"slices"
+	"strings"
 )
 
 func List(c *fiber.Ctx) error {
@@ -22,6 +25,14 @@ func List(c *fiber.Ctx) error {
 		}
 	}
 
+	slices.SortFunc(active, func(a, b structs.Machine) int {
+		return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
+	})
+
+	slices.SortFunc(inactive, func(a, b structs.Machine) int {
+		return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
+	})
+
 	Machines = append(active, inactive...)
 
 	defer db.Close()

app/handler/operator/edit.go

@@ -22,6 +22,12 @@ func Edit(c *fiber.Ctx) error {
 		log.Error(err)
 	}
 
+	machinesOfOperator, err := db.GetMachinesByOperator(operator.Id)
+	if err != nil {
+		return err
+	}
+	operator.MachineCount = len(machinesOfOperator)
+
 	defer db.Close()
 
 	return c.Render("app/views/operator/edit", fiber.Map{

app/handler/operator/list.go

@@ -1,21 +1,39 @@
 package operator
 
 import (
+	"cmp"
 	"github.com/gofiber/fiber/v2"
 	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+	"slices"
+	"strings"
 )
 
 func List(c *fiber.Ctx) error {
 	db := boltdb.New()
 
 	operators, err := db.GetAllOperators()
+	var Operators structs.Operators
 	if err != nil {
 		return err
 	}
+	for _, operator := range operators {
+		operator.MachineCount = 0
+		machinesOfOperator, err := db.GetMachinesByOperator(operator.Id)
+		if err != nil {
+			return err
+		}
+		operator.MachineCount = len(machinesOfOperator)
+		Operators = append(Operators, operator)
+	}
+
+	slices.SortFunc(Operators, func(a, b structs.Operator) int {
+		return cmp.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
+	})
 
 	defer db.Close()
 
 	return c.Render("app/views/operator/list", fiber.Map{
-		"Operators": operators,
+		"Operators": Operators,
 	})
 }

app/handler/system/delete.go

@@ -0,0 +1,37 @@
+package system
+
+import (
+	"errors"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/typomedia/patchouli/app/store/boltdb"
+	"github.com/typomedia/patchouli/app/structs"
+)
+
+func Delete(c *fiber.Ctx) error {
+	id := c.Params("id")
+
+	if id == "" {
+		log.Error(errors.New("id is required"))
+	}
+
+	db := boltdb.New()
+	err := db.SetBucket("systems")
+	if err != nil {
+		log.Error(err)
+	}
+
+	system := structs.System{}
+	err = db.Get(id, &system, "systems")
+	if err != nil {
+		log.Error(err)
+	}
+
+	err = db.Delete(system.Id, "systems")
+	if err != nil {
+		log.Error(err)
+	}
+	defer db.Close()
+
+	return c.Redirect("/system")
+}

app/handler/system/edit.go

@@ -22,6 +22,12 @@ func Edit(c *fiber.Ctx) error {
 		log.Error(err)
 	}
 
+	machinesOfSystem, err := db.GetMachinesBySystem(system.Id)
+	if err != nil {
+		log.Error(err)
+	}
+	system.MachineCount = len(machinesOfSystem)
+
 	defer db.Close()
 
 	return c.Render("app/views/system/edit", fiber.Map{

app/handler/system/list.go

@@ -1,12 +1,10 @@
 package system
 
 import (
-	"cmp"
 	"encoding/json"
 	"github.com/gofiber/fiber/v2"
 	"github.com/typomedia/patchouli/app/store/boltdb"
 	"github.com/typomedia/patchouli/app/structs"
-	"slices"
 )
 
 func List(c *fiber.Ctx) error {
@@ -20,6 +18,7 @@ func List(c *fiber.Ctx) error {
 	systems, _ := db.GetAll("systems")
 
 	Systems := structs.Systems{}
+	systemsWithoutEOL := structs.Systems{}
 	for _, v := range systems {
 		system := structs.System{}
 		err = json.Unmarshal(v, &system)
@@ -31,11 +30,16 @@ func List(c *fiber.Ctx) error {
 			return err
 		}
 		system.MachineCount = len(machinesOfSystem)
-		Systems = append(Systems, system)
+		if system.EOL == "" {
+			systemsWithoutEOL = append(systemsWithoutEOL, system)
+		} else {
+			Systems = append(Systems, system)
+		}
 	}
-	slices.SortFunc(Systems, func(a, b structs.System) int {
-		return cmp.Compare(b.MachineCount, a.MachineCount)
-	})
+
+	Systems.OrderedBy(Systems.ByName(), Systems.ByEOL()).Sort(Systems)
+	Systems = append(Systems, systemsWithoutEOL...)
+
 	defer db.Close()
 
 	return c.Render("app/views/system/list", fiber.Map{