extensions-tool: Add 'reset' command

Now that we allow to disable session mode extensions, it can be useful
to reset an extension to its original state, that is disabled in the
regular session, but possibly enabled via the session mode.

Add a corresponding command.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/1234
This commit is contained in:
Florian Müllner 2019-07-24 15:18:59 +02:00
parent 532acf4c4a
commit d4b8912c0e
6 changed files with 99 additions and 2 deletions

View File

@ -0,0 +1,84 @@
/* command-reset.c
*
* Copyright 2019 Florian Müllner <fmuellner@gnome.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* SPDX-License-Identifier: GPL-3.0-or-later
*/
#include <glib/gi18n.h>
#include <gio/gio.h>
#include "commands.h"
#include "common.h"
#include "config.h"
static gboolean
reset_extension (const char *uuid)
{
g_autoptr(GSettings) settings = get_shell_settings();
if (settings == NULL)
return FALSE;
return settings_list_remove (settings, "enabled-extensions", uuid) &&
settings_list_remove (settings, "disabled-extensions", uuid);
}
int
handle_reset (int argc, char *argv[], gboolean do_help)
{
g_autoptr (GOptionContext) context = NULL;
g_autoptr (GError) error = NULL;
g_auto(GStrv) uuids = NULL;
GOptionEntry entries[] = {
{ .long_name = G_OPTION_REMAINING,
.arg_description = "UUID",
.arg = G_OPTION_ARG_STRING_ARRAY, .arg_data = &uuids },
{ NULL }
};
g_set_prgname ("gnome-extensions reset");
context = g_option_context_new (NULL);
g_option_context_set_help_enabled (context, FALSE);
g_option_context_set_summary (context, _("Reset an extension"));
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
if (do_help)
{
show_help (context, NULL);
return 0;
}
if (!g_option_context_parse (context, &argc, &argv, &error))
{
show_help (context, error->message);
return 1;
}
if (uuids == NULL)
{
show_help (context, _("No UUID given"));
return 1;
}
else if (g_strv_length (uuids) > 1)
{
show_help (context, _("More than one UUID given"));
return 1;
}
return reset_extension (*uuids) ? 0 : 2;
}

View File

@ -26,6 +26,7 @@ G_BEGIN_DECLS
int handle_enable (int argc, char *argv[], gboolean do_help); int handle_enable (int argc, char *argv[], gboolean do_help);
int handle_disable (int argc, char *argv[], gboolean do_help); int handle_disable (int argc, char *argv[], gboolean do_help);
int handle_reset (int argc, char *argv[], gboolean do_help);
int handle_list (int argc, char *argv[], gboolean do_help); int handle_list (int argc, char *argv[], gboolean do_help);
int handle_info (int argc, char *argv[], gboolean do_help); int handle_info (int argc, char *argv[], gboolean do_help);
int handle_prefs (int argc, char *argv[], gboolean do_help); int handle_prefs (int argc, char *argv[], gboolean do_help);

View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
__gnome_extensions() { __gnome_extensions() {
local commands="version enable disable info install show list create pack prefs uninstall" local commands="version enable disable reset info install show list create pack prefs uninstall"
local COMMAND=${COMP_WORDS[1]} local COMMAND=${COMP_WORDS[1]}
_init_completion -s || return _init_completion -s || return
@ -35,7 +35,7 @@ __gnome_extensions() {
uninstall) uninstall)
local list_opt=--user local list_opt=--user
;;& ;;&
enable|disable|info|show|prefs|uninstall) enable|disable|info|show|prefs|reset|uninstall)
COMPREPLY=($(compgen -W "`gnome-extensions list $list_opt`" -- "$2")) COMPREPLY=($(compgen -W "`gnome-extensions list $list_opt`" -- "$2"))
return 0 return 0
;; ;;

View File

@ -244,6 +244,7 @@ usage (void)
g_printerr (" version %s\n", _("Print version")); g_printerr (" version %s\n", _("Print version"));
g_printerr (" enable %s\n", _("Enable extension")); g_printerr (" enable %s\n", _("Enable extension"));
g_printerr (" disable %s\n", _("Disable extension")); g_printerr (" disable %s\n", _("Disable extension"));
g_printerr (" reset %s\n", _("Reset extension"));
g_printerr (" uninstall %s\n", _("Uninstall extension")); g_printerr (" uninstall %s\n", _("Uninstall extension"));
g_printerr (" list %s\n", _("List extensions")); g_printerr (" list %s\n", _("List extensions"));
g_printerr (" info %s\n", _("Show extension info")); g_printerr (" info %s\n", _("Show extension info"));
@ -309,6 +310,8 @@ main (int argc, char *argv[])
return handle_enable (argc, argv, do_help); return handle_enable (argc, argv, do_help);
else if (g_str_equal (command, "disable")) else if (g_str_equal (command, "disable"))
return handle_disable (argc, argv, do_help); return handle_disable (argc, argv, do_help);
else if (g_str_equal (command, "reset"))
return handle_reset (argc, argv, do_help);
else if (g_str_equal (command, "list")) else if (g_str_equal (command, "list"))
return handle_list (argc, argv, do_help); return handle_list (argc, argv, do_help);
else if (g_str_equal (command, "info")) else if (g_str_equal (command, "info"))

View File

@ -19,6 +19,8 @@ SYNOPSIS
*gnome-extensions* disable 'UUID' *gnome-extensions* disable 'UUID'
*gnome-extensions* reset 'UUID'
*gnome-extensions* info 'UUID' *gnome-extensions* info 'UUID'
*gnome-extensions* show 'UUID' *gnome-extensions* show 'UUID'
@ -62,6 +64,12 @@ Disables the extension identified by 'UUID'.
+ +
If the extension is not enabled, the command will do nothing. If the extension is not enabled, the command will do nothing.
*reset* 'UUID'::
Reset the extension identified by 'UUID'.
+
The extension will be disabled in GNOME, but may be enabled by other sessions
like GNOME Classic.
*info* 'UUID':: *info* 'UUID'::
Show details of the extension identified by 'UUID', including name, Show details of the extension identified by 'UUID', including name,
description and state. description and state.

View File

@ -17,6 +17,7 @@ sources = [
'command-list.c', 'command-list.c',
'command-pack.c', 'command-pack.c',
'command-prefs.c', 'command-prefs.c',
'command-reset.c',
'command-uninstall.c', 'command-uninstall.c',
'main.c' 'main.c'
] ]