github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate .File.Extension

Browse source 
Fixes #9352
This commit is contained in:
Sara Op den Orth 2022-03-24 13:24:30 +01:00 committed by Bjørn Erik Pedersen
parent 9202117ba0
commit 94459680ba
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/hugo_sites.go
View file

@ -978,7 +978,7 @@ func (h *HugoSites) readData(f source.File) (any, error) {
defer file.Close() defer file.Close()
content := helpers.ReaderToBytes(file) content := helpers.ReaderToBytes(file)
format := metadecoders.FormatFromString(f.Extension()) format := metadecoders.FormatFromString(f.Ext())
return metadecoders.Default.Unmarshal(content, format) return metadecoders.Default.Unmarshal(content, format)
} }

12
source/fileInfo.go
View file

@ -70,11 +70,12 @@ type FileWithoutOverlap interface {
// The directory is relative to the content root. // The directory is relative to the content root.
Dir() string 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 Extension() string
// Ext is an alias for Extension. // Ext gets the file extension, i.e "myblogpost.md" will return "md".
Ext() string // Hmm... Deprecate Extension Ext() string
// LogicalName is filename and extension of the file. // LogicalName is filename and extension of the file.
LogicalName() string LogicalName() string
@ -139,7 +140,10 @@ func (fi *FileInfo) Path() string { return fi.relPath }
func (fi *FileInfo) Dir() string { return fi.relDir } func (fi *FileInfo) Dir() string { return fi.relDir }
// Extension is an alias to Ext(). // 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"). // Ext returns a file's extension without the leading period (ie. "md").
func (fi *FileInfo) Ext() string { return fi.ext } func (fi *FileInfo) Ext() string { return fi.ext }