kolan
/
GObject-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Different load methods: load_modules(), load_modules_depth2().

This commit is contained in:
Kolan Sh 2018-04-28 17:39:26 +03:00
parent c2640021cf
commit d93eb17d31
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/loader/PluginLoader.vala
View File

@ -75,6 +75,50 @@ namespace GObject {
} }
} }
void sort_modules (Gee.ArrayList<Module> modules) {
modules.sort ((a, b) => {
var a_name = a.get_plugin_type ().name ();
var b_name = b.get_plugin_type ().name ();
if (a_name < b_name) return -1;
if (a_name > b_name) return 1;
return 0;
});
}
/**
* Loads modules in the specific directory.
*
* @param dir_path path to the directory.
* @param modules where to save list of modules.
*
* @return are the modules loaded correctly or not.
*/
public bool load_modules (string dir_path, ref Gee.ArrayList<Module>? modules) {
modules = new Gee.ArrayList<Module> ();
try {
var libPath = File.new_for_path (dir_path);
var lib_enumerator = libPath.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
FileInfo file_info = null;
while ((file_info = lib_enumerator.next_file (null)) != null) {
if (Regex.match_simple ("^.*\\.(so|dll)$", file_info.get_name ())) {
var module = new Module (GLib.Module.build_path (dir_path, file_info.get_name ()));
if (module.load ())
modules.add (module);
}
}
} catch (Error e) {
message (e.message);
return false;
}
sort_modules (modules);
return true;
}
/** /**
* Loads modules in the 2-depth directory tree path. * Loads modules in the 2-depth directory tree path.
* *
@ -83,7 +127,7 @@ namespace GObject {
* *
* @return are the modules loaded correctly or not. * @return are the modules loaded correctly or not.
*/ */
public bool load_modules (string dir_path, ref Gee.ArrayList<Module>? modules) { public bool load_modules_depth2 (string dir_path, ref Gee.ArrayList<Module>? modules) {
modules = new Gee.ArrayList<Module> (); modules = new Gee.ArrayList<Module> ();
@ -112,13 +156,7 @@ namespace GObject {
return false; return false;
} }
modules.sort ((a, b) => { sort_modules (modules);
var a_name = a.get_plugin_type ().name ();
var b_name = b.get_plugin_type ().name ();
if (a_name < b_name) return -1;
if (a_name > b_name) return 1;
return 0;
});
return true; return true;
} }

4
test/loader_test/LoaderTest.vala
View File

@ -13,13 +13,13 @@ int main (string [] args) {
var h = new LoaderTestHost (); var h = new LoaderTestHost ();
GObject.Plugins.load_modules ( GObject.Plugins.load_modules_depth2 (
Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path ( Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path (
args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeA"), args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeA"),
ref type_a_modules ref type_a_modules
); );
GObject.Plugins.load_modules ( GObject.Plugins.load_modules_depth2 (
Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path ( Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path (
args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeB"), args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeB"),
ref type_b_modules ref type_b_modules