From 3e22ffa9f329e6224aa9d01dfde8f923229fa678 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 19 Mar 2018 17:22:00 +0100
Subject: [SERVER] image.c: Add size to RPC data, rename bytesReceived, always
 add uplink if existent

---
 src/server/image.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/server')

diff --git a/src/server/image.c b/src/server/image.c
index 28dc397..ec0ab7b 100644
--- a/src/server/image.c
+++ b/src/server/image.c
@@ -1555,7 +1555,7 @@ json_t* image_getListAsJson()
 	json_t *imagesJson = json_array();
 	json_t *jsonImage;
 	int i;
-	char buffer[100] = { 0 };
+	char uplinkName[100] = { 0 };
 	uint64_t bytesReceived;
 	int users, completeness;
 
@@ -1569,24 +1569,28 @@ json_t* image_getListAsJson()
 		completeness = image_getCompletenessEstimate( image );
 		if ( image->uplink == NULL ) {
 			bytesReceived = 0;
+			uplinkName[0] = '\0';
 		} else {
 			bytesReceived = image->uplink->bytesReceived;
-			if ( !host_to_string( &image->uplink->currentServer, buffer, sizeof(buffer) ) ) {
-				buffer[0] = '\0';
+			if ( !host_to_string( &image->uplink->currentServer, uplinkName, sizeof(uplinkName) ) ) {
+				uplinkName[0] = '\0';
 			}
 		}
 		image->users++; // Prevent freeing after we unlock
 		spin_unlock( &image->lock );
 
-		jsonImage = json_pack( "{sisssisisi}",
+		jsonImage = json_pack( "{sisssisisisI}",
 				"id", image->id, // id, name, rid never change, so access them without locking
 				"name", image->name,
 				"rid", (int) image->rid,
 				"users", users,
-				"complete",  completeness );
+				"complete",  completeness,
+				"size", (json_int_t)image->virtualFilesize );
 		if ( bytesReceived != 0 ) {
-			json_object_set_new( jsonImage, "uplinkServer", json_string( buffer ) );
-			json_object_set_new( jsonImage, "receivedBytes", json_integer( (json_int_t) bytesReceived ) );
+			json_object_set_new( jsonImage, "bytesReceived", json_integer( (json_int_t) bytesReceived ) );
+		}
+		if ( uplinkName[0] != '\0' ) {
+			json_object_set_new( jsonImage, "uplinkServer", json_string( uplinkName ) );
 		}
 		json_array_append_new( imagesJson, jsonImage );
 
-- 
cgit v1.2.3-55-g7522