X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fconfig.ex;h=2ecad3578071c53e41e0f954e0bdf8fa4bf4607a;hb=d817bae802c40bd2db9a88970cf24e98374b0af0;hp=ebaf2c623841d135660789ec68a4dcafcb2828d2;hpb=16bdc2bcd0600ae4c1fcb55eaa84824af01ee61e;p=akkoma

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index ebaf2c623..2ecad3578 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -5,6 +5,7 @@
 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,7 +63,9 @@ defmodule Mix.Tasks.Pleroma.Config do
       group = maybe_atomize(group)
       key = maybe_atomize(key)
 
-      dump_key(group, key)
+      group
+      |> ConfigDB.get_by_group_and_key(key)
+      |> dump()
     end)
   end
 
@@ -82,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")
@@ -140,7 +142,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
@@ -161,10 +169,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
 
@@ -280,58 +295,33 @@ 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_key(group, key) when is_atom(group) and is_atom(key) do
-    ConfigDB
-    |> Repo.all()
-    |> Enum.filter(fn x ->
-      if x.group == group && x.key == key do
-        x |> dump
-      end
-    end)
-  end
+  defp dump(_), do: :noop
 
   defp dump_group(group) when is_atom(group) do
-    ConfigDB
-    |> Repo.all()
-    |> Enum.filter(fn x ->
-      if x.group == group do
-        x |> dump
-      end
-    end)
+    group
+    |> ConfigDB.get_all_by_group()
+    |> Enum.each(&dump/1)
   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
+  defp group_exists?(group) do
+    group
+    |> ConfigDB.get_all_by_group()
+    |> Enum.any?()
   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
-    chars = String.codepoints(arg)
-
-    # hack to make sure input like Pleroma.Mailer.Foo is formatted correctly
-    # for matching against values returned by Ecto
-    if "." in chars do
-      :"Elixir.#{arg}"
+    if ConfigDB.module_name?(arg) do
+      String.to_existing_atom("Elixir." <> arg)
     else
       String.to_atom(arg)
     end
@@ -350,36 +340,19 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_key(group, key) do
     check_configdb(fn ->
-      ConfigDB
-      |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.group == group and x.key == key do
-          x |> delete(true)
-        end
-      end)
+      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
-        |> Repo.all()
-        |> Enum.filter(fn x ->
-          if x.group == group do
-            x |> delete(true)
-          end
-        end)
-      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
 
-  defp truncatedb() do
+  defp truncatedb do
     Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
     Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
   end