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

refactor: update progress logic

This commit is contained in:
Derrick Hammer 2024-03-26 23:40:11 -04:00
parent 6a9eede07d
commit 3331f1b1c1
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/s5/s5.go
View File

@ -2049,7 +2049,7 @@ func (s *S5API) pinImportCronJob(cid string, url string, proofUrl string, userId
} }
// Inline fetching and reading body, directly incorporating your checks. // Inline fetching and reading body, directly incorporating your checks.
fetchAndProcess := func(fetchUrl string) ([]byte, error) { fetchAndProcess := func(fetchUrl string, progressStage int) ([]byte, error) {
req, err := rq.Get(fetchUrl).ParseRequest() req, err := rq.Get(fetchUrl).ParseRequest()
if err != nil { if err != nil {
s.logger.Error("error parsing request", zap.Error(err)) s.logger.Error("error parsing request", zap.Error(err))
@ -2076,7 +2076,7 @@ func (s *S5API) pinImportCronJob(cid string, url string, proofUrl string, userId
return nil, err return nil, err
} }
err = s._import.UpdateProgress(ctx, parsedCid.Hash.HashBytes(), 1, totalStages) err = s._import.UpdateProgress(ctx, parsedCid.Hash.HashBytes(), progressStage, totalStages)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -2108,7 +2108,7 @@ func (s *S5API) pinImportCronJob(cid string, url string, proofUrl string, userId
} }
// Fetch file and process if under post upload limit. // Fetch file and process if under post upload limit.
if parsedCid.Size <= s.config.Config().Core.PostUploadLimit { if parsedCid.Size <= s.config.Config().Core.PostUploadLimit {
fileData, err := fetchAndProcess(url) fileData, err := fetchAndProcess(url, 1)
if err != nil { if err != nil {
return err // Error logged in fetchAndProcess return err // Error logged in fetchAndProcess
} }
@ -2123,6 +2123,11 @@ func (s *S5API) pinImportCronJob(cid string, url string, proofUrl string, userId
return fmt.Errorf("hash mismatch") return fmt.Errorf("hash mismatch")
} }
err = s._import.UpdateProgress(ctx, parsedCid.Hash.HashBytes(), 2, totalStages)
if err != nil {
return err
}
upload, err := s.storage.UploadObject(ctx, s5.GetStorageProtocol(s.protocol), bytes.NewReader(fileData), nil, hash) upload, err := s.storage.UploadObject(ctx, s5.GetStorageProtocol(s.protocol), bytes.NewReader(fileData), nil, hash)
if err != nil { if err != nil {
return err return err
@ -2137,7 +2142,7 @@ func (s *S5API) pinImportCronJob(cid string, url string, proofUrl string, userId
} }
// Fetch proof. // Fetch proof.
proof, err := fetchAndProcess(proofUrl) proof, err := fetchAndProcess(proofUrl, 1)
if err != nil { if err != nil {
return err return err
} }