From a5a7db9e2b63c5748dea312d23aafbb89d660667 Mon Sep 17 00:00:00 2001 From: Philip Flohr Date: Mon, 7 May 2018 20:57:32 +0200 Subject: implemented plugin updates --- src/command/cmd_defs.c | 4 ++++ src/command/cmd_funcs.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ src/command/cmd_funcs.h | 1 + 3 files changed, 63 insertions(+) diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 54df4903..ee320e84 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2085,6 +2085,7 @@ static struct cmd_t command_defs[] = { "sourcepath", cmd_plugins_sourcepath }, { "install", cmd_plugins_install }, { "uninstall", cmd_plugins_uninstall }, + { "update", cmd_plugins_update }, { "load", cmd_plugins_load }, { "unload", cmd_plugins_unload }, { "reload", cmd_plugins_reload }, @@ -2097,6 +2098,7 @@ static struct cmd_t command_defs[] = "/plugins sourcepath clear", "/plugins install []", "/plugins uninstall []", + "/plugins update []", "/plugins unload []", "/plugins load []", "/plugins reload []", @@ -2108,6 +2110,7 @@ static struct cmd_t command_defs[] = { "sourcepath clear", "Clear the default plugins source path." }, { "install []", "Install a plugin, or all plugins found in a directory (recursive). Passing no argument will use the sourcepath if one is set." }, { "uninstall []", "Uninstall a plugin." }, + { "update []", "Updates an installed plugin" }, { "load []", "Load a plugin that already exists in the plugin directory, passing no argument loads all found plugins." }, { "unload []", "Unload a loaded plugin, passing no argument will unload all plugins." }, { "reload []", "Reload a plugin, passing no argument will reload all plugins." }, @@ -2116,6 +2119,7 @@ static struct cmd_t command_defs[] = "/plugins sourcepath set /home/meee/projects/profanity-plugins", "/plugins install", "/plugins install /home/steveharris/Downloads/metal.py", + "/plugins update /home/steveharris/Downloads/metal.py", "/plugins uninstall browser.py", "/plugins load browser.py", "/plugins unload say.py", diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 6aae8fb2..fa675309 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -6663,6 +6663,64 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) return TRUE; } +gboolean +cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) +{ + char *path = args[1]; + if (path == NULL) { + char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); + if (sourcepath) { + path = strdup(sourcepath); + prefs_free_string(sourcepath); + } else { + cons_show("Either a path must be provided or the sourcepath property must be set, see /help plugins"); + return TRUE; + } + } else if (path[0] == '~' && path[1] == '/') { + if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) { + return TRUE; + } + } else { + path = strdup(path); + } + + if (access(path, R_OK) != 0) { + cons_show("File not found: %s", path); + free(path); + return TRUE; + } + + if (is_regular_file(path)) { + if (!g_str_has_suffix(path, ".py") && !g_str_has_suffix(path, ".so")) { + cons_show("Plugins must have one of the following extensions: '.py' '.so'"); + free(path); + return TRUE; + } + + GString* error_message = g_string_new(NULL); + gchar *plugin_name = g_path_get_basename(path); + gboolean result = plugins_unload(plugin_name); + result |= plugins_uninstall(plugin_name); + result |= plugins_install(plugin_name, path, error_message); + if (result) { + cons_show("Plugin installed: %s", plugin_name); + } else { + cons_show("Failed to install plugin: %s. %s", plugin_name, error_message->str); + } + g_free(plugin_name); + + free(path); + return TRUE; + } + + if (is_dir(path)) { + return FALSE; + } + + cons_show("Argument must be a file or directory."); + return TRUE; +} + gboolean cmd_plugins_uninstall(ProfWin *window, const char *const command, gchar **args) { diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h index a00fce5d..f4933d44 100644 --- a/src/command/cmd_funcs.h +++ b/src/command/cmd_funcs.h @@ -162,6 +162,7 @@ gboolean cmd_console(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins_install(ProfWin *window, const char *const command, gchar **args); +gboolean cmd_plugins_update(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins_uninstall(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins_load(ProfWin *window, const char *const command, gchar **args); gboolean cmd_plugins_unload(ProfWin *window, const char *const command, gchar **args); -- cgit 1.4.1-2-gfad0