Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Op den Orth <sara@opdenorth.com>2022-03-24 15:24:30 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-03-26 12:03:36 +0300
commit94459680ba391275ac667407627cafdab5a50d79 (patch)
treeee01acde2954fc1239c0f84d222306c7c5c04980
parent9202117ba08286975c723130db60a1c69ff249a0 (diff)
Deprecate .File.Extension
Fixes #9352
-rw-r--r--hugolib/hugo_sites.go2
-rw-r--r--source/fileInfo.go12
2 files changed, 9 insertions, 5 deletions
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 182d6bad1..9b27ae5e3 100644
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -978,7 +978,7 @@ func (h *HugoSites) readData(f source.File) (any, error) {
defer file.Close()
content := helpers.ReaderToBytes(file)
- format := metadecoders.FormatFromString(f.Extension())
+ format := metadecoders.FormatFromString(f.Ext())
return metadecoders.Default.Unmarshal(content, format)
}
diff --git a/source/fileInfo.go b/source/fileInfo.go
index 606b8b025..13c4495bf 100644
--- a/source/fileInfo.go
+++ b/source/fileInfo.go
@@ -70,11 +70,12 @@ type FileWithoutOverlap interface {
// The directory is relative to the content root.
Dir() string
- // Extension gets the file extension, i.e "myblogpost.md" will return "md".
+ // Extension is an alias to Ext().
+ // Deprecated: Use Ext instead.
Extension() string
- // Ext is an alias for Extension.
- Ext() string // Hmm... Deprecate Extension
+ // Ext gets the file extension, i.e "myblogpost.md" will return "md".
+ Ext() string
// LogicalName is filename and extension of the file.
LogicalName() string
@@ -139,7 +140,10 @@ func (fi *FileInfo) Path() string { return fi.relPath }
func (fi *FileInfo) Dir() string { return fi.relDir }
// Extension is an alias to Ext().
-func (fi *FileInfo) Extension() string { return fi.Ext() }
+func (fi *FileInfo) Extension() string {
+ helpers.Deprecated(".File.Extension", "Use .File.Ext instead. ", false)
+ return fi.Ext()
+}
// Ext returns a file's extension without the leading period (ie. "md").
func (fi *FileInfo) Ext() string { return fi.ext }