PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-17 11:04:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix propagation of replaced file in edit script (#192)

Browse source 
fixes derpibooru/philomena#281
This commit is contained in:
liamwhite 2024-03-04 10:57:46 -05:00 committed by GitHub
parent 9ece7c327c
commit 55eac3c638
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/philomena/images/thumbnailer.ex
View file

@ -76,16 +76,26 @@ defmodule Philomena.Images.Thumbnailer do
file = download_image_file(image) file = download_image_file(image)
{:ok, analysis} = Analyzers.analyze(file) {:ok, analysis} = Analyzers.analyze(file)
apply_edit_script(image, Processors.process(analysis, file, generated_sizes(image))) file = apply_edit_script(image, file, Processors.process(analysis, file, generated_sizes(image)))
generate_dupe_reports(image) generate_dupe_reports(image)
recompute_meta(image, file, &Image.thumbnail_changeset/2) recompute_meta(image, file, &Image.thumbnail_changeset/2)
apply_edit_script(image, Processors.post_process(analysis, file)) file = apply_edit_script(image, file, Processors.post_process(analysis, file))
recompute_meta(image, file, &Image.process_changeset/2) recompute_meta(image, file, &Image.process_changeset/2)
end end
defp apply_edit_script(image, changes), defp apply_edit_script(image, file, changes) do
do: Enum.map(changes, &apply_change(image, &1)) Enum.reduce(changes, file, fn change, existing_file ->
apply_change(image, change)
case change do
{:replace_original, new_file} ->
new_file
_ ->
existing_file
end
end)
end
defp apply_change(image, {:intensities, intensities}), defp apply_change(image, {:intensities, intensities}),
do: ImageIntensities.create_image_intensity(image, intensities) do: ImageIntensities.create_image_intensity(image, intensities)