mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

enhance(gonginx): lua code parse and format dump

Browse source 
Close #307
This commit is contained in:
Jacky 2025-04-14 18:08:55 +08:00
parent 92dc61ecb4
commit 1fe6b8b031
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
5 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/nginx/format_code.go
View file

@ -3,7 +3,6 @@ package nginx
import (
"github.com/tufanbarisyildirim/gonginx/dumper"
"github.com/tufanbarisyildirim/gonginx/parser"
"github.com/uozi-tech/cosy/logger"
)
func (c *NgxConfig) FmtCode() (fmtContent string) {
@ -12,7 +11,6 @@ func (c *NgxConfig) FmtCode() (fmtContent string) {
}
func FmtCode(content string) (fmtContent string, err error) {
logger.Debugf("content: %s", content)
p := parser.NewStringParser(content, parser.WithSkipValidDirectivesErr())
c, err := p.Parse()
if err != nil {

22
internal/nginx/parse.go
View file

@ -5,6 +5,7 @@ import (
"github.com/pkg/errors"
"github.com/tufanbarisyildirim/gonginx/config"
"github.com/tufanbarisyildirim/gonginx/dumper"
"github.com/tufanbarisyildirim/gonginx/parser"
)
@ -52,6 +53,13 @@ func (l *NgxLocation) parseLocation(directive config.IDirective, deep int) {
if directive.GetBlock() == nil {
return
}
if directive.GetBlock().GetCodeBlock() != "" {
// deep copy
style := *dumper.IndentedStyle
style.StartIndent = deep * style.Indent
l.Content += dumper.DumpLuaBlock(directive.GetBlock(), &style) + "\n"
return
}
for _, location := range directive.GetBlock().GetDirectives() {
if len(location.GetComment()) > 0 {
for _, c := range location.GetComment() {
@ -66,7 +74,7 @@ func (l *NgxLocation) parseLocation(directive config.IDirective, deep int) {
if location.GetBlock() != nil && location.GetBlock().GetDirectives() != nil {
l.Content += " { \n"
l.parseLocation(location, deep+1)
l.Content += " } \n"
l.Content += strings.Repeat("\t", deep) + "} \n"
} else {
l.Content += ";\n"
}
@ -146,8 +154,14 @@ func (c *NgxConfig) parseCustom(directive config.IDirective) {
for _, param := range v.GetParameters() {
params = append(params, param.Value)
}
inlineComment := ""
for _, inline := range v.GetInlineComment() {
inlineComment += inline.Value + " "
}
c.Custom += strings.Join(v.GetComment(), "\n") + "\n" +
v.GetName() + " " + strings.Join(params, " ") + ";\n"
v.GetName() + " " + strings.Join(params, " ") + ";" + inlineComment + "\n"
}
c.Custom += "}\n"
}
@ -190,6 +204,10 @@ func parse(block config.IBlock, ngxConfig *NgxConfig) (err error) {
ngxConfig.parseCustom(v)
}
}
if strings.TrimSpace(ngxConfig.Custom) == "" {
return
}
custom, err := FmtCode(ngxConfig.Custom)
if err != nil {
return