Oneric/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity

config_db search methods

Browse source
This commit is contained in:
Alexander Strizhakov 2020-12-03 19:34:23 +03:00
parent 7fd4f4908b
commit a02eb88396
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/mix/tasks/pleroma/config.ex
View file

@ -62,9 +62,8 @@ def run(["dump", group, key]) do
group = maybe_atomize(group) group = maybe_atomize(group)
key = maybe_atomize(key) key = maybe_atomize(key)
%{group: group, key: key} group
|> ConfigDB.get_by_params() |> ConfigDB.get_all_by_group_and_key(key)
|> Repo.all()
|> Enum.each(&dump/1) |> Enum.each(&dump/1)
end) end)
end end
@ -290,16 +289,14 @@ defp dump(%Pleroma.ConfigDB{} = config) do
end end
defp dump_group(group) when is_atom(group) do defp dump_group(group) when is_atom(group) do
%{group: group} group
|> ConfigDB.get_by_params() |> ConfigDB.get_all_by_group()
|> Repo.all()
|> Enum.each(&dump/1) |> Enum.each(&dump/1)
end end
defp group_exists?(group) do defp group_exists?(group) do
%{group: group} group
|> ConfigDB.get_by_params() |> ConfigDB.get_all_by_group()
|> Repo.all()
|> Enum.empty?() |> Enum.empty?()
end end
@ -326,8 +323,8 @@ defp check_configdb(callback) do
defp delete_key(group, key) do defp delete_key(group, key) do
check_configdb(fn -> check_configdb(fn ->
ConfigDB.get_by_params(%{group: group, key: key}) group
|> Repo.all() |> ConfigDB.get_all_by_group_and_key(key)
|> Enum.each(&delete(&1, true)) |> Enum.each(&delete(&1, true))
end) end)
end end
@ -338,10 +335,9 @@ defp delete_group(group) do
shell_info("The following settings will be removed from ConfigDB:\n") shell_info("The following settings will be removed from ConfigDB:\n")
dump_group(group) dump_group(group)
ConfigDB.get_by_params(%{group: group}) group
|> Repo.all() |> ConfigDB.get_all_by_group()
|> Enum.each(&delete(&1, true)) |> Enum.each(&delete(&1, true))
else else
_ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.") _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
end end

12
lib/pleroma/config_db.ex
View file

@ -6,7 +6,7 @@ defmodule Pleroma.ConfigDB do
use Ecto.Schema use Ecto.Schema
import Ecto.Changeset import Ecto.Changeset
import Ecto.Query, only: [select: 3] import Ecto.Query, only: [select: 3, from: 2]
import Pleroma.Web.Gettext import Pleroma.Web.Gettext
alias __MODULE__ alias __MODULE__
@ -41,6 +41,16 @@ def get_all_as_keyword do
end) end)
end end
@spec get_all_by_group(atom() | String.t()) :: [t()]
def get_all_by_group(group) do
from(c in ConfigDB, where: c.group == ^group) |> Repo.all()
end
@spec get_all_by_group_and_key(atom() | String.t(), atom() | String.t()) :: [t()]
def get_all_by_group_and_key(group, key) do
from(c in ConfigDB, where: c.group == ^group and c.key == ^key) |> Repo.all()
end
@spec get_by_params(map()) :: ConfigDB.t() | nil @spec get_by_params(map()) :: ConfigDB.t() | nil
def get_by_params(params), do: Repo.get_by(ConfigDB, params) def get_by_params(params), do: Repo.get_by(ConfigDB, params)