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

Enable buffering for Turtle Commands in WebSocket output

Browse Source
This commit is contained in:
Sebastian Serth
2020-11-24 00:21:39 +01:00
parent 839e6e0936
commit 1df4685f38
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/submissions_controller.rb
View File

@ -278,19 +278,24 @@ class SubmissionsController < ApplicationController
for part in message.split("\n") for part in message.split("\n")
self.parse_message(part,output_stream,socket, container, false) self.parse_message(part,output_stream,socket, container, false)
end end
elsif message.include? '<img' elsif message.include?('<img') || message.start_with?('{"cmd":')
#Rails.logger.info('img foung') #Rails.logger.info('img foung')
@buffering = true @buffering = true
@buffer = '' @buffer = ''
@buffer += message @buffer += message
#Rails.logger.info('Starting to buffer') #Rails.logger.info('Starting to buffer')
elsif @buffering and message.include? '/>' elsif @buffering and message.include?('/>')
@buffer += message @buffer += message
parsed = {'cmd'=>'write','stream'=>output_stream,'data'=>@buffer} parsed = {'cmd'=>'write','stream'=>output_stream,'data'=>@buffer}
socket.send_data JSON.dump(parsed) socket.send_data JSON.dump(parsed)
#socket.send_data @buffer #socket.send_data @buffer
@buffering = false @buffering = false
#Rails.logger.info('Sent complete buffer') #Rails.logger.info('Sent complete buffer')
elsif @buffering and message.end_with?("}\r")
@buffer += message
socket.send_data @buffer
@buffering = false
#Rails.logger.info('Sent complete buffer')
elsif @buffering elsif @buffering
@buffer += message @buffer += message
#Rails.logger.info('Appending to buffer') #Rails.logger.info('Appending to buffer')