From c2ed30480deabaf5d53db6bcc617807ef52f6034 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 25 Jun 2024 14:10:35 +0200
Subject: [PATCH] Show when requested domains were not found on the list

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/api.sh  | 10 +++++++---
 advanced/Scripts/list.sh | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/advanced/Scripts/api.sh b/advanced/Scripts/api.sh
index ea057adc..5843c585 100755
--- a/advanced/Scripts/api.sh
+++ b/advanced/Scripts/api.sh
@@ -166,10 +166,14 @@ PostFTLData() {
   local data response status
   # send the data to the API
   response=$(curl -skS -w "%{http_code}" -X POST "${API_URL}$1" --data-raw "$2" -H "Accept: application/json" -H "sid: ${SID}" )
-  # status are the last 3 characters
-  status=$(printf %s "${response#"${response%???}"}")
   # data is everything from response without the last 3 characters
-  printf %s "${response%???}"
+  if [ "${3}" = "status" ]; then
+    # Keep the status code appended if requested
+    printf %s "${response}"
+  else
+    # Strip the status code
+    printf %s "${response%???}"
+  fi
 }
 
 secretRead() {
diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh
index 144317ce..d6a30325 100755
--- a/advanced/Scripts/list.sh
+++ b/advanced/Scripts/list.sh
@@ -66,7 +66,7 @@ CreateDomainList() {
 }
 
 AddDomain() {
-    local json num
+    local json num data
 
     # Authenticate with the API
     LoginAPI
@@ -113,7 +113,7 @@ AddDomain() {
 }
 
 RemoveDomain() {
-    local json num
+    local json num data status
 
     # Authenticate with the API
     LoginAPI
@@ -130,7 +130,10 @@ RemoveDomain() {
     json=$(jq --null-input --compact-output --arg domains "${domList[*]}" --arg typeId "${typeId}" --arg kindId "${kindId}" '[ $domains | split(" ")[] as $item | {item: $item, type: $typeId, kind: $kindId} ]')
 
     # Send the request
-    data=$(PostFTLData "domains:batchDelete" "${json}")
+    data=$(PostFTLData "domains:batchDelete" "${json}" "status")
+    # Separate the status from the data
+    status=$(printf %s "${data#"${data%???}"}")
+    data=$(printf %s "${data%???}")
 
     # If there is an .error object in the returned data, display it
     local error
@@ -138,12 +141,10 @@ RemoveDomain() {
     if [[ $error != "null" && $error != "" ]]; then
         echo -e "  ${CROSS} Failed to remove domain(s):"
         echo -e "      $(jq <<< "${data}" '.error')"
-    elif [[ "${verbose}" == true ]]; then
-        echo -e "  ${TICK} Removed ${#domList[@]} domain(s):"
-        # Loop through the domains and display them
-        for dom in "${domList[@]}"; do
-            echo -e "    - ${COL_BLUE}${dom}${COL_NC}"
-        done
+    elif [[ "${verbose}" == true && "${status}" == "204" ]]; then
+        echo -e "  ${TICK} Domain(s) removed from the ${kindId} ${typeId}list"
+    elif [[ "${verbose}" == true && "${status}" == "404" ]]; then
+        echo -e "  ${TICK} Requested domain(s) not found on ${kindId} ${typeId}list"
     fi
 
     # Log out