anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

libdino: try to load all plugins found in the respective folders

Browse source
This commit is contained in:
Marvin W 2017-08-29 21:47:53 +02:00
parent 82a8f5c38d
commit 7c2023803e
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
4 changed files with 69 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libdino/CMakeLists.txt
View file

@ -74,7 +74,7 @@ DEPENDS
${CMAKE_BINARY_DIR}/exports/dino_i18n.h ${CMAKE_BINARY_DIR}/exports/dino_i18n.h
) )
add_definitions(${VALA_CFLAGS} -DDINO_PLUGINS_SYSTEM_PLUGIN_DIR="${PLUGIN_INSTALL_DIR}" -DDINO_PLUGINS_SYSTEM_LIBDIR_NAME="${LIBDIR_NAME}") add_definitions(${VALA_CFLAGS} -DDINO_SYSTEM_PLUGIN_DIR="${PLUGIN_INSTALL_DIR}" -DDINO_SYSTEM_LIBDIR_NAME="${LIBDIR_NAME}")
add_library(libdino SHARED ${LIBDINO_VALA_C} ${CMAKE_BINARY_DIR}/exports/dino_i18n.h) add_library(libdino SHARED ${LIBDINO_VALA_C} ${CMAKE_BINARY_DIR}/exports/dino_i18n.h)
add_dependencies(libdino dino-vapi) add_dependencies(libdino dino-vapi)
target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_PACKAGES} m) target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_PACKAGES} m)

79
libdino/src/plugin/loader.vala
View file

