Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ipfs add -r follow symlinks #620

Closed
wants to merge 2 commits into from
Closed

Make ipfs add -r follow symlinks #620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fbb90c
Follow symlinks on `ipfs add -r`
mildred Jan 22, 2015
09607fe
Make `ipfs add -r` faster: do away with lstat syscall for each file
mildred Jan 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 13 additions & 24 deletions commands/files/serialfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,30 @@ import (
"syscall"
)

type sortFIByName []os.FileInfo
type sortFIByName []string

func (es sortFIByName) Len() int { return len(es) }
func (es sortFIByName) Swap(i, j int) { es[i], es[j] = es[j], es[i] }
func (es sortFIByName) Less(i, j int) bool { return es[i].Name() < es[j].Name() }
func (es sortFIByName) Less(i, j int) bool { return es[i] < es[j] }

// serialFile implements File, and reads from a path on the OS filesystem.
// No more than one file will be opened at a time (directories will advance
// to the next file when NextFile() is called).
type serialFile struct {
path string
files []os.FileInfo
files []string
current *os.File
}

func NewSerialFile(path string, file *os.File) (File, error) {
stat, err := file.Stat()
if err != nil {
return nil, err
}

return newSerialFile(path, file, stat)
}

func newSerialFile(path string, file *os.File, stat os.FileInfo) (File, error) {
// for non-directories, return a ReaderFile
if !stat.IsDir() {
// try to list the content of the directory, and if it fails with no entries
// found, assume it is not a directory and return a ReaderFile. if we can,
// we should try to test that the error is ENOENT or ENOTDIR.
// See getdents(2)
contents, err := file.Readdirnames(0)
if err != nil && len(contents) == 0 {
return &ReaderFile{path, file}, nil
}

// for directories, stat all of the contents first, so we know what files to
// open when NextFile() is called
contents, err := file.Readdir(0)
if err != nil {
} else if err != nil {
return nil, err
}

Expand Down Expand Up @@ -76,11 +66,10 @@ func (f *serialFile) NextFile() (File, error) {
return nil, io.EOF
}

stat := f.files[0]
// open the next file
filePath := fp.Join(f.path, f.files[0])
f.files = f.files[1:]

// open the next file
filePath := fp.Join(f.path, stat.Name())
file, err := os.Open(filePath)
if err != nil {
return nil, err
Expand All @@ -90,7 +79,7 @@ func (f *serialFile) NextFile() (File, error) {
// recursively call the constructor on the next file
// if it's a regular file, we will open it as a ReaderFile
// if it's a directory, files in it will be opened serially
return newSerialFile(filePath, file, stat)
return NewSerialFile(filePath, file)
}

func (f *serialFile) FileName() string {
Expand Down