Skip to content
Permalink
Browse files

Avoid writing the same processed image to /public twice

Fixes #6307
  • Loading branch information...
bep committed Sep 6, 2019
1 parent 901077c commit 9442937d82005b369780edcc557e0d15d6bf0bad
Showing with 55 additions and 27 deletions.
  1. +3 −0 hugolib/image_test.go
  2. +8 −0 hugolib/testhelpers_test.go
  3. +44 −27 resources/resource.go
@@ -211,4 +211,7 @@ SUNSET2: {{ $resized2.RelPermalink }}/{{ $resized2.Width }}/Lat: {{ $resized2.Ex
b.AssertFileContent("resources/_gen/images/sunset_17701188623491591036.json",
"DateTimeDigitized|time.Time", "PENTAX")

// TODO(bep) add this as a default assertion after Build()?
b.AssertNoDuplicateWrites()

}
@@ -486,6 +486,8 @@ func (s *sitesBuilder) CreateSitesE() error {
return errors.Wrap(err, "failed to load config")
}

s.Fs.Destination = hugofs.NewCreateCountingFs(s.Fs.Destination)

depsCfg := s.depsCfg
depsCfg.Fs = s.Fs
depsCfg.Cfg = s.Cfg
@@ -680,6 +682,12 @@ func (s *sitesBuilder) AssertImage(width, height int, filename string) {
s.Assert(cfg.Height, qt.Equals, height)
}

func (s *sitesBuilder) AssertNoDuplicateWrites() {
s.Helper()
d := s.Fs.Destination.(hugofs.DuplicatesReporter)
s.Assert(d.ReportDuplicates(), qt.Equals, "")
}

func (s *sitesBuilder) FileContent(filename string) string {
s.T.Helper()
filename = filepath.FromSlash(filename)
@@ -233,19 +233,26 @@ func (l *genericResource) Permalink() string {
}

func (l *genericResource) Publish() error {
fr, err := l.ReadSeekCloser()
if err != nil {
return err
}
defer fr.Close()
var err error
l.publishInit.Do(func() {
var fr hugio.ReadSeekCloser
fr, err = l.ReadSeekCloser()
if err != nil {
return
}
defer fr.Close()

fw, err := helpers.OpenFilesForWriting(l.spec.BaseFs.PublishFs, l.getTargetFilenames()...)
if err != nil {
return err
}
defer fw.Close()
var fw io.WriteCloser
fw, err = helpers.OpenFilesForWriting(l.spec.BaseFs.PublishFs, l.getTargetFilenames()...)
if err != nil {
return
}
defer fw.Close()

_, err = io.Copy(fw, fr)

})

_, err = io.Copy(fw, fr)
return err
}

@@ -400,26 +407,34 @@ func (l genericResource) clone() *genericResource {
return &l
}

// returns an opened file or nil if nothing to write.
func (l *genericResource) openDestinationsForWriting() (io.WriteCloser, error) {
targetFilenames := l.getTargetFilenames()
var changedFilenames []string
// 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 existis at the destination.
for _, targetFilename := range targetFilenames {
if _, err := l.getSpec().BaseFs.PublishFs.Stat(targetFilename); err == nil {
continue
}

// Fast path:
// This is a processed version of the original;
// check if it already existis at the destination.
for _, targetFilename := range targetFilenames {
if _, err := l.getSpec().BaseFs.PublishFs.Stat(targetFilename); err == nil {
continue
changedFilenames = append(changedFilenames, targetFilename)
}
changedFilenames = append(changedFilenames, targetFilename)
}

if len(changedFilenames) == 0 {
return nil, nil
}
if len(changedFilenames) == 0 {
return
}

w, err = helpers.OpenFilesForWriting(l.getSpec().BaseFs.PublishFs, changedFilenames...)

})

return

return helpers.OpenFilesForWriting(l.getSpec().BaseFs.PublishFs, changedFilenames...)
}

func (r *genericResource) openPublishFileForWriting(relTargetPath string) (io.WriteCloser, error) {
@@ -524,6 +539,8 @@ type permalinker interface {
type resourceContent struct {
content string
contentInit sync.Once

publishInit sync.Once
}

type resourceFileInfo struct {

0 comments on commit 9442937

Please sign in to comment.
You can’t perform that action at this time.