buildservice: Implement uploads using the new API

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/buildservice.c b/src/pakfire/buildservice.c
index 5c7f27134af98f60150809f758b815896c43cce4..9f66108ccf01be3cecce8dba3a50d2ce2292ac59 100644 (file)
--- a/src/pakfire/buildservice.c
+++ b/src/pakfire/buildservice.c
@@ -464,10 +464,11 @@ ERROR:
 // Uploads
 
 static int pakfire_buildservice_create_upload(struct pakfire_buildservice* service,
-               const char* path, const char* filename, FILE* f, char** url, char** uuid) {
+               const char* path, const char* filename, FILE* f, char** uuid) {
        struct pakfire_hashes hashes = {};
        struct pakfire_xfer* xfer = NULL;
        struct json_object* response = NULL;
+       struct json_object* request = NULL;
        char* hexdigest_blake2b512 = NULL;
        struct stat stat;
        int r;
@@ -478,6 +479,7 @@ static int pakfire_buildservice_create_upload(struct pakfire_buildservice* servi
        r = fstat(fd, &stat);
        if (r) {
                ERROR(service->ctx, "Could not stat %s: %s\n", path, strerror(errno));
+               r = -errno;
                goto ERROR;
        }
 
@@ -496,7 +498,7 @@ static int pakfire_buildservice_create_upload(struct pakfire_buildservice* servi
 
        // Create a new xfer
        r = pakfire_buildservice_xfer_create(&xfer, service, "/api/v1/uploads");
-       if (r)
+       if (r < 0)
                goto ERROR;
 
        // Enable authentication
@@ -504,36 +506,39 @@ static int pakfire_buildservice_create_upload(struct pakfire_buildservice* servi
        if (r < 0)
                goto ERROR;
 
+       // Make the request
+       r = pakfire_json_new_object(&request);
+       if (r < 0)
+               goto ERROR;
+
        // Add the filename parameter
-       r = pakfire_xfer_add_param(xfer, "filename", "%s", filename);
-       if (r)
+       r = pakfire_json_add_string(request, "filename", filename);
+       if (r < 0)
                goto ERROR;
 
        // Add the size parameter
-       r = pakfire_xfer_add_param(xfer, "size", "%jd", stat.st_size);
-       if (r)
+       r = pakfire_json_add_int64(request, "size", stat.st_size);
+       if (r < 0)
                goto ERROR;
 
        // Add the hexdigest parameter
-       r = pakfire_xfer_add_param(xfer, "hexdigest_blake2b512", "%s", hexdigest_blake2b512);
-       if (r)
+       r = pakfire_json_add_string(request, "hexdigest_blake2b512", hexdigest_blake2b512);
+       if (r < 0)
+               goto ERROR;
+
+       // Add the payload
+       r = pakfire_xfer_set_json_payload(xfer, request);
+       if (r < 0)
                goto ERROR;
 
        // Send the request
        r = pakfire_xfer_run_api_request(xfer, &response);
-       if (r)
+       if (r < 0)
                goto ERROR;
 
-       // Fetch the URL
-       if (url) {
-               r = pakfire_buildservice_api_response_string(service, response, "url", url);
-               if (r < 0)
-                       goto ERROR;
-       }
-
        // Fetch the ID
        if (uuid) {
-               r = pakfire_buildservice_api_response_string(service, response, "id", uuid);
+               r = pakfire_buildservice_api_response_string(service, response, "uuid", uuid);
                if (r < 0)
                        goto ERROR;
        }
@@ -546,6 +551,8 @@ ERROR:
                pakfire_xfer_unref(xfer);
        if (response)
                json_object_put(response);
+       if (request)
+               json_object_put(request);
        if (hexdigest_blake2b512)
                free(hexdigest_blake2b512);
 
@@ -553,18 +560,18 @@ ERROR:
 }
 
 static int pakfire_buildservice_upload_payload(struct pakfire_buildservice* service,
-               const char* filename, const char* url, FILE* f) {
+               const char* filename, const char* uuid, FILE* f) {
        struct pakfire_xfer* xfer = NULL;
        int r;
 
        // Create a new xfer
-       r = pakfire_buildservice_xfer_create(&xfer, service, "%s", url);
-       if (r)
+       r = pakfire_buildservice_xfer_create(&xfer, service, "/api/v1/uploads/%s", uuid);
+       if (r < 0)
                goto ERROR;
 
        // Set the title
        r = pakfire_xfer_set_title(xfer, filename);
-       if (r)
+       if (r < 0)
                goto ERROR;
 
        // Enable authentication
@@ -592,7 +599,6 @@ ERROR:
 int pakfire_buildservice_upload(struct pakfire_buildservice* service,
                const char* path, const char* filename, char** uuid) {
        char basename[NAME_MAX];
-       char* url = NULL;
        FILE* f = NULL;
        int r;
 
@@ -613,16 +619,20 @@ int pakfire_buildservice_upload(struct pakfire_buildservice* service,
        }
 
        // Create a new upload
-       r = pakfire_buildservice_create_upload(service, path, filename, f, &url, uuid);
-       if (r)
+       r = pakfire_buildservice_create_upload(service, path, filename, f, uuid);
+       if (r < 0) {
+               ERROR(service->ctx, "Failed to create upload: %s\n", strerror(-r));
                goto ERROR;
+       }
 
        DEBUG(service->ctx, "Created a new upload (%s)\n", *uuid);
 
        // Send the payload
-       r = pakfire_buildservice_upload_payload(service, filename, url, f);
-       if (r)
+       r = pakfire_buildservice_upload_payload(service, filename, *uuid, f);
+       if (r < 0) {
+               ERROR(service->ctx, "Failed to upload the payload for %s: %s\n", *uuid, strerror(-r));
                goto ERROR;
+       }
 
 ERROR:
        if (r) {
@@ -631,8 +641,6 @@ ERROR:
 
                *uuid = NULL;
        }
-       if (url)
-               free(url);
        if (f)
                fclose(f);