Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit 617a21d

Browse files
mcuadrosmcuadros
committed
File, added size
1 parent 1931dfb commit 617a21d

File tree

3 files changed

+168
-69
lines changed

3 files changed

+168
-69
lines changed

‎file.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type File struct {
1313
Name string
1414
io.Reader
1515
Hash core.Hash
16+
Size int64
1617
}
1718

1819
// Contents returns the contents of a file as a string.

‎tree.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ func (t *Tree) File(path string) (*File, error) {
5151
blob := &Blob{}
5252
blob.Decode(obj)
5353

54-
return &File{Name: path, Reader: blob.Reader(), Hash: *hash}, nil
54+
return &File{
55+
Name: path,
56+
Reader: blob.Reader(),
57+
Hash: *hash,
58+
Size: blob.Size,
59+
}, nil
5560
}
5661

5762
func (t *Tree) findHash(path string) (*core.Hash, error) {
@@ -135,7 +140,12 @@ func (t *Tree) walkEntries(base string, ch chan *File) {
135140
blob := &Blob{}
136141
blob.Decode(obj)
137142

138-
ch <- &File{Name: filepath.Join(base, entry.Name), Reader: blob.Reader(), Hash: entry.Hash}
143+
ch <- &File{
144+
Name: filepath.Join(base, entry.Name),
145+
Reader: blob.Reader(),
146+
Hash: entry.Hash,
147+
Size: blob.Size,
148+
}
139149
}
140150
}
141151

‎tree_test.go

