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

refactor: pass mimetype to tus upload record and check a list of meta fields for it

This commit is contained in:
Derrick Hammer 2024-03-29 00:47:33 -04:00
parent 9d259925f8
commit 5ad1aaeb6a
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protocols/s5/tus.go
View File

@ -188,7 +188,7 @@ func (t *TusHandler) Uploads(ctx context.Context, uploaderID uint) ([]models.Tus
return uploads, nil return uploads, nil
} }
func (t *TusHandler) CreateUpload(ctx context.Context, hash []byte, uploadID string, uploaderID uint, uploaderIP string, protocol string) (*models.TusUpload, error) { func (t *TusHandler) CreateUpload(ctx context.Context, hash []byte, uploadID string, uploaderID uint, uploaderIP string, protocol string, mimeType string) (*models.TusUpload, error) {
upload := &models.TusUpload{ upload := &models.TusUpload{
Hash: hash, Hash: hash,
UploadID: uploadID, UploadID: uploadID,
@ -196,6 +196,7 @@ func (t *TusHandler) CreateUpload(ctx context.Context, hash []byte, uploadID str
UploaderIP: uploaderIP, UploaderIP: uploaderIP,
Uploader: models.User{}, Uploader: models.User{},
Protocol: protocol, Protocol: protocol,
MimeType: mimeType,
} }
result := t.db.WithContext(ctx).Create(upload) result := t.db.WithContext(ctx).Create(upload)
@ -512,7 +513,17 @@ func (t *TusHandler) worker() {
continue continue
} }
_, err = t.CreateUpload(ctx, decodedHash.HashBytes(), info.Upload.ID, uploaderID, uploaderIP, t.storageProtocol.Name()) var mimeType string
for _, field := range []string{"mimeType", "mimetype", "filetype"} {
typ, ok := info.Upload.MetaData[field]
if ok {
mimeType = typ
break
}
}
_, err = t.CreateUpload(ctx, decodedHash.HashBytes(), info.Upload.ID, uploaderID, uploaderIP, t.storageProtocol.Name(), mimeType)
mutex.(*sync.Mutex).Unlock() mutex.(*sync.Mutex).Unlock()
if err != nil { if err != nil {
errorResponse.Body = "Could not create tus upload" errorResponse.Body = "Could not create tus upload"