From 9e5dfe2fc99c3c256b21887eb74fbc7a9b687055 Mon Sep 17 00:00:00 2001 From: gatesvp Date: Sun, 3 May 2015 22:59:27 -0700 Subject: [PATCH] Make ipfs add ignore files by default. --- commands/files/is_hidden.go | 19 +++++++++ commands/files/is_hidden_windows.go | 29 +++++++++++++ commands/files/serialfile.go | 2 +- core/commands/add.go | 66 +++++++++++++++++------------ 4 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 commands/files/is_hidden.go create mode 100644 commands/files/is_hidden_windows.go diff --git a/commands/files/is_hidden.go b/commands/files/is_hidden.go new file mode 100644 index 00000000000..004ec04e51a --- /dev/null +++ b/commands/files/is_hidden.go @@ -0,0 +1,19 @@ +// +build !windows + +package files + +import ( + "path/filepath" + "strings" +) + +func IsHidden(f File) bool { + + fName := filepath.Base(f.FileName()) + + if strings.HasPrefix(fName, ".") { + return true, nil + } + + return false, nil +} diff --git a/commands/files/is_hidden_windows.go b/commands/files/is_hidden_windows.go new file mode 100644 index 00000000000..2f310d4448a --- /dev/null +++ b/commands/files/is_hidden_windows.go @@ -0,0 +1,29 @@ +// +build windows + +package files + +import ( + "path/filepath" + "strings" + "syscall" +) + +func IsHidden(f File) bool { + + fName := filepath.Base(f.FileName()) + + if strings.HasPrefix(fName, ".") { + return true + } + + p, e := syscall.UTF16PtrFromString(f.FileName()) + if e != nil { + return false + } + + attrs, e := syscall.GetFileAttributes(p) + if e != nil { + return false + } + return attrs&syscall.FILE_ATTRIBUTE_HIDDEN != 0, nil +} diff --git a/commands/files/serialfile.go b/commands/files/serialfile.go index aeba01fa7ed..461bde33600 100644 --- a/commands/files/serialfile.go +++ b/commands/files/serialfile.go @@ -3,7 +3,7 @@ package files import ( "io" "os" - fp "path" + fp "path/filepath" "sort" "syscall" ) diff --git a/core/commands/add.go b/core/commands/add.go index 85692337b7f..501b94a0820 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -29,6 +29,7 @@ const progressReaderIncrement = 1024 * 256 const ( progressOptionName = "progress" wrapOptionName = "wrap-with-directory" + hiddenOptionName = "hidden" ) type AddedObject struct { @@ -57,6 +58,7 @@ remains to be implemented. cmds.BoolOption(progressOptionName, "p", "Stream progress data"), cmds.BoolOption(wrapOptionName, "w", "Wrap files with a directory object"), cmds.BoolOption("t", "trickle", "Use trickle-dag format for dag generation"), + cmds.BoolOption(hiddenOptionName, "Include files that are hidden"), }, PreRun: func(req cmds.Request) error { if quiet, _, _ := req.Option("quiet").Bool(); quiet { @@ -90,6 +92,7 @@ remains to be implemented. progress, _, _ := req.Option(progressOptionName).Bool() wrap, _, _ := req.Option(wrapOptionName).Bool() + hidden, _, _ := req.Option(hiddenOptionName).Bool() outChan := make(chan interface{}) res.SetOutput((<-chan interface{})(outChan)) @@ -107,7 +110,7 @@ remains to be implemented. return } - rootnd, err := addFile(n, file, outChan, progress, wrap) + rootnd, err := addFile(n, file, outChan, progress, wrap, hidden) if err != nil { res.SetError(err, cmds.ErrNormal) return @@ -227,9 +230,12 @@ func add(n *core.IpfsNode, reader io.Reader) (*dag.Node, error) { return node, nil } -func addFile(n *core.IpfsNode, file files.File, out chan interface{}, progress bool, wrap bool) (*dag.Node, error) { +func addFile(n *core.IpfsNode, file files.File, out chan interface{}, progress bool, wrap bool, hidden bool) (*dag.Node, error) { if file.IsDirectory() { - return addDir(n, file, out, progress) + return addDir(n, file, out, progress, hidden) + } else if fileIsHidden := files.IsHidden(file); fileIsHidden && !hidden { + log.Infof("%s is a hidden file, skipping", file.FileName()) + return nil, &hiddenFileError{file.FileName()} } // if the progress flag was specified, wrap the file so that we can send @@ -263,43 +269,51 @@ func addFile(n *core.IpfsNode, file files.File, out chan interface{}, progress b return dagnode, nil } -func addDir(n *core.IpfsNode, dir files.File, out chan interface{}, progress bool) (*dag.Node, error) { - log.Infof("adding directory: %s", dir.FileName()) +func addDir(n *core.IpfsNode, dir files.File, out chan interface{}, progress bool, hidden bool) (*dag.Node, error) { tree := &dag.Node{Data: ft.FolderPBData()} + if dirIsHidden := files.IsHidden(dir); dirIsHidden && !hidden { + log.Infof("ignoring directory: %s", dir.FileName()) + } else { + log.Infof("adding directory: %s", dir.FileName()) + for { + file, err := dir.NextFile() + if err != nil && err != io.EOF { + return nil, err + } + if file == nil { + break + } - for { - file, err := dir.NextFile() - if err != nil && err != io.EOF { - return nil, err - } - if file == nil { - break + node, err := addFile(n, file, out, progress, false, hidden) + if _, ok := err.(*hiddenFileError); ok { + // hidden file error, set the node to nil for below + node = nil + } else if err != nil { + return nil, err + } + + if node != nil { + _, name := path.Split(file.FileName()) + + err = tree.AddNodeLink(name, node) + if err != nil { + return nil, err + } + } } - node, err := addFile(n, file, out, progress, false) + err := outputDagnode(out, dir.FileName(), tree) if err != nil { return nil, err } - _, name := path.Split(file.FileName()) - - err = tree.AddNodeLink(name, node) + _, err = n.DAG.Add(tree) if err != nil { return nil, err } } - err := outputDagnode(out, dir.FileName(), tree) - if err != nil { - return nil, err - } - - _, err = n.DAG.Add(tree) - if err != nil { - return nil, err - } - return tree, nil }