remove irrelevant apis and minor refactor

Signed-off-by: Max Peng <[email protected]>

Author: pengisgood

mfs.go

@@ -7,22 +7,16 @@ import (
 	files "github.com/ipfs/go-ipfs-files"
 )
 
+type FilesOpt func(*RequestBuilder) error
+
 type MfsLsEntry struct {
 	Name string
 	Type uint8
 	Size uint64
 	Hash string
 }
 
-type filesLsOutput struct {
-	Entries []*MfsLsEntry
-}
-
-type filesFlushOutput struct {
-	Cid string
-}
-
-type filesStatOutput struct {
+type FilesStatObject struct {
 	Blocks         int
 	CumulativeSize uint64
 	Hash           string
@@ -33,7 +27,14 @@ type filesStatOutput struct {
 	WithLocality   bool
 }
 
-type filesOpt func(*RequestBuilder) error
+type filesLsOutput struct {
+	Entries []*MfsLsEntry
+}
+
+type filesFlushOutput struct {
+	Cid string
+}
+
 type filesLs struct{}
 type filesChcid struct{}
 type filesMkdir struct{}
@@ -50,176 +51,160 @@ var (
 	FilesStat  filesStat
 )
 
-// Long use long listing format
-func (filesLs) Long(long bool) filesOpt {
+// Stat use long listing format
+func (filesLs) Stat(long bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("long", long)
 		return nil
 	}
 }
 
-// U do not sort; list entries in directory order
-func (filesLs) U(u bool) filesOpt {
-	return func(rb *RequestBuilder) error {
-		rb.Option("U", u)
-		return nil
-	}
-}
-
 // CidVersion cid version to use. (experimental)
-func (filesChcid) CidVersion(version int) filesOpt {
+func (filesChcid) CidVersion(version int) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("cid-version", version)
 		return nil
 	}
 }
 
 // Hash hash function to use. Will set Cid version to 1 if used. (experimental)
-func (filesChcid) Hash(hash string) filesOpt {
+func (filesChcid) Hash(hash string) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("hash", hash)
 		return nil
 	}
 }
 
 // Parents no error if existing, make parent directories as needed
-func (filesMkdir) Parents(parents bool) filesOpt {
+func (filesMkdir) Parents(parents bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("parents", parents)
 		return nil
 	}
 }
 
 // CidVersion cid version to use. (experimental)
-func (filesMkdir) CidVersion(version int) filesOpt {
+func (filesMkdir) CidVersion(version int) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("cid-version", version)
 		return nil
 	}
 }
 
 // Hash hash function to use. Will set Cid version to 1 if used. (experimental)
-func (filesMkdir) Hash(hash string) filesOpt {
+func (filesMkdir) Hash(hash string) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("hash", hash)
 		return nil
 	}
 }
 
 // Offset byte offset to begin reading from
-func (filesRead) Offset(offset int64) filesOpt {
+func (filesRead) Offset(offset int64) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("offset", offset)
 		return nil
 	}
 }
 
 // Count maximum number of bytes to read
-func (filesRead) Count(count int64) filesOpt {
+func (filesRead) Count(count int64) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("count", count)
 		return nil
 	}
 }
 
-// Format print statistics in given format. Allowed tokens: <hash> <size> <cumulsize> <type> <childs>. Conflicts with other format options.
-func (filesStat) Format(format string) filesOpt {
-	return func(rb *RequestBuilder) error {
-		rb.Option("format", format)
-		return nil
-	}
-}
-
 // Hash print only hash. Implies '--format=<hash>'. Conflicts with other format options.
-func (filesStat) Hash(hash bool) filesOpt {
+func (filesStat) Hash(hash bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("hash", hash)
 		return nil
 	}
 }
 
 // Size print only size. Implies '--format=<cumulsize>'. Conflicts with other format options.
-func (filesStat) Size(size bool) filesOpt {
+func (filesStat) Size(size bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("size", size)
 		return nil
 	}
 }
 
 // WithLocal compute the amount of the dag that is local, and if possible the total size.
-func (filesStat) WithLocal(withLocal bool) filesOpt {
+func (filesStat) WithLocal(withLocal bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("with-local", withLocal)
 		return nil
 	}
 }
 
 // Offset byte offset to begin writing at
-func (filesWrite) Offset(offset int64) filesOpt {
+func (filesWrite) Offset(offset int64) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("offset", offset)
 		return nil
 	}
 }
 
 // Create create the file if it does not exist
-func (filesWrite) Create(create bool) filesOpt {
+func (filesWrite) Create(create bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("create", create)
 		return nil
 	}
 }
 
 // Parents make parent directories as needed
-func (filesWrite) Parents(parents bool) filesOpt {
+func (filesWrite) Parents(parents bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("parents", parents)
 		return nil
 	}
 }
 
 // Truncate truncate the file to size zero before writing
-func (filesWrite) Truncate(truncate bool) filesOpt {
+func (filesWrite) Truncate(truncate bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("truncate", truncate)
 		return nil
 	}
 }
 
 // Count maximum number of bytes to write
-func (filesWrite) Count(count int64) filesOpt {
+func (filesWrite) Count(count int64) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("count", count)
 		return nil
 	}
 }
 
 // RawLeaves use raw blocks for newly created leaf nodes. (experimental)
-func (filesWrite) RawLeaves(rawLeaves bool) filesOpt {
+func (filesWrite) RawLeaves(rawLeaves bool) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("raw-leaves", rawLeaves)
 		return nil
 	}
 }
 
 // CidVersion cid version to use. (experimental)
