X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-api.c;h=7260d3fbd0e6f4a4978b4a8b124dbe8eb9d1a1c6;hb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;hp=e91eb39cf1d30d3e3cb59ec036cc731cc667cd08;hpb=ae8e72788e8f2db33efea6045e5ee835266b10eb;p=src%2Fapp-framework-binder.git

diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c
index e91eb39c..7260d3fb 100644
--- a/plugins/media/media-api.c
+++ b/plugins/media/media-api.c
@@ -2,18 +2,17 @@
  * Copyright (C) 2016 "IoT.bzh"
  * Author "Manuel Bachmann"
  *
- * 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.
  */
 
 #include "media-api.h"
@@ -33,7 +32,7 @@ STATIC mediaCtxHandleT* initMediaCtx () {
 }
 
 /* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC void freeMedia (void *context, void *handle) {
+STATIC void freeMedia (void *context) {
 
     free (context);
 }
@@ -103,6 +102,8 @@ STATIC json_object* selecting (AFB_request *request) {   /* AFB_SESSION_CHECK */
         jresp = json_object_new_object();
         json_object_object_add (jresp, "index", json_object_new_string (value));
     }
+    else
+        jresp = NULL;
 
     return jresp;
 }
@@ -156,34 +157,31 @@ STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_S
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
     AFB_PostCtx *postFileCtx;
-#if 0
-    const char *value = getQueryValue (request, "value");
     json_object *jresp;
-    char path[256];
+    char *path;
 
-    /* no "?value=" parameter : return error */
-    if (!value)
-      return jsonNewMessage(AFB_FAIL, "You must provide a file name");
-#endif
-    if (item == NULL) {
-        postFileCtx = getPostContext (request);
-        if (postFileCtx) {
-            postFileCtx->errcode = MHD_HTTP_OK;
-            postFileCtx->jresp = jsonNewMessage (AFB_SUCCESS, "upload=%s done", getPostPath (request));
-        }
-    }
+    /* item is !NULL until transfer is complete */
+    if (item != NULL)
+      return getPostFile (request, item, "media");
 
-    return getPostFile (request, item, "media");
-#if 0
-    snprintf (path, sizeof(path), "/tmp/%s", value);
-    if (access (path, R_OK) == -1)
-      return jsonNewMessage(AFB_FAIL, "File not found");
+    /* target intermediary file path */
+    path = getPostPath (request);
 
-    if (!_rygel_upload (ctx, path))
-      return jsonNewMessage(AFB_FAIL, "Error when uploading file... could not complete");
+    if (!path)
+        fprintf (stderr, "Error encoutered during intermediary file transfer\n");
+
+    else if (!_rygel_upload (ctx, path)) {
+        request->errcode = MHD_HTTP_EXPECTATION_FAILED;
+        request->jresp = jsonNewMessage (AFB_FAIL, "Error when uploading file to media server... could not complete");
+    }
+
+    else {
+        request->errcode = MHD_HTTP_OK;
+        request->jresp = jsonNewMessage (AFB_SUCCESS, "upload=%s done", path);
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "File successfully uploaded");
-#endif
+    /* finalizes file transfer */
+    return getPostFile (request, item, NULL);
 }
 
 STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */