优化部分代码

pkg/core/page.go

@@ -1,87 +0,0 @@
-package core
-
-import (
-	"fmt"
-	"os"
-	"regexp"
-	"strings"
-
-	"github.com/pkg/errors"
-	"go.uber.org/zap"
-)
-
-type PageDomain struct {
-	*ServerMeta
-
-	baseDomain    string
-	defaultBranch string
-}
-
-func NewPageDomain(meta *ServerMeta, baseDomain, defaultBranch string) *PageDomain {
-	return &PageDomain{
-		baseDomain:    baseDomain,
-		defaultBranch: defaultBranch,
-		ServerMeta:    meta,
-	}
-}
-
-type PageDomainContent struct {
-	*PageMetaContent
-
-	Owner string
-	Repo  string
-	Path  string
-}
-
-func (m *PageDomainContent) CacheKey() string {
-	return fmt.Sprintf("%s/%s/%s/%s", m.Owner, m.Repo, m.CommitID, m.Path)
-}
-
-func (p *PageDomain) ParseDomainMeta(domain, path, branch string) (*PageDomainContent, error) {
-	if branch == "" {
-		branch = p.defaultBranch
-	}
-	domain = regexp.MustCompile(`:\d+$`).ReplaceAllString(domain, "")
-
-	rel := &PageDomainContent{}
-	if !strings.HasSuffix(domain, "."+p.baseDomain) {
-		zap.L().Warn("Page Domain does not end with ."+p.baseDomain, zap.String("domain", domain))
-		return nil, os.ErrNotExist
-	}
-	rel.Owner = strings.TrimSuffix(domain, "."+p.baseDomain)
-	pathS := strings.Split(strings.TrimPrefix(path, "/"), "/")
-	rel.Repo = pathS[0]
-	defaultRepo := rel.Owner + "." + p.baseDomain
-	if rel.Repo == "" {
-		// 回退到默认仓库
-		rel.Repo = defaultRepo
-		zap.L().Debug("fail back to default repo", zap.String("repo", defaultRepo))
-	}
-
-	meta, err := p.GetMeta(rel.Owner, rel.Repo, branch)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return nil, err
-	}
-	if err == nil {
-		rel.Path = strings.Join(pathS[1:], "/")
-		if strings.HasSuffix(rel.Path, "/") || rel.Path == "" {
-			rel.Path = rel.Path + "index.html"
-		}
-		rel.PageMetaContent = meta
-		return rel, nil
-	}
-	if defaultRepo == rel.Repo {
-		return nil, os.ErrNotExist
-	}
-	if meta, err := p.GetMeta(rel.Owner, defaultRepo, branch); err == nil {
-		rel.PageMetaContent = meta
-		rel.Repo = defaultRepo
-		rel.Path = strings.Join(pathS[1:], "/")
-		if strings.HasSuffix(rel.Path, "/") || rel.Path == "" {
-			rel.Path = rel.Path + "index.html"
-		}
-		return rel, nil
-	}
-
-	return nil, os.ErrNotExist
-}