Use image_file_extension as original format

tvdeyen · tvdeyen · commit e80bdd54114a · 2024-07-10T22:27:15.000+02:00
ActiveStorage expects an extension and not an mime type.
diff --git a/app/models/alchemy/picture.rb b/app/models/alchemy/picture.rb
@@ -208,7 +208,7 @@ def thumbnail_url(size: "160x120")
 
       url(
         flatten: true,
-        format: image_file_format || "jpg",
+        format: image_file_extension || "jpg",
         size: size
       )
     end
diff --git a/app/models/concerns/alchemy/picture_thumbnails.rb b/app/models/concerns/alchemy/picture_thumbnails.rb
@@ -84,7 +84,7 @@ def thumbnail_url_options
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: picture&.image_file_format || "jpg"
+        format: picture&.image_file_extension || "jpg"
       }
     end
 

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ def thumbnail_url(size: "160x120")`
`208`	`208`
`209`	`209`	`url(`
`210`	`210`	`flatten: true,`
`211`		`- format: image_file_format \|\| "jpg",`
	`211`	`+ format: image_file_extension \|\| "jpg",`
`212`	`212`	`size: size`
`213`	`213`	`)`
`214`	`214`	`end`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def thumbnail_url_options`
`84`	`84`	`crop_from: crop && crop_from.presence \|\| default_crop_from&.join("x"),`
`85`	`85`	`crop_size: crop && crop_size.presence \|\| default_crop_size&.join("x"),`
`86`	`86`	`flatten: true,`
`87`		`- format: picture&.image_file_format \|\| "jpg"`
	`87`	`+ format: picture&.image_file_extension \|\| "jpg"`
`88`	`88`	`}`
`89`	`89`	`end`
`90`	`90`