xing/wp-go
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化

Browse Source
This commit is contained in:
xing 2023-03-14 19:21:00 +08:00
parent 8d398016ac
commit e03194b768
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/theme/twentyfifteen/twentyfifteen.go
View File

@ -34,7 +34,7 @@ func Init(fs embed.FS) {
logs.ErrPrintln(err, "解析colorscheme失败") logs.ErrPrintln(err, "解析colorscheme失败")
} }
var pipe = wp.HandlePipe(wp.Render, widget.IsCategory, dispatch) var pipe = wp.HandlePipe(wp.Render, widget.MiddleWare(dispatch)...)
func Hook(h *wp.Handle) { func Hook(h *wp.Handle) {
pipe(h) pipe(h)

3
internal/theme/twentyseventeen/twentyseventeen.go
View File

@ -16,6 +16,7 @@ import (
"github.com/fthvgb1/wp-go/internal/plugins/wphandle" "github.com/fthvgb1/wp-go/internal/plugins/wphandle"
"github.com/fthvgb1/wp-go/internal/theme/wp" "github.com/fthvgb1/wp-go/internal/theme/wp"
"github.com/fthvgb1/wp-go/internal/theme/wp/components" "github.com/fthvgb1/wp-go/internal/theme/wp/components"
"github.com/fthvgb1/wp-go/internal/theme/wp/components/widget"
"github.com/fthvgb1/wp-go/internal/wpconfig" "github.com/fthvgb1/wp-go/internal/wpconfig"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"strings" "strings"
@ -41,7 +42,7 @@ var paginate = func() plugins.PageEle {
return p return p
}() }()
var pipe = wp.HandlePipe(wp.Render, ready, dispatch) var pipe = wp.HandlePipe(wp.Render, widget.MiddleWare(ready, dispatch)...)
func Hook(h *wp.Handle) { func Hook(h *wp.Handle) {
pipe(h) pipe(h)

9
internal/theme/wp/components/widget/middleware.go Normal file
View File

@ -0,0 +1,9 @@
package widget
import "github.com/fthvgb1/wp-go/internal/theme/wp"
func MiddleWare(call ...wp.HandlePipeFn[*wp.Handle]) []wp.HandlePipeFn[*wp.Handle] {
return append([]wp.HandlePipeFn[*wp.Handle]{
IsCategory,
}, call...)
}

4
internal/theme/wp/detail.go
View File

@ -101,8 +101,8 @@ func (d *DetailHandle) ContextPost() {
} }
func (d *DetailHandle) Render() { func (d *DetailHandle) Render() {
d.PreCodeAndStats() PreCodeAndStats(d.Handle)
d.PreTemplate() PreTemplate(d.Handle)
reply := "" reply := ""
if d.Post.CommentStatus == "open" && wpconfig.GetOption("thread_comments") == "1" { if d.Post.CommentStatus == "open" && wpconfig.GetOption("thread_comments") == "1" {
reply = `<script src='/wp-includes/js/comment-reply.min.js' id='comment-reply-js'></script>` reply = `<script src='/wp-includes/js/comment-reply.min.js' id='comment-reply-js'></script>`

4
internal/theme/wp/index.go
View File

@ -148,8 +148,8 @@ func (i *IndexHandle) ExecPostsPlugin(calls ...func(*models.Posts)) {
} }
func (i *IndexHandle) Render() { func (i *IndexHandle) Render() {
i.PreCodeAndStats() PreCodeAndStats(i.Handle)
i.PreTemplate() PreTemplate(i.Handle)
i.PushHandleFn(constraints.Ok, NewHandleFn(func(h *Handle) { i.PushHandleFn(constraints.Ok, NewHandleFn(func(h *Handle) {
i.ExecPostsPlugin() i.ExecPostsPlugin()
i.Pagination() i.Pagination()

4
internal/theme/wp/wp.go
View File

@ -273,7 +273,7 @@ func (h *Handle) ExecHandleFns() {
} }
} }
func (h *Handle) PreTemplate() { func PreTemplate(h *Handle) {
if h.templ == "" { if h.templ == "" {
h.templ = str.Join(h.theme, "/posts/index.gohtml") h.templ = str.Join(h.theme, "/posts/index.gohtml")
if h.scene == constraints.Detail { if h.scene == constraints.Detail {
@ -281,7 +281,7 @@ func (h *Handle) PreTemplate() {
} }
} }
} }
func (h *Handle) PreCodeAndStats() { func PreCodeAndStats(h *Handle) {
if h.Stats != 0 && h.Code != 0 { if h.Stats != 0 && h.Code != 0 {
return return
} }