From 0d999e1db6cd8736ab697de8ce848fa3a5274b9f Mon Sep 17 00:00:00 2001 From: Joshua Sjoding Date: Wed, 24 Feb 2016 22:40:30 -0800 Subject: Refactor to use core.ObjectReader and core.ObjectWriter * New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future * New function signatures provide proper error handling * ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively * Object.Reader now returns (ObjectReader, error) * Object.Writer now returns (ObjectWriter, error) * File.Contents now returns (string, error) * File.Lines now returns ([]string, error) * Blob.Reader now returns (core.ObjectReader, error) * Added internal close helper function for deferred calls to Close that need to check the return value --- tag.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tag.go') diff --git a/tag.go b/tag.go index 4d2253a..4b3eb4d 100644 --- a/tag.go +++ b/tag.go @@ -29,14 +29,20 @@ type Tag struct { } // Decode transforms a core.Object into a Tag struct. -func (t *Tag) Decode(o core.Object) error { +func (t *Tag) Decode(o core.Object) (err error) { if o.Type() != core.TagObject { return ErrUnsupportedObject } t.Hash = o.Hash() - r := bufio.NewReader(o.Reader()) + reader, err := o.Reader() + if err != nil { + return err + } + defer close(reader, &err) + + r := bufio.NewReader(reader) for { line, err := r.ReadSlice('\n') if err != nil && err != io.EOF { -- cgit