X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-system-daemon.c;h=969bfaadcff56cd6ec670ee4d311486833953578;hb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;hp=70d8656ee87c4cec804f5636620aaee8fd8ded50;hpb=189415eece11c543e1ccb95dff32695ddc383565;p=src%2Fapp-framework-main.git diff --git a/src/afm-system-daemon.c b/src/afm-system-daemon.c index 70d8656..969bfaa 100644 --- a/src/afm-system-daemon.c +++ b/src/afm-system-daemon.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -22,24 +22,28 @@ #include #include -#include +#include +#include +#include #include "verbose.h" #include "utils-jbus.h" +#include "utils-json.h" #include "afm.h" #include "afm-db.h" #include "wgt-info.h" #include "wgtpkg-install.h" +#include "wgtpkg-uninstall.h" static const char appname[] = "afm-system-daemon"; +static const char *rootdir = NULL; static void usage() { printf( - "usage: %s [-q] [-v] [-r rootdir]... [-a appdir]...\n" + "usage: %s [-q] [-v] [-r rootdir]\n" "\n" - " -a appdir adds an application directory\n" - " -r rootdir adds a root directory of applications\n" + " -r rootdir set root directory of applications\n" " -d run as a daemon\n" " -q quiet\n" " -v verbose\n" @@ -50,7 +54,6 @@ static void usage() static struct option options[] = { { "root", required_argument, NULL, 'r' }, - { "application", required_argument, NULL, 'a' }, { "daemon", no_argument, NULL, 'd' }, { "quiet", no_argument, NULL, 'q' }, { "verbose", no_argument, NULL, 'v' }, @@ -59,72 +62,13 @@ static struct option options[] = { }; static struct jbus *jbus; -static struct afm_db *afdb; const char error_nothing[] = "[]"; const char error_bad_request[] = "\"bad request\""; const char error_not_found[] = "\"not found\""; const char error_cant_start[] = "\"can't start\""; -static const char *getappid(struct json_object *obj) -{ - return json_type_string == json_object_get_type(obj) ? json_object_get_string(obj) : NULL; -} - -static void reply(struct jreq *jreq, struct json_object *resp, const char *errstr) -{ - if (resp) - jbus_reply_j(jreq, resp); - else - jbus_reply_error_s(jreq, errstr); -} - -static void on_runnables(struct jreq *jreq, struct json_object *obj) -{ - struct json_object *resp = afm_db_application_list(afdb); - jbus_reply_j(jreq, resp); - json_object_put(resp); -} - -static void on_detail(struct jreq *jreq, struct json_object *obj) -{ - const char *appid = getappid(obj); - struct json_object *resp = afm_db_get_application_public(afdb, appid); - reply(jreq, resp, error_not_found); - json_object_put(resp); -} - -static const char *j_get_string(struct json_object *obj, const char *key, const char *defval) -{ - struct json_object *o; - return json_object_object_get_ex(obj, key, &o) && json_object_get_type(o) == json_type_string ? json_object_get_string(o) : defval; -} - -static int j_get_boolean(struct json_object *obj, const char *key, int defval) -{ - struct json_object *o; - return json_object_object_get_ex(obj, key, &o) && json_object_get_type(o) == json_type_boolean ? json_object_get_boolean(o) : defval; -} - -static int json_add(struct json_object *obj, const char *key, struct json_object *val) -{ - json_object_object_add(obj, key, val); - return 0; -} - -static int json_add_str(struct json_object *obj, const char *key, const char *val) -{ - struct json_object *str = json_object_new_string (val ? val : ""); - return str ? json_add(obj, key, str) : (errno = ENOMEM, -1); -} -/* -static int json_add_int(struct json_object *obj, const char *key, int val) -{ - struct json_object *v = json_object_new_int (val); - return v ? json_add(obj, key, v) : (errno = ENOMEM, -1); -} -*/ -static void on_install(struct jreq *jreq, struct json_object *req) +static void on_install(struct sd_bus_message *smsg, struct json_object *req, void *unused) { const char *wgtfile; const char *root; @@ -136,50 +80,72 @@ static void on_install(struct jreq *jreq, struct json_object *req) switch (json_object_get_type(req)) { case json_type_string: wgtfile = json_object_get_string(req); - root = FWK_APP_DIR; + root = rootdir; force = 0; break; case json_type_object: - wgtfile = j_get_string(req, "wgt", NULL); + wgtfile = j_string_at(req, "wgt", NULL); if (wgtfile != NULL) { - root = j_get_string(req, "root", FWK_APP_DIR); - force = j_get_boolean(req, "force", 0); + root = j_string_at(req, "root", rootdir); + force = j_boolean_at(req, "force", 0); break; } default: - jbus_reply_error_s(jreq, error_bad_request); + jbus_reply_error_s(smsg, error_bad_request); return; } /* install the widget */ ifo = install_widget(wgtfile, root, force); - if (ifo == NULL) { - jbus_reply_error_s(jreq, "\"installation failed\""); - return; - } + if (ifo == NULL) + jbus_reply_error_s(smsg, "\"installation failed\""); + else { + /* build the response */ + resp = json_object_new_object(); + if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver)) + jbus_reply_error_s(smsg, "\"out of memory but installed!\""); + else { + jbus_send_signal_s(jbus, "changed", "true"); + jbus_reply_j(smsg, resp); + } - /* build the response */ - resp = json_object_new_object(); - if(!resp || json_add_str(resp, "added", wgt_info_desc(ifo)->idaver)) { - json_object_put(resp); + /* clean-up */ wgt_info_unref(ifo); - jbus_reply_error_s(jreq, "\"out of memory but installed!\""); - return; + json_object_put(resp); } - wgt_info_unref(ifo); - - /* update the current database */ - afm_db_update_applications(afdb); - - /* reply and propagate event */ - jbus_reply_j(jreq, resp); - jbus_send_signal_j(jbus, "changed", resp); - json_object_put(resp); } -static void on_uninstall(struct jreq *jreq, struct json_object *req) +static void on_uninstall(struct sd_bus_message *smsg, struct json_object *req, void *unused) { - jbus_reply_error_s(jreq, "\"not yet implemented\""); + const char *idaver; + const char *root; + int rc; + + /* scan the request */ + switch (json_object_get_type(req)) { + case json_type_string: + idaver = json_object_get_string(req); + root = rootdir; + break; + case json_type_object: + idaver = j_string_at(req, "id", NULL); + if (idaver != NULL) { + root = j_string_at(req, "root", rootdir); + break; + } + default: + jbus_reply_error_s(smsg, error_bad_request); + return; + } + + /* install the widget */ + rc = uninstall_widget(idaver, root); + if (rc) + jbus_reply_error_s(smsg, "\"uninstallation had error\""); + else { + jbus_send_signal_s(jbus, "changed", "true"); + jbus_reply_s(smsg, "true"); + } } static int daemonize() @@ -194,12 +160,14 @@ static int daemonize() int main(int ac, char **av) { - int i, daemon = 0; + int i, daemon = 0, rc; + struct sd_event *evloop; + struct sd_bus *sysbus; LOGAUTH(appname); - /* first interpretation of arguments */ - while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) { + /* interpretation of arguments */ + while ((i = getopt_long(ac, av, "hdqvr:", options, NULL)) >= 0) { switch (i) { case 'h': usage(); @@ -215,8 +183,12 @@ int main(int ac, char **av) daemon = 1; break; case 'r': - break; - case 'a': + if (rootdir == NULL) + rootdir = optarg; + else { + ERROR("duplicate definition of rootdir"); + return 1; + } break; case ':': ERROR("missing argument value"); @@ -227,67 +199,62 @@ int main(int ac, char **av) } } - /* init framework */ - afdb = afm_db_create(); - if (!afdb) { - ERROR("afm_create failed"); - return 1; + /* check the rootdir */ + if (rootdir == NULL) + rootdir = FWK_APP_DIR; + else { + rootdir = realpath(rootdir, NULL); + if (rootdir == NULL) { + ERROR("out of memory"); + return 1; + } } - if (afm_db_add_root(afdb, FWK_APP_DIR)) { - ERROR("can't add root %s", FWK_APP_DIR); + if (chdir(rootdir)) { + ERROR("can't enter %s", rootdir); return 1; } - /* second interpretation of arguments */ - optind = 1; - while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) { - switch (i) { - case 'r': - if (afm_db_add_root(afdb, optarg)) { - ERROR("can't add root %s", optarg); - return 1; - } - break; - case 'a': - if (afm_db_add_application(afdb, optarg)) { - ERROR("can't add application %s", optarg); - return 1; - } - break; - } + /* daemonize */ + if (daemon && daemonize()) { + ERROR("daemonization failed"); + return 1; } - /* update the database */ - if (afm_db_update_applications(afdb)) { - ERROR("afm_update_applications failed"); + /* get systemd objects */ + rc = sd_event_new(&evloop); + if (rc < 0) { + ERROR("can't create event loop"); return 1; } - - if (daemon && daemonize()) { - ERROR("daemonization failed"); + rc = sd_bus_open_system(&sysbus); + if (rc < 0) { + ERROR("can't create system bus"); + return 1; + } + rc = sd_bus_attach_event(sysbus, evloop, 0); + if (rc < 0) { + ERROR("can't attach system bus to event loop"); return 1; } /* init service */ - jbus = create_jbus(0, AFM_SYSTEM_DBUS_PATH); + jbus = create_jbus(sysbus, AFM_SYSTEM_DBUS_PATH); if (!jbus) { ERROR("create_jbus failed"); return 1; } - if(jbus_add_service_j(jbus, "runnables", on_runnables) - || jbus_add_service_j(jbus, "detail", on_detail) - || jbus_add_service_j(jbus, "install", on_install) - || jbus_add_service_j(jbus, "uninstall", on_uninstall)) { + if(jbus_add_service_j(jbus, "install", on_install, NULL) + || jbus_add_service_j(jbus, "uninstall", on_uninstall, NULL)) { ERROR("adding services failed"); return 1; } /* start and run */ - if (jbus_start_serving(jbus)) { + if (jbus_start_serving(jbus) < 0) { ERROR("can't start server"); return 1; } - while (!jbus_read_write_dispatch(jbus, -1)); + for(;;) + sd_event_run(evloop, (uint64_t)-1); return 0; } -