优化本地调试
This commit is contained in:
@@ -2,7 +2,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
@@ -14,7 +13,6 @@ import (
|
|||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"gopkg.d7z.net/gitea-pages/pkg"
|
"gopkg.d7z.net/gitea-pages/pkg"
|
||||||
"gopkg.d7z.net/gitea-pages/pkg/core"
|
|
||||||
"gopkg.d7z.net/gitea-pages/pkg/providers"
|
"gopkg.d7z.net/gitea-pages/pkg/providers"
|
||||||
"gopkg.d7z.net/middleware/cache"
|
"gopkg.d7z.net/middleware/cache"
|
||||||
"gopkg.d7z.net/middleware/kv"
|
"gopkg.d7z.net/middleware/kv"
|
||||||
@@ -60,13 +58,13 @@ func main() {
|
|||||||
|
|
||||||
file, _ := os.ReadFile(filepath.Join(path, ".pages.yaml"))
|
file, _ := os.ReadFile(filepath.Join(path, ".pages.yaml"))
|
||||||
if file != nil {
|
if file != nil {
|
||||||
var info core.PageConfig
|
var info map[string]interface{}
|
||||||
err := yaml.Unmarshal(file, &info)
|
err := yaml.Unmarshal(file, &info)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
zap.L().Fatal("parse yaml", zap.Error(err))
|
zap.L().Fatal("parse yaml", zap.Error(err))
|
||||||
}
|
}
|
||||||
info.Alias = []string{}
|
delete(info, "alias")
|
||||||
marshal, _ := json.Marshal(info)
|
marshal, _ := yaml.Marshal(info)
|
||||||
provider.AddOverlay(".pages.yaml", marshal)
|
provider.AddOverlay(".pages.yaml", marshal)
|
||||||
}
|
}
|
||||||
memory, err := kv.NewMemory("")
|
memory, err := kv.NewMemory("")
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ func (p *PageConfigRoute) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
keys = append(keys, k)
|
keys = append(keys, k)
|
||||||
}
|
}
|
||||||
if len(keys) != 1 {
|
if len(keys) != 1 {
|
||||||
return errors.New("invalid param")
|
return errors.Errorf("invalid param: %v", keys)
|
||||||
}
|
}
|
||||||
p.Type = keys[0]
|
p.Type = keys[0]
|
||||||
params := data[p.Type]
|
params := data[p.Type]
|
||||||
|
|||||||
Reference in New Issue
Block a user