Refactor config

This commit is contained in:
Roman Chvanikov 2020-08-05 13:00:49 +03:00
parent 56e9bf3393
commit 6f60ac9f41
3 changed files with 49 additions and 33 deletions

View File

@ -11,33 +11,11 @@ defmodule Pleroma.Config do
def get([key], default), do: get(key, default) def get([key], default), do: get(key, default)
def get([root_key | keys], default) do def get([_ | _] = path, default) do
# This is to mimic Application.get_env/3 behaviour that returns `nil` if the case fetch(path) do
# actual value is `nil`. {:ok, value} -> value
Enum.reduce_while(keys, Application.get_env(:pleroma, root_key), fn key, config -> :error -> default
case key do
[last_key] when is_map(config) ->
{:halt, Map.get(config, last_key, default)}
[last_key] when is_list(config) ->
{:halt, Keyword.get(config, last_key, default)}
_ ->
case config do
%{^key => value} ->
{:cont, value}
[_ | _] ->
case :lists.keyfind(key, 1, config) do
{_, value} -> {:cont, value}
_ -> {:halt, default}
end end
_ ->
{:halt, default}
end
end
end)
end end
def get(key, default) do def get(key, default) do
@ -54,6 +32,22 @@ defmodule Pleroma.Config do
end end
end end
def fetch([root_key | keys]) do
Enum.reduce_while(keys, Application.fetch_env(:pleroma, root_key), fn
key, {:ok, config} when is_map(config) or is_list(config) ->
case Access.fetch(config, key) do
:error ->
{:halt, :error}
value ->
{:cont, value}
end
_key, _config ->
{:halt, :error}
end)
end
def put([key], value), do: put(key, value) def put([key], value), do: put(key, value)
def put([parent_key | keys], value) do def put([parent_key | keys], value) do
@ -70,13 +64,16 @@ defmodule Pleroma.Config do
def delete([key]), do: delete(key) def delete([key]), do: delete(key)
def delete([parent_key | keys]) do def delete([parent_key | keys] = path) do
with {:ok, _} <- fetch(path) do
{_, parent} = {_, parent} =
Application.get_env(:pleroma, parent_key) parent_key
|> get()
|> get_and_update_in(keys, fn _ -> :pop end) |> get_and_update_in(keys, fn _ -> :pop end)
Application.put_env(:pleroma, parent_key, parent) Application.put_env(:pleroma, parent_key, parent)
end end
end
def delete(key) do def delete(key) do
Application.delete_env(:pleroma, key) Application.delete_env(:pleroma, key)

View File

@ -127,7 +127,10 @@ defmodule Pleroma.ApplicationRequirementsTest do
:ok :ok
end end
setup do: clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check]) setup do
Pleroma.Config.get(:i_am_aware_this_may_cause_data_loss, 42) |> IO.inspect()
clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
end
test "raises if it detects unapplied migrations" do test "raises if it detects unapplied migrations" do
assert_raise Pleroma.ApplicationRequirements.VerifyError, assert_raise Pleroma.ApplicationRequirements.VerifyError,

View File

@ -117,5 +117,21 @@ defmodule Pleroma.ConfigTest do
Pleroma.Config.put([:delete_me, :delete_me], hello: "world", world: "Hello") Pleroma.Config.put([:delete_me, :delete_me], hello: "world", world: "Hello")
Pleroma.Config.delete([:delete_me, :delete_me, :world]) Pleroma.Config.delete([:delete_me, :delete_me, :world])
assert Pleroma.Config.get([:delete_me, :delete_me]) == [hello: "world"] assert Pleroma.Config.get([:delete_me, :delete_me]) == [hello: "world"]
assert Pleroma.Config.delete([:this_key_does_not_exist])
assert Pleroma.Config.delete([:non, :existing, :key])
end
test "fetch/1" do
Pleroma.Config.put([:lorem], :ipsum)
Pleroma.Config.put([:ipsum], dolor: :sit)
assert Pleroma.Config.fetch([:lorem]) == {:ok, :ipsum}
assert Pleroma.Config.fetch([:ipsum, :dolor]) == {:ok, :sit}
assert Pleroma.Config.fetch([:lorem, :ipsum]) == :error
assert Pleroma.Config.fetch([:loremipsum]) == :error
Pleroma.Config.delete([:lorem])
Pleroma.Config.delete([:ipsum])
end end
end end