Merge pull request #22 from ipfs/feat/symlink-size

feat: correctly report the size of symlinks

.travis.yml

@@ -10,7 +10,6 @@ env:
   global:
     - GOTFLAGS="-race"
   matrix:
-    - BUILD_DEPTYPE=gx
     - BUILD_DEPTYPE=gomod
 
 
@@ -24,7 +23,6 @@ script:
 
 cache:
   directories:
-    - $GOPATH/src/gx
     - $GOPATH/pkg/mod
     - $HOME/.cache/go-build
 

go.mod

 module github.com/ipfs/go-ipfs-files
 
 require golang.org/x/sys v0.0.0-20190302025703-b6889370fb10
+
+go 1.12

linkfile.go

 package files
 
 import (
-	"io"
-	"os"
 	"strings"
 )
 
 type Symlink struct {
 	Target string
-	stat   os.FileInfo
 
-	reader io.Reader
+	reader strings.Reader
 }
 
-func NewLinkFile(target string, stat os.FileInfo) File {
-	return &Symlink{
-		Target: target,
-		stat:   stat,
-		reader: strings.NewReader(target),
-	}
+func NewLinkFile(target string) File {
+	lf := &Symlink{Target: target}
+	lf.reader.Reset(lf.Target)
+	return lf
 }
 
 func (lf *Symlink) Close() error {
-	if c, ok := lf.reader.(io.Closer); ok {
-		return c.Close()
-	}
-
 	return nil
 }
 
@@ -34,15 +25,11 @@ func (lf *Symlink) Read(b []byte) (int, error) {
 }
 
 func (lf *Symlink) Seek(offset int64, whence int) (int64, error) {
-	if s, ok := lf.reader.(io.Seeker); ok {
-		return s.Seek(offset, whence)
-	}
-
-	return 0, ErrNotSupported
+	return lf.reader.Seek(offset, whence)
 }
 
 func (lf *Symlink) Size() (int64, error) {
-	return 0, ErrNotSupported
+	return lf.reader.Size(), nil
 }
 
 func ToSymlink(n Node) *Symlink {

multipartfile.go

@@ -99,7 +99,7 @@ func (w *multipartWalker) nextFile() (Node, error) {
 			return nil, err
 		}
 
-		return NewLinkFile(string(out), nil), nil
+		return NewLinkFile(string(out)), nil
 	default:
 		return &ReaderFile{
 			reader:  part,

package.json

-{
-  "author": "magik6k",
-  "bugs": {
-    "url": "https://github.com/ipfs/go-ipfs-files"
-  },
-  "gx": {
-    "dvcsimport": "github.com/ipfs/go-ipfs-files"
-  },
-  "gxDependencies": [
-    {
-      "author": "The Go Authors",
-      "hash": "QmVGjyM9i2msKvLXwh9VosCTgP4mL91kC7hDmqnwTTx6Hu",
-      "name": "sys",
-      "version": "0.2.0"
-    }
-  ],
-  "gxVersion": "0.11.0",
-  "language": "go",
-  "license": "",
-  "name": "go-ipfs-files",
-  "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "2.0.7"
-}
-

serialfile.go

@@ -53,7 +53,7 @@ func NewSerialFile(path string, hidden bool, stat os.FileInfo) (Node, error) {
 		if err != nil {
 			return nil, err
 		}
-		return NewLinkFile(target, stat), nil
+		return NewLinkFile(target), nil
 	default:
 		return nil, fmt.Errorf("unrecognized file type for %s: %s", path, mode.String())
 	}