X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fmedia%2Fmedia-api.c;h=4e064bc221ec18a1e83011051efbb5004ca1e23e;hb=ca208671cc79bbc05c574df788035878e5d39382;hp=05237d39b9fab45f282c492ea6779db8d6ac4702;hpb=c9a33351febfbafb58f477b1bbc9bf14a4e35d05;p=src%2Fapp-framework-binder.git

diff --git a/plugins/media/media-api.c b/plugins/media/media-api.c
index 05237d39..4e064bc2 100644
--- a/plugins/media/media-api.c
+++ b/plugins/media/media-api.c
@@ -33,7 +33,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);
 }
@@ -42,14 +42,18 @@ STATIC void freeMedia (void *context, void *handle) {
 
 STATIC json_object* init (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
+    mediaCtxHandleT *ctx;
     json_object *jresp;
 
     /* create a private client context */
     if (!request->context)
         request->context = initMediaCtx();
 
+    ctx = (mediaCtxHandleT*)request->context;
+
     /* initialize server connection */
-    _rygel_init (request->context);
+    if (!ctx->media_server)
+      _rygel_init (request->context);
 
     jresp = json_object_new_object();
     json_object_object_add(jresp, "info", json_object_new_string ("Media initialized"));
@@ -60,19 +64,16 @@ STATIC json_object* list (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
     json_object *jresp;
-    char *result;
 
-    result = _rygel_list (ctx);
+    jresp = _rygel_list (ctx);
 
-    if (!result)
+    if (!jresp)
       return jsonNewMessage(AFB_FAIL, "No content found in media server");
 
-    jresp = json_object_new_object();
-    json_object_object_add(jresp, "list", json_object_new_string (result));
     return jresp;
 }
 
-STATIC json_object* choose (AFB_request *request) {      /* AFB_SESSION_CHECK */
+STATIC json_object* selecting (AFB_request *request) {   /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
@@ -95,13 +96,15 @@ STATIC json_object* choose (AFB_request *request) {      /* AFB_SESSION_CHECK */
     else if (atoi(value) >= 0) {
         index = (unsigned int) atoi(value);
 
-        if (!_rygel_choose (ctx, index))
+        if (!_rygel_select (ctx, index))
           return jsonNewMessage(AFB_FAIL, "Chosen index superior to current media count");
 
         ctx->index = index;
         jresp = json_object_new_object();
         json_object_object_add (jresp, "index", json_object_new_string (value));
     }
+    else
+        jresp = NULL;
 
     return jresp;
 }
@@ -110,7 +113,7 @@ STATIC json_object* play (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
 
-    if (!_rygel_do (ctx, PLAY))
+    if (!_rygel_do (ctx, PLAY, NULL))
       return jsonNewMessage(AFB_FAIL, "Could not play chosen media");
 
     return jsonNewMessage(AFB_SUCCESS, "PLaying media");
@@ -120,41 +123,66 @@ STATIC json_object* stop (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
 
-    if (!_rygel_do (ctx, STOP))
+    if (!_rygel_do (ctx, STOP, NULL))
       return jsonNewMessage(AFB_FAIL, "Could not stop chosen media");
 
     return jsonNewMessage(AFB_SUCCESS, "Stopped media");
 }
 
-STATIC json_object* paused (AFB_request *request) {      /* AFB_SESSION_CHECK */
+STATIC json_object* pausing (AFB_request *request) {     /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
 
-    if (!_rygel_do (ctx, PAUSE))
+    if (!_rygel_do (ctx, PAUSE, NULL))
       return jsonNewMessage(AFB_FAIL, "Could not pause chosen media");
 
     return jsonNewMessage(AFB_SUCCESS, "Paused media");
 }
 
-STATIC json_object* upload (AFB_request *request) {      /* AFB_SESSION_CHECK */
+STATIC json_object* seek (AFB_request *request) {        /* AFB_SESSION_CHECK */
 
     mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
     const char *value = getQueryValue (request, "value");
-    json_object *jresp;
-    char path[256];
 
     /* no "?value=" parameter : return error */
     if (!value)
-      return jsonNewMessage(AFB_FAIL, "You must provide a file name");
+      return jsonNewMessage(AFB_FAIL, "You must provide a time");
+
+    if (!_rygel_do (ctx, SEEK, value))
+      return jsonNewMessage(AFB_FAIL, "Could not seek chosen media");
+
+    return jsonNewMessage(AFB_SUCCESS, "Seeked media");
+}
+
+STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_SESSION_CHECK */
 
-    snprintf (path, sizeof(path), "/tmp/%s", value);
-    if (access (path, R_OK) == -1)
-      return jsonNewMessage(AFB_FAIL, "File not found");
+    mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
+    AFB_PostCtx *postFileCtx;
+    json_object *jresp;
+    char *path;
+
+    /* item is !NULL until transfer is complete */
+    if (item != NULL)
+      return getPostFile (request, item, "media");
+
+    /* 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");
+    /* finalizes file transfer */
+    return getPostFile (request, item, NULL);
 }
 
 STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */
@@ -165,10 +193,11 @@ STATIC json_object* ping (AFB_request *request) {         /* AFB_SESSION_NONE */
 STATIC AFB_restapi pluginApis[]= {
   {"init"   , AFB_SESSION_CHECK,  (AFB_apiCB)init       , "Media API - init"   },
   {"list"   , AFB_SESSION_CHECK,  (AFB_apiCB)list       , "Media API - list"   },
-  {"choose" , AFB_SESSION_CHECK,  (AFB_apiCB)choose     , "Media API - choose" },
+  {"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)paused     , "Media API - pause"  },
+  {"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"   },
   {NULL}