-func (filesWrite) CidVersion(version int) filesOpt {
+func (filesWrite) CidVersion(version int) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("cid-version", version)
 		return nil
 	}
 }
 
 // Hash hash function to use. Will set Cid version to 1 if used. (experimental)
-func (filesWrite) Hash(hash string) filesOpt {
+func (filesWrite) Hash(hash string) FilesOpt {
 	return func(rb *RequestBuilder) error {
 		rb.Option("hash", hash)
 		return nil
 	}
 }
 
 // FilesChcid change the cid version or hash function of the root node of a given path
-func (s *Shell) FilesChcid(path string, options ...filesOpt) error {
+func (s *Shell) FilesChcid(path string, options ...FilesOpt) error {
 	if len(path) == 0 {
 		path = "/"
 	}
@@ -231,15 +216,13 @@ func (s *Shell) FilesChcid(path string, options ...filesOpt) error {
 		}
 	}
 
-	resp, err := rb.Send(context.Background())
-	return handleResponse(resp, err)
+	return rb.Exec(context.Background(), nil)
 }
 
 // FilesCp copy any IPFS files and directories into MFS (or copy within MFS)
 func (s *Shell) FilesCp(src string, dest string) error {
-	resp, err := s.Request("files/cp", src, dest).
-		Send(context.Background())
-	return handleResponse(resp, err)
+	return s.Request("files/cp", src, dest).
+		Exec(context.Background(), nil)
 }
 
 // FilesFlush flush a given path's data to disk
@@ -257,7 +240,7 @@ func (s *Shell) FilesFlush(path string) (string, error) {
 }
 
 // FilesLs list directories in the local mutable namespace
-func (s *Shell) FilesLs(path string, options ...filesOpt) ([]*MfsLsEntry, error) {
+func (s *Shell) FilesLs(path string, options ...FilesOpt) ([]*MfsLsEntry, error) {
 	if len(path) == 0 {
 		path = "/"
 	}
@@ -276,27 +259,25 @@ func (s *Shell) FilesLs(path string, options ...filesOpt) ([]*MfsLsEntry, error)
 }
 
 // FilesMkdir make directories
-func (s *Shell) FilesMkdir(path string, options ...filesOpt) error {
+func (s *Shell) FilesMkdir(path string, options ...FilesOpt) error {
 	rb := s.Request("files/mkdir", path)
 	for _, opt := range options {
 		if err := opt(rb); err != nil {
 			return err
 		}
 	}
 
-	resp, err := rb.Send(context.Background())
-	return handleResponse(resp, err)
+	return rb.Exec(context.Background(), nil)
 }
 
 // FilesMv move files
 func (s *Shell) FilesMv(src string, dest string) error {
-	resp, err := s.Request("files/mv", src, dest).
-		Send(context.Background())
-	return handleResponse(resp, err)
+	return s.Request("files/mv", src, dest).
+		Exec(context.Background(), nil)
 }
 
 // FilesRead read a file in a given MFS
-func (s *Shell) FilesRead(path string, options ...filesOpt) (io.ReadCloser, error) {
+func (s *Shell) FilesRead(path string, options ...FilesOpt) (io.ReadCloser, error) {
 	rb := s.Request("files/read", path)
 	for _, opt := range options {
 		if err := opt(rb); err != nil {
@@ -317,15 +298,14 @@ func (s *Shell) FilesRead(path string, options ...filesOpt) (io.ReadCloser, erro
 
 // FilesRm remove a file
 func (s *Shell) FilesRm(path string, force bool) error {
-	resp, err := s.Request("files/rm", path).
+	return s.Request("files/rm", path).
 		Option("force", force).
-		Send(context.Background())
-	return handleResponse(resp, err)
+		Exec(context.Background(), nil)
 }
 
 // FilesStat display file status
-func (s *Shell) FilesStat(path string, options ...filesOpt) (*filesStatOutput, error) {
-	out := &filesStatOutput{}
+func (s *Shell) FilesStat(path string, options ...FilesOpt) (*FilesStatObject, error) {
+	out := &FilesStatObject{}
 
 	rb := s.Request("files/stat", path)
 	for _, opt := range options {
@@ -342,7 +322,7 @@ func (s *Shell) FilesStat(path string, options ...filesOpt) (*filesStatOutput, e
 }
 
 // FilesWrite write to a mutable file in a given filesystem
-func (s *Shell) FilesWrite(path string, data io.Reader, options ...filesOpt) error {
+func (s *Shell) FilesWrite(path string, data io.Reader, options ...FilesOpt) error {
 	fr := files.NewReaderFile(data)
 	slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry("", fr)})
 	fileReader := files.NewMultiFileReader(slf, true)
@@ -354,17 +334,5 @@ func (s *Shell) FilesWrite(path string, data io.Reader, options ...filesOpt) err
 		}
 	}
 
-	resp, err := rb.Body(fileReader).Send(context.Background())
-	return handleResponse(resp, err)
-}
-
-func handleResponse(resp *Response, err error) error {
-	if err != nil {
-		return err
-	}
-	if resp.Error != nil {
-		return resp.Error
-	}
-
-	return nil
+	return rb.Body(fileReader).Exec(context.Background(), nil)
 }

mfs_test.go

@@ -78,7 +78,7 @@ func TestFilesLs(t *testing.T) {
 	is := is.New(t)
 	s := NewShell(shellUrl)
 
-	list, err := s.FilesLs("/testdata", FilesLs.Long(true), FilesLs.U(true))
+	list, err := s.FilesLs("/testdata", FilesLs.Stat(true))
 	is.Nil(err)
 
 	is.Equal(len(list), 2)