mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-12 20:13:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix so temporary images do not get published

Browse Source 
Fixes #10255
This commit is contained in:
Bjørn Erik Pedersen
2023-07-30 11:26:29 +02:00
parent 87d9bffe74
commit fbb8eb39ec
4 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
resources/resource.go
View File

@@ -161,7 +161,6 @@ type baseResourceInternal interface {
specProvider
getResourcePaths() *resourcePathDescriptor
getTargetFilenames() []string
openDestinationsForWriting() (io.WriteCloser, error)
openPublishFileForWriting(relTargetPath string) (io.WriteCloser, error)
relTargetPathForRel(rel string, addBaseTargetPath, isAbs, isURL bool) string
@@ -216,6 +215,7 @@ func (d dirFile) path() string {
type fileInfo interface {
getSourceFilename() string
setSourceFilename(string)
setSourfeFilenameIsHash(bool)
setSourceFs(afero.Fs)
getFileInfo() hugofs.FileMetaInfo
hash() (string, error)
@@ -304,6 +304,21 @@ func (l *genericResource) Permalink() string {
func (l *genericResource) Publish() error {
var err error
l.publishInit.Do(func() {
targetFilenames := l.getTargetFilenames()
if l.sourceFilenameIsHash {
// This is a processed image. We want to avoid copying it if it hasn't changed.
var changedFilenames []string
for _, targetFilename := range targetFilenames {
if _, err := l.getSpec().BaseFs.PublishFs.Stat(targetFilename); err == nil {
continue
}
changedFilenames = append(changedFilenames, targetFilename)
}
if len(changedFilenames) == 0 {
return
}
targetFilenames = changedFilenames
}
var fr hugio.ReadSeekCloser
fr, err = l.ReadSeekCloser()
if err != nil {
@@ -312,7 +327,7 @@ func (l *genericResource) Publish() error {
defer fr.Close()
var fw io.WriteCloser
fw, err = helpers.OpenFilesForWriting(l.spec.BaseFs.PublishFs, l.getTargetFilenames()...)
fw, err = helpers.OpenFilesForWriting(l.spec.BaseFs.PublishFs, targetFilenames...)
if err != nil {
return
}
@@ -475,33 +490,6 @@ func (l genericResource) clone() *genericResource {
return &l
}
// returns an opened file or nil if nothing to write (it may already be published).
func (l *genericResource) openDestinationsForWriting() (w io.WriteCloser, err error) {
l.publishInit.Do(func() {
targetFilenames := l.getTargetFilenames()
var changedFilenames []string
// Fast path:
// This is a processed version of the original;
// check if it already exists at the destination.
for _, targetFilename := range targetFilenames {
if _, err := l.getSpec().BaseFs.PublishFs.Stat(targetFilename); err == nil {
continue
}
changedFilenames = append(changedFilenames, targetFilename)
}
if len(changedFilenames) == 0 {
return
}
w, err = helpers.OpenFilesForWriting(l.getSpec().BaseFs.PublishFs, changedFilenames...)
})
return
}
func (r *genericResource) openPublishFileForWriting(relTargetPath string) (io.WriteCloser, error) {
return helpers.OpenFilesForWriting(r.spec.BaseFs.PublishFs, r.relTargetPathsFor(relTargetPath)...)
}
@@ -622,6 +610,9 @@ type resourceFileInfo struct {
// the path to the file on the real filesystem.
sourceFilename string
// For performance. This means that whenever the content changes, the filename changes.
sourceFilenameIsHash bool
fi hugofs.FileMetaInfo
// A hash of the source content. Is only calculated in caching situations.
@@ -654,6 +645,10 @@ func (fi *resourceFileInfo) setSourceFilename(s string) {
fi.sourceFilename = s
}
func (fi *resourceFileInfo) setSourfeFilenameIsHash(b bool) {
fi.sourceFilenameIsHash = b
}
func (fi *resourceFileInfo) getSourceFs() afero.Fs {
return fi.sourceFs
}