1 files changed, 84 insertions, 70 deletions

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 715b72dbe..861832451 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -19,94 +19,55 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   def run(["migrate_from_db" | options]) do
-    # TODO: add support for releases
     start_pleroma()
 
     {opts, _} =
       OptionParser.parse!(options,
-        strict: [env: :string, delete_from_db: :boolean],
-        aliases: [d: :delete_from_db]
+        strict: [env: :string, delete: :boolean],
+        aliases: [d: :delete]
       )
 
-    with {:active?, true} <-
-           {:active?, Pleroma.Config.get([:configurable_from_database])},
-         env when is_binary(env) <- opts[:env] || "prod",
-         config_path <- config_path(env),
-         {:ok, file} <- File.open(config_path, [:write, :utf8]) do
-      IO.write(file, config_header())
-
-      ConfigDB
-      |> Repo.all()
-      |> Enum.each(&write_to_file_with_deletion(&1, file, opts[:delete_from_db]))
-
-      File.close(file)
-      System.cmd("mix", ["format", config_path])
-    else
-      {:active?, false} ->
-        shell_info(
-          "Migration is not allowed by config. You can change this behavior in instance settings."
-        )
-
-      error ->
-        shell_info("Error occuried while opening file. #{inspect(error)}")
-    end
-  end
-
-  defp config_path(env) do
-    path =
-      if Pleroma.Config.get(:release) do
-        :config_path
-        |> Pleroma.Config.get()
-        |> Path.dirname()
-      else
-        "config"
-      end
-
-    Path.join(path, "#{env}.exported_from_db.secret.exs")
+    migrate_from_db(opts)
   end
 
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
     if Pleroma.Config.get([:configurable_from_database]) do
-      user_config_file =
-        if Pleroma.Config.get(:release),
-          do: Pleroma.Config.get(:config_path),
-          else: "config/#{Pleroma.Config.get(:env)}.secret.exs"
+      config_file =
+        if file_path do
+          file_path
+        else
+          if Pleroma.Config.get(:release) do
+            Pleroma.Config.get(:config_path)
+          else
+            "config/#{Pleroma.Config.get(:env)}.secret.exs"
+          end
+        end
 
-      config_file = file_path || user_config_file
       do_migrate_to_db(config_file)
     else
-      shell_info(
-        "Migration is not allowed by config. You can change this behavior in instance settings."
-      )
+      migration_error()
     end
   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)
-  else
-    defp config_header, do: "use Mix.Config\r\n\r\n"
-    defp read_file(config_file), do: Mix.Config.eval!(config_file)
-  end
-
   defp do_migrate_to_db(config_file) do
     if File.exists?(config_file) do
-      {custom_config, _paths} = read_file(config_file)
+      custom_config =
+        config_file
+        |> read_file()
+        |> elem(0)
 
       custom_config
       |> Keyword.keys()
-      |> Enum.each(&create(&1, custom_config[&1]))
+      |> Enum.each(&create(&1, custom_config))
     else
       shell_info("To migrate settings, you must define custom settings in #{config_file}.")
     end
   end
 
   defp create(group, settings) do
-    Enum.reject(settings, fn {k, _v} ->
-      k in [Pleroma.Repo, Pleroma.Web.Endpoint, :env, :configurable_from_database] or
-        (group == :phoenix and k == :serve_endpoints)
-    end)
+    group
+    |> Pleroma.Config.Loader.filter_group(settings)
     |> Enum.each(fn {key, value} ->
       key = inspect(key)
       {:ok, _} = ConfigDB.update_or_create(%{group: inspect(group), key: key, value: value})
@@ -117,17 +78,70 @@ defmodule Mix.Tasks.Pleroma.Config do
     shell_info("Settings for group :#{group} migrated.")
   end
 
-  defp write_to_file_with_deletion(config, file, with_deletion) do
-    IO.write(
-      file,
-      "config #{config.group}, #{config.key}, #{
-        inspect(ConfigDB.from_binary(config.value), limit: :infinity)
-      }\r\n\r\n"
-    )
+  defp migrate_from_db(opts) do
+    if Pleroma.Config.get([:configurable_from_database]) do
+      env = opts[:env] || "prod"
+
+      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")
+
+      file = File.open!(config_path, [:write, :utf8])
+
+      IO.write(file, config_header())
+
+      ConfigDB
+      |> Repo.all()
+      |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
 
-    if with_deletion do
-      {:ok, _} = Repo.delete(config)
-      shell_info("#{config.key} deleted from DB.")
+      :ok = File.close(file)
+      System.cmd("mix", ["format", config_path])
+    else
+      migration_error()
     end
   end
+
+  defp migration_error do
+    shell_error(
+      "Migration is not allowed in config. You can change this behavior by setting `configurable_from_database` to true."
+    )
+  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)
+  else
+    defp config_header, do: "use Mix.Config\r\n\r\n"
+    defp read_file(config_file), do: Mix.Config.eval!(config_file)
+  end
+
+  defp write_and_delete(config, file, delete?) do
+    config
+    |> write(file)
+    |> delete(delete?)
+  end
+
+  defp write(config, file) do
+    value =
+      config.value
+      |> ConfigDB.from_binary()
+      |> inspect(limit: :infinity)
+
+    IO.write(file, "config #{config.group}, #{config.key}, #{value}\r\n\r\n")
+
+    config
+  end
+
+  defp delete(config, true) do
+    {:ok, _} = Repo.delete(config)
+    shell_info("#{config.key} deleted from DB.")
+  end
+
+  defp delete(_config, _), do: :ok
 end