From 91a0e4a7d5ffece5d61491ad661d8f896da3a428 Mon Sep 17 00:00:00 2001
From: "tobias.kantusch" <tobias.kantusch@student.hpi.de>
Date: Mon, 26 Apr 2021 15:35:16 +0200
Subject: [PATCH] Align files_attributes in remote evaluation with structure of
 normal submission

---
 app/assets/remote_scripts/macos.sh    |  8 ++++----
 app/assets/remote_scripts/ubuntu.sh   |  8 ++++----
 app/assets/remote_scripts/windows.ps1 | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/assets/remote_scripts/macos.sh b/app/assets/remote_scripts/macos.sh
index ac084b55..df95f7df 100644
--- a/app/assets/remote_scripts/macos.sh
+++ b/app/assets/remote_scripts/macos.sh
@@ -44,7 +44,7 @@ function get_file_attributes {
     file_path="$(get_valid_file_path "${file_info%=*}")"
     escaped_file_content="$(get_escaped_file_content "$file_path")"
     file_id="${file_info##*=}"
-    echo "{\"file_id\": $file_id,\"content\": \"$escaped_file_content\"}"
+    echo "\"$2\": {\"file_id\": $file_id,\"content\": \"$escaped_file_content\"}"
 }
 
 function read_file_to_array {
@@ -63,13 +63,13 @@ validation_token="${file_array[0]}"
 
 target_url="${file_array[1]}"
 
-files_attributes="$(get_file_attributes "${file_array[2]}")"
+files_attributes="$(get_file_attributes "${file_array[2]}" 0)"
 
 for ((i = 3; i < ${#file_array[@]}; i++)); do
-    files_attributes+=", $(get_file_attributes "${file_array[i]}")"
+    files_attributes+=", $(get_file_attributes "${file_array[i]}" $((i-2)))"
 done
 
-post_data="{\"remote_evaluation\": {\"validation_token\": \"$validation_token\",\"files_attributes\": [$files_attributes]}}"
+post_data="{\"remote_evaluation\": {\"validation_token\": \"$validation_token\",\"files_attributes\": {$files_attributes}}}"
 
 curl -H 'Content-Type: application/json' --data "$(echo $post_data)" "$target_url"
 echo
diff --git a/app/assets/remote_scripts/ubuntu.sh b/app/assets/remote_scripts/ubuntu.sh
index 64eda313..c5edd7b2 100644
--- a/app/assets/remote_scripts/ubuntu.sh
+++ b/app/assets/remote_scripts/ubuntu.sh
@@ -43,7 +43,7 @@ function get_file_attributes {
     file_path="$(get_valid_file_path "${file_info%=*}")"
     escaped_file_content="$(get_escaped_file_content "$file_path")"
     file_id="${file_info##*=}"
-    echo "{\"file_id\": $file_id,\"content\": \"$escaped_file_content\"}"
+    echo "\"$2\": {\"file_id\": $file_id,\"content\": \"$escaped_file_content\"}"
 }
 
 
@@ -54,13 +54,13 @@ validation_token="${file_array[0]}"
 
 target_url="${file_array[1]}"
 
-files_attributes="$(get_file_attributes "${file_array[2]}")"
+files_attributes="$(get_file_attributes "${file_array[2]}" 0)"
 
 for ((i = 3; i < ${#file_array[@]}; i++)); do
-    files_attributes+=", $(get_file_attributes "${file_array[i]}")"
+    files_attributes+=", $(get_file_attributes "${file_array[i]}" $((i-2)))"
 done
 
-post_data="{\"remote_evaluation\": {\"validation_token\": \"$validation_token\",\"files_attributes\": [$files_attributes]}}"
+post_data="{\"remote_evaluation\": {\"validation_token\": \"$validation_token\",\"files_attributes\": {$files_attributes}}}"
 
 # "$(echo $post_data)" solves some whitespace issues
 curl -H 'Content-Type: application/json' --data "$(echo $post_data)" "$target_url"
diff --git a/app/assets/remote_scripts/windows.ps1 b/app/assets/remote_scripts/windows.ps1
index f548caea..dd9d523d 100644
--- a/app/assets/remote_scripts/windows.ps1
+++ b/app/assets/remote_scripts/windows.ps1
@@ -67,11 +67,11 @@ function get_escaped_file_content ($file){
     return $content
 }
 
-function get_file_attributes ($file_info){
+function get_file_attributes ($file_info, $index){
     $file = get_file ($file_info | select-string -pattern '^.*(?==)').matches.value
     $escaped_file_content = get_escaped_file_content $file
     $file_id = ($file_info | select-string -pattern '[^=]+$').matches.value
-    return "{`"file_id`": $file_id,`"content`": `"$escaped_file_content`"}"
+    return "`"$index`": {`"file_id`": $file_id,`"content`": `"$escaped_file_content`"}"
 }
 
 $co_file = get_file '.co'
@@ -82,13 +82,13 @@ $validation_token = $file_array[0]
 
 $target_url = $file_array[1]
 
-$files_attributes = get_file_attributes $file_array[2]
+$files_attributes = get_file_attributes $file_array[2] 0
 
 for ($i = 3; $i -lt $file_array.length; $i++){
     $files_attributes += ', '
-    $files_attributes += get_file_attributes $file_array[$i]
+    $files_attributes += get_file_attributes $file_array[$i] ($i-2)
 }
 
-$post_data = "{`"remote_evaluation`": {`"validation_token`": `"$validation_token`",`"files_attributes`": [$files_attributes]}}"
+$post_data = "{`"remote_evaluation`": {`"validation_token`": `"$validation_token`",`"files_attributes`": {$files_attributes}}}"
 
 post_web_request 'application/json' $post_data $target_url