From a313210f7178e846a081c6f4bb6f1ccb5ce01618 Mon Sep 17 00:00:00 2001
From: xing <fthvgb1@163.com>
Date: Tue, 14 Mar 2023 13:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 helper/func.go                                |  4 +-
 helper/func_test.go                           | 18 ++++
 .../theme/twentyfifteen/custombackground.go   |  2 +-
 .../theme/twentyfifteen/layout/sidebar.gohtml | 14 ---
 .../theme/wp/components/widget/category.go    | 89 +++++++++++++++++++
 .../theme/wp/components/widgetareadata.go     |  1 +
 7 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 internal/theme/wp/components/widget/category.go

diff --git a/README.md b/README.md
index de05bab..956ca99 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## wp-go
 
-一个go写的WordPress的前端，功能比较简单，只有列表页和详情页,rss2，主题只有twentyfifteen和twentyseventeen两套主题，插件的话只有一个简单的列表页的摘要生成和enlighter代码高亮。本身只用于展示文章及评论。因为大量用了泛型功能，所以要求go的版本在1.19及以上，越新越好。。。
+一个go写的WordPress的前端，功能比较简单，只有列表页和详情页,rss2，主题只有twentyfifteen和twentyseventeen两套主题，插件的话只有一个简单的列表页的摘要生成和enlighter代码高亮。本身只用于展示文章及评论。要求go的版本在1.20以上，越新越好。。。
 
 #### 特色功能
 
diff --git a/helper/func.go b/helper/func.go
index be8370d..043d86a 100644
--- a/helper/func.go
+++ b/helper/func.go
@@ -70,7 +70,7 @@ func IsZeros(v any) bool {
 	switch v.(type) {
 	case int64, int, int8, int16, int32, uint64, uint, uint8, uint16, uint32:
 		i := fmt.Sprintf("%d", v)
-		return str.ToInt[int](i) == 0
+		return str.ToInt[int64](i) == 0
 	case float32, float64:
 		f := fmt.Sprintf("%v", v)
 		ff, _ := strconv.ParseFloat(f, 64)
@@ -81,7 +81,7 @@ func IsZeros(v any) bool {
 		s := v.(string)
 		return s == ""
 	}
-	return false
+	return reflect.DeepEqual(v, reflect.Zero(reflect.TypeOf(v)).Interface())
 }
 
 func ToBool[T comparable](t T) bool {
diff --git a/helper/func_test.go b/helper/func_test.go
index b718244..dc336b3 100644
--- a/helper/func_test.go
+++ b/helper/func_test.go
@@ -217,3 +217,21 @@ func TestToBool(t *testing.T) {
 		})
 	}
 }
