修复 ignore 未跳过默认策略的问题
This commit is contained in:
@@ -103,7 +103,10 @@ func (s *ServerMeta) GetMeta(owner, repo, branch string) (*PageMetaContent, erro
|
|||||||
_ = s.cache.Put(key, rel.String(), s.ttl)
|
_ = s.cache.Put(key, rel.String(), s.ttl)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
// 添加默认跳过的内容
|
||||||
|
for _, defIgnore := range rel.Ignore {
|
||||||
|
rel.ignoreL = append(rel.ignoreL, glob.MustCompile(defIgnore))
|
||||||
|
}
|
||||||
// 解析配置
|
// 解析配置
|
||||||
if data, err := s.ReadString(owner, repo, rel.CommitID, ".pages.yaml"); err == nil {
|
if data, err := s.ReadString(owner, repo, rel.CommitID, ".pages.yaml"); err == nil {
|
||||||
cfg := new(PageConfig)
|
cfg := new(PageConfig)
|
||||||
|
|||||||
@@ -88,6 +88,12 @@ ignore: .pages.yaml
|
|||||||
server.AddFile("org1/repo1/gh-pages/.pages.yaml", `
|
server.AddFile("org1/repo1/gh-pages/.pages.yaml", `
|
||||||
ignore: bad.*
|
ignore: bad.*
|
||||||
`)
|
`)
|
||||||
|
data, _, err = server.OpenFile("https://org1.example.com/repo1/")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, "hello world", string(data))
|
||||||
_, resp, _ := server.OpenFile("https://org1.example.com/repo1/bad.html")
|
_, resp, _ := server.OpenFile("https://org1.example.com/repo1/bad.html")
|
||||||
assert.Equal(t, 404, resp.StatusCode)
|
assert.Equal(t, 404, resp.StatusCode)
|
||||||
|
// 默认排除的内容
|
||||||
|
_, resp, _ = server.OpenFile("https://org1.example.com/repo1/.pages.yaml")
|
||||||
|
assert.Equal(t, 404, resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user