renamed fs.EntryMetadataReadCloser as fs.Reader

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.

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

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
 	}

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,

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")
 }