From 6aaf3511206f57228d7dcb99db4414f3e5f15ad1 Mon Sep 17 00:00:00 2001
From: Chris Lee <clee@mg8.org>
Date: Tue, 5 Jun 2018 01:36:42 -0600
Subject: [PATCH 1/2] Add repo_blob

This adds a new Repository.GetBlob(id) method for use by gitea.
---
 repo_blob.go      | 30 ++++++++++++++++++++++++++++++
 repo_blob_test.go | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 repo_blob.go
 create mode 100644 repo_blob_test.go

diff --git a/repo_blob.go b/repo_blob.go
new file mode 100644
index 000000000..a9445a1f7
--- /dev/null
+++ b/repo_blob.go
@@ -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)
+}
diff --git a/repo_blob_test.go b/repo_blob_test.go
new file mode 100644
index 000000000..8ccef69b1
--- /dev/null
+++ b/repo_blob_test.go
@@ -0,0 +1,40 @@
+// 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 (
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRepository_GetBlob(t *testing.T) {
+	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+	bareRepo1, err := OpenRepository(bareRepo1Path)
+	assert.NoError(t, err)
+
+	testCases := []struct {
+		OID  string
+		Data []byte
+	}{
+		{"e2129701f1a4d54dc44f03c93bca0a2aec7c5449", []byte("file1\n")},
+		{"6c493ff740f9380390d5c9ddef4af18697ac9375", []byte("file2\n")},
+		{"b1fc9917b618c924cf4aa421dae74e8bf9b556d3", []byte("Hi\n")},
+	}
+
+	for _, testCase := range testCases {
+		blob, err := bareRepo1.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)
+	}
+}

From 944c6c758d3a064ac13116840f2b2acb4062eca5 Mon Sep 17 00:00:00 2001
From: "Berengar W. Lehr" <Berengar.Lehr@kompetenztest.de>
Date: Sat, 10 Nov 2018 18:23:09 +0100
Subject: [PATCH 2/2] This is a follow-up for PR #121 to implement blob_api
 including full test coverage

Signed-off-by: Berengar W. Lehr <Berengar.Lehr@kompetenztest.de>
---
 repo_blob_test.go | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/repo_blob_test.go b/repo_blob_test.go
index 8ccef69b1..074365f16 100644
--- a/repo_blob_test.go
+++ b/repo_blob_test.go
@@ -5,6 +5,7 @@
 package git
 
 import (
+	"fmt"
 	"io/ioutil"
 	"path/filepath"
 	"testing"
@@ -12,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestRepository_GetBlob(t *testing.T) {
-	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
-	bareRepo1, err := OpenRepository(bareRepo1Path)
+func TestRepository_GetBlob_Found(t *testing.T) {
+	repoPath := filepath.Join(testReposDir, "repo1_bare")
+	r, err := OpenRepository(repoPath)
 	assert.NoError(t, err)
 
 	testCases := []struct {
@@ -23,11 +24,10 @@ func TestRepository_GetBlob(t *testing.T) {
 	}{
 		{"e2129701f1a4d54dc44f03c93bca0a2aec7c5449", []byte("file1\n")},
 		{"6c493ff740f9380390d5c9ddef4af18697ac9375", []byte("file2\n")},
-		{"b1fc9917b618c924cf4aa421dae74e8bf9b556d3", []byte("Hi\n")},
 	}
 
 	for _, testCase := range testCases {
-		blob, err := bareRepo1.GetBlob(testCase.OID)
+		blob, err := r.GetBlob(testCase.OID)
 		assert.NoError(t, err)
 
 		dataReader, err := blob.Data()
@@ -38,3 +38,29 @@ func TestRepository_GetBlob(t *testing.T) {
 		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())
+}