#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;
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", rootdir);
- force = j_get_boolean(req, "force", 0);
+ root = j_string_at(req, "root", rootdir);
+ force = j_boolean_at(req, "force", 0);
break;
}
default:
/* install the widget */
ifo = install_widget(wgtfile, root, force);
- if (ifo == NULL) {
+ if (ifo == NULL)
jbus_reply_error_s(jreq, "\"installation failed\"");
- return;
- }
-
- /* build the response */
- resp = json_object_new_object();
- if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver)) {
- json_object_put(resp);
+ 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(jreq, "\"out of memory but installed!\"");
+ else
+ jbus_reply_j(jreq, 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);
- /* reply and propagate event */
- jbus_reply_j(jreq, resp);
- jbus_send_signal_j(jbus, "changed", resp);
- json_object_put(resp);
+ /* still sends the signal */
+ jbus_send_signal_s(jbus, "changed", "true");
}
static void on_uninstall(struct jreq *jreq, struct json_object *req)
{
- 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(jreq, error_bad_request);
+ return;
+ }
+
+ /* install the widget */
+ rc = uninstall_widget(idaver, root);
+ if (rc)
+ jbus_reply_error_s(jreq, "\"uninstallation had error\"");
+ else
+ jbus_reply_s(jreq, "true");
+
+ /* still sends the signal */
+ jbus_send_signal_s(jbus, "changed", "true");
}
static int daemonize()