Load plugins in CLI, beginin of the final refactor in the CLI.

Author: viferga

source/cli/metacallcli/CMakeLists.txt

@@ -26,7 +26,7 @@ include(SecurityFlags)
 
 set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
 set(inline_path "${CMAKE_CURRENT_SOURCE_DIR}/inline/${target}")
-set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
+set(source_path "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(headers
 	${include_path}/tokenizer.hpp
@@ -139,6 +139,15 @@ target_compile_options(${target}
 	${DEFAULT_COMPILE_OPTIONS}
 )
 
+#
+# Compile features
+#
+
+target_compile_features(${target}
+	PRIVATE
+	cxx_std_17 # Required for filesystem
+)
+
 #
 # Linker options
 #

source/cli/metacallcli/include/metacallcli/application.hpp

@@ -301,6 +301,7 @@ class application
 	/* -- Private Member Data -- */
 
 	bool exit_condition;				/**< Condition for main loop */
+	void *plugin_cli_handle;			/**< Handle containing all loaded plugins */
 	arg_list arguments;					/**< Vector containing a list of arguments */
 	script_list scripts;				/**< Vector containing a list of script names */
 	command_table commands;				/**< Hash table from command strings to command handlers */

source/cli/metacallcli/source/application.cpp

@@ -13,6 +13,7 @@
 #include <metacallcli/tokenizer.hpp>
 
 #include <algorithm>
+#include <filesystem>
 #include <functional>
 #include <iostream>
 
@@ -621,7 +622,7 @@ bool application::clear(const std::string &tag, const std::string &script)
 }
 
 application::application(int argc, char *argv[]) :
-	exit_condition(false)
+	exit_condition(false), plugin_cli_handle(NULL)
 {
 	/* Set locale */
 	setlocale(LC_CTYPE, "C");
@@ -667,6 +668,33 @@ application::application(int argc, char *argv[]) :
 		std::for_each(&argv[1], argv + /*argc*/ 2, param_it);
 	}
 
+	/* Get core plugin path and handle in order to load cli plugins */
+	const char *plugin_path = metacall_plugin_path();
+	void *plugin_extension_handle = metacall_plugin_extension();
+
+	/* Define the cli plugin path as string (core plugin path plus cli) */
+	namespace fs = std::filesystem;
+	fs::path plugin_cli_path(plugin_path);
+	plugin_cli_path /= "cli";
+	std::string plugin_cli_path_str(plugin_cli_path.string());
+
+	/* Load cli plugins into plugin cli handle */
+	void *args[] = {
+		metacall_value_create_string(plugin_cli_path_str.c_str(), plugin_cli_path_str.length()),
+		metacall_value_create_ptr(&plugin_cli_handle)
+	};
+
+	void *ret = metacallhv_s(plugin_extension_handle, "plugin_load_from_path", args, sizeof(args) / sizeof(args[0]));
+
+	if (ret == NULL || (ret != NULL && metacall_value_to_int(ret) != 0))
+	{
+		std::cout << "Failed to load CLI plugins from folder: " << plugin_cli_path_str << std::endl;
+	}
+
+	metacall_value_destroy(args[0]);
+	metacall_value_destroy(args[1]);
+	metacall_value_destroy(ret);
+
 	/* Define available commands */
 	define("help", &command_cb_help);
 
@@ -833,8 +861,15 @@ void application::command_inspect(const char *str, size_t size, void *allocator)
 					value_array_for_each(v_args_array, [&iterator, &count](void *arg) {
 						void **v_arg_map = metacall_value_to_map(arg);
 						void **v_arg_name_tupla = metacall_value_to_array(v_arg_map[0]);
+						std::string parameter_name(metacall_value_to_string(v_arg_name_tupla[1]));
+
+						if (parameter_name.empty())
+						{
+							parameter_name += "arg";
+							parameter_name += std::to_string(iterator);
+						}
 
-						std::cout << metacall_value_to_string(v_arg_name_tupla[1]);
+						std::cout << parameter_name;
 
 						if (iterator + 1 < count)
 						{

source/metacall/include/metacall/metacall.h

@@ -1405,6 +1405,15 @@ METACALL_API int metacall_clear(void *handle);
 */
 METACALL_API void *metacall_plugin_extension(void);
 
+/**
+*  @brief
+*    Get the plugin extension path to be used for accessing the plugins folder
+*
+*  @return
+*    String containing the core plugin path, or null if it failed to load the plugin extension
+*/
+METACALL_API const char *metacall_plugin_path(void);
+
 /**
 *  @brief
 *    Destroy MetaCall library

source/metacall/source/metacall.c

@@ -61,6 +61,7 @@ static int metacall_config_flags = 0;
 static int metacall_initialize_argc = 0;
 static char **metacall_initialize_argv = NULL;
 static void *plugin_extension_handle = NULL;
+static loader_path plugin_path = { 0 };
 
 /* -- Private Methods -- */
 
@@ -94,7 +95,6 @@ int metacall_plugin_extension_load(void)
 	};
 	static const char plugin_suffix[] = "plugins";
 	const char *library_path = loader_library_path();
-	loader_path plugin_path;
 	size_t plugin_path_size;
 	void *args[2];
 	void *ret;
@@ -2209,6 +2209,16 @@ void *metacall_plugin_extension(void)
 	return plugin_extension_handle;
 }
 
+const char *metacall_plugin_path(void)
+{
+	if (plugin_extension_handle == NULL)
+	{
+		return NULL;
+	}
+
+	return plugin_path;
+}
+
 int metacall_destroy(void)
 {
 	if (metacall_initialize_flag == 0)