LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

feat: need to support mime type in small uploads

This commit is contained in:
Derrick Hammer 2024-01-25 19:15:01 -05:00
parent f3be950ba7
commit be27728b42
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
api/s5/http.go
View File

@ -204,7 +204,26 @@ func (h *HttpHandler) SmallFileUpload(jc jape.Context) {
h.portal.Logger().Info("CID", zap.String("cidStr", cidStr)) h.portal.Logger().Info("CID", zap.String("cidStr", cidStr))
upload, err := h.portal.Storage().CreateUpload(hash, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(bufferSize), "s5") _, err = rs.Seek(0, io.SeekStart)
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.portal.Logger().Error(errUploadingFile, zap.Error(err))
return
}
var mimeBytes [512]byte
_, err = rs.Read(mimeBytes[:])
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.portal.Logger().Error(errUploadingFile, zap.Error(err))
return
}
mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.portal.Storage().CreateUpload(hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(bufferSize), "s5")
if err != nil { if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError) _ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.portal.Logger().Error(errUploadingFile, zap.Error(err)) h.portal.Logger().Error(errUploadingFile, zap.Error(err))
@ -770,7 +789,25 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
return return
} }
upload, err := h.portal.Storage().CreateUpload(hash, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5") _, err = rs.Seek(0, io.SeekStart)
if err != nil {
return
}
if err != nil {
errored(err)
return
}
var mimeBytes [512]byte
if _, err := file.Read(mimeBytes[:]); err != nil {
errored(err)
return
}
mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.portal.Storage().CreateUpload(hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5")
if err != nil { if err != nil {
errored(err) errored(err)
@ -790,15 +827,6 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
return return
} }
// Reset the read pointer back to the start of the file.
if _, err := file.Seek(0, 0); err != nil {
errored(err)
return
}
// Detect MIME type.
mimeType := http.DetectContentType(buffer)
uploadMap[fileHeader.Filename] = *upload uploadMap[fileHeader.Filename] = *upload
mimeMap[fileHeader.Filename] = mimeType mimeMap[fileHeader.Filename] = mimeType
} }