@ -1,7 +1,6 @@
namespace Dino.Plugins { using Gee;
private extern const string SYSTEM_LIBDIR_NAME; namespace Dino.Plugins {
private extern const string SYSTEM_PLUGIN_DIR;
private class Info : Object { private class Info : Object {
public Module module; public Module module;
@ -15,72 +14,76 @@ private class Info : Object {
public class Loader : Object { public class Loader : Object {
[CCode (has_target = false)] [CCode (has_target = false)]
private delegate Type RegisterPluginFunction (Module module); private delegate Type RegisterPluginFunction(Module module);
private string[] search_paths = new string[0]; private Application app;
private string[] search_paths;
private RootInterface[] plugins = new RootInterface[0]; private RootInterface[] plugins = new RootInterface[0];
private Info[] infos = new Info[0]; private Info[] infos = new Info[0];
public Loader(string? exec_str = null) { public Loader(Application app) {
if (Environment.get_variable("DINO_PLUGIN_DIR") != null) { this.app = app;
search_paths += Environment.get_variable("DINO_PLUGIN_DIR"); this.search_paths = app.search_path_generator.get_plugin_paths();
}
search_paths += Path.build_filename(Environment.get_home_dir(), ".local", "lib", "dino", "plugins");
string? exec_path = exec_str;
if (exec_path != null) {
if (!exec_path.contains(Path.DIR_SEPARATOR_S)) {
exec_path = Environment.find_program_in_path(exec_str);
}
if (Path.get_dirname(exec_path).contains("dino") || Path.get_dirname(exec_path) == "." || Path.get_dirname(exec_path).contains("build")) {
search_paths += Path.build_filename(Path.get_dirname(exec_path), "plugins");
}
if (Path.get_basename(Path.get_dirname(exec_path)) == "bin") {
search_paths += Path.build_filename(Path.get_dirname(Path.get_dirname(exec_path)), SYSTEM_LIBDIR_NAME, "dino", "plugins");
}
}
search_paths += SYSTEM_PLUGIN_DIR;
} }
public void print_search_paths() { public void loadAll() {
foreach (string prefix in search_paths) { if (Module.supported() == false) {
print(@"$prefix\n"); throw new Error(-1, 0, "Plugins are not supported");
}
HashSet<string> plugin_names = new HashSet<string>();
foreach (string path in search_paths) {
try {
Dir dir = Dir.open(path, 0);
string? file = null;
while ((file = dir.read_name()) != null) {
if (file.has_suffix(Module.SUFFIX)) plugin_names.add(file);
}
} catch (Error e) {
// Ignore this folder
} }
} }
public RootInterface load(string name, Dino.Application app) throws Error { foreach (string plugin in plugin_names) {
if (Module.supported () == false) { load(plugin);
throw new Error (-1, 0, "Plugins are not supported"); }
}
public RootInterface load(string name) throws Error {
if (Module.supported() == false) {
throw new Error(-1, 0, "Plugins are not supported");
} }
Module module = null; Module module = null;
string path = ""; string path = "";
foreach (string prefix in search_paths) { foreach (string prefix in search_paths) {
path = Path.build_filename(prefix, name); path = Path.build_filename(prefix, name);
module = Module.open (path, ModuleFlags.BIND_LAZY); module = Module.open(path, ModuleFlags.BIND_LAZY);
if (module != null) break; if (module != null) break;
} }
if (module == null) { if (module == null) {
throw new Error (-1, 1, "%s", Module.error ().replace(path, name)); throw new Error(-1, 1, "%s", Module.error().replace(path, name));
} }
void* function; void* function;
module.symbol ("register_plugin", out function); module.symbol("register_plugin", out function);
if (function == null) { if (function == null) {
throw new Error (-1, 2, "register_plugin () not found"); throw new Error(-1, 2, "register_plugin () not found");
} }
RegisterPluginFunction register_plugin = (RegisterPluginFunction) function; RegisterPluginFunction register_plugin = (RegisterPluginFunction) function;
Type type = register_plugin (module); Type type = register_plugin(module);
if (type.is_a (typeof (RootInterface)) == false) { if (type.is_a(typeof(RootInterface)) == false) {
throw new Error (-1, 3, "Unexpected type"); throw new Error(-1, 3, "Unexpected type");
} }
Info info = new Plugins.Info (type, (owned) module); Info info = new Plugins.Info(type, (owned) module);
infos += info; infos += info;
RootInterface plugin = (RootInterface) Object.new (type); RootInterface plugin = (RootInterface) Object.new (type);
plugins += plugin; plugins += plugin;
plugin.registered (app); plugin.registered(app);
return plugin; return plugin;
} }

25
libdino/src/util.vala
View file

@ -1,5 +1,8 @@
namespace Dino { namespace Dino {
private extern const string SYSTEM_LIBDIR_NAME;
private extern const string SYSTEM_PLUGIN_DIR;
public class SearchPathGenerator { public class SearchPathGenerator {
public string? exec_path { get; private set; } public string? exec_path { get; private set; }
@ -18,6 +21,28 @@ public class SearchPathGenerator {
} }
return locale_dir ?? locale_install_dir; return locale_dir ?? locale_install_dir;
} }
public string[] get_plugin_paths() {
string[] search_paths = new string[0];
if (Environment.get_variable("DINO_PLUGIN_DIR") != null) {
search_paths += Environment.get_variable("DINO_PLUGIN_DIR");
}
search_paths += Path.build_filename(Environment.get_home_dir(), ".local", "lib", "dino", "plugins");
string? exec_path = this.exec_path;
if (exec_path != null) {
if (!exec_path.contains(Path.DIR_SEPARATOR_S)) {
exec_path = Environment.find_program_in_path(this.exec_path);
}
if (Path.get_dirname(exec_path).contains("dino") || Path.get_dirname(exec_path) == "." || Path.get_dirname(exec_path).contains("build")) {
search_paths += Path.build_filename(Path.get_dirname(exec_path), "plugins");
}
if (Path.get_basename(Path.get_dirname(exec_path)) == "bin") {
search_paths += Path.build_filename(Path.get_dirname(Path.get_dirname(exec_path)), SYSTEM_LIBDIR_NAME, "dino", "plugins");
}
}
search_paths += SYSTEM_PLUGIN_DIR;
return search_paths;
}
} }
public static string get_storage_dir() { public static string get_storage_dir() {

26
main/src/main.vala
View file

@ -11,36 +11,14 @@ void main(string[] args) {
try{ try{
string? exec_path = args.length > 0 ? args[0] : null; string? exec_path = args.length > 0 ? args[0] : null;
SearchPathGenerator search_path_generator = new SearchPathGenerator(exec_path); SearchPathGenerator search_path_generator = new SearchPathGenerator(exec_path);
if (exec_path != null && exec_path.contains(Path.DIR_SEPARATOR_S)) {
string bindir = Path.get_dirname(exec_path);
if (FileUtils.test(Path.build_filename(bindir, "gschemas.compiled"), FileTest.IS_REGULAR)) {
Environment.set_variable("GSETTINGS_SCHEMA_DIR", Path.get_dirname(exec_path), false);
}
}
Intl.textdomain(GETTEXT_PACKAGE); Intl.textdomain(GETTEXT_PACKAGE);
internationalize(GETTEXT_PACKAGE, search_path_generator.get_locale_path(GETTEXT_PACKAGE, LOCALE_INSTALL_DIR)); internationalize(GETTEXT_PACKAGE, search_path_generator.get_locale_path(GETTEXT_PACKAGE, LOCALE_INSTALL_DIR));
Plugins.Loader loader = new Plugins.Loader(exec_path);
Gtk.init(ref args); Gtk.init(ref args);
Dino.Ui.Application app = new Dino.Ui.Application() { search_path_generator=search_path_generator }; Dino.Ui.Application app = new Dino.Ui.Application() { search_path_generator=search_path_generator };
Plugins.Loader loader = new Plugins.Loader(app);
loader.loadAll();
app.add_main_option("plugin-paths", 0, 0, OptionArg.NONE, "Display plugin search paths and exit", null);
app.handle_local_options.connect((options) => {
Variant v = options.lookup_value("plugin-paths", VariantType.BOOLEAN);
if (v != null && v.get_boolean()) {
loader.print_search_paths();
return 0;
}
return -1;
});
foreach (string plugin in new string[]{"omemo", "openpgp", "http-files"}) {
try {
loader.load(plugin, app);
} catch (Error e) {
print(@"Error loading plugin $plugin: $(e.message)\n");
}
}
app.run(args); app.run(args);
loader.shutdown(); loader.shutdown();
} catch (Error e) { } catch (Error e) {