forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add repo_blob This adds a new Repository.GetBlob(id) method for use by gitea. * This is a follow-up for PR go-gitea#121 to implement blob_api including full test coverage Signed-off-by: Berengar W. Lehr <[email protected]>
- Loading branch information
Showing
2 changed files
with
96 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// Copyright 2018 The Gitea Authors. All rights reserved. | ||
// Use of this source code is governed by a MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package git | ||
|
||
func (repo *Repository) getBlob(id SHA1) (*Blob, error) { | ||
if _, err := NewCommand("cat-file", "-p", id.String()).RunInDir(repo.Path); err != nil { | ||
return nil, ErrNotExist{id.String(), ""} | ||
} | ||
|
||
return &Blob{ | ||
repo: repo, | ||
TreeEntry: &TreeEntry{ | ||
ID: id, | ||
ptree: &Tree{ | ||
repo: repo, | ||
}, | ||
}, | ||
}, nil | ||
} | ||
|
||
// GetBlob finds the blob object in the repository. | ||
func (repo *Repository) GetBlob(idStr string) (*Blob, error) { | ||
id, err := NewIDFromString(idStr) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return repo.getBlob(id) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Copyright 2018 The Gitea Authors. All rights reserved. | ||
// Use of this source code is governed by a MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package git | ||
|
||
import ( | ||
"fmt" | ||
"io/ioutil" | ||
"path/filepath" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestRepository_GetBlob_Found(t *testing.T) { | ||
repoPath := filepath.Join(testReposDir, "repo1_bare") | ||
r, err := OpenRepository(repoPath) | ||
assert.NoError(t, err) | ||
|
||
testCases := []struct { | ||
OID string | ||
Data []byte | ||
}{ | ||
{"e2129701f1a4d54dc44f03c93bca0a2aec7c5449", []byte("file1\n")}, | ||
{"6c493ff740f9380390d5c9ddef4af18697ac9375", []byte("file2\n")}, | ||
} | ||
|
||
for _, testCase := range testCases { | ||
blob, err := r.GetBlob(testCase.OID) | ||
assert.NoError(t, err) | ||
|
||
dataReader, err := blob.Data() | ||
assert.NoError(t, err) | ||
|
||
data, err := ioutil.ReadAll(dataReader) | ||
assert.NoError(t, err) | ||
assert.Equal(t, testCase.Data, data) | ||
} | ||
} | ||
|
||
func TestRepository_GetBlob_NotExist(t *testing.T) { | ||
repoPath := filepath.Join(testReposDir, "repo1_bare") | ||
r, err := OpenRepository(repoPath) | ||
assert.NoError(t, err) | ||
|
||
testCase := "0000000000000000000000000000000000000000" | ||
testError := ErrNotExist{testCase, ""} | ||
|
||
blob, err := r.GetBlob(testCase) | ||
assert.Nil(t, blob) | ||
assert.EqualError(t, err, testError.Error()) | ||
} | ||
|
||
func TestRepository_GetBlob_NoId(t *testing.T) { | ||
repoPath := filepath.Join(testReposDir, "repo1_bare") | ||
r, err := OpenRepository(repoPath) | ||
assert.NoError(t, err) | ||
|
||
testCase := "" | ||
testError := fmt.Errorf("Length must be 40: %s", testCase) | ||
|
||
blob, err := r.GetBlob(testCase) | ||
assert.Nil(t, blob) | ||
assert.EqualError(t, err, testError.Error()) | ||
} |