improves plugin interface

[src/app-framework-binder.git] / plugins / samples / SamplePost.c

diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c
index e5a7235..b61b91c 100644 (file)
--- a/plugins/samples/SamplePost.c
+++ b/plugins/samples/SamplePost.c
@@ -1,28 +1,26 @@
 /*
- * Copyright (C) 2015 "IoT.bzh"
+ * Copyright (C) 2015, 2016 "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 <http://www.gnu.org/licenses/>.
+ * 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 <stdio.h>
 #include <string.h>
-#include <json.h>
+#include <json-c/json.h>
 
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
+#include <afb/afb-plugin.h>
 
 
 // Sample Generic Ping Debug API
@@ -49,7 +47,11 @@ static void GetJsonByPost (struct afb_req request)
 // Upload a file and execute a function when upload is done
 static void Uploads (struct afb_req request, const char *destination)
 {
-   afb_req_fail_f(request, "unimplemented", "destination: %s", destination);
+   struct afb_arg a = afb_req_get(request, "file");
+   if (a.value == NULL || *a.value == 0)
+     afb_req_fail(request, "failed", "no file selected");
+   else
+     afb_req_success_f(request, NULL, "uploaded file %s of path %s for destination %s", a.value, a.path, destination);
 }
 
 // Upload a file and execute a function when upload is done
@@ -74,7 +76,7 @@ static void UploadImage (struct afb_req request)
 
 // 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 const struct AFB_restapi pluginApis[]= {
+static const struct AFB_verb_desc_v1 verbs[]= {
   {"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"},
@@ -84,13 +86,15 @@ static const struct AFB_restapi pluginApis[]= {
 };
 
 static const struct AFB_plugin plugin_desc = {
-       .type = AFB_PLUGIN_JSON,
-       .info = "Sample with Post Upload Files",
-       .prefix = "post",
-       .apis = pluginApis
+       .type = AFB_PLUGIN_VERSION_1,
+       .v1 = {
+               .info = "Sample with Post Upload Files",
+               .prefix = "post",
+               .verbs = verbs
+       }
 };
 
-const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
 {
     return &plugin_desc;
 };