/*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* constant strings
*/
static const char _added_[] = "added";
+static const char _all_[] = "all";
static const char _a_l_c_[] = "application-list-changed";
static const char _bad_request_[] = "bad-request";
static const char _cannot_start_[] = "cannot-start";
static const char _install_[] = "install";
static const char _lang_[] = "lang";
static const char _not_found_[] = "not-found";
+static const char _not_running_[] = "not-running";
static const char _once_[] = "once";
static const char _pause_[] = "pause";
static const char _resume_[] = "resume";
static const struct afb_auth
auth_perm_widget = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget"
+ .text = FWK_PREFIX"permission:afm:system:widget"
},
auth_perm_widget_install = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:install"
+ .text = FWK_PREFIX"permission:afm:system:widget:install"
},
auth_perm_widget_uninstall = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:uninstall"
+ .text = FWK_PREFIX"permission:afm:system:widget:uninstall"
},
auth_perm_widget_preinstall = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:preinstall"
+ .text = FWK_PREFIX"permission:afm:system:widget:preinstall"
},
auth_perm_widget_detail = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:detail"
+ .text = FWK_PREFIX"permission:afm:system:widget:detail"
},
auth_perm_widget_start = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:start"
+ .text = FWK_PREFIX"permission:afm:system:widget:start"
},
auth_perm_widget_view_all = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:widget:view-all"
+ .text = FWK_PREFIX"permission:afm:system:widget:view-all"
},
auth_perm_runner = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:runner"
+ .text = FWK_PREFIX"permission:afm:system:runner"
},
auth_perm_runner_state = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:runner:state"
+ .text = FWK_PREFIX"permission:afm:system:runner:state"
},
auth_perm_runner_kill = {
.type = afb_auth_Permission,
- .text = "urn:AGL:permission:afm:system:runner:kill"
+ .text = FWK_PREFIX"permission:afm:system:runner:kill"
},
auth_install = {
afb_req_fail(req, _not_found_, NULL);
}
+/* common not running reply */
+static void not_running(afb_req_t req)
+{
+ afb_req_fail(req, _not_running_, NULL);
+}
+
/* common can't start reply */
static void cant_start(afb_req_t req)
{
return lang;
}
+/*
+ * Retrieve whether all is required from 'req'.
+ */
+static int get_all(afb_req_t req)
+{
+ struct json_object *val;
+
+ /* get the optional language */
+ return json_object_object_get_ex(afb_req_json(req), _all_, &val)
+ && json_object_get_boolean(val);
+}
+
/*
* retrieves the 'appid' in parameters received with the
/* get the appid if any */
if (!wrap_json_unpack(json, "s", appid)
- || !wrap_json_unpack(json, "{si}", _id_, appid)) {
+ || !wrap_json_unpack(json, "{ss}", _id_, appid)) {
/* found */
INFO("method %s called for %s", method, *appid);
return 1;
/* nothing appropriate */
INFO("method %s can't get runid for %s: %m", method,
appid);
- not_found(req);
+ if (errno == ESRCH)
+ not_running(req);
+ else
+ not_found(req);
return 0;
}
*/
static void runnables(afb_req_t req)
{
+ int all;
const char *lang;
struct json_object *resp;
/* get the language */
lang = get_lang(req);
+ /* get the all */
+ all = get_all(req);
+
/* get the details */
- resp = afm_udb_applications_public(afudb, afb_req_get_uid(req), lang);
+ resp = afm_udb_applications_public(afudb, all, afb_req_get_uid(req), lang);
afb_req_success(req, resp, NULL);
}
/* launch the application */
runid = afm_urun_start(appli, afb_req_get_uid(req));
- if (runid <= 0) {
+ if (runid < 0) {
cant_start(req);
return;
}
#if 0
wrap_json_pack(&resp, "{si}", _runid_, runid);
#else
- wrap_json_pack(&resp, "i", runid);
+ if (runid)
+ wrap_json_pack(&resp, "i", runid);
#endif
afb_req_success(req, resp, NULL);
}
/* launch the application */
runid = afm_urun_once(appli, afb_req_get_uid(req));
- if (runid <= 0) {
+ if (runid < 0) {
cant_start(req);
return;
}
/* returns the state */
- resp = afm_urun_state(afudb, runid, afb_req_get_uid(req));
+ resp = runid ? afm_urun_state(afudb, runid, afb_req_get_uid(req)) : NULL;
afb_req_success(req, resp, NULL);
}
*/
static void runners(afb_req_t req)
{
+ int all;
struct json_object *resp;
- resp = afm_urun_list(afudb, afb_req_get_uid(req));
+ all = get_all(req);
+ resp = afm_urun_list(afudb, all, afb_req_get_uid(req));
afb_req_success(req, resp, NULL);
}
json_true = json_object_new_boolean(1);
/* init database */
- afudb = afm_udb_create(1, 0, "afm-appli-");
+ afudb = afm_udb_create(1, 0, "afm-");
if (!afudb) {
ERROR("afm_udb_create failed");
return -1;