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

parse target url to .co file, update remote scripts

Browse Source
This commit is contained in:
Niklas Kiefer
2017-02-03 09:13:59 +01:00
parent 213ca6c6a1
commit 4d314317ae
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
# run like this: powershell.exe -noprofile -executionpolicy bypass -file path\to\client_script.ps1 path\to\project_root # run like this: powershell.exe -noprofile -executionpolicy bypass -file path\to\client_script.ps1 path\to\project_root
# CodeOcean Remote Client v0.4 # CodeOcean Remote Client v0.5
#file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34) #file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34)
#file_path format: <path/to/file/><file_name> #file_path format: <path/to/file/><file_name>
@ -76,13 +76,15 @@ $file_array = get-content $co_file.fullname
$validation_token = $file_array[0] $validation_token = $file_array[0]
$files_attributes = get_file_attributes $file_array[1] $target_url = $file_array[1]
for ($i = 2; $i -lt $file_array.length; $i++){ $files_attributes = get_file_attributes $file_array[2]
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]
} }
$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 'http://codeocean.openhpi.de/evaluate' post_web_request 'application/json' $post_data $target_url

12
app/assets/remote_scripts/client_script.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# CodeOcean Remote Client v0.4 # CodeOcean Remote Client v0.5
#file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34) #file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34)
#file_path format: <path/to/file/><file_name> #file_path format: <path/to/file/><file_name>
@ -46,13 +46,15 @@ mapfile -t file_array < "$co_file_path"
validation_token="${file_array[0]}" validation_token="${file_array[0]}"
files_attributes="$(get_file_attributes "${file_array[1]}")" target_url="${file_array[1]}"
for ((i = 2; i < ${#file_array[@]}; i++)); do files_attributes="$(get_file_attributes "${file_array[2]}")"
for ((i = 3; i < ${#file_array[@]}; i++)); do
files_attributes+=", $(get_file_attributes "${file_array[i]}")" files_attributes+=", $(get_file_attributes "${file_array[i]}")"
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 "$post_data" http://codeocean.openhpi.de/evaluate curl -H 'Content-Type: application/json' --data "$post_data" "$target_url"
echo echo

13
app/assets/remote_scripts/client_script_osx.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# CodeOcean Remote Client v0.4 # CodeOcean Remote Client v0.5
#file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34) #file_info format: <path/to/file/><file_name>=<id> (src/frog.java=34)
#file_path format: <path/to/file/><file_name> #file_path format: <path/to/file/><file_name>
@ -55,14 +55,15 @@ read_file_to_array $co_file_path
validation_token="${file_array[0]}" validation_token="${file_array[0]}"
files_attributes="$(get_file_attributes "${file_array[1]}")" target_url="${file_array[1]}"
for ((i = 2; i < ${#file_array[@]}; i++)); do files_attributes="$(get_file_attributes "${file_array[2]}")"
for ((i = 3; i < ${#file_array[@]}; i++)); do
files_attributes+=", $(get_file_attributes "${file_array[i]}")" files_attributes+=", $(get_file_attributes "${file_array[i]}")"
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} curl -H 'Content-Type: application/json' --data "$post_data" "$target_url"
curl -H 'Content-Type: application/json' --data "$post_data" http://codeocean.openhpi.de/evaluate echo
echo

3
app/controllers/submissions_controller.rb
View File

@ -342,7 +342,10 @@ class SubmissionsController < ApplicationController
# create id.co file # create id.co file
path = "tmp/.co" path = "tmp/.co"
# parse validation token
content = "#{remote_evaluation_mapping.validation_token}\n" content = "#{remote_evaluation_mapping.validation_token}\n"
# parse remote request url
content += "#{request.base_url}/evaluate\n"
@submission.files.each do |file| @submission.files.each do |file|
file_path = file.path.to_s == '' ? file.name_with_extension : File.join(file.path, file.name_with_extension) file_path = file.path.to_s == '' ? file.name_with_extension : File.join(file.path, file.name_with_extension)
content += "#{file_path}=#{file.id.to_s}\n" content += "#{file_path}=#{file.id.to_s}\n"