From 2e7646b98b026c9340eb28ab66949b058dd55182 Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Tue, 4 Apr 2017 14:35:03 -0600 Subject: [PATCH] lfs: rename CatFileBatchScanner to PointerScanner --- commands/command_status.go | 10 ++++----- lfs/gitscanner_catfilebatch.go | 22 +++++++++---------- ...t.go => gitscanner_pointerscanner_test.go} | 12 +++++----- lfs/gitscanner_tree.go | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) rename lfs/{gitscanner_catfilebatchscanner_test.go => gitscanner_pointerscanner_test.go} (89%) diff --git a/commands/command_status.go b/commands/command_status.go index 5f9f4370..b7b599ef 100644 --- a/commands/command_status.go +++ b/commands/command_status.go @@ -40,7 +40,7 @@ func statusCommand(cmd *cobra.Command, args []string) { ExitWithError(err) } - scanner, err := lfs.NewCatFileBatchScanner() + scanner, err := lfs.NewPointerScanner() if err != nil { ExitWithError(err) } @@ -69,7 +69,7 @@ func statusCommand(cmd *cobra.Command, args []string) { var z40 = regexp.MustCompile(`\^?0{40}`) -func formatBlobInfo(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) string { +func formatBlobInfo(s *lfs.PointerScanner, entry *lfs.DiffIndexEntry) string { fromSha, fromSrc, err := blobInfoFrom(s, entry) if err != nil { ExitWithError(err) @@ -89,7 +89,7 @@ func formatBlobInfo(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) strin return fmt.Sprintf("%s -> %s", from, to) } -func blobInfoFrom(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) (sha, from string, err error) { +func blobInfoFrom(s *lfs.PointerScanner, entry *lfs.DiffIndexEntry) (sha, from string, err error) { var blobSha string = entry.SrcSha if z40.MatchString(blobSha) { blobSha = entry.DstSha @@ -98,7 +98,7 @@ func blobInfoFrom(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) (sha, f return blobInfo(s, blobSha, entry.SrcName) } -func blobInfoTo(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) (sha, from string, err error) { +func blobInfoTo(s *lfs.PointerScanner, entry *lfs.DiffIndexEntry) (sha, from string, err error) { var name string = entry.DstName if len(name) == 0 { name = entry.SrcName @@ -107,7 +107,7 @@ func blobInfoTo(s *lfs.CatFileBatchScanner, entry *lfs.DiffIndexEntry) (sha, fro return blobInfo(s, entry.DstSha, name) } -func blobInfo(s *lfs.CatFileBatchScanner, blobSha, name string) (sha, from string, err error) { +func blobInfo(s *lfs.PointerScanner, blobSha, name string) (sha, from string, err error) { if !z40.MatchString(blobSha) { s.Scan(blobSha) if err := s.Err(); err != nil { diff --git a/lfs/gitscanner_catfilebatch.go b/lfs/gitscanner_catfilebatch.go index 35240e81..4b14c38e 100644 --- a/lfs/gitscanner_catfilebatch.go +++ b/lfs/gitscanner_catfilebatch.go @@ -17,7 +17,7 @@ import ( // if that blob is for a locked file. Any errors are sent to errCh. An error is // returned if the 'git cat-file' command fails to start. func runCatFileBatch(pointerCh chan *WrappedPointer, lockableCh chan string, lockableSet *lockableNameSet, revs *StringChannelWrapper, errCh chan error) error { - scanner, err := NewCatFileBatchScanner() + scanner, err := NewPointerScanner() if err != nil { return err } @@ -57,7 +57,7 @@ func runCatFileBatch(pointerCh chan *WrappedPointer, lockableCh chan string, loc return nil } -type CatFileBatchScanner struct { +type PointerScanner struct { scanner *git.ObjectScanner blobSha string @@ -66,32 +66,32 @@ type CatFileBatchScanner struct { err error } -func NewCatFileBatchScanner() (*CatFileBatchScanner, error) { +func NewPointerScanner() (*PointerScanner, error) { scanner, err := git.NewObjectScanner() if err != nil { return nil, err } - return &CatFileBatchScanner{scanner: scanner}, nil + return &PointerScanner{scanner: scanner}, nil } -func (s *CatFileBatchScanner) BlobSHA() string { +func (s *PointerScanner) BlobSHA() string { return s.blobSha } -func (s *CatFileBatchScanner) ContentsSha() string { +func (s *PointerScanner) ContentsSha() string { return s.contentsSha } -func (s *CatFileBatchScanner) Pointer() *WrappedPointer { +func (s *PointerScanner) Pointer() *WrappedPointer { return s.pointer } -func (s *CatFileBatchScanner) Err() error { +func (s *PointerScanner) Err() error { return s.err } -func (s *CatFileBatchScanner) Scan(sha string) bool { +func (s *PointerScanner) Scan(sha string) bool { s.pointer, s.err = nil, nil s.blobSha, s.contentsSha = "", "" @@ -110,11 +110,11 @@ func (s *CatFileBatchScanner) Scan(sha string) bool { return true } -func (s *CatFileBatchScanner) Close() error { +func (s *PointerScanner) Close() error { return s.scanner.Close() } -func (s *CatFileBatchScanner) next(blob string) (string, string, *WrappedPointer, error) { +func (s *PointerScanner) next(blob string) (string, string, *WrappedPointer, error) { if !s.scanner.Scan(blob) { if err := s.scanner.Err(); err != nil { return "", "", nil, err diff --git a/lfs/gitscanner_catfilebatchscanner_test.go b/lfs/gitscanner_pointerscanner_test.go similarity index 89% rename from lfs/gitscanner_catfilebatchscanner_test.go rename to lfs/gitscanner_pointerscanner_test.go index 68222f36..754bd09c 100644 --- a/lfs/gitscanner_catfilebatchscanner_test.go +++ b/lfs/gitscanner_pointerscanner_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" ) -func TestCatFileBatchScannerWithValidOutput(t *testing.T) { +func TestPointerScannerWithValidOutput(t *testing.T) { blobs := []*Pointer{ &Pointer{ Version: "https://git-lfs.github.com/spec/v1", @@ -34,7 +34,7 @@ func TestCatFileBatchScannerWithValidOutput(t *testing.T) { return } - scanner := &CatFileBatchScanner{ + scanner := &PointerScanner{ scanner: git.NewObjectScannerFrom(reader), } @@ -59,7 +59,7 @@ func TestCatFileBatchScannerWithValidOutput(t *testing.T) { assert.Nil(t, scanner.Pointer()) } -func TestCatFileBatchScannerWithLargeBlobs(t *testing.T) { +func TestPointerScannerWithLargeBlobs(t *testing.T) { buf := bytes.NewBuffer(make([]byte, 0, 1025)) sha := sha256.New() rng := rand.New(rand.NewSource(0)) @@ -70,7 +70,7 @@ func TestCatFileBatchScannerWithLargeBlobs(t *testing.T) { fake := bytes.NewBuffer(nil) writeFakeBuffer(t, fake, buf.Bytes(), buf.Len()) - scanner := &CatFileBatchScanner{ + scanner := &PointerScanner{ scanner: git.NewObjectScannerFrom(fake), } @@ -83,7 +83,7 @@ func TestCatFileBatchScannerWithLargeBlobs(t *testing.T) { assert.Nil(t, scanner.Pointer()) } -func assertNextPointer(t *testing.T, scanner *CatFileBatchScanner, oid string) { +func assertNextPointer(t *testing.T, scanner *PointerScanner, oid string) { assert.True(t, scanner.Scan("")) assert.Nil(t, scanner.Err()) @@ -93,7 +93,7 @@ func assertNextPointer(t *testing.T, scanner *CatFileBatchScanner, oid string) { assert.Equal(t, oid, p.Oid) } -func assertNextEmptyPointer(t *testing.T, scanner *CatFileBatchScanner) { +func assertNextEmptyPointer(t *testing.T, scanner *PointerScanner) { assert.True(t, scanner.Scan("")) assert.Nil(t, scanner.Err()) diff --git a/lfs/gitscanner_tree.go b/lfs/gitscanner_tree.go index 3331031d..77f199e9 100644 --- a/lfs/gitscanner_tree.go +++ b/lfs/gitscanner_tree.go @@ -46,7 +46,7 @@ func runScanTree(cb GitScannerFoundPointer, ref string, filter *filepathfilter.F // a Git LFS pointer. treeblobs is a channel over which blob entries // will be sent. It returns a channel from which point.Pointers can be read. func catFileBatchTree(treeblobs *TreeBlobChannelWrapper) (*PointerChannelWrapper, error) { - scanner, err := NewCatFileBatchScanner() + scanner, err := NewPointerScanner() if err != nil { return nil, err }