PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-23 20:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix source differ and caller to accept nested fields_for input

Browse source
This commit is contained in:
byte[] 2021-10-10 08:22:30 -04:00 committed by Luna D
parent adc77429f6
commit cb1d2b97ff
No known key found for this signature in database
GPG key ID: 4B1C63448394F688
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/philomena/images.ex
View file

@ -335,9 +335,7 @@ defmodule Philomena.Images do
new_sources = attrs["sources"] new_sources = attrs["sources"]
Multi.new() Multi.new()
|> Multi.run( |> Multi.run(:image, fn repo, _chg ->
:image,
fn repo, _chg ->
image = repo.preload(image, [:sources]) image = repo.preload(image, [:sources])
image image
@ -383,7 +381,7 @@ defmodule Philomena.Images do
%{ %{
image_id: image.id, image_id: image.id,
source: source, source_url: source,
user_id: user_id, user_id: user_id,
created_at: now, created_at: now,
updated_at: now, updated_at: now,

23
lib/philomena/images/source_differ.ex
View file

@ -3,8 +3,8 @@ defmodule Philomena.Images.SourceDiffer do
alias Philomena.Images.Source alias Philomena.Images.Source
def diff_input(changeset, old_sources, new_sources) do def diff_input(changeset, old_sources, new_sources) do
old_set = MapSet.new(old_sources) old_set = MapSet.new(flatten_input(old_sources))
new_set = MapSet.new(new_sources) new_set = MapSet.new(flatten_input(new_sources))
source_set = MapSet.new(get_field(changeset, :sources), & &1.source) source_set = MapSet.new(get_field(changeset, :sources), & &1.source)
added_sources = MapSet.difference(new_set, old_set) added_sources = MapSet.difference(new_set, old_set)
@ -47,4 +47,23 @@ defmodule Philomena.Images.SourceDiffer do
defp source_structs(image_id, sources) do defp source_structs(image_id, sources) do
Enum.map(sources, &%Source{image_id: image_id, source: &1}) Enum.map(sources, &%Source{image_id: image_id, source: &1})
end end
defp flatten_input(input) when is_map(input) do
Enum.flat_map(Map.values(input), fn
%{"source" => source} ->
source = String.trim(source)
if source != "" do
[source]
else
[]
end
_ -> []
end)
end
defp flatten_input(_input) do
[]
end
end end