piano: Do not return empty explanation.

Instead return NULL and let the client handle it.
PromyLOPh · Mar 29, 2024 · ee735ee · ee735ee
1 parent c76bcb2
commit ee735ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/libpiano/response.c b/src/libpiano/response.c
@@ -520,7 +520,8 @@ PianoReturn_t PianoResponse (PianoHandle_t *ph, PianoRequest_t *req) {
 			assert (reqData != NULL);
 
 			json_object *explanations;
-			if (json_object_object_get_ex (result, "explanations", &explanations)) {
+			if (json_object_object_get_ex (result, "explanations", &explanations) &&
+					json_object_array_length (explanations) > 0) {
 				reqData->retExplain = malloc (strSize *
 						sizeof (*reqData->retExplain));
 				strncpy (reqData->retExplain, "We're playing this track "

diff --git a/src/ui_act.c b/src/ui_act.c
@@ -271,8 +271,12 @@ BarUiActCallback(BarUiActExplain) {
 
 	BarUiMsg (&app->settings, MSG_INFO, "Receiving explanation... ");
 	if (BarUiActDefaultPianoCall (PIANO_REQUEST_EXPLAIN, &reqData)) {
-		BarUiMsg (&app->settings, MSG_INFO, "%s\n", reqData.retExplain);
-		free (reqData.retExplain);
+		if (reqData.retExplain == NULL) {
+			BarUiMsg (&app->settings, MSG_ERR, "No explanation provided.\n");
+		} else {
+			BarUiMsg (&app->settings, MSG_INFO, "%s\n", reqData.retExplain);
+			free (reqData.retExplain);
+		}
 	}
 	BarUiActDefaultEventcmd ("songexplain");
 }