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 --- storage/memory/object.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'storage/memory/object.go') diff --git a/storage/memory/object.go b/storage/memory/object.go index eda6ab7..125e887 100644 --- a/storage/memory/object.go +++ b/storage/memory/object.go @@ -2,7 +2,7 @@ package memory import ( "bytes" - "io" + "io/ioutil" "gopkg.in/src-d/go-git.v3/core" ) @@ -39,17 +39,21 @@ func (o *Object) Size() int64 { return o.size } // SetSize set the object size, the given size should be written afterwards func (o *Object) SetSize(s int64) { o.size = s } -// Reader returns a io.Reader used to read the object content -func (o *Object) Reader() io.Reader { - return bytes.NewBuffer(o.content) +// Reader returns a core.ObjectReader used to read the object's content. +func (o *Object) Reader() (core.ObjectReader, error) { + return ioutil.NopCloser(bytes.NewBuffer(o.content)), nil } -// Writer returns a io.Writed used to write the object content -func (o *Object) Writer() io.Writer { - return o +// Writer returns a core.ObjectWriter used to write the object's content. +func (o *Object) Writer() (core.ObjectWriter, error) { + return o, nil } func (o *Object) Write(p []byte) (n int, err error) { o.content = append(o.content, p...) return len(p), nil } + +// Close releases any resources consumed by the object when it is acting as a +// core.ObjectWriter. +func (o *Object) Close() error { return nil } -- cgit