Lines changed: 155 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -52,86 +52,174 @@ func (s *SuiteTree) TestFile(c *C) {
5252
commit string // the commit to search for the file
5353
path string // the path of the file to find
5454
blobHash string // expected hash of the returned file
55+
size int64 // expected file size
5556
found bool // expected found value
5657
}{
5758
// use git ls-tree commit to get the hash of the blobs
58-
{"https://github.com/tyba/git-fixture.git", "b029517f6300c2da0f4b651b8642506cd6aaf45d", "not-found",
59-
"", false},
60-
{"https://github.com/tyba/git-fixture.git", "b029517f6300c2da0f4b651b8642506cd6aaf45d", ".gitignore",
61-
"32858aad3c383ed1ff0a0f9bdf231d54a00c9e88", true},
62-
{"https://github.com/tyba/git-fixture.git", "b029517f6300c2da0f4b651b8642506cd6aaf45d", "LICENSE",
63-
"c192bd6a24ea1ab01d78686e417c8bdc7c3d197f", true},
64-
65-
{"https://github.com/tyba/git-fixture.git", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "not-found",
66-
"", false},
67-
{"https://github.com/tyba/git-fixture.git", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", ".gitignore",
68-
"32858aad3c383ed1ff0a0f9bdf231d54a00c9e88", true},
69-
{"https://github.com/tyba/git-fixture.git", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "binary.jpg",
70-
"d5c0f4ab811897cadf03aec358ae60d21f91c50d", true},
71-
{"https://github.com/tyba/git-fixture.git", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "LICENSE",
72-
"c192bd6a24ea1ab01d78686e417c8bdc7c3d197f", true},
73-
74-
{"https://github.com/tyba/git-fixture.git", "35e85108805c84807bc66a02d91535e1e24b38b9", "binary.jpg",
75-
"d5c0f4ab811897cadf03aec358ae60d21f91c50d", true},
76-
{"https://github.com/tyba/git-fixture.git", "b029517f6300c2da0f4b651b8642506cd6aaf45d", "binary.jpg",
77-
"", false},
78-
79-
{"https://github.com/tyba/git-fixture.git", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "CHANGELOG",
80-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", true},
81-
{"https://github.com/tyba/git-fixture.git", "1669dce138d9b841a518c64b10914d88f5e488ea", "CHANGELOG",
82-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", true},
83-
{"https://github.com/tyba/git-fixture.git", "a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "CHANGELOG",
84-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", true},
85-
{"https://github.com/tyba/git-fixture.git", "35e85108805c84807bc66a02d91535e1e24b38b9", "CHANGELOG",
86-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", false},
87-
{"https://github.com/tyba/git-fixture.git", "b8e471f58bcbca63b07bda20e428190409c2db47", "CHANGELOG",
88-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", true},
89-
{"https://github.com/tyba/git-fixture.git", "b029517f6300c2da0f4b651b8642506cd6aaf45d", "CHANGELOG",
90-
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", false},
59+
{
60+
"https://github.com/tyba/git-fixture.git",
61+
"b029517f6300c2da0f4b651b8642506cd6aaf45d", "not-found",
62+
"", 0, false,
63+
},
64+
{
65+
"https://github.com/tyba/git-fixture.git",
66+
"b029517f6300c2da0f4b651b8642506cd6aaf45d", ".gitignore",
67+
"32858aad3c383ed1ff0a0f9bdf231d54a00c9e88", 189, true,
68+
},
69+
{
70+
"https://github.com/tyba/git-fixture.git",
71+
"b029517f6300c2da0f4b651b8642506cd6aaf45d", "LICENSE",
72+
"c192bd6a24ea1ab01d78686e417c8bdc7c3d197f", 1072, true,
73+
},
74+
{
75+
"https://github.com/tyba/git-fixture.git",
76+
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "not-found",
77+
"", 0, false,
78+
},
79+
{
80+
"https://github.com/tyba/git-fixture.git",
81+
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", ".gitignore",
82+
"32858aad3c383ed1ff0a0f9bdf231d54a00c9e88", 189, true,
83+
},
84+
{
85+
"https://github.com/tyba/git-fixture.git",
86+
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "binary.jpg",
87+
"d5c0f4ab811897cadf03aec358ae60d21f91c50d", 76110, true,
88+
},
89+
{
90+
"https://github.com/tyba/git-fixture.git",
91+
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "LICENSE",
92+
"c192bd6a24ea1ab01d78686e417c8bdc7c3d197f", 1072, true,
93+
},
94+
{
95+
"https://github.com/tyba/git-fixture.git",
96+
"35e85108805c84807bc66a02d91535e1e24b38b9", "binary.jpg",
97+
"d5c0f4ab811897cadf03aec358ae60d21f91c50d", 76110, true,
98+
},
99+
{
100+
"https://github.com/tyba/git-fixture.git",
101+
"b029517f6300c2da0f4b651b8642506cd6aaf45d", "binary.jpg",
102+
"", 0, false,
103+
},
104+
{
105+
"https://github.com/tyba/git-fixture.git",
106+
"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "CHANGELOG",
107+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 18, true,
108+
},
109+
{
110+
"https://github.com/tyba/git-fixture.git",
111+
"1669dce138d9b841a518c64b10914d88f5e488ea", "CHANGELOG",
112+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 18, true,
113+
},
114+
{
115+
"https://github.com/tyba/git-fixture.git",
116+
"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "CHANGELOG",
117+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 18, true,
118+
},
119+
{
120+
"https://github.com/tyba/git-fixture.git",
121+
"35e85108805c84807bc66a02d91535e1e24b38b9", "CHANGELOG",
122+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 0, false,
123+
},
124+
{
125+
"https://github.com/tyba/git-fixture.git",
126+
"b8e471f58bcbca63b07bda20e428190409c2db47", "CHANGELOG",
127+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 18, true,
128+
},
129+
{
130+
"https://github.com/tyba/git-fixture.git",
131+
"b029517f6300c2da0f4b651b8642506cd6aaf45d", "CHANGELOG",
132+
"d3ff53e0564a9f87d8e84b6e28e5060e517008aa", 0, false,
133+
},
91134

92135
// git submodule
93-
{"https://github.com/cpcs499/Final_Pres_P.git", "70bade703ce556c2c7391a8065c45c943e8b6bc3", "Final",
94-
"", false},
95-
{"https://github.com/cpcs499/Final_Pres_P.git", "70bade703ce556c2c7391a8065c45c943e8b6bc3", "Final/not-found",
96-
"", false},
97-
98-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "LICENSE",
99-
"49c45e6cc893d6f5ebd5c9343fe4492360f339bf", true},
100-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples",
101-
"", false},
102-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples/desk.sh",
103-
"d9c7751138824cd2d539c23d5afe3f9d29836854", true},
104-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples/not-found",
105-
"", false},
106-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "test/bashrc",
107-
"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", true},
108-
{"https://github.com/jamesob/desk.git", "d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "test/not-found",
109-
"", false},
110-
111-
{"https://github.com/spinnaker/spinnaker.git", "b32b2aecae2cfca4840dd480f8082da206a538da", "etc/apache2/sites-available/spinnaker.conf",
112-
"1d452c616be4fb16d2cc6b8a7e7a2208a6e64d2d", true},
113-
114-
{"https://github.com/alcortesm/binary-relations.git", "c44b5176e99085c8fe36fa27b045590a7b9d34c9", "Makefile",
115-
"2dd2ad8c14de6612ed15813679a6554bad99330b", true},
116-
{"https://github.com/alcortesm/binary-relations.git", "c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/binrels",
117-
"", false},
118-
{"https://github.com/alcortesm/binary-relations.git", "c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice",
119-
"", false},
120-
{"https://github.com/alcortesm/binary-relations.git", "c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice/map-slice.go",
121-
"12431e98381dd5097e1a19fe53429c72ef1f328e", true},
122-
{"https://github.com/alcortesm/binary-relations.git", "c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice/map-slice.go/not-found",
123-
"", false},
136+
{
137+
"https://github.com/cpcs499/Final_Pres_P.git",
138+
"70bade703ce556c2c7391a8065c45c943e8b6bc3", "Final",
139+
"", 0, false,
140+
},
141+
{
142+
"https://github.com/cpcs499/Final_Pres_P.git",
143+
"70bade703ce556c2c7391a8065c45c943e8b6bc3", "Final/not-found",
144+
"", 0, false,
145+
},
146+
{
147+
"https://github.com/jamesob/desk.git",
148+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "LICENSE",
149+
"49c45e6cc893d6f5ebd5c9343fe4492360f339bf", 1058, true,
150+
},
151+
{
152+
"https://github.com/jamesob/desk.git",
153+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples",
154+
"", 0, false,
155+
},
156+
{
157+
"https://github.com/jamesob/desk.git",
158+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples/desk.sh",
159+
"d9c7751138824cd2d539c23d5afe3f9d29836854", 265, true,
160+
},
161+
{
162+
"https://github.com/jamesob/desk.git",
163+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "examples/not-found",
164+
"", 0, false,
165+
},
166+
{
167+
"https://github.com/jamesob/desk.git",
168+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "test/bashrc",
169+
"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", 0, true,
170+
},
171+
{
172+
"https://github.com/jamesob/desk.git",
173+
"d4edaf0e8101fcea437ebd982d899fe2cc0f9f7b", "test/not-found",
174+
"", 0, false,
175+
},
176+
{
177+
"https://github.com/spinnaker/spinnaker.git",
178+
"b32b2aecae2cfca4840dd480f8082da206a538da", "etc/apache2/sites-available/spinnaker.conf",
179+
"1d452c616be4fb16d2cc6b8a7e7a2208a6e64d2d", 67, true,
180+
},
181+
{
182+
"https://github.com/alcortesm/binary-relations.git",
183+
"c44b5176e99085c8fe36fa27b045590a7b9d34c9", "Makefile",
184+
"2dd2ad8c14de6612ed15813679a6554bad99330b", 1254, true,
185+
},
186+
{
187+
"https://github.com/alcortesm/binary-relations.git",
188+
"c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/binrels",
189+
"", 0, false,
190+
},
191+
{
192+
"https://github.com/alcortesm/binary-relations.git",
193+
"c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice",
194+
"", 0, false,
195+
},
196+
{
197+
"https://github.com/alcortesm/binary-relations.git",
198+
"c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice/map-slice.go",
199+
"12431e98381dd5097e1a19fe53429c72ef1f328e", 179, true,
200+
},
201+
{
202+
"https://github.com/alcortesm/binary-relations.git",
203+
"c44b5176e99085c8fe36fa27b045590a7b9d34c9", "src/map-slice/map-slice.go/not-found",
204+
"", 0, false,
205+
},
124206
} {
125207
commit, err := s.repos[t.repo].Commit(core.NewHash(t.commit))
126208
c.Assert(err, IsNil, Commentf("subtest %d: %v (%s)", i, err, t.commit))
127209

128210
tree := commit.Tree()
129211
file, err := tree.File(t.path)
130212
found := err == nil
131-
c.Assert(found, Equals, t.found, Commentf("subtest %d, path=%s, commit=%s", i, t.path, t.commit))
132-
if found {
133-
c.Assert(file.Hash.String(), Equals, t.blobHash, Commentf("subtest %d, commit=%s, path=%s", i, t.commit, t.path))
213+
214+
comment := Commentf("subtest %d, commit=%s, path=%s", i, t.commit, t.path)
215+
c.Assert(found, Equals, t.found, comment)
216+
217+
if !found {
218+
continue
134219
}
220+
221+
c.Assert(file.Size, Equals, t.size, comment)
222+
c.Assert(file.Hash.String(), Equals, t.blobHash, comment)
135223
}
136224
}
137225

0 commit comments

Comments
 (0)