- add feature EmptyMain

Author: B9O2

application.go

@@ -48,6 +48,7 @@ type Application interface {
 	Detail() (string, string)
 	Help(...string)
 	Main(Arguments) (*TabbyContainer, error)
+	EmptyMain() (*TabbyContainer, error)
 	SetParam(string, string, DefaultValue, ...string)
 	Params() []Parameter
 	SubApplication(string) (Application, bool)
@@ -57,7 +58,6 @@ type Application interface {
 type BaseApplication struct {
 	apps                  map[string]Application
 	params                []Parameter
-	width, height         uint
 	ignoreUnsupportedArgs bool
 }
 
@@ -97,6 +97,11 @@ func (ba *BaseApplication) Help(parts ...string) {
 
 }
 
+func (ba *BaseApplication) EmptyMain() (*TabbyContainer, error) {
+	ba.Help("Usage:")
+	return nil, nil
+}
+
 // SetParam default设置为nil则必须提供
 func (ba *BaseApplication) SetParam(identify, help string, defaultValue DefaultValue, alias ...string) {
 	ba.params = append(ba.params, Parameter{
@@ -127,11 +132,9 @@ func (ba *BaseApplication) IgnoreUnsupportedArgs() bool {
 	return ba.ignoreUnsupportedArgs
 }
 
-func NewBaseApplication(ignoreUnsupportedArgs bool, width, height uint, apps []Application) *BaseApplication {
+func NewBaseApplication(ignoreUnsupportedArgs bool, apps []Application) *BaseApplication {
 	ba := &BaseApplication{
 		apps:                  make(map[string]Application),
-		width:                 width,
-		height:                height,
 		ignoreUnsupportedArgs: ignoreUnsupportedArgs,
 	}
 	for _, app := range apps {

tabby.go

@@ -4,32 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 )
 
-var (
-	Int = NewTransfer("int", func(s string) (any, error) {
-		if i, err := strconv.ParseInt(s, 10, 0); err != nil {
-			return 0, err
-		} else {
-			return int(i), nil
-		}
-	})
-
-	String = NewTransfer("string", func(s string) (any, error) {
-		return s, nil
-	})
-
-	Bool = NewTransfer("int", func(s string) (any, error) {
-		if len(s) == 0 {
-			return true, nil
-		} else {
-			return false, errors.New("boolean requires no value")
-		}
-	})
-)
-
 type DefaultValue struct {
 	name     string
 	value    any
@@ -119,7 +96,7 @@ func (t *Tabby) Run(rawArgs []string) (*TabbyContainer, error) {
 		subApp, ok = app.SubApplication(appName)
 		if !ok {
 			if t.unknownApp == nil {
-				return nil, fmt.Errorf("App '%s' not exists", strings.Join(appPath, "/"))
+				return nil, fmt.Errorf("application '%s' not exists", strings.Join(appPath, "/"))
 			} else {
 				app = t.unknownApp
 				if err := app.Init(t.mainApp); err != nil {
@@ -151,7 +128,7 @@ func (t *Tabby) Run(rawArgs []string) (*TabbyContainer, error) {
 		for _, alia := range param.alias {
 			if v, ok := strArgs[alia]; ok {
 				if value, err1 := param.defaultValue.transfer(v); err1 != nil {
-					return nil, fmt.Errorf("App '%s': argument '%s(%s)' :error: %s", finalAppPath, param.identify, param.defaultValue.name, err1.Error())
+					return nil, fmt.Errorf("application '%s': argument '%s(%s)' :error: %s", finalAppPath, param.identify, param.defaultValue.name, err1.Error())
 				} else {
 					args[param.identify] = value
 					empty = false
@@ -161,11 +138,19 @@ func (t *Tabby) Run(rawArgs []string) (*TabbyContainer, error) {
 		}
 	}
 
+	if empty {
+		tc, err := app.EmptyMain()
+		if err != nil {
+			return nil, errors.New("App '" + finalAppPath + "' error:" + err.Error())
+		}
+		return tc, nil
+	}
+
 	if len(strArgs) > 0 && !app.IgnoreUnsupportedArgs() {
 		return nil, fmt.Errorf(
-			"App '%s': unsupported parameters '%s'",
+			"application '%s': unsupported parameters '%s'",
 			finalAppPath,
-			strings.Join(AddPrefix(MapKeys[string, string](strArgs), "-"), ","))
+			strings.Join(AddPrefix(MapKeys(strArgs), "-"), ","))
 	}
 
 	//DefaultArgs
@@ -175,7 +160,7 @@ func (t *Tabby) Run(rawArgs []string) (*TabbyContainer, error) {
 				args[param.identify] = param.defaultValue.value
 			} else if !empty {
 				return nil, fmt.Errorf(
-					"App '%s': required parameter '%s' not provided(%s)",
+					"application '%s': required parameter '%s' not provided(%s)",
 					finalAppPath, param.identify,
 					strings.Join(AddPrefix(param.alias, "-"), ","))
 			}

tabby_test.go

@@ -20,7 +20,7 @@ func (t TestApplication) Main(args Arguments) (*TabbyContainer, error) {
 
 func NewTestApplication() *TestApplication {
 	return &TestApplication{
-		NewBaseApplication(true, 0, 0, nil),
+		NewBaseApplication(true, nil),
 	}
 }
 func TestTabby(t *testing.T) {

types.go

@@ -0,0 +1,37 @@
+package tabby
+
+import (
+	"errors"
+	"strconv"
+	"time"
+)
+
+var (
+	Int = NewTransfer("int", func(s string) (any, error) {
+		if i, err := strconv.ParseInt(s, 10, 0); err != nil {
+			return 0, err
+		} else {
+			return int(i), nil
+		}
+	})
+
+	String = NewTransfer("string", func(s string) (any, error) {
+		return s, nil
+	})
+
+	Bool = NewTransfer("bool", func(s string) (any, error) {
+		if len(s) == 0 {
+			return true, nil
+		} else {
+			return false, errors.New("boolean requires no value")
+		}
+	})
+
+	Duration = NewTransfer("duration", func(s string) (any, error) {
+		if i, err := time.ParseDuration(s); err != nil {
+			return time.Duration(0), err
+		} else {
+			return time.Duration(i), nil
+		}
+	})
+)