More TODOs

Author: bep

config/allconfig/alldecoders.go

@@ -246,7 +246,7 @@ var allDecoderSetups = map[string]decodeWeight{
 				err                    error
 				defaultContentLanguage string
 			)
-			p.c.Languages, defaultContentLanguage, err = langs.DecodeConfig2(p.c.RootConfig.DefaultContentLanguage, p.c.RootConfig.DisableLanguages, m)
+			p.c.Languages, defaultContentLanguage, err = langs.DecodeConfig(p.c.RootConfig.DefaultContentLanguage, p.c.RootConfig.DisableLanguages, m)
 			if err != nil {
 				return fmt.Errorf("failed to decode languages config: %w", err)
 			}

hugolib/content_map.go

@@ -208,10 +208,6 @@ func (p *resourceSource) lookupContentNodes(siteVector sitesmatrix.Vector, fallb
 	}
 }
 
-func (r *resourceSource) ForEeachIdentity(f func(identity.Identity) bool) bool {
-	return f(r.GetIdentity())
-}
-
 func (r *resourceSource) Path() string {
 	return r.path.Base()
 }

hugolib/content_map_page_assembler.go

@@ -326,12 +326,15 @@ func (a *allPagesAssembler) createAllPages() error {
 			}
 			return
 		case *pageState:
+			// Nothing to do.
+			ns = doctree.NodeTransformStateNone
 			return v, ns, nil
 		case contentNodesMap:
