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

resource: Move opening of the transformed resources after cache check

Browse source 
The old version should be functionally the same, but opening up these readers (potentially files) every time is wasteful if we don't read from them.
This commit is contained in:
Bjørn Erik Pedersen 2018-07-12 18:59:39 +02:00
parent beec1fc98e
commit 0024dcfe3e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resource/transform.go
View file

@ -303,12 +303,6 @@ func (r *transformedResource) transform(setContent bool) (err error) {
first := chain[0] first := chain[0]
contentrc, err := contentReadSeekerCloser(first)
if err != nil {
return err
}
defer contentrc.Close()
// Files with a suffix will be stored in cache (both on disk and in memory) // Files with a suffix will be stored in cache (both on disk and in memory)
// partitioned by their suffix. There will be other files below /other. // partitioned by their suffix. There will be other files below /other.
// This partition is also how we determine what to delete on server reloads. // This partition is also how we determine what to delete on server reloads.
@ -347,6 +341,7 @@ func (r *transformedResource) transform(setContent bool) (err error) {
r.cache.nlocker.Unlock(key) r.cache.nlocker.Unlock(key)
return return
} }
defer r.cache.nlocker.Unlock(key) defer r.cache.nlocker.Unlock(key)
defer r.cache.set(key, r) defer r.cache.set(key, r)
@ -362,6 +357,13 @@ func (r *transformedResource) transform(setContent bool) (err error) {
tctx.InMediaType = first.MediaType() tctx.InMediaType = first.MediaType()
tctx.OutMediaType = first.MediaType() tctx.OutMediaType = first.MediaType()
contentrc, err := contentReadSeekerCloser(first)
if err != nil {
return err
}
defer contentrc.Close()
tctx.From = contentrc tctx.From = contentrc
tctx.To = b1 tctx.To = b1