/*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016, 2017 IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
#include <unistd.h>
#include <sys/types.h>
-#include <json.h>
+#include <json-c/json.h>
#include "utils-json.h"
#include "wgt-info.h"
#include "afm-db.h"
+/*
+ * The json object recorded by application widget
+ * has the following contents:
+ * {
+ * id: STRING, the application identifier without version info
+ * path: STRING, the path of the root directory for the application
+ * content: STRING, the relative path to the entryu point of the application
+ * type: STRING, the mime type describing the type 'content'
+ * bindings: ARRAY, array of bindings
+ * [
+ * STRING, path to the binding
+ * ]
+ * public: OBJECT, public content describing the application widget
+ * {
+ * id: STRING, the application identifier "idaver"
+ * version: STRING, the full version of the application
+ * width: INTEGER, the width indication or 0
+ * height: INTEGER, the height indication or 0
+ * name: STRING, the name of the application
+ * description: STRING, the description of the application
+ * shortname: STRING, the short name of the application
+ * author: STRING, the author of the application
+ * }
+ */
+
/*
* The structure afm_apps records the data about applications
* for several accesses.
*/
struct afm_apps {
- struct json_object *pubarr; /* array of the public data of applications */
- struct json_object *direct; /* hash of applications by their id */
- struct json_object *byapp; /* hash of versions of applications by their appid */
+ struct json_object *pubarr; /* array of the public data of apps */
+ struct json_object *direct; /* hash of applications by their "idaver" */
+ struct json_object *byapp; /* hash of applications by their id */
};
/*
* Two types of directory are handled:
- * - root directories: contains subdirectories appid/versio containing the applications
+ * - root directories: contains subdirectories appid/version
+ * containing the applications
* - application directories: it contains an application
*/
enum dir_type {
*/
struct afm_db {
int refcount; /* count of references to the structure */
- struct afm_db_dir *dirhead; /* first directory of the set of directories */
- struct afm_db_dir *dirtail; /* last directory of the set of directories */
+ struct afm_db_dir *dirhead; /* first directory of the set */
+ struct afm_db_dir *dirtail; /* last directory of the set */
struct afm_apps applications; /* the data about applications */
};
* Returns 0 in case of success.
* Returns -1 and set errno in case of error
*/
-static int addwgt(struct afm_apps *apps, const char *path, const struct wgt_desc *desc)
+static int addwgt(struct afm_apps *apps, const char *path,
+ const struct wgt_desc *desc)
{
const struct wgt_desc_feature *feat;
struct json_object *priv, *pub, *bya, *plugs, *str;
if (!pub)
goto error;
- plugs = j_add_new_array(priv, "plugins");
+ plugs = j_add_new_array(priv, "bindings");
if (!plugs)
goto error;
|| !j_add_string(pub, "author", desc->author))
goto error;
- /* extract plugins from features */
+ /* extract bindings from features */
feat = desc->features;
while (feat) {
- static const char prefix[] = FWK_PREFIX_PLUGIN;
+ static const char prefix[] = FWK_PREFIX_BINDING;
if (!memcmp(feat->name, prefix, sizeof prefix - 1)) {
- str = json_object_new_string (feat->name + sizeof prefix - 1);
+ str = json_object_new_string (
+ feat->name + sizeof prefix - 1);
if (str == NULL)
goto error;
if (json_object_array_add(plugs, str)) {
/* enumerate entries */
rc = readdir_r(dir, &entry, &e);
while (!rc && e) {
- if (entry.d_name[0] != '.' || (entry.d_name[1] && (entry.d_name[1] != '.' || entry.d_name[2]))) {
+ if (entry.d_name[0] != '.' || (entry.d_name[1]
+ && (entry.d_name[1] != '.' || entry.d_name[2]))) {
/* prepare callto */
len = strlen(entry.d_name);
if (beg + len >= data->path + sizeof data->path) {
errno = ENAMETOOLONG;
return -1;
}
- data->length = stpcpy(beg, entry.d_name) - data->path;
+ data->length = (int)(stpcpy(beg, entry.d_name)
+ - data->path);
/* call the function */
rc = callto(data);
if (rc)
edata.apps.pubarr = json_object_new_array();
edata.apps.direct = json_object_new_object();
edata.apps.byapp = json_object_new_object();
- if (edata.apps.pubarr == NULL || edata.apps.direct == NULL || edata.apps.byapp == NULL) {
+ if (edata.apps.pubarr == NULL || edata.apps.direct == NULL
+ || edata.apps.byapp == NULL) {
errno = ENOMEM;
goto error;
}
/* for each directory of afdb */
for (dir = afdb->dirhead ; dir != NULL ; dir = dir->next) {
if (dir->type == type_root) {
- edata.length = stpcpy(edata.path, dir->path) - edata.path;
- assert(edata.length < sizeof edata.path);
+ edata.length = (int)(stpcpy(edata.path, dir->path)
+ - edata.path);
+ assert(edata.length < (int)sizeof edata.path);
/* enumerate the applications */
rc = enumentries(&edata, enumvers);
if (rc)
/*
* Get the list of the applications public data of the afm_db object 'afdb'.
- * The list is returned as a JSON-array that must be released using 'json_object_put'.
+ * The list is returned as a JSON-array that must be released using
+ * 'json_object_put'.
* Returns NULL in case of error.
*/
struct json_object *afm_db_application_list(struct afm_db *afdb)
{
- return afm_db_ensure_applications(afdb) ? NULL : json_object_get(afdb->applications.pubarr);
+ return afm_db_ensure_applications(afdb) ? NULL
+ : json_object_get(afdb->applications.pubarr);
}
/*
*/
struct json_object *afm_db_get_application(struct afm_db *afdb, const char *id)
{
+ int i;
struct json_object *result;
- if (!afm_db_ensure_applications(afdb) && json_object_object_get_ex(afdb->applications.direct, id, &result))
+
+ if (afm_db_ensure_applications(afdb))
+ return NULL;
+
+ /* search case sensitively */
+ if (json_object_object_get_ex( afdb->applications.direct, id, &result))
return json_object_get(result);
+
+ /* fallback to a case insensitive search */
+ i = json_object_array_length(afdb->applications.pubarr);
+ while (i) {
+ result = json_object_array_get_idx(afdb->applications.pubarr, --i);
+ if (result
+ && json_object_object_get_ex(result, "id", &result)
+ && !strcasecmp(id, json_object_get_string(result))) {
+ if (json_object_object_get_ex( afdb->applications.direct,
+ json_object_get_string(result),
+ &result))
+ return json_object_get(result);
+ else
+ return NULL;
+ }
+ }
return NULL;
}
* It returns a JSON-object that must be released using 'json_object_put'.
* Returns NULL in case of error.
*/
-struct json_object *afm_db_get_application_public(struct afm_db *afdb, const char *id)
+struct json_object *afm_db_get_application_public(struct afm_db *afdb,
+ const char *id)
{
struct json_object *result;
struct json_object *priv = afm_db_get_application(afdb, id);
Code Review / src / app-framework-main.git / blobdiff