+
+func TestIsZeros(t *testing.T) {
+	tt := struct {
+		name string
+		args struct {
+			v struct{ a string }
+		}
+		want bool
+	}{
+		name: "t1",
+		args: struct{ v struct{ a string } }{v: struct{ a string }{a: ""}},
+	}
+	t.Run(tt.name, func(t *testing.T) {
+		if got := IsZeros(tt.args.v); got != tt.want {
+			t.Errorf("IsZeros() = %v, want %v", got, tt.want)
+		}
+	})
+}
diff --git a/internal/theme/twentyfifteen/custombackground.go b/internal/theme/twentyfifteen/custombackground.go
index 463c987..86e1471 100644
--- a/internal/theme/twentyfifteen/custombackground.go
+++ b/internal/theme/twentyfifteen/custombackground.go
@@ -32,7 +32,7 @@ var repeat = map[string]string{
 
 func CalCustomBackGround(h *wp.Handle) (r string) {
 	themeMods := h.CommonThemeMods()
-	if themeMods.BackgroundImage == "" && themeMods.BackgroundColor == themesupport.CustomBackground.DefaultColor {
+	if themeMods.BackgroundImage == "" && (themeMods.BackgroundColor == "" || themeMods.BackgroundColor == themesupport.CustomBackground.DefaultColor) {
 		return
 	}
 	s := str.NewBuilder()
diff --git a/internal/theme/twentyfifteen/layout/sidebar.gohtml b/internal/theme/twentyfifteen/layout/sidebar.gohtml
index 02bad3c..7250873 100644
--- a/internal/theme/twentyfifteen/layout/sidebar.gohtml
+++ b/internal/theme/twentyfifteen/layout/sidebar.gohtml
@@ -1,20 +1,6 @@
 {{define "layout/sidebar" }}
     <div id="widget-area" class="widget-area" role="complementary">
         {{template "common/sidebarWidget" .}}
-
-        <aside id="categories-2" class="widget widget_categories">
-            <h2 class="widget-title">分类</h2>
-            <nav aria-label="分类">
-                <ul>
-                    {{range $k,$v := .categories}}
-                        <li class="cat-item cat-item-{{$v.Terms.TermId}}">
-                            <a href="/p/category/{{$v.Name}}">{{$v.Name}}</a>
-                        </li>
-                    {{end}}
-                </ul>
-
-            </nav>
-        </aside>
         <aside id="meta-2" class="widget widget_meta"><h2 class="widget-title">其他操作</h2>
             <nav aria-label="其他操作">
                 <ul>
diff --git a/internal/theme/wp/components/widget/category.go b/internal/theme/wp/components/widget/category.go
new file mode 100644
index 0000000..4a6f69a
--- /dev/null
+++ b/internal/theme/wp/components/widget/category.go
@@ -0,0 +1,89 @@
+package widget
+
+import (
+	"fmt"
+	"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/cache"
+	"github.com/fthvgb1/wp-go/internal/pkg/constraints"
+	"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
+	"github.com/fthvgb1/wp-go/internal/pkg/models"
+	"github.com/fthvgb1/wp-go/internal/theme/wp"
+	"github.com/fthvgb1/wp-go/internal/wpconfig"
+	"github.com/fthvgb1/wp-go/safety"
+	"strings"
+)
+
+var categoryArgs safety.Var[map[string]string]
+var categoryConfig = func() safety.Var[map[any]any] {
+	v := safety.Var[map[any]any]{}
+	v.Store(map[any]any{
+		"count":        int64(0),
+		"dropdown":     int64(0),
+		"hierarchical": int64(0),
+		"title":        "分类",
+	})
+	categoryArgs.Store(map[string]string{
+		"{$before_widget}":  `<aside id="categories-2" class="widget widget_categories">`,
+		"{$after_widget}":   "</aside>",
+		"{$before_title}":   `<h2 class="widget-title">`,
+		"{$after_title}":    "</h2>",
+		"{$before_sidebar}": "",
+		"{$after_sidebar}":  "",
+		"{$nav}":            "",
+		"{$navCloser}":      "",
+		"{$title}":          "",
+		"{$dropdown_id}":    "archives-dropdown-2",
+		"{$dropdown_type}":  "monthly",
+		"{$dropdown_label}": "选择月份",
+	})
+	return v
+}()
+
+var categoryTemplate = `{$before_widget}
+{$title}
+{$nav}
+{$html}
+{$navCloser}
+{$after_widget}
+`
+
+func Category(h *wp.Handle) string {
+	args := wp.GetComponentsArgs(h, widgets.ArchiveArgs, categoryArgs.Load())
+	args = maps.FilterZeroMerge(categoryArgs.Load(), args)
+	conf := wpconfig.GetPHPArrayVal("widget_categories", categoryConfig.Load(), int64(2))
+	conf = maps.FilterZeroMerge(categoryConfig.Load(), conf)
+	args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
+	t := categoryTemplate
+	dropdown := conf["dropdown"].(int64)
+	categories := cache.CategoriesTags(h.C, constraints.Category)
+	if dropdown == 1 {
+
+	} else {
+		t = strings.ReplaceAll(t, "{$html}", categoryUL(h, args, conf, categories))
+	}
+	return str.Replace(t, args)
+}
+
+func categoryUL(h *wp.Handle, args map[string]string, conf map[any]any, categories []models.TermsMy) string {
+	if slice.IsContained(h.CommonThemeMods().ThemeSupport.HTML5, "navigation-widgets") {
+		args["{$nav}"] = fmt.Sprintf(`<nav aria-label="%s">`, args["{title}"])
+		args["{$navCloser}"] = "</nav>"
+	}
+	s := str.NewBuilder()
+	s.WriteString("<ul>\n")
+	isCount := conf["count"].(int64)
+	for _, category := range categories {
+		count := ""
+		if isCount != 0 {
+			count = fmt.Sprintf("(%d)", category.Count)
+		}
+		s.Sprintf(`	<li class="cat-item cat-item-%d">
+		<a href="/p/category/%s">%s %s</a>
+	</li>
+`, category.Terms.TermId, category.Name, category.Name, count)
+	}
+	s.WriteString("</ul>")
+	return s.String()
+}
diff --git a/internal/theme/wp/components/widgetareadata.go b/internal/theme/wp/components/widgetareadata.go
index eef375d..97ea927 100644
--- a/internal/theme/wp/components/widgetareadata.go
+++ b/internal/theme/wp/components/widgetareadata.go
@@ -14,6 +14,7 @@ var widgets = map[string]func(*wp.Handle) string{
 	"recent-posts-2":    widget.RecentPosts,
 	"recent-comments-2": widget.RecentComments,
 	"archives-2":        widget.Archive,
+	"categories-2":      widget.Category,
 }
 
 func WidgetArea(h *wp.Handle) {