summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--server/include/api_core.h15
-rw-r--r--server/include/api_module_base.h2
-rw-r--r--server/include/modules_handler.h10
-rw-r--r--server/modules/metadata/flat_files/flat_files.cbp4
-rw-r--r--server/modules/metadata/flat_files/main.cpp12
-rw-r--r--server/modules/metadata/flat_files/main.h3
-rw-r--r--server/src/api_core.cpp26
-rw-r--r--server/src/main.cpp4
-rw-r--r--server/src/modules_handler.cpp64
9 files changed, 101 insertions, 39 deletions
diff --git a/server/include/api_core.h b/server/include/api_core.h
index 1663f09..7dcec4d 100644
--- a/server/include/api_core.h
+++ b/server/include/api_core.h
@@ -30,13 +30,14 @@ class module_base;
class core_api
{
- //core
- std::map<std::string, std::string> get_module_settings(const module_base *m);
-
- //metadata
- bool metadata_set(const module_base *m, const std::string &setting_name, const std::vector<char> &data);
- bool metadata_get(const module_base *m, const std::string &setting_name, std::vector<char> &data);
- bool metadata_remove(const module_base *m, const std::string &setting_name);
+ public:
+ //core
+ virtual std::map<std::string, std::string> get_module_settings(module_base *m);
+
+ //metadata
+ virtual bool metadata_set(module_base *m, const std::string &setting_name, const std::vector<char> &data);
+ virtual bool metadata_get(module_base *m, const std::string &setting_name, std::vector<char> &data);
+ virtual bool metadata_remove(module_base *m, const std::string &setting_name);
};
diff --git a/server/include/api_module_base.h b/server/include/api_module_base.h
index 38c9a00..1a9fc4f 100644
--- a/server/include/api_module_base.h
+++ b/server/include/api_module_base.h
@@ -22,11 +22,13 @@
#ifndef API_MODULE_BASE_H_INCLUDED
#define API_MODULE_BASE_H_INCLUDED
#include <api_core.h>
+#include <boost/function.hpp>
struct module_info
{
std::string name, description, version;
std::map<std::string, std::string> default_settings; //to save in config file
+ boost::function<void()> on_modules_loaded;
};
class module_base
diff --git a/server/include/modules_handler.h b/server/include/modules_handler.h
index 2459d9c..c111faf 100644
--- a/server/include/modules_handler.h
+++ b/server/include/modules_handler.h
@@ -30,17 +30,19 @@ class modules_handler
{
public:
modules_handler();
- std::string list_modules(short verbose_level = 0);
+ void load_modules();
+ void on_modules_loaded();
+ std::string list_modules();
~modules_handler();
private:
void load_metadata_modules(const std::string &path);
void load_downloader_modules(const std::string &path);
void sync_module_settings(module_base *m);
+ std::string list_modules_single_type_internal(const std::list<module_base*> &modules);
std::string get_self_path();
std::string self_path;
- std::list<module_metadata_storage*> metadata_modules;
- std::list<module_downloader*> downloader_modules;
-
+ std::list<module_base*> metadata_modules;
+ std::list<module_base*> downloader_modules;
};
diff --git a/server/modules/metadata/flat_files/flat_files.cbp b/server/modules/metadata/flat_files/flat_files.cbp
index 7dd9c9f..3081897 100644
--- a/server/modules/metadata/flat_files/flat_files.cbp
+++ b/server/modules/metadata/flat_files/flat_files.cbp
@@ -37,6 +37,10 @@
<Add option="-fexceptions -fPIC" />
<Add directory="../../../include" />
</Compiler>
+ <Linker>
+ <Add library="boost_filesystem" />
+ <Add library="boost_system" />
+ </Linker>
<Unit filename="main.cpp" />
<Unit filename="main.h" />
<Extensions>
diff --git a/server/modules/metadata/flat_files/main.cpp b/server/modules/metadata/flat_files/main.cpp
index 78b8a58..7fd197c 100644
--- a/server/modules/metadata/flat_files/main.cpp
+++ b/server/modules/metadata/flat_files/main.cpp
@@ -22,6 +22,13 @@
#include "main.h"
#include <iostream>
+#include <boost/filesystem.hpp>
+#include <boost/bind.hpp>
+
+void storage_impl::on_modules_loaded()
+{
+ settings = api->get_module_settings(this);
+}
void storage_impl::load(core_api *a)
@@ -30,8 +37,9 @@ void storage_impl::load(core_api *a)
info.name = "flat_files_metadata";
info.description = "this module provide metadata storage in flat files";
- info.version = "0.0.0.1";
+ info.version = "0.0.0.1draft";
info.default_settings["data_path"] = "~/.local/share/udm/metadata";
+ info.on_modules_loaded = boost::bind(&storage_impl::on_modules_loaded, this);
std::cout<<"flat_files metadata module succesfully loaded\n";
}
@@ -74,7 +82,7 @@ module_base::~module_base()
}
-extern "C" void* udm_metadata_module_load()
+extern "C" module_metadata_storage* udm_metadata_module_load()
{
return new storage_impl;
}
diff --git a/server/modules/metadata/flat_files/main.h b/server/modules/metadata/flat_files/main.h
index 5604623..97a2723 100644
--- a/server/modules/metadata/flat_files/main.h
+++ b/server/modules/metadata/flat_files/main.h
@@ -40,9 +40,10 @@ class storage_impl: public module_metadata_storage
bool remove(const std::string &module_name, const std::string &setting_name);
private:
+ void on_modules_loaded();
module_info info;
core_api *api = nullptr;
-
+ std::map<std::string, std::string> settings;
};
diff --git a/server/src/api_core.cpp b/server/src/api_core.cpp
index 5412624..6cee810 100644
--- a/server/src/api_core.cpp
+++ b/server/src/api_core.cpp
@@ -19,23 +19,41 @@
*/
-#include <api_core.h>
+#include "api_core.h"
+#include "main.h"
+#include "api_module_base.h"
+#include <boost/foreach.hpp>
+extern runtime_config_s runtime_config;
-bool core_api::metadata_set(const module_base *m, const std::string &setting_name, const std::vector<char> &data)
+
+bool core_api::metadata_set(module_base *m, const std::string &setting_name, const std::vector<char> &data)
{
//TODO
return true;
}
-bool core_api::metadata_get(const module_base *m, const std::string &setting_name, std::vector<char> &data)
+bool core_api::metadata_get(module_base *m, const std::string &setting_name, std::vector<char> &data)
{
//TODO
return true;
}
-bool core_api::metadata_remove(const module_base *m, const std::string &setting_name)
+bool core_api::metadata_remove(module_base *m, const std::string &setting_name)
{
//TODO
return true;
}
+
+std::map<std::string, std::string> core_api::get_module_settings(module_base *m)
+{
+ //TODO:
+ std::map<std::string, std::string> settings;
+ std::string module = "modules.";
+ module += m->get_module_info().name;
+ for(auto i = runtime_config.config_file.get_child(module).begin(), end = runtime_config.config_file.get_child(module).end(); i != end; ++i)
+ {
+ settings[i->first] = i->second.get_value<std::string>("");
+ }
+ return settings;
+}
diff --git a/server/src/main.cpp b/server/src/main.cpp
index e8b4e2c..8cf9efc 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -37,6 +37,7 @@ namespace bpo = boost::program_options;
runtime_config_s runtime_config;
+//TODO: "core" config section architecture, define base settings
int main(int argc, char *argv[])
@@ -89,7 +90,10 @@ int main(int argc, char *argv[])
if(!module_api)
module_api = new core_api;
if(!modules)
+ {
modules = new modules_handler;
+ modules->load_modules();
+ }
std::cout<<modules->list_modules();
bpt::write_info(parsed_config_path, runtime_config.config_file); //save config on exit
return 0;
diff --git a/server/src/modules_handler.cpp b/server/src/modules_handler.cpp
index 1626d91..7a17ec7 100644
--- a/server/src/modules_handler.cpp
+++ b/server/src/modules_handler.cpp
@@ -20,6 +20,7 @@
#include "modules_handler.h"
#include "main.h"
+#include "utilities.h"
#include <unistd.h>
#include <dlfcn.h>
#include <string>
@@ -46,12 +47,13 @@ void modules_handler::load_metadata_modules(const std::string &path)
{
for(boost::filesystem::directory_iterator i(path), end = boost::filesystem::directory_iterator(); i != end; ++i)
{
- void *lib = dlopen(i->path().generic_string().c_str(), RTLD_LAZY);
+ void *lib = dlopen(i->path().generic_string().c_str(), RTLD_LAZY |RTLD_GLOBAL);
if(!lib)
{
printf("failed to open library \"%s\" with error: %s\n", i->path().c_str(), dlerror());
return;
}
+
void *fptr = dlsym(lib, "udm_metadata_module_load");
if(!fptr)
{
@@ -59,10 +61,10 @@ void modules_handler::load_metadata_modules(const std::string &path)
dlclose(lib);
return;
}
- void *(*f)(void);
- f = (void* (*)())fptr;
+ module_metadata_storage *(*f)(void);
+ f = (module_metadata_storage *(*)(void))fptr;
//TODO: aditional sanity checks
- module_metadata_storage *m = static_cast<module_metadata_storage*>(f());
+ module_metadata_storage *m = f();
m->load(module_api);
sync_module_settings(m);
metadata_modules.push_back(m);
@@ -89,10 +91,10 @@ void modules_handler::load_downloader_modules(const std::string &path)
dlclose(lib);
return;
}
- void *(*f)(void);
- f = (void* (*)())fptr;
+ module_downloader *(*f)(void);
+ f = (module_downloader *(*)(void))fptr;
//TODO: aditional sanity checks
- module_metadata_storage *m = static_cast<module_metadata_storage*>(f());
+ module_downloader *m = f();
m->load(module_api);
sync_module_settings(m);
metadata_modules.push_back(m);
@@ -109,11 +111,21 @@ std::string modules_handler::get_self_path()
return s;
}
-std::string modules_handler::list_modules(short verbose_level)
+std::string modules_handler::list_modules()
{
std::string buf;
buf += "Installed metadata modules:\n";
- for(auto i = metadata_modules.begin(), end = metadata_modules.end(); i != end; ++i)
+ buf += list_modules_single_type_internal((std::list<module_base*>)metadata_modules);
+ buf += "\nInstalled downloader modules:\n";
+ buf += list_modules_single_type_internal(downloader_modules);
+
+ return buf;
+}
+
+std::string modules_handler::list_modules_single_type_internal(const std::list<module_base*> &modules)
+{
+ std::string buf;
+ for(auto i = modules.begin(), end = modules.end(); i != end; ++i)
{
buf += "\tName: ";
buf += (*i)->get_module_info().name;
@@ -130,16 +142,7 @@ std::string modules_handler::list_modules(short verbose_level)
buf += i1->second;
}
}
- buf += "\n";
- }
- buf += "Installed downloader modules:\n";
- for(auto i = downloader_modules.begin(), end = downloader_modules.end(); i != end; ++i)
- {
- buf += "\t";
- buf += (*i)->get_module_info().name;
- buf += " (" + (*i)->get_module_info().description + ") ";
- buf += "v" + (*i)->get_module_info().version;
- buf += "\n";
+ buf += "\n\n";
}
return buf;
}
@@ -159,14 +162,33 @@ void modules_handler::sync_module_settings(module_base *m)
modules_handler::modules_handler()
{
self_path = get_self_path();
+}
+
+void modules_handler::load_modules()
+{
boost::filesystem::path p(self_path);
std::string self_dir = p.parent_path().generic_string();
load_metadata_modules(self_dir + "/modules/metadata");
- load_metadata_modules("~/.share/udm/modules/metadata");
+ load_metadata_modules(replace_home_var("~/.share/udm/modules/metadata"));
load_metadata_modules("/usr/lib/udm/modules/metadata");
load_downloader_modules(self_dir + "/modules/downloader");
- load_downloader_modules("~/.share/udm/modules/downloader");
+ load_downloader_modules(replace_home_var("~/.share/udm/modules/downloader"));
load_downloader_modules("/usr/lib/udm/modules/downloader");
+ on_modules_loaded();
+}
+
+void modules_handler::on_modules_loaded()
+{
+ for(auto i = metadata_modules.begin(), end = metadata_modules.end(); i != end; ++i)
+ {
+ if(!(*i)->get_module_info().on_modules_loaded.empty())
+ (*i)->get_module_info().on_modules_loaded();
+ }
+ for(auto i = downloader_modules.begin(), end = downloader_modules.end(); i != end; ++i)
+ {
+ if(!(*i)->get_module_info().on_modules_loaded.empty())
+ (*i)->get_module_info().on_modules_loaded();
+ }
}
modules_handler::~modules_handler()
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 11:16:50 +0000