From 94459680ba391275ac667407627cafdab5a50d79 Mon Sep 17 00:00:00 2001 From: Sara Op den Orth Date: Thu, 24 Mar 2022 13:24:30 +0100 Subject: [PATCH] Deprecate .File.Extension Fixes #9352 --- hugolib/hugo_sites.go | 2 +- source/fileInfo.go | 12 ++++++++---- 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 }