rest: no copy file download

criyle · Feb 3, 2024 · c29d0ad · c29d0ad
1 parent 8025bd3
commit c29d0ad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cmd/go-judge/rest_executor/file_handler.go b/cmd/go-judge/rest_executor/file_handler.go
@@ -67,6 +67,15 @@ func (f *fileHandle) fileIDGet(c *gin.Context) {
 		c.AbortWithStatus(http.StatusNotFound)
 		return
 	}
+	typ := mime.TypeByExtension(path.Ext(name))
+	c.Header("Content-Type", typ)
+
+	fi, ok := file.(*envexec.FileInput) // fast path
+	if ok {
+		c.FileAttachment(fi.Path, name)
+		return
+	}
+
 	r, err := envexec.FileToReader(file)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
@@ -79,8 +88,6 @@ func (f *fileHandle) fileIDGet(c *gin.Context) {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return
 	}
-
-	typ := mime.TypeByExtension(path.Ext(name))
 	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", name))
 	c.Data(http.StatusOK, typ, content)
 }

diff --git a/env/winc/environment_windows.go b/env/winc/environment_windows.go
@@ -251,7 +251,7 @@ func (e *Environment) Execve(ctx context.Context, param envexec.ExecveParam) (pr
 		result.ExitStatus = int(exitCode)
 
 		// collect usage
-		t, m, err := getJobOjbectUsage(hJob)
+		t, m, err := getJobObjectUsage(hJob)
 		if err != nil {
 			procSet.result = runner.Result{Status: runner.StatusRunnerError, Error: err.Error()}
 			return