helper/strings/strings_test.go

@@ -95,34 +95,3 @@ func TestBuilder_WriteString(t *testing.T) {
 		})
 	}
 }
-
-func BenchmarkBuilder_SprintfXX(b *testing.B) {
-	s := NewBuilder()
-	for i := 0; i < b.N; i++ {
-		s.Sprintf("%s %s %s", "a", "b", "c")
-		_ = s.String()
-	}
-}
-
-func BenchmarkSPrintfXX(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = fmt.Sprintf("%s %s %s", "a", "b", "c")
-	}
-}
-
-func BenchmarkStrJoinXX(b *testing.B) {
-	s := strings.Builder{}
-	for i := 0; i < b.N; i++ {
-		s.WriteString("a ")
-		s.WriteString("b ")
-		s.WriteString("c ")
-		_ = s.String()
-	}
-}
-func BenchmarkBuilderJoinXX(b *testing.B) {
-	s := NewBuilder()
-	for i := 0; i < b.N; i++ {
-		s.WriteString("a ", "b ", "c")
-		_ = s.String()
-	}
-}

internal/theme/common/common.go

@@ -1,10 +1,17 @@
 package common
 
 import (
+	"context"
+	"errors"
+	"github.com/fthvgb1/wp-go/helper/maps"
 	"github.com/fthvgb1/wp-go/helper/slice"
+	str "github.com/fthvgb1/wp-go/helper/strings"
 	"github.com/fthvgb1/wp-go/internal/cmd/reload"
+	"github.com/fthvgb1/wp-go/internal/pkg/config"
 	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
 	"github.com/fthvgb1/wp-go/internal/pkg/logs"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/plugins"
 	"github.com/fthvgb1/wp-go/internal/wpconfig"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -23,7 +30,6 @@ type Handle struct {
 	Templ     string
 	Class     []string
 	ThemeMods wpconfig.ThemeMods
-	Plugins   []HandlePluginFn[*Handle]
 }
 
 func NewHandle(c *gin.Context, scene int, theme string) *Handle {
@@ -41,6 +47,13 @@ func NewHandle(c *gin.Context, scene int, theme string) *Handle {
 	}
 }
 
+func (h *Handle) GetPassword() {
+	pw := h.Session.Get("post_password")
+	if pw != nil {
+		h.Password = pw.(string)
+	}
+}
+
 func (h *Handle) AutoCal(name string, fn func() string) {
 	v, ok := reload.GetStr(name)
 	if !ok {
@@ -50,30 +63,63 @@ func (h *Handle) AutoCal(name string, fn func() string) {
 	h.GinH[name] = v
 }
 
+func (i *IndexHandle) ExecListPagePlugin(m map[string]Plugin[models.Posts, *Handle], calls ...func(*models.Posts)) {
+
+	pluginConf := config.GetConfig().ListPagePlugins
+
+	plugin := GetListPostPlugins(pluginConf, m)
+
+	i.GinH["posts"] = slice.Map(i.Posts, PluginFn[models.Posts, *Handle](plugin, i.Handle, Defaults(calls...)))
+
+}
+
+func ListPostPlugins() map[string]Plugin[models.Posts, *Handle] {
+	return maps.Copy(pluginFns)
+}
+
+func Defaults(call ...func(*models.Posts)) Fn[models.Posts] {
+	return func(posts models.Posts) models.Posts {
+		for _, fn := range call {
+			fn(&posts)
+		}
+		return posts
+	}
+}
+
 func Default[T any](t T) T {
 	return t
 }
 
-func (h *Handle) GetPassword() {
+func ProjectTitle(t models.Posts) models.Posts {
-	pw := h.Session.Get("post_password")
+	if t.PostPassword != "" {
-	if pw != nil {
+		plugins.PasswordProjectTitle(&t)
-		h.Password = pw.(string)
+	}
+	return t
+}
+
+func GetListPostPlugins(name []string, m map[string]Plugin[models.Posts, *Handle]) []Plugin[models.Posts, *Handle] {
+	return slice.FilterAndMap(name, func(t string) (Plugin[models.Posts, *Handle], bool) {
+		v, ok := m[t]
+		if ok {
+			return v, true
+		}
+		logs.ErrPrintln(errors.New(str.Join("插件", t, "不存在")), "")
+		return nil, false
+	})
+}
+
+func DigestsAndOthers(ctx context.Context, calls ...func(*models.Posts)) Fn[models.Posts] {
+	return func(post models.Posts) models.Posts {
+		if post.PostExcerpt != "" {
+			plugins.PostExcerpt(&post)
+		} else {
+			plugins.Digest(ctx, &post, config.GetConfig().DigestWordCount)
+		}
+		if len(calls) > 0 {
+			for _, call := range calls {
+				call(&post)
+			}
+		}
+		return post
 	}
 }
-
-func (h *Handle) ExecHandlePlugin() {
-	if len(h.Plugins) > 0 {
-		HandlePlugin(h.Plugins, h)
-	}
-}
-
-type HandleFn[T any] func(T)
-
-type HandlePluginFn[T any] func(HandleFn[T], T) HandleFn[T]
-
-// HandlePlugin 方便把功能写在其它包里
-func HandlePlugin[T any](fns []HandlePluginFn[T], h T) HandleFn[T] {
-	return slice.ReverseReduce(fns, func(t HandlePluginFn[T], r HandleFn[T]) HandleFn[T] {
-		return t(r, h)
-	}, func(t T) {})
-}

internal/theme/common/detail.go

@@ -117,6 +117,5 @@ func (d *DetailHandle) Details() {
 		d.C.HTML(d.Code, d.Templ, d.GinH)
 		return
 	}
-	d.ExecHandlePlugin()
 	d.Render()
 }

internal/theme/common/index.go

@@ -130,6 +130,5 @@ func (i *IndexHandle) Indexs() {
 		i.C.HTML(i.Code, i.Templ, i.GinH)
 		return
 	}
-	i.ExecHandlePlugin()
 	i.Render()
 }

internal/theme/common/listpostplugins.go

@@ -1,13 +1,8 @@
 package common
 
 import (
-	"context"
-	"errors"
-	"github.com/fthvgb1/wp-go/helper/maps"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	str "github.com/fthvgb1/wp-go/helper/strings"
 	"github.com/fthvgb1/wp-go/internal/pkg/config"
-	"github.com/fthvgb1/wp-go/internal/pkg/logs"
 	"github.com/fthvgb1/wp-go/internal/pkg/models"
 	"github.com/fthvgb1/wp-go/internal/plugins"
 )
@@ -51,60 +46,3 @@ func Digest(next Fn[models.Posts], h *Handle, post models.Posts) models.Posts {
 	}
 	return post
 }
-
-func ListPostPlugins() map[string]Plugin[models.Posts, *Handle] {
-	return maps.Copy(pluginFns)
-}
-
-func ProjectTitle(t models.Posts) models.Posts {
-	if t.PostPassword != "" {
-		plugins.PasswordProjectTitle(&t)
-	}
-	return t
-}
-
-func GetListPostPlugins(name []string, m map[string]Plugin[models.Posts, *Handle]) []Plugin[models.Posts, *Handle] {
-	return slice.FilterAndMap(name, func(t string) (Plugin[models.Posts, *Handle], bool) {
-		v, ok := m[t]
-		if ok {
-			return v, true
-		}
-		logs.ErrPrintln(errors.New(str.Join("插件", t, "不存在")), "")
-		return nil, false
-	})
-}
-
-func DigestsAndOthers(ctx context.Context, calls ...func(*models.Posts)) Fn[models.Posts] {
-	return func(post models.Posts) models.Posts {
-		if post.PostExcerpt != "" {
-			plugins.PostExcerpt(&post)
-		} else {
-			plugins.Digest(ctx, &post, config.GetConfig().DigestWordCount)
-		}
-		if len(calls) > 0 {
-			for _, call := range calls {
-				call(&post)
-			}
-		}
-		return post
-	}
-}
-
-func (i *IndexHandle) ExecListPagePlugin(m map[string]Plugin[models.Posts, *Handle], calls ...func(*models.Posts)) {
-
-	pluginConf := config.GetConfig().ListPagePlugins
-
-	plugin := GetListPostPlugins(pluginConf, m)
-
-	i.GinH["posts"] = slice.Map(i.Posts, PluginFn[models.Posts, *Handle](plugin, i.Handle, Defaults(calls...)))
-
-}
-
-func Defaults(call ...func(*models.Posts)) Fn[models.Posts] {
-	return func(posts models.Posts) models.Posts {
-		for _, fn := range call {
-			fn(&posts)
-		}
-		return posts
-	}
-}

model/parse.go

@@ -1,18 +1,20 @@
 package model
 
 import (
+	"fmt"
 	"github.com/fthvgb1/wp-go/helper/slice"
-	str "github.com/fthvgb1/wp-go/helper/strings"
 	"strconv"
 	"strings"
 )
 
 func (w SqlBuilder) parseField(ss []string, s *strings.Builder) {
 	if strings.Contains(ss[0], ".") && !strings.Contains(ss[0], "(") {
-		x := slice.Map(strings.Split(ss[0], "."), func(t string) string {
+		s.WriteString("`")
-			return str.Join("`", t, "`")
+		sx := strings.Split(ss[0], ".")
-		})
+		s.WriteString(sx[0])
-		s.WriteString(strings.Join(x, "."))
+		s.WriteString("`.`")
+		s.WriteString(sx[1])
+		s.WriteString("`")
 	} else if !strings.Contains(ss[0], ".") && !strings.Contains(ss[0], "(") {
 		s.WriteString("`")
 		s.WriteString(ss[0])
@@ -25,9 +27,13 @@ func (w SqlBuilder) parseField(ss []string, s *strings.Builder) {
 func (w SqlBuilder) parseIn(ss []string, s *strings.Builder, c *int, args *[]any, in *[][]any) (t bool) {
 	if slice.IsContained(ss[1], []string{"in", "not in"}) && len(*in) > 0 {
 		s.WriteString(" (")
-		x := strings.TrimRight(strings.Repeat("?,", len((*in)[*c])), ",")
+		for _, p := range (*in)[*c] {
-		s.WriteString(x)
+			s.WriteString("?,")
-		*args = append(*args, (*in)[*c]...)
+			*args = append(*args, p)
+		}
+		sx := s.String()
+		s.Reset()
+		s.WriteString(strings.TrimRight(sx, ","))
 		s.WriteString(")")
 		*c++
 		t = true
@@ -76,15 +82,11 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
 	args := make([]any, 0, len(w))
 	c := 0
 	for _, ss := range w {
-		switch len(ss) {
+		if len(ss) == 2 {
-		case 1:
-			s.WriteString(ss[0])
-			s.WriteString(" and ")
-		case 2:
 			w.parseField(ss, &s)
 			s.WriteString("=? and ")
 			args = append(args, ss[1])
-		case 3, 4:
+		} else if len(ss) >= 3 && len(ss) < 5 {
 			w.parseField(ss, &s)
 			s.WriteString(ss[1])
 			if w.parseIn(ss, &s, &c, &args, in) {
@@ -96,9 +98,7 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
 			if err != nil {
 				return "", nil, err
 			}
-		}
+		} else if len(ss) >= 5 && len(ss)%5 == 0 {
-
-		if len(ss) >= 5 && len(ss)%5 == 0 {
 			j := len(ss) / 5
 			for i := 0; i < j; i++ {
 				start := i * 5
@@ -108,9 +108,7 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
 					st = strings.TrimRight(st, "and ")
 					s.Reset()
 					s.WriteString(st)
-					s.WriteString(" ")
+					s.WriteString(fmt.Sprintf(" %s ", ss[start]))
-					s.WriteString(ss[start])
-					s.WriteString(" ")
 				}
 				if i == 0 {
 					s.WriteString("( ")
@@ -150,7 +148,7 @@ func (w SqlBuilder) ParseWhere(in *[][]any) (string, []any, error) {
 func (w SqlBuilder) parseOrderBy() string {
 	s := strings.Builder{}
 	for _, ss := range w {
-		if len(ss) == 2 && ss[0] != "" && slice.IsContained(strings.ToLower(ss[1]), []string{"asc", "desc"}) {
+		if len(ss) == 2 && ss[0] != "" && slice.IsContained(ss[1], []string{"asc", "desc"}) {
 			s.WriteString(" ")
 			s.WriteString(ss[0])
 			s.WriteString(" ")

model/querycondition_test.go

@@ -510,7 +510,7 @@ func Test_findScanner(t *testing.T) {
 func BenchmarkSqlxQueryXX(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		var r []options
-		err := ddb.Select(&r, "select * from wp_options where option_id<100 and option_id>50")
+		err := ddb.Select(&r, "select * from wp_options where option_id<100")
 		if err != nil {
 			panic(err)
 		}
@@ -523,7 +523,7 @@ func BenchmarkScannerXX(b *testing.B) {
 		err := findScanner[options](glob, ctx, func(t options) {
 			r = append(r, t)
 			//fmt.Println(t)
-		}, Conditions(Where(SqlBuilder{{"option_id<100"}, {"option_id>50"}})))
+		}, Conditions(Where(SqlBuilder{{"option_id", "<", "100", "int"}})))
 		if err != nil {
 			panic(err)
 		}
@@ -532,9 +532,7 @@ func BenchmarkScannerXX(b *testing.B) {
 
 func BenchmarkFindsXX(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		_, err := finds[options](glob, ctx, Conditions(
+		_, err := finds[options](glob, ctx, Conditions(Where(SqlBuilder{{"option_id", "<", "100", "int"}})))
-			Where(SqlBuilder{{"option_id<100"}, {"option_id>50"}})),
-		)
 		if err != nil {
 			panic(err)
 		}