zishuo/golib
1
0
Fork 0
mirror of https://github.com/nabbar/golib.git synced 2025-10-05 15:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Package artifact:

Browse Source 
- replace file progress to generic interface extended from io reader / writer with progress function
- replace download function who's make the io copy, to a function that return the size + io.readCloser stream

Package ioutils/ioprogress:
- add a package to expose a generic interface based on io readcloser / writecloser
- add a instance to create a io readcloser / writecloser with progress function
- new instance based only on io readcloser/ writecloser and allow to register progress function or not if not wanted

Other:
- bump dependencies
- adjust format licence for context/gin
This commit is contained in:
Nicolas JUHEL
2024-04-12 16:32:03 +02:00
parent 71c18b96a5
commit 24e4191bc4
11 changed files with 442 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
artifact/gitlab/model.go
View File

@@ -36,7 +36,6 @@ import (
hscvrs "github.com/hashicorp/go-version"
libart "github.com/nabbar/golib/artifact"
artcli "github.com/nabbar/golib/artifact/client"
libfpg "github.com/nabbar/golib/file/progress"
gitlab "github.com/xanzy/go-gitlab"
)
@@ -111,46 +110,34 @@ func (g *gitlabModel) GetArtifact(containName string, regexName string, release
return "", ErrorGitlabNotFound.Error(nil)
}
func (g *gitlabModel) Download(dst libfpg.Progress, containName string, regexName string, release *hscvrs.Version) error {
func (g *gitlabModel) Download(containName string, regexName string, release *hscvrs.Version) (int64, io.ReadCloser, error) {
var (
uri string
rsp *gitlab.Response
req *hschtc.Request
err error
e error
n int64
)
defer func() {
if req != nil && req.Body != nil {
_ = req.Body.Close()
}
if rsp != nil && rsp.Body != nil {
_ = rsp.Body.Close()
}
}()
if uri, e = g.GetArtifact(containName, regexName, release); e != nil {
return e
return 0, nil, e
} else if req, err = g.c.NewRequest(http.MethodGet, uri, nil, nil); err != nil {
return ErrorGitlabRequestNew.Error(err)
return 0, nil, ErrorGitlabRequestNew.Error(err)
} else if rsp, err = g.c.Do(req, nil); err != nil {
return ErrorGitlabRequestRun.Error(err)
return 0, nil, ErrorGitlabRequestRun.Error(err)
} else if rsp.StatusCode < 200 || rsp.StatusCode > 299 {
return ErrorGitlabResponse.Error(errResponseCode)
return 0, nil, ErrorGitlabResponse.Error(errResponseCode)
} else if rsp.ContentLength < 1 {
return ErrorGitlabResponse.Error(errResponseContents)
return 0, nil, ErrorGitlabResponse.Error(errResponseContents)
} else if rsp.Body == nil {
return ErrorGitlabResponse.Error(errResponseBodyEmpty)
return 0, nil, ErrorGitlabResponse.Error(errResponseBodyEmpty)
} else {
dst.Reset(rsp.ContentLength)
return rsp.ContentLength, rsp.Body, nil
}
if n, err = io.Copy(dst, rsp.Body); err != nil {
return ErrorGitlabIOCopy.Error(err)
} else if n != rsp.ContentLength {
return ErrorDestinationSize.Error(errMisMatchingSize)
}
return nil
}