From 65dc4f9f192cc013e4765fb1162ce6ebda16573d Mon Sep 17 00:00:00 2001
From: Miguel Molina <miguel@erizocosmi.co>
Date: Thu, 9 Aug 2018 12:18:49 +0200
Subject: plumbing: packfile, rename DiskObject to FSObject

Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
---
 plumbing/format/packfile/disk_object.go | 64 ---------------------------------
 plumbing/format/packfile/fsobject.go    | 64 +++++++++++++++++++++++++++++++++
 plumbing/format/packfile/packfile.go    |  4 +--
 3 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 plumbing/format/packfile/disk_object.go
 create mode 100644 plumbing/format/packfile/fsobject.go

(limited to 'plumbing/format/packfile')

diff --git a/plumbing/format/packfile/disk_object.go b/plumbing/format/packfile/disk_object.go
deleted file mode 100644
index d3e8520..0000000
--- a/plumbing/format/packfile/disk_object.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package packfile
-
-import (
-	"io"
-
-	"gopkg.in/src-d/go-git.v4/plumbing"
-)
-
-// DiskObject is an object from the packfile on disk.
-type DiskObject struct {
-	hash     plumbing.Hash
-	h        *ObjectHeader
-	offset   int64
-	size     int64
-	typ      plumbing.ObjectType
-	packfile *Packfile
-}
-
-// NewDiskObject creates a new disk object.
-func NewDiskObject(
-	hash plumbing.Hash,
-	finalType plumbing.ObjectType,
-	offset int64,
-	contentSize int64,
-	packfile *Packfile,
-) *DiskObject {
-	return &DiskObject{
-		hash:     hash,
-		offset:   offset,
-		size:     contentSize,
-		typ:      finalType,
-		packfile: packfile,
-	}
-}
-
-// Reader implements the plumbing.EncodedObject interface.
-func (o *DiskObject) Reader() (io.ReadCloser, error) {
-	return o.packfile.getObjectContent(o.offset)
-}
-
-// SetSize implements the plumbing.EncodedObject interface. This method
-// is a noop.
-func (o *DiskObject) SetSize(int64) {}
-
-// SetType implements the plumbing.EncodedObject interface. This method is
-// a noop.
-func (o *DiskObject) SetType(plumbing.ObjectType) {}
-
-// Hash implements the plumbing.EncodedObject interface.
-func (o *DiskObject) Hash() plumbing.Hash { return o.hash }
-
-// Size implements the plumbing.EncodedObject interface.
-func (o *DiskObject) Size() int64 { return o.size }
-
-// Type implements the plumbing.EncodedObject interface.
-func (o *DiskObject) Type() plumbing.ObjectType {
-	return o.typ
-}
-
-// Writer implements the plumbing.EncodedObject interface. This method always
-// returns a nil writer.
-func (o *DiskObject) Writer() (io.WriteCloser, error) {
-	return nil, nil
-}
diff --git a/plumbing/format/packfile/fsobject.go b/plumbing/format/packfile/fsobject.go
new file mode 100644
index 0000000..d63127e
--- /dev/null
+++ b/plumbing/format/packfile/fsobject.go
@@ -0,0 +1,64 @@
+package packfile
+
+import (
+	"io"
+
+	"gopkg.in/src-d/go-git.v4/plumbing"
+)
+
+// FSObject is an object from the packfile on the filesystem.
+type FSObject struct {
+	hash     plumbing.Hash
+	h        *ObjectHeader
+	offset   int64
+	size     int64
+	typ      plumbing.ObjectType
+	packfile *Packfile
+}
+
+// NewFSObject creates a new filesystem object.
+func NewFSObject(
+	hash plumbing.Hash,
+	finalType plumbing.ObjectType,
+	offset int64,
+	contentSize int64,
+	packfile *Packfile,
+) *FSObject {
+	return &FSObject{
+		hash:     hash,
+		offset:   offset,
+		size:     contentSize,
+		typ:      finalType,
+		packfile: packfile,
+	}
+}
+
+// Reader implements the plumbing.EncodedObject interface.
+func (o *FSObject) Reader() (io.ReadCloser, error) {
+	return o.packfile.getObjectContent(o.offset)
+}
+
+// SetSize implements the plumbing.EncodedObject interface. This method
+// is a noop.
+func (o *FSObject) SetSize(int64) {}
+
+// SetType implements the plumbing.EncodedObject interface. This method is
+// a noop.
+func (o *FSObject) SetType(plumbing.ObjectType) {}
+
+// Hash implements the plumbing.EncodedObject interface.
+func (o *FSObject) Hash() plumbing.Hash { return o.hash }
+
+// Size implements the plumbing.EncodedObject interface.
+func (o *FSObject) Size() int64 { return o.size }
+
+// Type implements the plumbing.EncodedObject interface.
+func (o *FSObject) Type() plumbing.ObjectType {
+	return o.typ
+}
+
+// Writer implements the plumbing.EncodedObject interface. This method always
+// returns a nil writer.
+func (o *FSObject) Writer() (io.WriteCloser, error) {
+	return nil, nil
+}
diff --git a/plumbing/format/packfile/packfile.go b/plumbing/format/packfile/packfile.go
index 37743ba..df8a3d4 100644
--- a/plumbing/format/packfile/packfile.go
+++ b/plumbing/format/packfile/packfile.go
@@ -232,7 +232,7 @@ func (p *Packfile) nextObject() (plumbing.EncodedObject, error) {
 
 	p.offsetToType[h.Offset] = typ
 
-	return NewDiskObject(hash, typ, h.Offset, size, p), nil
+	return NewFSObject(hash, typ, h.Offset, size, p), nil
 }
 
 func (p *Packfile) getObjectContent(offset int64) (io.ReadCloser, error) {
@@ -410,7 +410,7 @@ func (p *Packfile) Close() error {
 	return closer.Close()
 }
 
-// MemoryObjectFromDisk converts a DiskObject to a MemoryObject.
+// MemoryObjectFromDisk converts a FSObject to a MemoryObject.
 func MemoryObjectFromDisk(obj plumbing.EncodedObject) (plumbing.EncodedObject, error) {
 	o2 := new(plumbing.MemoryObject)
 	o2.SetType(obj.Type())
-- 
cgit