-			ns = doctree.NodeTransformStateUpdated
+			ns = doctree.NodeTransformStateNone
 			for _, vv := range v {
 				switch m := vv.(type) {
 				case *pageMetaSource:
+					ns = doctree.NodeTransformStateUpdated
 					_, err := handlePageMetaSource(m, v, true)
 					if err != nil {
 						return nil, 0, fmt.Errorf("failed to create page from pageMetaSource %s: %w", s, err)
@@ -341,7 +344,7 @@ func (a *allPagesAssembler) createAllPages() error {
 				}
 			}
 
-			return v, 0, nil
+			return v, ns, nil
 
 		default:
 			panic(fmt.Sprintf("unexpected type %T", n))

hugolib/content_map_page_contentnode.go

@@ -220,10 +220,6 @@ func (n contentNodes) sample() contentNode {
 	return n[0]
 }
 
-func (n contentNodes) resetBuildState() {
-	// Nothing to do for now.
-}
-
 type contentNodesMap map[sitesmatrix.Vector]contentNode
 
 var cnh helperContentNode
@@ -286,7 +282,7 @@ func (h helperContentNode) markStale(n contentNode) {
 func (h helperContentNode) resetBuildState(n contentNode) {
 	n.forEeachContentNode(
 		func(_ sitesmatrix.Vector, nn contentNode) bool {
-			if nnn := nn.(contentNodeBuildStateResetter); nnn != nil {
+			if nnn, ok := nn.(contentNodeBuildStateResetter); ok {
 				nnn.resetBuildState()
 			}
 			return true

hugolib/content_map_test.go

@@ -20,9 +20,7 @@ import (
 	"testing"
 
 	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/common/paths"
 	"github.com/gohugoio/hugo/hugolib/sitesmatrix"
-	"github.com/gohugoio/hugo/identity"
 )
 
 func TestContentMapSite(t *testing.T) {
@@ -444,29 +442,14 @@ type testContentNode struct {
 	key string
 }
 
-func (n *testContentNode) GetIdentity() identity.Identity {
-	return identity.StringIdentity(n.key)
-}
-
-func (n *testContentNode) ForEeachIdentity(cb func(id identity.Identity) bool) bool {
-	panic("not supported")
-}
-
 func (n *testContentNode) Path() string {
 	return n.key
 }
 
-func (n *testContentNode) PathInfo() *paths.Path {
-	panic("not supported")
-}
-
 func (n *testContentNode) forEeachContentNode(f func(v sitesmatrix.Vector, n contentNode) bool) bool {
 	panic("not supported")
 }
 
-func (n *testContentNode) resetBuildState() {
-}
-
 // Issue 12274.
 func TestHTMLNotContent(t *testing.T) {
 	filesTemplate := `

hugolib/doctree/nodeshifttree.go

@@ -33,7 +33,6 @@ type (
 	}
 
 	// Shifter handles tree transformations.
-	// TODO1 clean up all the description in here and elsewhere where dimensions etc. are mentioned and remove unused.
 	Shifter[T any] interface {
 		// ForEeachInDimension will call the given function for each value in the given dimension d.
 		// If the function returns true, the walk will stop.

hugolib/filesystems/basefs.go

@@ -626,7 +626,7 @@ func (b *sourceFilesystemsBuilder) createMainOverlayFs(p *paths.Paths) (*filesys
 
 		overlayMounts:        overlayfs.New(overlayfs.Options{}),
 		overlayMountsContent: overlayfs.New(overlayfs.Options{DirsMerger: hugofs.AppendDirsMerger}),
-		overlayMountsStatic:  overlayfs.New(overlayfs.Options{}), // TODO1
+		overlayMountsStatic:  overlayfs.New(overlayfs.Options{}),
 		overlayFull:          overlayfs.New(overlayfs.Options{}),
 		overlayResources:     overlayfs.New(overlayfs.Options{FirstWritable: true}),
 	}

hugolib/page.go

@@ -531,7 +531,7 @@ func (ps *pageState) siteVectors() sitesmatrix.VectorIterator {
 	return ps.s.siteVector
 }
 
-// TODO1 name.
+// Rotate returns all pages in the given dimension for this page.
 func (ps *pageState) Rotate(dimensionStr string) (page.Pages, error) {
 	dimensionStr = strings.ToLower(dimensionStr)
 	key := ps.Path() + "/" + "rotate-" + dimensionStr

hugolib/page__content.go

@@ -186,7 +186,7 @@ type contentParseInfo struct {
 	itemsStep2 []any
 
 	// The shortcode handler.
-	shortcodeParseInfo *shortcodeParsInfo
+	shortcodeParseInfo *shortcodeParseInfo
 }
 
 func (pi *contentParseInfo) AddBytes(item pageparser.Item) {

hugolib/page__meta.go

@@ -54,18 +54,10 @@ import (
 
 var cjkRe = regexp.MustCompile(`\p{Han}|\p{Hangul}|\p{Hiragana}|\p{Katakana}`)
 
-// Implement contentNodeI
 func (m *pageMetaSource) GetIdentity() identity.Identity {
 	return m.pathInfo
 }
 
-// ForEeachIdentityProvider calls cb for each Identity.
-// If cb returns true, the iteration is terminated.
-// The return value is whether the iteration was terminated.
-func (m *pageMetaSource) ForEeachIdentity(cb func(id identity.Identity) bool) bool {
-	return cb(m.pathInfo)
-}
-
 func (m *pageMetaSource) Path() string {
 	return m.pathInfo.Base()
 }
@@ -78,12 +70,8 @@ func (m *pageMetaSource) forEeachContentNode(f func(v sitesmatrix.Vector, n cont
 	return f(sitesmatrix.Vector{}, m)
 }
 
-func (m *pageMetaSource) resetBuildState() {
-	// Nothing to do.
-}
-
 type pageMetaSource struct {
-	pathInfo                      *paths.Path // Always set. This the canonical path to the Page. // TODO1 remove.
+	pathInfo                      *paths.Path // Always set. This the canonical path to the Page.
 	f                             *source.File
 	pi                            *contentParseInfo
 	contentAdapterSourceEntryHash uint64
@@ -1075,21 +1063,6 @@ func getParam(m resource.ResourceParamsProvider, key string, stringToLower bool)
 	}
 }
 
-// Implement contentNodeI.
-// Note that pageMeta is just a temporary contentNode. It will be replaced in the tree with a *pageState.
-// TODO1 make some partial interfaces.
-func (m *pageMeta) GetIdentity() identity.Identity {
-	panic("not supported")
-}
-
-func (m *pageMeta) ForEeachIdentity(cb func(id identity.Identity) bool) bool {
-	panic("not supported")
-}
-
-func (m *pageMeta) resetBuildState() {
-	panic("not supported")
-}
-
 func getParamToLower(m resource.ResourceParamsProvider, key string) any {
 	return getParam(m, key, true)
 }