X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-binding.c;h=17715209bf5093b57c7bcf464c4887bbfc9629f5;hb=f8f2338aba84394e132fff55b6ebdef7d884292b;hp=037c1080eb6149c515bb725f8c8d80b40706555d;hpb=44c70fd80a3ff8931aa97555ceaf5ed578e4f8be;p=src%2Fapp-framework-main.git

diff --git a/src/afm-binding.c b/src/afm-binding.c
index 037c108..1771520 100644
--- a/src/afm-binding.c
+++ b/src/afm-binding.c
@@ -1,5 +1,5 @@
 /*
- * 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");
@@ -41,6 +41,7 @@
  * 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";
@@ -68,43 +69,43 @@ static const char _update_[]    = "update";
 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 = {
@@ -226,6 +227,18 @@ static const char *get_lang(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
@@ -244,7 +257,7 @@ static int onappid(afb_req_t req, const char *method, const char **appid)
 
 	/* 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;
@@ -328,14 +341,18 @@ static void reply_status(afb_req_t req, int status)
  */
 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);
 }
 
@@ -385,7 +402,7 @@ static void start(afb_req_t req)
 
 	/* launch the application */
 	runid = afm_urun_start(appli, afb_req_get_uid(req));
-	if (runid <= 0) {
+	if (runid < 0) {
 		cant_start(req);
 		return;
 	}
@@ -395,7 +412,8 @@ static void start(afb_req_t req)
 #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);
 }
@@ -422,13 +440,13 @@ static void once(afb_req_t req)
 
 	/* 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);
 }
 
@@ -473,8 +491,10 @@ static void terminate(afb_req_t req)
  */
 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);
 }
 
@@ -585,7 +605,7 @@ static int init(afb_api_t api)
 	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;