htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align files_attributes in remote evaluation with structure of normal submission

Browse Source
This commit is contained in:
tobias.kantusch
2021-04-26 15:35:16 +02:00
committed by Sebastian Serth
parent 36cacc2330
commit 91a0e4a7d5
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/remote_scripts/macos.sh
View File

@ -44,7 +44,7 @@ function get_file_attributes {
file_path="$(get_valid_file_path "${file_info%=*}")" file_path="$(get_valid_file_path "${file_info%=*}")"
escaped_file_content="$(get_escaped_file_content "$file_path")" escaped_file_content="$(get_escaped_file_content "$file_path")"
file_id="${file_info##*=}" 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 { function read_file_to_array {
@ -63,13 +63,13 @@ validation_token="${file_array[0]}"
target_url="${file_array[1]}" 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 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 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" curl -H 'Content-Type: application/json' --data "$(echo $post_data)" "$target_url"
echo echo

8
app/assets/remote_scripts/ubuntu.sh
View File

@ -43,7 +43,7 @@ function get_file_attributes {
file_path="$(get_valid_file_path "${file_info%=*}")" file_path="$(get_valid_file_path "${file_info%=*}")"
escaped_file_content="$(get_escaped_file_content "$file_path")" escaped_file_content="$(get_escaped_file_content "$file_path")"
file_id="${file_info##*=}" 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]}" 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 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 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 # "$(echo $post_data)" solves some whitespace issues
curl -H 'Content-Type: application/json' --data "$(echo $post_data)" "$target_url" curl -H 'Content-Type: application/json' --data "$(echo $post_data)" "$target_url"

10
app/assets/remote_scripts/windows.ps1
View File

@ -67,11 +67,11 @@ function get_escaped_file_content ($file){
return $content 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 $file = get_file ($file_info | select-string -pattern '^.*(?==)').matches.value
$escaped_file_content = get_escaped_file_content $file $escaped_file_content = get_escaped_file_content $file
$file_id = ($file_info | select-string -pattern '[^=]+$').matches.value $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' $co_file = get_file '.co'
@ -82,13 +82,13 @@ $validation_token = $file_array[0]
$target_url = $file_array[1] $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++){ for ($i = 3; $i -lt $file_array.length; $i++){
$files_attributes += ', ' $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 post_web_request 'application/json' $post_data $target_url