iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

more efficient file upload/download

Browse Source
This commit is contained in:
William Harrell 2022-11-16 20:06:36 -05:00
parent 57e89bb1cc
commit b65df3e3bf
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/internal/http/http.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"image/jpeg" "image/jpeg"
"io"
"net/http" "net/http"
"os" "os"
"regexp" "regexp"
@ -131,21 +132,10 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
return return
} }
defer f.Close() defer f.Close()
fileinfo, err := f.Stat()
if err != nil {
http.Error(w, "unable to stat file", http.StatusInternalServerError)
return
}
buffer := make([]byte, fileinfo.Size())
_, err = f.Read(buffer)
if err != nil {
http.Error(w, "error reading file", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Type", "application/octet-stream")
w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
w.Write(buffer) io.Copy(w, f)
}) })
router.Post("/file", func(w http.ResponseWriter, r *http.Request) { router.Post("/file", func(w http.ResponseWriter, r *http.Request) {
@ -162,7 +152,6 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
} }
r.ParseMultipartForm(32 << 20) r.ParseMultipartForm(32 << 20)
buffer := make([]byte, FILE_UPLOAD_BUF_SIZE)
for _, formheader := range r.MultipartForm.File["files"] { for _, formheader := range r.MultipartForm.File["files"] {
formfile, err := formheader.Open() formfile, err := formheader.Open()
if err != nil { if err != nil {
@ -170,30 +159,14 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
http.Error(w, "error writing file", http.StatusInternalServerError) http.Error(w, "error writing file", http.StatusInternalServerError)
return return
} }
defer formfile.Close()
f, err := os.OpenFile(webSocketHandler.MakeFilePath(formheader.Filename), os.O_WRONLY|os.O_CREATE, 0644) f, err := os.OpenFile(webSocketHandler.MakeFilePath(formheader.Filename), os.O_WRONLY|os.O_CREATE, 0644)
if err != nil { if err != nil {
http.Error(w, "unable to open file for writing", http.StatusInternalServerError) http.Error(w, "unable to open file for writing", http.StatusInternalServerError)
return return
} }
defer f.Close()
var copied int64 = 0 io.Copy(f, formfile)
for copied < formheader.Size {
var limit int64 = int64(len(buffer))
if limit > formheader.Size-copied {
limit = formheader.Size - copied
}
bytesRead, err := formfile.ReadAt(buffer[:limit], copied)
if err != nil {
logger.Warn().Err(err).Msg("failed copying file in upload")
http.Error(w, "error writing file", http.StatusInternalServerError)
return
}
f.Write(buffer[:bytesRead])
copied += int64(bytesRead)
}
formfile.Close()
f.Close()
} }
}) })