timorl/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure deleting entire group prints out settings that will be removed before actually removing them

Browse source
This commit is contained in:
Mark Felder 2020-12-04 11:30:48 -06:00
parent 696d39c3dc
commit 3bf5c5b015
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,13 @@ def run(["delete", "--force", group]) do
group = maybe_atomize(group) 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 end
def run(["delete", group, key]) do def run(["delete", group, key]) do
@ -163,10 +169,17 @@ def run(["delete", group]) do
group = maybe_atomize(group) group = maybe_atomize(group)
if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do with true <- group_exists?(group) do
delete_group(group) 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 else
shell_error("No changes made.") _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
end end
end end
@ -329,18 +342,11 @@ defp delete_key(group, key) do
defp delete_group(group) do defp delete_group(group) do
check_configdb(fn -> check_configdb(fn ->
with true <- group_exists?(group) do group
shell_info("The following settings will be removed from ConfigDB:\n") |> Pleroma.ConfigDB.get_all_by_group()
dump_group(group) |> Enum.each(fn config ->
Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
group end)
|> Pleroma.ConfigDB.get_all_by_group()
|> Enum.each(fn config ->
Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
end)
else
_ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
end
end) end)
end end