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

fix: update method calls and hash object usage

This commit is contained in:
Derrick Hammer 2024-02-09 15:28:50 -05:00
parent fc9724df2c
commit e7ac46de32
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/s5/http.go
View File

@ -183,7 +183,7 @@ func (h *HttpHandler) SmallFileUpload(jc jape.Context) {
return
}
if exists, upload := h.storage.FileExists(hash); exists {
if exists, upload := h.storage.FileExists(hash.Hash); exists {
cid, err := encoding.CIDFromHash(hash, upload.Size, types.CIDTypeRaw, types.HashTypeBlake3)
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
@ -210,7 +210,7 @@ func (h *HttpHandler) SmallFileUpload(jc jape.Context) {
return
}
hash, err = h.storage.PutFileSmall(rs, "s5", false)
hash, err = h.storage.PutFileSmall(rs, "s5")
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
@ -218,7 +218,7 @@ func (h *HttpHandler) SmallFileUpload(jc jape.Context) {
return
}
h.logger.Info("Hash", zap.String("hash", hex.EncodeToString(hash)))
h.logger.Info("Hash", zap.String("hash", hex.EncodeToString(hash.Hash)))
cid, err := encoding.CIDFromHash(hash, uint64(bufferSize), types.CIDTypeRaw, types.HashTypeBlake3)
@ -257,7 +257,7 @@ func (h *HttpHandler) SmallFileUpload(jc jape.Context) {
mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.storage.CreateUpload(hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(bufferSize), "s5")
upload, err := h.storage.CreateUpload(hash.Hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(bufferSize), "s5")
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
h.logger.Error(errUploadingFile, zap.Error(err))
@ -811,12 +811,12 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
return
}
if exists, upload := h.storage.FileExists(hash); exists {
if exists, upload := h.storage.FileExists(hash.Hash); exists {
uploadMap[fileHeader.Filename] = upload
continue
}
hash, err = h.storage.PutFileSmall(rs, "s5", false)
hash, err = h.storage.PutFileSmall(rs, "s5")
if err != nil {
errored(err)
@ -841,7 +841,7 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
}
mimeType := http.DetectContentType(mimeBytes[:])
upload, err := h.storage.CreateUpload(hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5")
upload, err := h.storage.CreateUpload(hash.Hash, mimeType, uint(jc.Request.Context().Value(middleware.S5AuthUserIDKey).(uint64)), jc.Request.RemoteAddr, uint64(fileHeader.Size), "s5")
if err != nil {
errored(err)
@ -901,7 +901,7 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
return
}
if exists, upload := h.storage.FileExists(hash); exists {
if exists, upload := h.storage.FileExists(hash.Hash); exists {
cid, err := encoding.CIDFromHash(hash, upload.Size, types.CIDTypeMetadataWebapp, types.HashTypeBlake3)
if err != nil {
_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
@ -918,7 +918,7 @@ func (h *HttpHandler) DirectoryUpload(jc jape.Context) {
return
}
hash, err = h.storage.PutFileSmall(rs, "s5", false)
hash, err = h.storage.PutFileSmall(rs, "s5")
if err != nil {
errored(err)