diff --git a/cmd/local/main.go b/cmd/local/main.go index 2298d8a..caefd9b 100644 --- a/cmd/local/main.go +++ b/cmd/local/main.go @@ -2,7 +2,6 @@ package main import ( "context" - "encoding/json" "flag" "fmt" "io" @@ -14,7 +13,6 @@ import ( "github.com/pkg/errors" "go.uber.org/zap" "gopkg.d7z.net/gitea-pages/pkg" - "gopkg.d7z.net/gitea-pages/pkg/core" "gopkg.d7z.net/gitea-pages/pkg/providers" "gopkg.d7z.net/middleware/cache" "gopkg.d7z.net/middleware/kv" @@ -60,13 +58,13 @@ func main() { file, _ := os.ReadFile(filepath.Join(path, ".pages.yaml")) if file != nil { - var info core.PageConfig + var info map[string]interface{} err := yaml.Unmarshal(file, &info) if err != nil { zap.L().Fatal("parse yaml", zap.Error(err)) } - info.Alias = []string{} - marshal, _ := json.Marshal(info) + delete(info, "alias") + marshal, _ := yaml.Marshal(info) provider.AddOverlay(".pages.yaml", marshal) } memory, err := kv.NewMemory("") diff --git a/pkg/core/config.go b/pkg/core/config.go index 98ae458..ed36a77 100644 --- a/pkg/core/config.go +++ b/pkg/core/config.go @@ -32,7 +32,7 @@ func (p *PageConfigRoute) UnmarshalYAML(value *yaml.Node) error { keys = append(keys, k) } if len(keys) != 1 { - return errors.New("invalid param") + return errors.Errorf("invalid param: %v", keys) } p.Type = keys[0] params := data[p.Type]