X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fconfig.ex;h=f657adf4600f7fae031d85f00d5985f4c38213f4;hb=6334ba9ad3d275e9e50b30319e2dbed3aac35fac;hp=a794344cbbb7450a2da26c936942f00e0a09f45a;hpb=c6a0ca2213be0eac1233ae28c11e563109771c85;p=akkoma

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a794344cb..f657adf46 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -36,12 +36,18 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       header = config_header()
 
-      shell_info("#{header}")
+      settings =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.sort()
 
-      ConfigDB
-      |> Repo.all()
-      |> Enum.sort()
-      |> Enum.each(&dump(&1))
+      unless settings == [] do
+        shell_info("#{header}")
+
+        settings |> Enum.each(&dump(&1))
+      else
+        shell_error("No settings in ConfigDB.")
+      end
     else
       _ -> configdb_not_enabled()
     end
@@ -51,6 +57,9 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      group = maybe_atomize(group)
+      key = maybe_atomize(key)
+
       dump_key(group, key)
     else
       _ -> configdb_not_enabled()
@@ -61,6 +70,8 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      group = maybe_atomize(group)
+
       dump_group(group)
     else
       _ -> configdb_not_enabled()
@@ -88,54 +99,68 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["keys" | group]) do
+  def run(["reset"]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      keys =
-        ConfigDB
-        |> Repo.all()
-        |> Enum.map(fn x ->
-          if x.group == group do
-            x.key
-          end
-        end)
-        |> Enum.sort()
-        |> Enum.uniq()
-        |> Enum.reject(fn x -> x == nil end)
+      shell_info("The following settings will be permanently removed:")
 
-      if length(keys) > 0 do
-        shell_info("The following configuration keys under :#{group} are set in ConfigDB:\r\n")
-        keys |> Enum.each(fn x -> shell_info("-  #{x}") end)
-        shell_info("\r\n")
+      ConfigDB
+      |> Repo.all()
+      |> Enum.sort()
+      |> Enum.each(&dump(&1))
+
+      shell_error("\nTHIS CANNOT BE UNDONE!")
+
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+
+        shell_info("The ConfigDB settings have been removed from the database.")
+      else
+        shell_error("No changes made.")
       end
     else
       _ -> configdb_not_enabled()
     end
   end
 
-  def run(["reset"]) do
+  def run(["delete", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      group = maybe_atomize(group)
 
-        shell_info("The ConfigDB settings have been removed from the database.")
+      if 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
+          ConfigDB
+          |> Repo.all()
+          |> Enum.filter(fn x ->
+            if x.group == group do
+              x |> delete(true)
+            end
+          end)
+        else
+          shell_error("No changes made.")
+        end
       else
-        shell_info("No changes made.")
+        shell_error("No settings in ConfigDB for :#{group}. Aborting.")
       end
     else
       _ -> configdb_not_enabled()
     end
   end
 
-  def run(["delete" | args]) when is_list(args) and length(args) == 2 do
+  def run(["delete", group, key]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      [group, key] = args
+      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
         ConfigDB
@@ -146,7 +171,7 @@ defmodule Mix.Tasks.Pleroma.Config do
           end
         end)
       else
-        shell_info("No changes made.")
+        shell_error("No changes made.")
       end
     else
       _ -> configdb_not_enabled()
@@ -273,7 +298,10 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete(config, true) do
     {:ok, _} = Repo.delete(config)
-    shell_info("#{config.key} deleted from the ConfigDB.")
+
+    shell_info(
+      "config #{inspect(config.group)}, #{inspect(config.key)} deleted from the ConfigDB."
+    )
   end
 
   defp delete(_config, _), do: :ok
@@ -290,10 +318,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     )
   end
 
-  defp dump_key(group, key) do
-    group = group |> String.to_atom()
-    key = key |> String.to_atom()
-
+  defp dump_key(group, key) when is_atom(group) and is_atom(key) do
     ConfigDB
     |> Repo.all()
     |> Enum.filter(fn x ->
@@ -303,9 +328,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  defp dump_group(group) do
-    group = group |> String.to_atom()
-
+  defp dump_group(group) when is_atom(group) do
     ConfigDB
     |> Repo.all()
     |> Enum.filter(fn x ->
@@ -314,4 +337,33 @@ defmodule Mix.Tasks.Pleroma.Config do
       end
     end)
   end
+
+  defp group_exists?(group) when is_atom(group) do
+    result =
+      ConfigDB
+      |> Repo.all()
+      |> Enum.filter(fn x ->
+        if x.group == group do
+          x
+        end
+      end)
+
+    unless result == [] do
+      true
+    else
+      false
+    end
+  end
+
+  def maybe_atomize(arg) when is_atom(arg), do: arg
+
+  def maybe_atomize(arg) when is_binary(arg) do
+    chars = String.codepoints(arg)
+
+    if "." in chars do
+      :"Elixir.#{arg}"
+    else
+      String.to_atom(arg)
+    end
+  end
 end