lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitmediaclient doesn't need to check .git/media dir

Browse Source 
the smudge command takes care of that
This commit is contained in:
Rick Olson 2014-07-28 17:58:54 -06:00
parent 5fbaa6c897
commit 1125c63674
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gitmediaclient/client.go
View File

@ -84,32 +84,28 @@ func Put(filehash, filename string) error {
func Get(filename string) (io.ReadCloser, error) {
oid := filepath.Base(filename)
if stat, err := os.Stat(filename); err != nil || stat == nil {
req, creds, err := clientRequest("GET", oid)
if err != nil {
return nil, err
}
req.Header.Set("Accept", gitMediaType)
res, err := doRequest(req, creds)
if err != nil {
return nil, err
}
contentType := res.Header.Get("Content-Type")
if contentType == "" {
return nil, errors.New("Invalid Content-Type")
}
if ok, err := validateMediaHeader(contentType, res.Body); !ok {
return nil, err
}
return res.Body, nil
req, creds, err := clientRequest("GET", oid)
if err != nil {
return nil, err
}
return os.Open(filename)
req.Header.Set("Accept", gitMediaType)
res, err := doRequest(req, creds)
if err != nil {
return nil, err
}
contentType := res.Header.Get("Content-Type")
if contentType == "" {
return nil, errors.New("Invalid Content-Type")
}
if ok, err := validateMediaHeader(contentType, res.Body); !ok {
return nil, err
}
return res.Body, nil
}
func validateMediaHeader(contentType string, reader io.Reader) (bool, error) {