@@ -30,7 +30,6 @@ import (
3030
3131 "github.com/gohugoio/hugo/cache/filecache"
3232 "github.com/gohugoio/hugo/common/hashing"
33- "github.com/gohugoio/hugo/common/hstrings"
3433 "github.com/gohugoio/hugo/common/paths"
3534
3635 "github.com/disintegration/gift"
@@ -205,15 +204,12 @@ func (i *imageResource) cloneWithUpdates(u *transformationUpdate) (baseResource,
205204 }, nil
206205}
207206
208- var imageActions = []string {images .ActionResize , images .ActionCrop , images .ActionFit , images .ActionFill }
209-
210207// Process processes the image with the given spec.
211208// The spec can contain an optional action, one of "resize", "crop", "fit" or "fill".
212209// This makes this method a more flexible version that covers all of Resize, Crop, Fit and Fill,
213210// but it also supports e.g. format conversions without any resize action.
214211func (i * imageResource ) Process (spec string ) (images.ImageResource , error ) {
215- action , options := i .resolveActionOptions (spec )
216- return i .processActionOptions (action , options )
212+ return i .processActionSpec ("" , spec )
217213}
218214
219215// Resize resizes the image to the specified width and height using the specified resampling
@@ -243,55 +239,38 @@ func (i *imageResource) Fill(spec string) (images.ImageResource, error) {
243239}
244240
245241func (i * imageResource ) Filter (filters ... any ) (images.ImageResource , error ) {
246- var conf images.ImageConfig
242+ var confMain images.ImageConfig
247243
248244 var gfilters []gift.Filter
249245
250246 for _ , f := range filters {
251247 gfilters = append (gfilters , images .ToFilters (f )... )
252248 }
253249
254- var (
255- targetFormat images.Format
256- configSet bool
257- )
250+ var options []string
251+
258252 for _ , f := range gfilters {
259253 f = images .UnwrapFilter (f )
260254 if specProvider , ok := f .(images.ImageProcessSpecProvider ); ok {
261- action , options := i .resolveActionOptions (specProvider .ImageProcessSpec ())
262- var err error
263- conf , err = images .DecodeImageConfig (action , options , i .Proc .Cfg , i .Format )
264- if err != nil {
265- return nil , err
266- }
267- configSet = true
268- if conf .TargetFormat != 0 {
269- targetFormat = conf .TargetFormat
270- // We only support one target format, but prefer the last one,
271- // so we keep going.
272- }
255+ options = append (options , strings .Fields (specProvider .ImageProcessSpec ())... )
273256 }
274257 }
275258
276- if ! configSet {
277- conf = images .GetDefaultImageConfig ("filter" , i .Proc .Cfg )
259+ confMain , err := images .DecodeImageConfig (options , i .Proc .Cfg , i .Format )
260+ if err != nil {
261+ return nil , err
278262 }
279263
280- conf .Action = "filter"
281- conf .Key = hashing .HashString (gfilters )
282- conf .TargetFormat = targetFormat
283- if conf .TargetFormat == 0 {
284- conf .TargetFormat = i .Format
285- }
264+ confMain .Action = "filter"
265+ confMain .Key = hashing .HashString (gfilters )
286266
287- return i .doWithImageConfig (conf , func (src image.Image ) (image.Image , error ) {
267+ return i .doWithImageConfig (confMain , func (src image.Image ) (image.Image , error ) {
288268 var filters []gift.Filter
289269 for _ , f := range gfilters {
290270 f = images .UnwrapFilter (f )
291271 if specProvider , ok := f .(images.ImageProcessSpecProvider ); ok {
292- processSpec := specProvider .ImageProcessSpec ()
293- action , options := i .resolveActionOptions (processSpec )
294- conf , err := images .DecodeImageConfig (action , options , i .Proc .Cfg , i .Format )
272+ options := strings .Fields (specProvider .ImageProcessSpec ())
273+ conf , err := images .DecodeImageConfig (options , i .Proc .Cfg , i .Format )
295274 if err != nil {
296275 return nil , err
297276 }
@@ -313,25 +292,13 @@ func (i *imageResource) Filter(filters ...any) (images.ImageResource, error) {
313292 })
314293}
315294
316- func (i * imageResource ) resolveActionOptions (spec string ) (string , []string ) {
317- var action string
318- options := strings .Fields (spec )
319- for i , p := range options {
320- if hstrings .InSlicEqualFold (imageActions , p ) {
321- action = p
322- options = append (options [:i ], options [i + 1 :]... )
323- break
324- }
325- }
326- return action , options
327- }
328-
329295func (i * imageResource ) processActionSpec (action , spec string ) (images.ImageResource , error ) {
330- return i .processActionOptions (action , strings .Fields (spec ))
296+ options := append ([]string {action }, strings .Fields (strings .ToLower (spec ))... )
297+ return i .processOptions (options )
331298}
332299
333- func (i * imageResource ) processActionOptions ( action string , options []string ) (images.ImageResource , error ) {
334- conf , err := images .DecodeImageConfig (action , options , i .Proc .Cfg , i .Format )
300+ func (i * imageResource ) processOptions ( options []string ) (images.ImageResource , error ) {
301+ conf , err := images .DecodeImageConfig (options , i .Proc .Cfg , i .Format )
335302 if err != nil {
336303 return nil , err
337304 }
@@ -343,13 +310,12 @@ func (i *imageResource) processActionOptions(action string, options []string) (i
343310 return nil , err
344311 }
345312
346- if action == images .ActionFill {
347- if conf .Anchor == 0 && img .Width () == 0 || img .Height () == 0 {
313+ if conf . Action == images .ActionFill {
314+ if conf .Anchor == images . SmartCropAnchor && img .Width () == 0 || img .Height () == 0 {
348315 // See https://github.com/gohugoio/hugo/issues/7955
349316 // Smartcrop fails silently in some rare cases.
350317 // Fall back to a center fill.
351- conf .Anchor = gift .CenterAnchor
352- conf .AnchorStr = "center"
318+ conf = conf .Reanchor (gift .CenterAnchor )
353319 return i .doWithImageConfig (conf , func (src image.Image ) (image.Image , error ) {
354320 return i .Proc .ApplyFiltersFromConfig (src , conf )
355321 })
@@ -417,7 +383,7 @@ func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src im
417383 }
418384
419385 ci := i .clone (converted )
420- targetPath := i .relTargetPathFromConfig (conf )
386+ targetPath := i .relTargetPathFromConfig (conf , i . getSpec (). imaging . Cfg . SourceHash )
421387 ci .setTargetPath (targetPath )
422388 ci .Format = conf .TargetFormat
423389 ci .setMediaType (conf .TargetFormat .MediaType ())
@@ -485,26 +451,30 @@ func (i *imageResource) getImageMetaCacheTargetPath() string {
485451 df := i .getResourcePaths ()
486452 p1 , _ := paths .FileAndExt (df .File )
487453 h := i .hash ()
488- idStr := hashing .HashString (h , i .size (), imageMetaVersionNumber , cfgHash )
454+ idStr := hashing .HashStringHex (h , i .size (), imageMetaVersionNumber , cfgHash )
489455 df .File = fmt .Sprintf ("%s_%s.json" , p1 , idStr )
490456 return df .TargetPath ()
491457}
492458
493- func (i * imageResource ) relTargetPathFromConfig (conf images.ImageConfig ) internal.ResourcePaths {
459+ func (i * imageResource ) relTargetPathFromConfig (conf images.ImageConfig , imagingConfigSourceHash string ) internal.ResourcePaths {
494460 p1 , p2 := paths .FileAndExt (i .getResourcePaths ().File )
495461 if conf .TargetFormat != i .Format {
496462 p2 = conf .TargetFormat .DefaultExtension ()
497463 }
498- const prefix = "_hu"
499- huIdx := strings .LastIndex (p1 , prefix )
500- incomingID := "i"
464+
465+ // Do not change.
466+ const imageHashPrefix = "_hu_"
467+
468+ huIdx := strings .LastIndex (p1 , imageHashPrefix )
469+ incomingID := ""
501470 if huIdx > - 1 {
502- incomingID = p1 [huIdx + len (prefix ):]
471+ incomingID = p1 [huIdx + len (imageHashPrefix ):]
503472 p1 = p1 [:huIdx ]
504473 }
505- hash := hashing .HashUint64 (incomingID , i .hash (), conf .GetKey (i .Format ))
474+
475+ hash := hashing .HashStringHex (incomingID , i .hash (), conf .Key , imagingConfigSourceHash )
506476 rp := i .getResourcePaths ()
507- rp .File = fmt .Sprintf ("%s%s%d %s" , p1 , prefix , hash , p2 )
477+ rp .File = fmt .Sprintf ("%s%s%s %s" , p1 , imageHashPrefix , hash , p2 )
508478
509479 return rp
510480}
0 commit comments