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

Merge pull request #320 from philomena-dev/extended-source-validation

Browse source 
Extended source validation
This commit is contained in:
liamwhite 2024-07-08 14:26:28 -04:00 committed by GitHub
commit 6c94595f8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/philomena/images/source.ex
View file

@ -13,7 +13,9 @@ defmodule Philomena.Images.Source do
@doc false @doc false
def changeset(source, attrs) do def changeset(source, attrs) do
source source
|> cast(attrs, []) |> cast(attrs, [:source])
|> validate_required([]) |> validate_required([:source])
|> validate_format(:source, ~r/\Ahttps?:\/\//)
|> validate_length(:source, max: 255)
end end
end end

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

@ -1,6 +1,5 @@
defmodule Philomena.Images.SourceDiffer do defmodule Philomena.Images.SourceDiffer do
import Ecto.Changeset import Ecto.Changeset
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(flatten_input(old_sources)) old_set = MapSet.new(flatten_input(old_sources))
@ -13,12 +12,11 @@ defmodule Philomena.Images.SourceDiffer do
{sources, actually_added, actually_removed} = {sources, actually_added, actually_removed} =
apply_changes(source_set, added_sources, removed_sources) apply_changes(source_set, added_sources, removed_sources)
image_id = fetch_field!(changeset, :id)
changeset changeset
|> cast(source_params(sources), [])
|> put_change(:added_sources, actually_added) |> put_change(:added_sources, actually_added)
|> put_change(:removed_sources, actually_removed) |> put_change(:removed_sources, actually_removed)
|> put_assoc(:sources, source_structs(image_id, sources)) |> cast_assoc(:sources)
end end
defp apply_changes(source_set, added_set, removed_set) do defp apply_changes(source_set, added_set, removed_set) do
@ -44,8 +42,8 @@ defmodule Philomena.Images.SourceDiffer do
{sources, actually_added, actually_removed} {sources, actually_added, actually_removed}
end end
defp source_structs(image_id, sources) do defp source_params(sources) do
Enum.map(sources, &%Source{image_id: image_id, source: &1}) %{sources: Enum.map(sources, &%{source: &1})}
end end
defp flatten_input(input) when is_map(input) do defp flatten_input(input) when is_map(input) do