remote-delete: Move to FlatpakDir and add checks for installed refs

You can't remove a remote unless you --force or there are no installs
from it.

1 files changed, 9 insertions, 15 deletions

diff --git a/app/flatpak-builtins-delete-remote.c b/app/flatpak-builtins-delete-remote.c
index 48330cd..53ab9b9 100644
--- a/app/flatpak-builtins-delete-remote.c
+++ b/app/flatpak-builtins-delete-remote.c
@@ -30,6 +30,14 @@
 
 #include "flatpak-builtins.h"
 
+static gboolean opt_force;
+
+static GOptionEntry modify_options[] = {
+  { "force", 0, 0, G_OPTION_ARG_NONE, &opt_force, "Remove remote even if in use",  },
+  { NULL }
+};
+
+
 gboolean
 flatpak_builtin_delete_remote (int argc, char **argv, GCancellable *cancellable, GError **error)
 {
@@ -47,23 +55,9 @@ flatpak_builtin_delete_remote (int argc, char **argv, GCancellable *cancellable,
 
   remote_name = argv[1];
 
-  if (!flatpak_dir_remove_all_refs (dir, remote_name,
-                                    cancellable, error))
-    return FALSE;
-
-  if (!flatpak_dir_remove_appstream (dir, remote_name,
-                                     cancellable, error))
-    return FALSE;
-
-  if (!ostree_repo_remote_change (flatpak_dir_get_repo (dir), NULL,
-                                  OSTREE_REPO_REMOTE_CHANGE_DELETE,
-                                  remote_name, NULL,
-                                  NULL,
+  if (!flatpak_dir_remove_remote (dir, opt_force, remote_name,
                                   cancellable, error))
     return FALSE;
 
-  if (!flatpak_dir_mark_changed (dir, error))
-    return FALSE;
-
   return TRUE;
 }