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

refactor: return bytes count from hashing to use for upload record

This commit is contained in:
Derrick Hammer 2024-01-22 18:52:37 -05:00
parent da298cc56f
commit 11e533577b
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
interfaces/storage.go
View File

@ -16,7 +16,7 @@ type StorageService interface {
BuildUploadBufferTus(basePath string, preUploadCb TusPreUploadCreateCallback, preFinishCb TusPreFinishResponseCallback) (*tusd.Handler, tusd.DataStore, *s3.Client, error) BuildUploadBufferTus(basePath string, preUploadCb TusPreUploadCreateCallback, preFinishCb TusPreFinishResponseCallback) (*tusd.Handler, tusd.DataStore, *s3.Client, error)
FileExists(hash []byte) (bool, models.Upload) FileExists(hash []byte) (bool, models.Upload)
GetHashSmall(file io.ReadSeeker) ([]byte, error) GetHashSmall(file io.ReadSeeker) ([]byte, error)
GetHash(file io.Reader) ([]byte, error) GetHash(file io.Reader) ([]byte, int64, error)
CreateUpload(hash []byte, uploaderID uint, uploaderIP string, size uint64, protocol string) (*models.Upload, error) CreateUpload(hash []byte, uploaderID uint, uploaderIP string, size uint64, protocol string) (*models.Upload, error)
TusUploadExists(hash []byte) (bool, models.TusUpload) TusUploadExists(hash []byte) (bool, models.TusUpload)
CreateTusUpload(hash []byte, uploadID string, uploaderID uint, uploaderIP string, protocol string) (*models.TusUpload, error) CreateTusUpload(hash []byte, uploadID string, uploaderID uint, uploaderIP string, protocol string) (*models.TusUpload, error)

12
storage/storage.go
View File

@ -275,18 +275,18 @@ func (s *StorageServiceImpl) GetHashSmall(file io.ReadSeeker) ([]byte, error) {
return hash[:], nil return hash[:], nil
} }
func (s *StorageServiceImpl) GetHash(file io.Reader) ([]byte, error) { func (s *StorageServiceImpl) GetHash(file io.Reader) ([]byte, int64, error) {
hasher := blake3.New(64, nil) hasher := blake3.New(64, nil)
_, err := io.Copy(hasher, file) totalBytes, err := io.Copy(hasher, file)
if err != nil { if err != nil {
return nil, err return nil, 0, err
} }
hash := hasher.Sum(nil) hash := hasher.Sum(nil)
return hash[:32], nil return hash[:32], totalBytes, nil
} }
func (s *StorageServiceImpl) CreateUpload(hash []byte, uploaderID uint, uploaderIP string, size uint64, protocol string) (*models.Upload, error) { func (s *StorageServiceImpl) CreateUpload(hash []byte, uploaderID uint, uploaderIP string, size uint64, protocol string) (*models.Upload, error) {
@ -506,7 +506,7 @@ func (s *StorageServiceImpl) buildNewTusUploadTask(upload *models.TusUpload) (jo
return err return err
} }
hash, err := s.GetHash(reader) hash, byteCount, err := s.GetHash(reader)
if err != nil { if err != nil {
s.portal.Logger().Error("Could not compute hash", zap.Error(err)) s.portal.Logger().Error("Could not compute hash", zap.Error(err))
@ -544,7 +544,7 @@ func (s *StorageServiceImpl) buildNewTusUploadTask(upload *models.TusUpload) (jo
return err return err
} }
_, err = s.CreateUpload(dbHash, upload.UploaderID, upload.UploaderIP, uint64(info.Size), upload.Protocol) _, err = s.CreateUpload(dbHash, upload.UploaderID, upload.UploaderIP, uint64(byteCount), upload.Protocol)
if err != nil { if err != nil {
s.portal.Logger().Error("Could not create upload", zap.Error(err)) s.portal.Logger().Error("Could not create upload", zap.Error(err))
return err return err