From cded7ba49b4c17c5a013bcaa4929944b9e0010f9 Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Fri, 26 Aug 2016 21:31:51 -0700
Subject: [PATCH] renamed fs.EntryMetadataReadCloser as fs.Reader

---
 fs/entry.go                  | 6 +++---
 fs/local_fs.go               | 2 +-
 internal/mockfs/mockfs.go    | 2 +-
 repo/repofs/repository_fs.go | 4 ++--
 upload/bundle.go             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fs/entry.go b/fs/entry.go
index 8ea2cbbba..75a8da359 100644
--- a/fs/entry.go
+++ b/fs/entry.go
@@ -94,8 +94,8 @@ func (e *EntryMetadata) FileMode() os.FileMode {
 // Entries is a list of entries sorted by name.
 type Entries []Entry
 
-// EntryMetadataReadCloser allows reading from a file and retrieving *EntryMetadata for its metadata.
-type EntryMetadataReadCloser interface {
+// Reader allows reading from a file and retrieving *EntryMetadata for its metadata.
+type Reader interface {
 	io.ReadCloser
 	EntryMetadata() (*EntryMetadata, error)
 }
@@ -103,7 +103,7 @@ type EntryMetadataReadCloser interface {
 // File represents an entry that is a file.
 type File interface {
 	Entry
-	Open() (EntryMetadataReadCloser, error)
+	Open() (Reader, error)
 }
 
 // Directory represents contents of a directory.
diff --git a/fs/local_fs.go b/fs/local_fs.go
index 330b6eb8e..242fa07e2 100644
--- a/fs/local_fs.go
+++ b/fs/local_fs.go
@@ -66,7 +66,7 @@ func (erc *fileWithMetadata) EntryMetadata() (*EntryMetadata, error) {
 	return entryMetadataFromFileInfo(fi), nil
 }
 
-func (fsf *filesystemFile) Open() (EntryMetadataReadCloser, error) {
+func (fsf *filesystemFile) Open() (Reader, error) {
 	f, err := os.Open(fsf.path)
 	if err != nil {
 		return nil, err
diff --git a/internal/mockfs/mockfs.go b/internal/mockfs/mockfs.go
index 4f55a0373..9df2a7b5d 100644
--- a/internal/mockfs/mockfs.go
+++ b/internal/mockfs/mockfs.go
@@ -163,7 +163,7 @@ func (ifr *fileReader) Close() error {
 }
 
 // Open opens the file for reading, optionally simulating error.
-func (imf *File) Open() (fs.EntryMetadataReadCloser, error) {
+func (imf *File) Open() (fs.Reader, error) {
 	if imf.openError != nil {
 		return nil, imf.openError
 	}
diff --git a/repo/repofs/repository_fs.go b/repo/repofs/repository_fs.go
index 85016452e..09edeaa4c 100644
--- a/repo/repofs/repository_fs.go
+++ b/repo/repofs/repository_fs.go
@@ -56,7 +56,7 @@ func (rd *repositoryDirectory) Readdir() (fs.Entries, error) {
 	return entries, nil
 }
 
-func (rf *repositoryFile) Open() (fs.EntryMetadataReadCloser, error) {
+func (rf *repositoryFile) Open() (fs.Reader, error) {
 	r, err := rf.repo.Open(rf.Metadata().ObjectID)
 	if err != nil {
 		return nil, err
@@ -99,7 +99,7 @@ func (emrc *entryMetadataReadCloser) EntryMetadata() (*fs.EntryMetadata, error)
 	return emrc.metadata, nil
 }
 
-func withMetadata(rc io.ReadCloser, md *fs.EntryMetadata) fs.EntryMetadataReadCloser {
+func withMetadata(rc io.ReadCloser, md *fs.EntryMetadata) fs.Reader {
 	return &entryMetadataReadCloser{
 		rc,
 		md,
diff --git a/upload/bundle.go b/upload/bundle.go
index 12e6c94f1..228943998 100644
--- a/upload/bundle.go
+++ b/upload/bundle.go
@@ -40,6 +40,6 @@ func (f *bundledFile) Metadata() *fs.EntryMetadata {
 	return f.metadata
 }
 
-func (f *bundledFile) Open() (fs.EntryMetadataReadCloser, error) {
+func (f *bundledFile) Open() (fs.Reader, error) {
 	panic("Open() is not meant to be called")
 }