commands: migrate to generic.OptionFunc

Author: djdv

internal/commands/client.go

@@ -96,7 +96,7 @@ func (co clientOptions) make() (clientSettings, error) {
 	settings := clientSettings{
 		exitInterval: exitIntervalDefault,
 	}
-	if err := applyOptions(&settings, co...); err != nil {
+	if err := generic.ApplyOptions(&settings, co...); err != nil {
 		return clientSettings{}, err
 	}
 	if err := settings.fillDefaults(); err != nil {

internal/commands/daemon.go

@@ -175,7 +175,7 @@ func (do daemonOptions) make() (daemonSettings, error) {
 		},
 		permissions: apiPermissionsDefault,
 	}
-	if err := applyOptions(&settings, do...); err != nil {
+	if err := generic.ApplyOptions(&settings, do...); err != nil {
 		return daemonSettings{}, err
 	}
 	if settings.serverMaddrs == nil {

internal/commands/flag.go

@@ -22,17 +22,17 @@ import (
 type (
 	optionsReference[
 		OS optionSlice[OT, T],
-		OT optionFunc[T],
+		OT generic.OptionFunc[T],
 		T any,
 	] interface {
 		*OS
 	}
-	optionSlice[OT optionFunc[T], T any] interface {
+	optionSlice[
+		OT generic.OptionFunc[T],
+		T any,
+	] interface {
 		~[]OT
 	}
-	optionFunc[T any] interface {
-		~func(*T) error
-	}
 	sharedSettings struct {
 		verbose bool
 	}
@@ -82,18 +82,9 @@ const (
 	permSymText    = 't'
 )
 
-func makeWithOptions[OT optionFunc[T], T any](options ...OT) (T, error) {
+func makeWithOptions[OT generic.OptionFunc[T], T any](options ...OT) (T, error) {
 	var settings T
-	return settings, applyOptions(&settings, options...)
-}
-
-func applyOptions[OT optionFunc[T], T any](settings *T, options ...OT) error {
-	for _, apply := range options {
-		if err := apply(settings); err != nil {
-			return err
-		}
-	}
-	return nil
+	return settings, generic.ApplyOptions(&settings, options...)
 }
 
 func (so *sharedOptions) BindFlags(flagSet *flag.FlagSet) {
@@ -519,7 +510,7 @@ func underline(text string) string {
 func flagSetFunc[
 	OSR optionsReference[OS, OT, ST],
 	OS optionSlice[OT, ST],
-	OT optionFunc[ST],
+	OT generic.OptionFunc[ST],
 	setterFn func(VT, *ST) error,
 	ST, VT any,
 ](flagSet *flag.FlagSet, name, usage string,
@@ -545,7 +536,7 @@ func funcFlag[T any](flagSet *flag.FlagSet, name, usage string, fn func(string)
 func parseAndSet[
 	OSR optionsReference[OS, OT, ST],
 	OS optionSlice[OT, ST],
-	OT optionFunc[ST],
+	OT generic.OptionFunc[ST],
 	setterFn func(VT, *ST) error,
 	ST, VT any,
 ](parameter string, options OSR, setter setterFn,

internal/commands/mount.go

@@ -190,7 +190,7 @@ func (mo *mountCmdOptions[HT, GT, HM, GM, HC, GC]) BindFlags(flagSet *flag.FlagS
 
 func (mo mountCmdOptions[HT, GT, HM, GM, HC, GC]) make() (mountCmdSettings[HM, GM], error) {
 	var settings mountCmdSettings[HM, GM]
-	if err := applyOptions(&settings, mo...); err != nil {
+	if err := generic.ApplyOptions(&settings, mo...); err != nil {
 		return settings, err
 	}
 	if err := settings.clientSettings.fillDefaults(); err != nil {
@@ -375,7 +375,7 @@ func (c *Client) Mount(host filesystem.Host, fsid filesystem.ID, data [][]byte,
 		uid:         apiUIDDefault,
 		gid:         apiGIDDefault,
 	}
-	if err := applyOptions(&set, options...); err != nil {
+	if err := generic.ApplyOptions(&set, options...); err != nil {
 		return err
 	}
 	mounts, err := (*p9.Client)(c).Attach(mountsFileName)

internal/commands/mountpoint_fuse.go

@@ -196,7 +196,7 @@ func (fo fuseOptions) make() (fuseSettings, error) {
 		GID:         fuseGIDDefault,
 		ReaddirPlus: readdirPlusCapible,
 	}
-	return settings, applyOptions(&settings, fo...)
+	return settings, generic.ApplyOptions(&settings, fo...)
 }
 
 func (set fuseSettings) marshal(arg string) ([]byte, error) {

internal/commands/mountpoint_ipfs.go

@@ -239,7 +239,7 @@ func (no ipnsOptions) make() (ipnsSettings, error) {
 	settings := ipnsSettings{
 		NodeExpiry: ipnsExpiryDefault,
 	}
-	return settings, applyOptions(&settings, no...)
+	return settings, generic.ApplyOptions(&settings, no...)
 }
 
 func (set ipnsSettings) marshal(string) ([]byte, error) {

internal/commands/shutdown.go

@@ -9,6 +9,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/djdv/go-filesystem-utils/internal/command"
+	"github.com/djdv/go-filesystem-utils/internal/generic"
 	"github.com/djdv/p9/p9"
 )
 
@@ -88,7 +89,7 @@ func (so shutdownOptions) make() (shutdownSettings, error) {
 	settings := shutdownSettings{
 		disposition: dispositionDefault,
 	}
-	if err := applyOptions(&settings, so...); err != nil {
+	if err := generic.ApplyOptions(&settings, so...); err != nil {
 		return shutdownSettings{}, err
 	}
 	return settings, settings.clientSettings.fillDefaults()