X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fconfig.ex;h=1962154b91f42df08a123f1f3a041f2ab7043339;hb=fbcddd812627283cbf320608cf692b38ff64c0b9;hp=137aef0387a60cf34d31efc94d492e1754cb5224;hpb=7fd4f4908bc31b3b4cc9d73a79169c3b3f08714c;p=akkoma
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 137aef038..1962154b9 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -1,10 +1,11 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Tasks.Pleroma.Config do
use Mix.Task
+ import Ecto.Query
import Mix.Pleroma
alias Pleroma.ConfigDB
@@ -48,7 +49,7 @@ defmodule Mix.Tasks.Pleroma.Config do
unless settings == [] do
shell_info("#{header}")
- settings |> Enum.each(&dump(&1))
+ Enum.each(settings, &dump(&1))
else
shell_error("No settings in ConfigDB.")
end
@@ -62,10 +63,9 @@ defmodule Mix.Tasks.Pleroma.Config do
group = maybe_atomize(group)
key = maybe_atomize(key)
- %{group: group, key: key}
- |> ConfigDB.get_by_params()
- |> Repo.all()
- |> Enum.each(&dump/1)
+ group
+ |> ConfigDB.get_by_group_and_key(key)
+ |> dump()
end)
end
@@ -85,10 +85,9 @@ defmodule Mix.Tasks.Pleroma.Config do
groups =
ConfigDB
+ |> distinct([c], true)
+ |> select([c], c.group)
|> Repo.all()
- |> Enum.map(fn x -> x.group end)
- |> Enum.sort()
- |> Enum.uniq()
if length(groups) > 0 do
shell_info("The following configuration groups are set in ConfigDB:\r\n")
@@ -135,7 +134,18 @@ defmodule Mix.Tasks.Pleroma.Config do
group = maybe_atomize(group)
key = maybe_atomize(key)
- delete_key(group, key)
+ with true <- key_exists?(group, key) do
+ shell_info("The following settings will be removed from ConfigDB:\n")
+
+ group
+ |> ConfigDB.get_by_group_and_key(key)
+ |> dump()
+
+ delete_key(group, key)
+ else
+ _ ->
+ shell_error("No settings in ConfigDB for #{inspect(group)}, #{inspect(key)}. Aborting.")
+ end
end
def run(["delete", "--force", group]) do
@@ -143,7 +153,13 @@ defmodule Mix.Tasks.Pleroma.Config do
group = maybe_atomize(group)
- delete_group(group)
+ with true <- group_exists?(group) do
+ shell_info("The following settings will be removed from ConfigDB:\n")
+ dump_group(group)
+ delete_group(group)
+ else
+ _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
+ end
end
def run(["delete", group, key]) do
@@ -152,10 +168,21 @@ defmodule Mix.Tasks.Pleroma.Config do
group = maybe_atomize(group)
key = maybe_atomize(key)
- if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
- delete_key(group, key)
+ with true <- key_exists?(group, key) do
+ shell_info("The following settings will be removed from ConfigDB:\n")
+
+ group
+ |> ConfigDB.get_by_group_and_key(key)
+ |> dump()
+
+ if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+ delete_key(group, key)
+ else
+ shell_error("No changes made.")
+ end
else
- shell_error("No changes made.")
+ _ ->
+ shell_error("No settings in ConfigDB for #{inspect(group)}, #{inspect(key)}. Aborting.")
end
end
@@ -164,10 +191,17 @@ defmodule Mix.Tasks.Pleroma.Config do
group = maybe_atomize(group)
- if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
- delete_group(group)
+ with true <- group_exists?(group) do
+ shell_info("The following settings will be removed from ConfigDB:\n")
+ dump_group(group)
+
+ if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+ delete_group(group)
+ else
+ shell_error("No changes made.")
+ end
else
- shell_error("No changes made.")
+ _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
end
end
@@ -283,34 +317,43 @@ defmodule Mix.Tasks.Pleroma.Config do
defp delete(_config, _), do: :ok
- defp dump(%Pleroma.ConfigDB{} = config) do
+ defp dump(%ConfigDB{} = config) do
value = inspect(config.value, limit: :infinity)
shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
end
+ defp dump(_), do: :noop
+
defp dump_group(group) when is_atom(group) do
- %{group: group}
- |> ConfigDB.get_by_params()
- |> Repo.all()
+ group
+ |> ConfigDB.get_all_by_group()
|> Enum.each(&dump/1)
end
defp group_exists?(group) do
- %{group: group}
- |> ConfigDB.get_by_params()
- |> Repo.all()
- |> Enum.empty?()
+ group
+ |> ConfigDB.get_all_by_group()
+ |> Enum.any?()
+ end
+
+ defp key_exists?(group, key) do
+ group
+ |> ConfigDB.get_by_group_and_key(key)
+ |> is_nil
+ |> Kernel.!()
end
defp maybe_atomize(arg) when is_atom(arg), do: arg
+ defp maybe_atomize(":" <> arg), do: maybe_atomize(arg)
+
defp maybe_atomize(arg) when is_binary(arg) do
- if Pleroma.ConfigDB.module_name?(arg) do
+ if ConfigDB.module_name?(arg) do
String.to_existing_atom("Elixir." <> arg)
else
String.to_atom(arg)
- end
+ end
end
defp check_configdb(callback) do
@@ -326,25 +369,15 @@ defmodule Mix.Tasks.Pleroma.Config do
defp delete_key(group, key) do
check_configdb(fn ->
- ConfigDB.get_by_params(%{group: group, key: key})
- |> Repo.all()
- |> Enum.each(&delete(&1, true))
+ ConfigDB.delete(%{group: group, key: key})
end)
end
defp delete_group(group) do
check_configdb(fn ->
- with true <- group_exists?(group) do
- shell_info("The following settings will be removed from ConfigDB:\n")
- dump_group(group)
-
- ConfigDB.get_by_params(%{group: group})
- |> Repo.all()
- |> Enum.each(&delete(&1, true))
-
- else
- _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
- end
+ group
+ |> ConfigDB.get_all_by_group()
+ |> Enum.each(&ConfigDB.delete/1)
end)
end