X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-api.c;h=7b4fa18f81d0d982168c4da563c64a5ecbb53fb0;hb=28a3f9d5c0b92c7dd3a3844e73b83aa350d5e165;hp=e91eb39cf1d30d3e3cb59ec036cc731cc667cd08;hpb=c1dda27fbbbbbf14aabe5bc8b4cb2a70abfd09f0;p=src%2Fapp-framework-binder.git

diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c
index e91eb39c..7b4fa18f 100644
--- a/plugins/media/media-api.c
+++ b/plugins/media/media-api.c
@@ -2,26 +2,37 @@
  * 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.
  */
 
+#define _GNU_SOURCE
+
+#include <string.h>
+
+#include <json-c/json.h>
+
 #include "media-api.h"
+#include "media-rygel.h"
+
+#include "afb-plugin.h"
+#include "afb-req-itf.h"
+
+json_object* _rygel_list (mediaCtxHandleT *);
 
 /* ------ LOCAL HELPER FUNCTIONS --------- */
 
 /* private client context creation ; default values */
-STATIC mediaCtxHandleT* initMediaCtx () {
+static mediaCtxHandleT* initMediaCtx () {
 
     mediaCtxHandleT *ctx;
 
@@ -32,55 +43,63 @@ STATIC mediaCtxHandleT* initMediaCtx () {
     return ctx;
 }
 
-/* called when client session dies [e.g. client quits for more than 15mns] */
-STATIC void freeMedia (void *context, void *handle) {
-
-    free (context);
-}
-
 /* ------ PUBLIC PLUGIN FUNCTIONS --------- */
 
-STATIC json_object* init (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void init (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    mediaCtxHandleT *ctx;
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
     json_object *jresp;
 
     /* create a private client context */
-    if (!request->context)
-        request->context = initMediaCtx();
-
-    ctx = (mediaCtxHandleT*)request->context;
+    if (!ctx) {
+        ctx = initMediaCtx();
+        afb_req_context_set (request, ctx, free);
+    }
 
     /* initialize server connection */
     if (!ctx->media_server)
-      _rygel_init (request->context);
+      _rygel_init (ctx);
 
-    jresp = json_object_new_object();
-    json_object_object_add(jresp, "info", json_object_new_string ("Media initialized"));
-    return jresp;
+    jresp = json_object_new_object ();
+    json_object_object_add (jresp, "init", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Media - Initialized");
 }
 
-STATIC json_object* list (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void list (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
     json_object *jresp;
 
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
+
     jresp = _rygel_list (ctx);
 
-    if (!jresp)
-      return jsonNewMessage(AFB_FAIL, "No content found in media server");
+    if (!jresp) {
+      afb_req_fail (request, "failed", "no content found in media server");
+      return;
+    }
 
-    return jresp;
+    afb_req_success (request, jresp, "Media - Listed");
 }
 
-STATIC json_object* selecting (AFB_request *request) {   /* AFB_SESSION_CHECK */
+static void selecting (struct afb_req request) {   /* AFB_SESSION_CHECK */
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
-    const char *value = getQueryValue (request, "value");
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
     json_object *jresp;
     unsigned int index;
     char index_str[5];
 
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
+
     /* no "?value=" parameter : return current index */
     if (!value) {
         snprintf (index_str, sizeof(index_str), "%d", ctx->index);
@@ -89,130 +108,220 @@ STATIC json_object* selecting (AFB_request *request) {   /* AFB_SESSION_CHECK */
     }
 
     /* "?value=" parameter is negative */
-    else if (atoi(value) < 0)
-        return jsonNewMessage(AFB_FAIL, "Chosen index cannot be negative");
+    else if (atoi(value) < 0) {
+        afb_req_fail (request, "failed", "chosen index cannot be negative");
+        return;
+    }
 
     /* "?value=" parameter is positive */
     else if (atoi(value) >= 0) {
         index = (unsigned int) atoi(value);
 
-        if (!_rygel_select (ctx, index))
-          return jsonNewMessage(AFB_FAIL, "Chosen index superior to current media count");
+        if (!_rygel_select (ctx, index)) {
+          afb_req_fail (request, "failed", "chosen index superior to current media count");
+          return;
+        }
 
         ctx->index = index;
         jresp = json_object_new_object();
         json_object_object_add (jresp, "index", json_object_new_string (value));
     }
+    else
+        jresp = NULL;
 
-    return jresp;
+    afb_req_success (request, jresp, "Media - Listed");
 }
 
-STATIC json_object* play (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void play (struct afb_req request) {        /* AFB_SESSION_CHECK */
+
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    json_object *jresp;
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
 
-    if (!_rygel_do (ctx, PLAY, NULL))
-      return jsonNewMessage(AFB_FAIL, "Could not play chosen media");
+    if (!_rygel_do (ctx, PLAY, NULL)) {
+      afb_req_fail (request, "failed", "could not play chosen media");
+      return;
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "PLaying media");
+    jresp = json_object_new_object ();
+    json_object_object_add (jresp, "play", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Media - Listed");
 }
 
-STATIC json_object* stop (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void stop (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    json_object *jresp;
 
-    if (!_rygel_do (ctx, STOP, NULL))
-      return jsonNewMessage(AFB_FAIL, "Could not stop chosen media");
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "Stopped media");
+    if (!_rygel_do (ctx, STOP, NULL)) {
+      afb_req_fail (request, "failed", "could not stop chosen media");
+      return;
+    }
+
+    jresp = json_object_new_object ();
+    json_object_object_add (jresp, "stop", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Media - Stopped");
 }
 
-STATIC json_object* pausing (AFB_request *request) {     /* AFB_SESSION_CHECK */
+static void pausing (struct afb_req request) {     /* AFB_SESSION_CHECK */
+
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    json_object *jresp;
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
 
-    if (!_rygel_do (ctx, PAUSE, NULL))
-      return jsonNewMessage(AFB_FAIL, "Could not pause chosen media");
+    if (!_rygel_do (ctx, PAUSE, NULL)) {
+      afb_req_fail (request, "failed", "could not pause chosen media");
+      return;
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "Paused media");
+    jresp = json_object_new_object();
+    json_object_object_add (jresp, "pause", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Media - Paused");
 }
 
-STATIC json_object* seek (AFB_request *request) {        /* AFB_SESSION_CHECK */
+static void seek (struct afb_req request) {        /* AFB_SESSION_CHECK */
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
-    const char *value = getQueryValue (request, "value");
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    const char *value = afb_req_value (request, "value");
+    json_object *jresp;
+
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
+    }
 
     /* no "?value=" parameter : return error */
-    if (!value)
-      return jsonNewMessage(AFB_FAIL, "You must provide a time");
+    if (!value) {
+      afb_req_fail (request, "failed", "you must provide a time");
+      return;
+    }
 
-    if (!_rygel_do (ctx, SEEK, value))
-      return jsonNewMessage(AFB_FAIL, "Could not seek chosen media");
+    if (!_rygel_do (ctx, SEEK, (char *)value)) {
+      afb_req_fail (request, "failed", "could not seek chosen media");
+      return;
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "Seeked media");
+    jresp = json_object_new_object();
+    json_object_object_add (jresp, "seek", json_object_new_string ("success"));
+    afb_req_success (request, jresp, "Media - Sought");
 }
 
-STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_SESSION_CHECK */
+static char *renamed_filename(struct afb_arg argfile)
+{
+    char *result;
+    const char *e = strrchr(argfile.path, '/');
+    if (e == NULL)
+        result = strdup(argfile.value);
+    else {
+        result = malloc((++e - argfile.path) + strlen(argfile.value) + 1);
+        if (result != NULL)
+            strcpy(stpncpy(result, argfile.path, e - argfile.path), argfile.value);
+    }
+    return result;
+}
 
-    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
-    AFB_PostCtx *postFileCtx;
-#if 0
-    const char *value = getQueryValue (request, "value");
-    json_object *jresp;
-    char path[256];
+static void on_uploaded(struct afb_req *prequest, int status)
+{
+    struct afb_req request = afb_req_unstore(prequest);
+    struct afb_arg argfile = afb_req_get(request, "file-upload");
+    char *file = renamed_filename(argfile);
+    if (file != NULL)
+        unlink(file);
+    free(file);
+    if (status)
+        afb_req_fail (request, "failed", "expected file not received");
+    else
+        afb_req_success_f (request, NULL, "uploaded file %s", argfile.value);
+}
 
-    /* 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));
-        }
+static void upload (struct afb_req request) { /* AFB_SESSION_CHECK */
+
+    mediaCtxHandleT *ctx = afb_req_context_get(request);
+    struct afb_req *prequest;
+    struct afb_arg argfile;
+    char *path;
+
+    /* check that context is initialized */
+    if (ctx == NULL) {
+      afb_req_fail (request, "failed", "uninitialized");
+      return;
     }
 
-    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");
+    /* get the file */
+    argfile = afb_req_get(request, "file-upload");
+    if (!argfile.value || !argfile.path) {
+        afb_req_fail (request, "failed", "expected file not received");
+        return;
+    }
 
-    if (!_rygel_upload (ctx, path))
-      return jsonNewMessage(AFB_FAIL, "Error when uploading file... could not complete");
+    /* rename the file */
+    path = renamed_filename(argfile);
+    if (path == NULL) {
+        afb_req_fail (request, "failed", "out of memory");
+        return;
+    }
+    if (rename(argfile.path, path) != 0) {
+        free(path);
+        afb_req_fail (request, "failed", "system error");
+        return;
+    }
 
-    return jsonNewMessage(AFB_SUCCESS, "File successfully uploaded");
-#endif
+    /* for asynchronous processing */
+    prequest = afb_req_store(request);
+    if (path == NULL) {
+        unlink(path);
+        afb_req_fail (request, "failed", "out of memory");
+    }
+    else if (!_rygel_upload (ctx, path, (void*)on_uploaded, prequest)) {
+        unlink(path);
+        afb_req_fail (afb_req_unstore(prequest), "failed", "Error when uploading file to media server... could not complete");
+    }
+    free(path);
 }
 
-STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */
-    return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Media API");
+static void ping (struct afb_req request) {         /* AFB_SESSION_NONE */
+    afb_req_success (request, NULL, "Media - Ping succeeded");
 }
 
 
-STATIC AFB_restapi pluginApis[]= {
-  {"init"   , AFB_SESSION_CHECK,  (AFB_apiCB)init       , "Media API - init"   },
-  {"list"   , AFB_SESSION_CHECK,  (AFB_apiCB)list       , "Media API - list"   },
-  {"select" , AFB_SESSION_CHECK,  (AFB_apiCB)selecting  , "Media API - select" },
-  {"play"   , AFB_SESSION_CHECK,  (AFB_apiCB)play       , "Media API - play"   },
-  {"stop"   , AFB_SESSION_CHECK,  (AFB_apiCB)stop       , "Media API - stop"   },
-  {"pause"  , AFB_SESSION_CHECK,  (AFB_apiCB)pausing    , "Media API - pause"  },
-  {"seek"   , AFB_SESSION_CHECK,  (AFB_apiCB)seek       , "Media API - seek"   },
-  {"upload" , AFB_SESSION_CHECK,  (AFB_apiCB)upload     , "Media API - upload" },
-  {"ping"   , AFB_SESSION_NONE,   (AFB_apiCB)ping       , "Media API - ping"   },
+static const struct AFB_restapi pluginApis[]= {
+  {"init"   , AFB_SESSION_CHECK,  init       , "Media API - init"   },
+  {"list"   , AFB_SESSION_CHECK,  list       , "Media API - list"   },
+  {"select" , AFB_SESSION_CHECK,  selecting  , "Media API - select" },
+  {"play"   , AFB_SESSION_CHECK,  play       , "Media API - play"   },
+  {"stop"   , AFB_SESSION_CHECK,  stop       , "Media API - stop"   },
+  {"pause"  , AFB_SESSION_CHECK,  pausing    , "Media API - pause"  },
+  {"seek"   , AFB_SESSION_CHECK,  seek       , "Media API - seek"   },
+//  {"upload" , AFB_SESSION_CHECK,  upload     , "Media API - upload" },
+  {"ping"   , AFB_SESSION_NONE,   ping       , "Media API - ping"   },
   {NULL}
 };
 
-PUBLIC AFB_plugin* pluginRegister () {
-    AFB_plugin *plugin = malloc (sizeof(AFB_plugin));
-    plugin->type  = AFB_PLUGIN_JSON;
-    plugin->info  = "Application Framework Binder - Media plugin";
-    plugin->prefix  = "media";
-    plugin->apis  = pluginApis;
-
-    /*plugin->handle = initRadioPlugin();*/
-    plugin->freeCtxCB = (AFB_freeCtxCB)freeMedia;
-
-    return (plugin);
+static const struct AFB_plugin pluginDesc = {
+    .type   = AFB_PLUGIN_JSON,
+    .info   = "Application Framework Binder - Media plugin",
+    .prefix = "media",
+    .apis   = pluginApis
 };
+
+const struct AFB_plugin *pluginRegister (const struct AFB_interface *itf)
+{
+    return &pluginDesc;
+}