Skip to content

Commit

Permalink
all: Rename Unmormalized => Unnormalized
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Feb 3, 2024
1 parent 7f82461 commit 53f2043
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions common/paths/pathparser.go
Expand Up @@ -359,8 +359,8 @@ func (p *Path) Path() (d string) {
return p.norm(p.s)
}

// Unmormalized returns the Path with the original case preserved.
func (p *Path) Unmormalized() *Path {
// Unnormalized returns the Path with the original case preserved.
func (p *Path) Unnormalized() *Path {
return p.unnormalized
}

Expand Down
2 changes: 1 addition & 1 deletion common/paths/pathparser_test.go
Expand Up @@ -93,7 +93,7 @@ func TestParse(t *testing.T) {
"Basic text file, mixed case and spaces, unnormalized",
"/a/Foo BAR.txt",
func(c *qt.C, p *Path) {
pp := p.Unmormalized()
pp := p.Unnormalized()
c.Assert(pp, qt.IsNotNil)
c.Assert(pp.BaseNameNoIdentifier(), qt.Equals, "Foo BAR")
},
Expand Down
4 changes: 2 additions & 2 deletions hugolib/content_map_page.go
Expand Up @@ -1554,7 +1554,7 @@ func (sa *sitePagesAssembler) assembleResources() error {
return false, nil
}

relPathOriginal := rs.path.Unmormalized().PathRel(ps.m.pathInfo.Unmormalized())
relPathOriginal := rs.path.Unnormalized().PathRel(ps.m.pathInfo.Unnormalized())
relPath := rs.path.BaseRel(ps.m.pathInfo)

var targetBasePaths []string
Expand Down Expand Up @@ -1759,7 +1759,7 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
seen[section] = true

// Try to preserve the original casing if possible.
sectionUnnormalized := p.Unmormalized().Section()
sectionUnnormalized := p.Unnormalized().Section()
pth := sa.s.Conf.PathParser().Parse(files.ComponentFolderContent, "/"+sectionUnnormalized+"/_index.md")
nn := w.Tree.Get(pth.Base())

Expand Down
2 changes: 1 addition & 1 deletion hugolib/hugo_sites.go
Expand Up @@ -502,7 +502,7 @@ func (h *HugoSites) handleDataFile(r *source.File) error {

// Crawl in data tree to insert data
current = h.data
dataPath := r.FileInfo().Meta().PathInfo.Unmormalized().Dir()[1:]
dataPath := r.FileInfo().Meta().PathInfo.Unnormalized().Dir()[1:]
keyParts := strings.Split(dataPath, "/")

for _, key := range keyParts {
Expand Down
6 changes: 3 additions & 3 deletions hugolib/page__meta.go
Expand Up @@ -195,7 +195,7 @@ func (p *pageMeta) Name() string {
return p.resourcePath
}
if p.pageConfig.Kind == kinds.KindTerm {
return p.pathInfo.Unmormalized().BaseNameNoIdentifier()
return p.pathInfo.Unnormalized().BaseNameNoIdentifier()
}
return p.Title()
}
Expand Down Expand Up @@ -742,7 +742,7 @@ func (p *pageMeta) applyDefaultValues() error {
case kinds.KindHome:
p.pageConfig.Title = p.s.Title()
case kinds.KindSection:
sectionName := p.pathInfo.Unmormalized().BaseNameNoIdentifier()
sectionName := p.pathInfo.Unnormalized().BaseNameNoIdentifier()
if p.s.conf.PluralizeListTitles {
sectionName = flect.Pluralize(sectionName)
}
Expand All @@ -754,7 +754,7 @@ func (p *pageMeta) applyDefaultValues() error {
panic("term not set")
}
case kinds.KindTaxonomy:
p.pageConfig.Title = strings.Replace(p.s.conf.C.CreateTitle(p.pathInfo.Unmormalized().BaseNameNoIdentifier()), "-", " ", -1)
p.pageConfig.Title = strings.Replace(p.s.conf.C.CreateTitle(p.pathInfo.Unnormalized().BaseNameNoIdentifier()), "-", " ", -1)
case kinds.KindStatus404:
p.pageConfig.Title = "404 Page not found"
}
Expand Down
4 changes: 2 additions & 2 deletions hugolib/page__paths.go
Expand Up @@ -116,8 +116,8 @@ func createTargetPathDescriptor(p *pageState) (page.TargetPathDescriptor, error)
pageInfoPage := p.PathInfo()
pageInfoCurrentSection := p.CurrentSection().PathInfo()
if p.s.Conf.DisablePathToLower() {
pageInfoPage = pageInfoPage.Unmormalized()
pageInfoCurrentSection = pageInfoCurrentSection.Unmormalized()
pageInfoPage = pageInfoPage.Unnormalized()
pageInfoCurrentSection = pageInfoCurrentSection.Unnormalized()
}

desc := page.TargetPathDescriptor{
Expand Down
2 changes: 1 addition & 1 deletion source/fileInfo.go
Expand Up @@ -130,7 +130,7 @@ func (fi *File) pathToDir(s string) string {
}

func (fi *File) p() *paths.Path {
return fi.fim.Meta().PathInfo.Unmormalized()
return fi.fim.Meta().PathInfo.Unnormalized()
}

func NewFileInfoFrom(path, filename string) *File {
Expand Down

0 comments on commit 53f2043

Please sign in to comment.