Skip to content
This repository has been archived by the owner on Mar 29, 2023. It is now read-only.

feat: correctly report the size of symlinks #22

Merged
merged 2 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ env:
global:
- GOTFLAGS="-race"
matrix:
- BUILD_DEPTYPE=gx
- BUILD_DEPTYPE=gomod


Expand All @@ -24,7 +23,6 @@ script:

cache:
directories:
- $GOPATH/src/gx
- $GOPATH/pkg/mod
- $HOME/.cache/go-build

Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module github.com/ipfs/go-ipfs-files

require golang.org/x/sys v0.0.0-20190302025703-b6889370fb10

go 1.12
27 changes: 7 additions & 20 deletions linkfile.go
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
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
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion multipartfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
24 changes: 0 additions & 24 deletions package.json

This file was deleted.

2 changes: 1 addition & 1 deletion serialfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down