X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fsamples%2FSamplePost.c;h=f484d1315f08cbedbffb984ffce5d36e4c3b01b5;hb=469e619ac45402471ea7d8c792ffc06e79346ef2;hp=88949736def4db45bd759b6d644d4072cde480c1;hpb=c1dda27fbbbbbf14aabe5bc8b4cb2a70abfd09f0;p=src%2Fapp-framework-binder.git
diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c
index 88949736..f484d131 100644
--- a/plugins/samples/SamplePost.c
+++ b/plugins/samples/SamplePost.c
@@ -2,107 +2,93 @@
* Copyright (C) 2015 "IoT.bzh"
* Author "Fulup Ar Foll"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+#define _GNU_SOURCE
+#include
+#include
+#include
-#include "local-def.h"
+#include "afb-plugin.h"
-// With content-type=json data are directly avaliable in request->post->data
-STATIC json_object* GetJsonByPost (AFB_request *request) {
- json_object* jresp;
- char query [256];
- int len;
-
- // check if we have some post data
- if (request->post == NULL) request->post->data="NoData";
-
- // Get all query string [Note real app should probably use value=getQueryValue(request,"key")]
- len = getQueryAll (request, query, sizeof(query));
- if (len == 0) strncpy (query, "NoSearchQueryList", sizeof(query));
-
- // for debug/test return response to caller
- jresp = jsonNewMessage(AFB_SUCCESS, "GetJsonByPost query={%s} PostData: [%s]", query, request->post->data);
-
- return (jresp);
+
+// Sample Generic Ping Debug API
+static void getPingTest(struct afb_req request)
+{
+ static int pingcount = 0;
+ json_object *query = afb_req_json(request);
+
+ afb_req_success_f(request, query, "Ping Binder Daemon count=%d", ++pingcount);
}
+// With content-type=json data are directly avaliable in request->post->data
+static void GetJsonByPost (struct afb_req request)
+{
+ struct afb_arg arg;
+ json_object* jresp;
+ json_object *query = afb_req_json(request);
+ arg = afb_req_get(request, "");
+ jresp = arg.value ? json_tokener_parse(arg.value) : NULL;
+ afb_req_success_f(request, jresp, "GetJsonByPost query={%s}", json_object_to_json_string(query));
+}
// Upload a file and execute a function when upload is done
-STATIC json_object* UploadAppli (AFB_request *request, AFB_PostItem *item) {
-
- char *destination = "applications";
+static void Uploads (struct afb_req request, const char *destination)
+{
+ afb_req_fail_f(request, "unimplemented", "destination: %s", destination);
+}
- // This is called after PostForm and then after DonePostForm
- if (item == NULL) {
- // Do something intelligent here to install application
- request->errcode = MHD_HTTP_OK; // or error is something went wrong;
- request->jresp = jsonNewMessage(AFB_SUCCESS,"UploadFile Post Appli=%s done", getPostPath (request));
- // Note: should not return here in order getPostedFile to clear Post resources.
- }
-
- // upload multi iteration logic is handle by getPostedFile
- return (getPostFile (request, item, destination));
+// Upload a file and execute a function when upload is done
+static void UploadAppli (struct afb_req request)
+{
+ Uploads(request, "applications");
}
// Simples Upload case just upload a file
-STATIC json_object* UploadMusic (AFB_request *request, AFB_PostItem *item) {
-
- // upload multi iteration logic is handle by getPostedFile
- return (getPostFile (request, item, "musics"));
+static void UploadMusic (struct afb_req request)
+{
+ Uploads(request, "musics");
}
// PostForm callback is called multiple times (one or each key within form, or once per file buffer)
// When file has been fully uploaded call is call with item==NULL
-STATIC json_object* UploadImage (AFB_request *request, AFB_PostItem *item) {
-
- // note if directory is relative it will be prefixed by request->config->sessiondir
- char *destination = "images";
-
- // This is called after PostForm and then after DonePostForm
- if (item == NULL && getPostPath (request) != NULL) {
- // Do something with your newly upload filepath=postFileCtx->path
- request->errcode = MHD_HTTP_OK;
- request->jresp = jsonNewMessage(AFB_SUCCESS,"UploadFile Post Image done");
-
- // Note: should not return here in order getPostedFile to clear Post resources.
- }
-
- // upload multi iteration logic is handle by getPostedFile
- return (getPostFile (request, item, destination));
+static void UploadImage (struct afb_req request)
+{
+ Uploads(request, "images");
}
// NOTE: this sample does not use session to keep test a basic as possible
// in real application upload-xxx should be protected with AFB_SESSION_CHECK
-STATIC AFB_restapi pluginApis[]= {
- {"ping" , AFB_SESSION_NONE , (AFB_apiCB)getPingTest ,"Ping Rest Test Service"},
- {"upload-json" , AFB_SESSION_NONE , (AFB_apiCB)GetJsonByPost ,"Demo for Json Buffer on Post"},
- {"upload-image" , AFB_SESSION_NONE , (AFB_apiCB)UploadImage ,"Demo for file upload"},
- {"upload-music" , AFB_SESSION_NONE , (AFB_apiCB)UploadMusic ,"Demo for file upload"},
- {"upload-appli" , AFB_SESSION_NONE , (AFB_apiCB)UploadAppli ,"Demo for file upload"},
+static const struct AFB_restapi pluginApis[]= {
+ {"ping" , AFB_SESSION_NONE , getPingTest ,"Ping Rest Test Service"},
+ {"upload-json" , AFB_SESSION_NONE , GetJsonByPost ,"Demo for Json Buffer on Post"},
+ {"upload-image" , AFB_SESSION_NONE , UploadImage ,"Demo for file upload"},
+ {"upload-music" , AFB_SESSION_NONE , UploadMusic ,"Demo for file upload"},
+ {"upload-appli" , AFB_SESSION_NONE , UploadAppli ,"Demo for file upload"},
{NULL}
};
-PUBLIC AFB_plugin *pluginRegister () {
- AFB_plugin *plugin = malloc (sizeof (AFB_plugin));
- plugin->type = AFB_PLUGIN_JSON;
- plugin->info = "Sample with Post Upload Files";
- plugin->prefix= "post"; // url base
- plugin->apis = pluginApis;
- plugin->handle= (void*) "What ever you want";
-
- return (plugin);
+static const struct AFB_plugin plugin_desc = {
+ .type = AFB_PLUGIN_JSON,
+ .info = "Sample with Post Upload Files",
+ .prefix = "post",
+ .apis = pluginApis
+};
+
+const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+{
+ return &plugin_desc;
};