afm-launch: comments and improvements

[src/app-framework-main.git] / src / afm-user-daemon.c

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index 8f8f381..04f5fea 100644 (file)
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -20,13 +20,16 @@
 #include <stdio.h>
 #include <time.h>
 #include <getopt.h>
+#include <string.h>
 
 #include <json.h>
 
 #include "verbose.h"
 #include "utils-jbus.h"
+#include "utils-json.h"
 #include "afm.h"
 #include "afm-db.h"
+#include "afm-launch-mode.h"
 #include "afm-run.h"
 
 static const char appname[] = "afm-user-daemon";
@@ -34,10 +37,11 @@ static const char appname[] = "afm-user-daemon";
 static void usage()
 {
        printf(
-               "usage: %s [-q] [-v] [-r rootdir]... [-a appdir]...\n"
+               "usage: %s [-q] [-v] [-m mode] [-r rootdir]... [-a appdir]...\n"
                "\n"
                "   -a appdir    adds an application directory\n"
                "   -r rootdir   adds a root directory of applications\n"
+               "   -m mode      set default launch mode (local or remote)\n"
                "   -d           run as a daemon\n"
                "   -q           quiet\n"
                "   -v           verbose\n"
@@ -49,6 +53,7 @@ static void usage()
 static struct option options[] = {
        { "root",        required_argument, NULL, 'r' },
        { "application", required_argument, NULL, 'a' },
+       { "mode",        required_argument, NULL, 'm' },
        { "daemon",      no_argument,       NULL, 'd' },
        { "quiet",       no_argument,       NULL, 'q' },
        { "verbose",     no_argument,       NULL, 'v' },
@@ -113,30 +118,64 @@ static void on_detail(struct jreq *jreq, struct json_object *obj)
 
 static void on_start(struct jreq *jreq, struct json_object *obj)
 {
-       const char *appid;
-       struct json_object *appli;
+       const char *appid, *modestr;
+       char *uri;
+       struct json_object *appli, *resp;
        int runid;
        char runidstr[20];
-
-       appid = getappid(obj);
-       INFO("method start called for %s", appid);
-       if (appid == NULL)
+       enum afm_launch_mode mode;
+
+       /* get the parameters */
+       mode = invalid_launch_mode;
+       if (j_read_string(obj, &appid)) {
+               mode = get_default_launch_mode();
+       } else if (j_read_string_at(obj, "id", &appid)) {
+               if (j_read_string_at(obj, "mode", &modestr)) {
+                       mode = launch_mode_of_name(modestr);
+               } else {
+                       mode = get_default_launch_mode();
+               }
+       }
+       if (!is_valid_launch_mode(mode)) {
                jbus_reply_error_s(jreq, error_bad_request);
+               return;
+       }
+
+       /* get the application */
+       INFO("method start called for %s mode=%s", appid, name_of_launch_mode(mode));
+       appli = afm_db_get_application(afdb, appid);
+       if (appli == NULL) {
+               jbus_reply_error_s(jreq, error_not_found);
+               return;
+       }
+
+       /* launch the application */
+       uri = NULL;
+       runid = afm_run_start(appli, mode, &uri);
+       if (runid <= 0) {
+               jbus_reply_error_s(jreq, error_cant_start);
+               free(uri);
+               return;
+       }
+
+       if (uri == NULL) {
+               /* returns only the runid */
+               snprintf(runidstr, sizeof runidstr, "%d", runid);
+               runidstr[sizeof runidstr - 1] = 0;
+               jbus_reply_s(jreq, runidstr);
+               return;
+       }
+
+       /* returns the runid and its uri */
+       resp = json_object_new_object();
+       if (resp != NULL && j_add_integer(resp, "runid", runid) && j_add_string(resp, "uri", uri))
+               jbus_reply_j(jreq, resp);
        else {
-               appli = afm_db_get_application(afdb, appid);
-               if (appli == NULL)
-                       jbus_reply_error_s(jreq, error_not_found);
-               else {
-                       runid = afm_run_start(appli);
-                       if (runid <= 0)
-                               jbus_reply_error_s(jreq, error_cant_start);
-                       else {
-                               snprintf(runidstr, sizeof runidstr, "%d", runid);
-                               runidstr[sizeof runidstr - 1] = 0;
-                               jbus_reply_s(jreq, runidstr);
-                       }
-               }
+               afm_run_stop(runid);
+               jbus_reply_error_s(jreq, error_cant_start);
        }
+       json_object_put(resp);
+       free(uri);
 }
 
 static void on_stop(struct jreq *jreq, struct json_object *obj)
@@ -230,11 +269,12 @@ static int daemonize()
 int main(int ac, char **av)
 {
        int i, daemon = 0;
+       enum afm_launch_mode mode;
 
        LOGAUTH(appname);
 
        /* first interpretation of arguments */
-       while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) {
+       while ((i = getopt_long(ac, av, "hdqvr:a:m:", options, NULL)) >= 0) {
                switch (i) {
                case 'h':
                        usage();
@@ -253,6 +293,14 @@ int main(int ac, char **av)
                        break;
                case 'a':
                        break;
+               case 'm':
+                       mode = launch_mode_of_name(optarg);
+                       if (!is_valid_launch_mode(mode)) {
+                               ERROR("invalid mode '%s'", optarg);
+                               return 1;
+                       }
+                       set_default_launch_mode(mode);
+                       break;
                case ':':
                        ERROR("missing argument value");
                        return 1;
@@ -284,7 +332,7 @@ int main(int ac, char **av)
 
        /* second interpretation of arguments */
        optind = 1;
-       while ((i = getopt_long(ac, av, "hdqvr:a:", options, NULL)) >= 0) {
+       while ((i = getopt_long(ac, av, "hdqvr:a:m:", options, NULL)) >= 0) {
                switch (i) {
                case 'r':
                        if (afm_db_add_root(afdb, optarg)) {
@@ -313,7 +361,7 @@ int main(int ac, char **av)
        }
 
        /* init observers */
-       jbuses[0] = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
+       jbuses[0] = create_jbus_system(AFM_SYSTEM_DBUS_PATH);
        if (!jbuses[0]) {
                ERROR("create_jbus failed for system");
                return 1;
@@ -324,7 +372,7 @@ int main(int ac, char **av)
        }
 
        /* init service */
-       jbuses[1] = create_jbus(1, AFM_USER_DBUS_PATH);
+       jbuses[1] = create_jbus_session(AFM_USER_DBUS_PATH);
        if (!jbuses[1]) {
                ERROR("create_jbus failed");
                return 1;