准备v0.1.8.2（v0.1.9的预览版）

Author: iwind

teaconfigs/agents/agent.go

@@ -635,7 +635,9 @@ func (this *AgentConfig) FirstGroup() *Group {
 
 // 判断是否匹配关键词
 func (this *AgentConfig) MatchKeyword(keyword string) (matched bool, name string, tags []string) {
-	if teautils.MatchKeyword(this.Name, keyword) || teautils.MatchKeyword(this.Host, keyword) {
+	if teautils.MatchKeyword(this.Name, keyword) ||
+		teautils.MatchKeyword(this.Host, keyword) ||
+		this.Id == keyword {
 		matched = true
 		name = this.Name
 		if len(this.Host) > 0 {

teaconst/const.go

@@ -1,7 +1,7 @@
 package teaconst
 
 const (
-	TeaVersion = "0.1.8.1"
+	TeaVersion = "0.1.8.2"
 
 	TeaProcessName = "teaweb" // 进程名
 	TeaProductName = "TeaWeb" // 产品名

teautils/command_help.go

@@ -0,0 +1,94 @@
+package teautils
+
+import (
+	"fmt"
+	"strconv"
+)
+
+// 命令帮助
+type CommandHelp struct {
+	product       string
+	version       string
+	usage         string
+	options       []*CommandHelpOption
+	appendStrings []string
+}
+
+func NewCommandHelp() *CommandHelp {
+	return &CommandHelp{}
+}
+
+type CommandHelpOption struct {
+	Code        string
+	Description string
+}
+
+// 产品
+func (this *CommandHelp) Product(product string) *CommandHelp {
+	this.product = product
+	return this
+}
+
+// 版本
+func (this *CommandHelp) Version(version string) *CommandHelp {
+	this.version = version
+	return this
+}
+
+// 使用方法
+func (this *CommandHelp) Usage(usage string) *CommandHelp {
+	this.usage = usage
+	return this
+}
+
+// 选项
+func (this *CommandHelp) Option(code string, description string) *CommandHelp {
+	this.options = append(this.options, &CommandHelpOption{
+		Code:        code,
+		Description: description,
+	})
+	return this
+}
+
+// 附加内容
+func (this *CommandHelp) Append(appendString string) *CommandHelp {
+	this.appendStrings = append(this.appendStrings, appendString)
+	return this
+}
+
+// 打印
+func (this *CommandHelp) Print() {
+	fmt.Println(this.product + " v" + this.version)
+	fmt.Println("Usage:", "\n   "+this.usage)
+
+	if len(this.options) > 0 {
+		fmt.Println("")
+		fmt.Println("Options:")
+
+		spaces := 20
+		max := 40
+		for _, option := range this.options {
+			l := len(option.Code)
+			if l < max && l > spaces {
+				spaces = l + 4
+			}
+		}
+
+		for _, option := range this.options {
+			if len(option.Code) > max {
+				fmt.Println("")
+				fmt.Println("  " + option.Code)
+				option.Code = ""
+			}
+
+			fmt.Printf("  %-"+strconv.Itoa(spaces)+"s%s\n", option.Code, ": "+option.Description)
+		}
+	}
+
+	if len(this.appendStrings) > 0 {
+		fmt.Println("")
+		for _, s := range this.appendStrings {
+			fmt.Println(s)
+		}
+	}
+}

teautils/file.go

@@ -0,0 +1,11 @@
+package teautils
+
+import (
+	"github.com/iwind/TeaGo/Tea"
+	"path/filepath"
+)
+
+// 临时文件
+func TmpFile(path string) string {
+	return filepath.Clean(Tea.Root + Tea.DS + "web" + Tea.DS + "tmp" + Tea.DS + path)
+}

teautils/logbuffer/buffer.go

@@ -101,3 +101,15 @@ func (this *Buffer) Read() (data []byte, err error) {
 func (this *Buffer) filename(index int) string {
 	return this.prefix + "." + strconv.Itoa(index) + ".log"
 }
+
+// 关闭
+func (this *Buffer) Close() error {
+	var resultErr error
+	for _, file := range this.files {
+		err := file.Close()
+		if err != nil {
+			resultErr = err
+		}
+	}
+	return resultErr
+}