* 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"
}
/* 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);
}
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;
}
jresp = json_object_new_object();
json_object_object_add (jresp, "index", json_object_new_string (value));
}
+ else
+ jresp = NULL;
return jresp;
}
return jsonNewMessage(AFB_SUCCESS, "Seeked media");
}
-STATIC json_object* upload (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC json_object* upload (AFB_request *request, AFB_PostItem *item) { /* AFB_SESSION_CHECK */
mediaCtxHandleT *ctx = (mediaCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ AFB_PostCtx *postFileCtx;
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");
+ /* item is !NULL until transfer is complete */
+ if (item != NULL)
+ return getPostFile (request, item, "media");
- 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");
+ /* finalizes file transfer */
+ return getPostFile (request, item, NULL);
}
STATIC json_object* ping (AFB_request *request) { /* AFB_SESSION_NONE */