更新依赖

pkg/core/domain.go

@@ -8,7 +8,6 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"gopkg.d7z.net/middleware/kv"
-	"gopkg.d7z.net/middleware/tools"
 )
 
 type PageDomain struct {
@@ -89,8 +88,8 @@ func (p *PageDomain) returnMeta(ctx context.Context, owner, repo, branch string,
 	result.Owner = owner
 	result.Repo = repo
 	result.PageVFS = NewPageVFS(p.client, p.Backend, owner, repo, result.CommitID)
-	result.OrgDB = tools.NewPrefixKV(p.pageDB, p.pageDB.WithKey("org", owner))
-	result.RepoDB = tools.NewPrefixKV(p.pageDB, p.pageDB.WithKey("repo", owner, repo))
+	result.OrgDB = p.pageDB.Child("org").Child(owner)
+	result.RepoDB = p.pageDB.Child("repo").Child(owner).Child(repo)
 	result.Path = strings.Join(path, "/")
 
 	if err = p.alias.Bind(ctx, meta.Alias, result.Owner, result.Repo, branch); err != nil {

pkg/core/meta.go

@@ -26,7 +26,7 @@ type ServerMeta struct {
 	Domain string
 
 	client *http.Client
-	cache  *tools.Cache[PageMetaContent]
+	cache  *tools.KVCache[PageMetaContent]
 	locker *utils.Locker
 }
 

pkg/server.go

@@ -16,7 +16,6 @@ import (
 	"gopkg.d7z.net/gitea-pages/pkg/core"
 	"gopkg.d7z.net/gitea-pages/pkg/filters"
 	"gopkg.d7z.net/middleware/kv"
-	"gopkg.d7z.net/middleware/tools"
 )
 
 var portExp = regexp.MustCompile(`:\d+$`)
@@ -42,9 +41,10 @@ func NewPageServer(
 	errorHandler func(w http.ResponseWriter, r *http.Request, err error),
 ) *Server {
 	svcMeta := core.NewServerMeta(client, backend, domain, cache, cacheTTL)
+	cfgDB := db.Child("config")
 	pageMeta := core.NewPageDomain(svcMeta,
-		core.NewDomainAlias(tools.NewPrefixKV(db, "config/alias")),
-		tools.NewPrefixKV(db, "config/pages"),
+		core.NewDomainAlias(cfgDB.Child("alias")),
+		cfgDB.Child("pages"),
 		domain, defaultBranch)
 	c, err := lru.New[string, glob.Glob](256)
 	if err != nil {