diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-08-18 01:46:36 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-08-18 01:46:36 +0900 |
| commit | ed796dddde6db433c88b04a1ad154bf88a24faa4 (patch) | |
| tree | de82ed4ae74c75ba7ddf9e478cb6129177ee4c89 /backend/game/hub.go | |
| parent | 7653eb2b28911a0479b3b673c9b63fd490aedb6b (diff) | |
| parent | 9bd1f89febe6311781aca3e8ee2b6a706a606e3c (diff) | |
| download | iosdc-japan-2024-albatross-ed796dddde6db433c88b04a1ad154bf88a24faa4.tar.gz iosdc-japan-2024-albatross-ed796dddde6db433c88b04a1ad154bf88a24faa4.tar.zst iosdc-japan-2024-albatross-ed796dddde6db433c88b04a1ad154bf88a24faa4.zip | |
Merge branch 'feat/watch-page'
Diffstat (limited to 'backend/game/hub.go')
| -rw-r--r-- | backend/game/hub.go | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/backend/game/hub.go b/backend/game/hub.go index 7c06e05..d385746 100644 --- a/backend/game/hub.go +++ b/backend/game/hub.go @@ -138,7 +138,7 @@ func (hub *gameHub) run() { } } -func (hub *gameHub) sendExecResultMessage(playerID int, testcaseID nullable.Nullable[int], status string, stdout string, stderr string) { +func (hub *gameHub) sendExecResult(playerID int, testcaseID nullable.Nullable[int], status string, stdout string, stderr string) { hub.sendToPlayer(playerID, &playerMessageS2CExecResult{ Type: playerMessageTypeS2CExecResult, Data: playerMessageS2CExecResultPayload{ @@ -218,7 +218,7 @@ func (hub *gameHub) processTaskResults() { case *taskqueue.TaskResultCompileSwiftToWasm: err := hub.processTaskResultCompileSwiftToWasm(taskResult) if err != nil { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullNullable[int](), err.Status, @@ -234,7 +234,7 @@ func (hub *gameHub) processTaskResults() { case *taskqueue.TaskResultCompileWasmToNativeExecutable: err := hub.processTaskResultCompileWasmToNativeExecutable(taskResult) if err != nil { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullNullable[int](), err.Status, @@ -247,12 +247,11 @@ func (hub *gameHub) processTaskResults() { nullable.NewNullNullable[int](), ) } else { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullNullable[int](), "success", - // TODO: inherit the command stdout/stderr. - "Successfully compiled", + "", "", ) } @@ -270,13 +269,12 @@ func (hub *gameHub) processTaskResults() { Stderr: "", }) if err != nil { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullableWithValue(int(taskResult.TaskPayload.TestcaseID)), "internal_error", - // TODO: inherit the command stdout/stderr? "", - "internal error", + "", ) hub.sendSubmitResult( taskResult.TaskPayload.UserID(), @@ -286,20 +284,19 @@ func (hub *gameHub) processTaskResults() { continue } if err1 != nil { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullableWithValue(int(taskResult.TaskPayload.TestcaseID)), aggregatedStatus, - err1.Stdout, - err1.Stderr, + "", + "", ) } else { - hub.sendExecResultMessage( + hub.sendExecResult( taskResult.TaskPayload.UserID(), nullable.NewNullableWithValue(int(taskResult.TaskPayload.TestcaseID)), "success", - // TODO: inherit the command stdout/stderr? - "Testcase passed", + "", "", ) } |