X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fconfig.ex;h=f4bb84a1387b4815ad08463065d243e5bf2a6cdd;hb=60c4ac0f708b4a67d6168ed327327dcb13e7219f;hp=3e144955054a18a179d7ba23f065f267483a4fcf;hpb=5135a8189f9e297354a1d9f61f3cb7454711923c;p=akkoma

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 3e1449550..f4bb84a13 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -14,24 +14,28 @@ defmodule Mix.Tasks.Pleroma.Config do
   @moduledoc File.read!("docs/administration/CLI_tasks/config.md")
 
   def run(["migrate_to_db"]) do
-    start_pleroma()
-    migrate_to_db()
+    check_configdb(fn ->
+      start_pleroma()
+      migrate_to_db()
+    end)
   end
 
   def run(["migrate_from_db" | options]) do
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    {opts, _} =
-      OptionParser.parse!(options,
-        strict: [env: :string, delete: :boolean],
-        aliases: [d: :delete]
-      )
+      {opts, _} =
+        OptionParser.parse!(options,
+          strict: [env: :string, delete: :boolean],
+          aliases: [d: :delete]
+        )
 
-    migrate_from_db(opts)
+      migrate_from_db(opts)
+    end)
   end
 
   def run(["dump"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
+    check_configdb(fn ->
       start_pleroma()
 
       header = config_header()
@@ -48,38 +52,35 @@ defmodule Mix.Tasks.Pleroma.Config do
       else
         shell_error("No settings in ConfigDB.")
       end
-    else
-      _ -> configdb_not_enabled()
-    end
+    end)
   end
 
   def run(["dump", group, key]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
+    check_configdb(fn ->
       start_pleroma()
 
       group = maybe_atomize(group)
       key = maybe_atomize(key)
 
-      dump_key(group, key)
-    else
-      _ -> configdb_not_enabled()
-    end
+      %{group: group, key: key}
+      |> ConfigDB.get_by_params()
+      |> Repo.all()
+      |> Enum.each(&dump/1)
+    end)
   end
 
   def run(["dump", group]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
+    check_configdb(fn ->
       start_pleroma()
 
       group = maybe_atomize(group)
 
       dump_group(group)
-    else
-      _ -> configdb_not_enabled()
-    end
+    end)
   end
 
   def run(["groups"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
+    check_configdb(fn ->
       start_pleroma()
 
       groups =
@@ -94,13 +95,19 @@ defmodule Mix.Tasks.Pleroma.Config do
         groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
         shell_info("\r\n")
       end
-    else
-      _ -> configdb_not_enabled()
-    end
+    end)
+  end
+
+  def run(["reset", "--force"]) do
+    check_configdb(fn ->
+      start_pleroma()
+      truncatedb()
+      shell_info("The ConfigDB settings have been removed from the database.")
+    end)
   end
 
   def run(["reset"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
+    check_configdb(fn ->
       start_pleroma()
 
       shell_info("The following settings will be permanently removed:")
@@ -113,75 +120,60 @@ defmodule Mix.Tasks.Pleroma.Config do
       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;")
+        truncatedb()
 
         shell_info("The ConfigDB settings have been removed from the database.")
       else
         shell_error("No changes made.")
       end
-    else
-      _ -> configdb_not_enabled()
-    end
+    end)
   end
 
-  def run(["delete", group]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+  def run(["delete", "--force", group, key]) do
+    start_pleroma()
 
-      group = maybe_atomize(group)
+    group = maybe_atomize(group)
+    key = maybe_atomize(key)
 
-      if group_exists?(group) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
+    delete_key(group, key)
+  end
 
-        dump_group(group)
+  def run(["delete", "--force", group]) do
+    start_pleroma()
 
-        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_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
-      end
+    group = maybe_atomize(group)
+
+    delete_group(group)
+  end
+
+  def run(["delete", group, key]) do
+    start_pleroma()
+
+    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)
     else
-      _ -> configdb_not_enabled()
+      shell_error("No changes made.")
     end
   end
 
-  def run(["delete", group, key]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+  def run(["delete", group]) do
+    start_pleroma()
 
-      group = maybe_atomize(group)
-      key = maybe_atomize(key)
+    group = maybe_atomize(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 and x.key == key do
-            x |> delete(true)
-          end
-        end)
-      else
-        shell_error("No changes made.")
-      end
+    if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      delete_group(group)
     else
-      _ -> configdb_not_enabled()
+      shell_error("No changes made.")
     end
   end
 
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
-    with true <- Pleroma.Config.get([:configurable_from_database]),
-         :ok <- Pleroma.Config.DeprecationWarnings.warn() do
+    with :ok <- Pleroma.Config.DeprecationWarnings.warn() do
       config_file =
         if file_path do
           file_path
@@ -195,16 +187,15 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       do_migrate_to_db(config_file)
     else
-      :error -> deprecation_error()
-      _ -> migration_error()
+      _ ->
+        shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
     end
   end
 
   defp do_migrate_to_db(config_file) do
     if File.exists?(config_file) do
       shell_info("Migrating settings from file: #{Path.expand(config_file)}")
-      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      truncatedb()
 
       custom_config =
         config_file
@@ -232,48 +223,34 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp migrate_from_db(opts) do
-    if Pleroma.Config.get([:configurable_from_database]) do
-      env = opts[:env] || Pleroma.Config.get(:env)
-
-      config_path =
-        if Pleroma.Config.get(:release) do
-          :config_path
-          |> Pleroma.Config.get()
-          |> Path.dirname()
-        else
-          "config"
-        end
-        |> Path.join("#{env}.exported_from_db.secret.exs")
+    env = opts[:env] || Pleroma.Config.get(:env)
 
-      file = File.open!(config_path, [:write, :utf8])
+    config_path =
+      if Pleroma.Config.get(:release) do
+        :config_path
+        |> Pleroma.Config.get()
+        |> Path.dirname()
+      else
+        "config"
+      end
+      |> Path.join("#{env}.exported_from_db.secret.exs")
 
-      IO.write(file, config_header())
+    file = File.open!(config_path, [:write, :utf8])
 
-      ConfigDB
-      |> Repo.all()
-      |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
+    IO.write(file, config_header())
 
-      :ok = File.close(file)
-      System.cmd("mix", ["format", config_path])
+    ConfigDB
+    |> Repo.all()
+    |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
 
-      shell_info(
-        "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
-      )
-    else
-      migration_error()
-    end
-  end
+    :ok = File.close(file)
+    System.cmd("mix", ["format", config_path])
 
-  defp migration_error do
-    shell_error(
-      "Migration is not allowed in config. You can change this behavior by setting `config :pleroma, configurable_from_database: true`"
+    shell_info(
+      "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
     )
   end
 
-  defp deprecation_error do
-    shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
-  end
-
   if Code.ensure_loaded?(Config.Reader) do
     defp config_header, do: "import Config\r\n\r\n"
     defp read_file(config_file), do: Config.Reader.read_imports!(config_file)
@@ -300,7 +277,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     {:ok, _} = Repo.delete(config)
 
     shell_info(
-      "config #{inspect(config.group)}, #{inspect(config.key)} deleted from the ConfigDB."
+      "config #{inspect(config.group)}, #{inspect(config.key)} was deleted from the ConfigDB."
     )
   end
 
@@ -312,12 +289,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
   end
 
-  defp configdb_not_enabled do
-    shell_error(
-      "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
-    )
-  end
-
   defp dump_key(group, key) when is_atom(group) and is_atom(key) do
     ConfigDB
     |> Repo.all()
@@ -329,41 +300,66 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp dump_group(group) when is_atom(group) do
-    ConfigDB
+    %{group: group}
+    |> ConfigDB.get_by_params()
     |> Repo.all()
-    |> Enum.filter(fn x ->
-      if x.group == group do
-        x |> dump
-      end
-    end)
+    |> Enum.each(&dump/1)
   end
 
-  defp group_exists?(group) when is_atom(group) do
-    result =
-      ConfigDB
+  defp group_exists?(group) do
+    %{group: group}
+      |> ConfigDB.get_by_params()
       |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.group == group do
-          x
-        end
-      end)
+      |> Enum.empty?()
+  end
+
+  defp maybe_atomize(arg) when is_atom(arg), do: arg
 
-    unless result == [] do
-      true
+  defp maybe_atomize(arg) when is_binary(arg) do
+    if Pleroma.ConfigDB.module_name?(arg) do
+      String.to_existing_atom("Elixir." <> arg)
     else
-      false
+      String.to_atom(arg)
+    end 
+  end
+
+  defp check_configdb(callback) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      callback.()
+    else
+      _ ->
+        shell_error(
+          "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
+        )
     end
   end
 
-  def maybe_atomize(arg) when is_atom(arg), do: arg
+  defp delete_key(group, key) do
+    check_configdb(fn ->
+      ConfigDB.get_by_params(%{group: group, key: key})
+      |> Repo.all()
+      |> Enum.each(&delete(&1, true))
+    end)
+  end
 
-  def maybe_atomize(arg) when is_binary(arg) do
-    chars = String.codepoints(arg)
+  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)
 
-    if "." in chars do
-      :"Elixir.#{arg}"
-    else
-      String.to_atom(arg)
-    end
+      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
+    end)
+  end
+
+  defp truncatedb do
+    Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+    Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
   end
 end