Adding ignore globs to fsadd. (#502)

* Adding ignore globs to fsadd.

Also fixed #408 whilst in the area - `util.addFromFs` goes up almost to the
root directory for files. It looks like for directories it was fixed in
42ccb00, but it is now fixed for files too.

* Linting fixes - see pull request #502

Author: JeffDownie

.gitignore

@@ -3,3 +3,4 @@
 test/setup/tmp-disposable-nodes-addrs.json
 dist
 coverage
+**/*.swp

README.md

@@ -150,10 +150,10 @@ Complete documentation for these methods is coming with: https://github.com/ipfs
 
 > `ipfs.util.addFromFs(path, option, callback)`
 
-Reads a file from `path` on the filesystem  and adds it to IPFS. If `path` is a directory, use option `{ recursive: true }` to add the directory and all its sub-directories.
+Reads a file from `path` on the filesystem  and adds it to IPFS. If `path` is a directory, use option `{ recursive: true }` to add the directory and all its sub-directories. To exclude fileglobs from the directory, use option `{ ignore: ['ignore/this/folder/**', 'and/this/file'] }`.
 
 ```JavaScript
-ipfs.util.addFromFs('path/to/a/file', { recursive: true }, (err, result) => {
+ipfs.util.addFromFs('path/to/a/folder', { recursive: true , ignore: ['subfolder/to/ignore/**']}, (err, result) => {
   if (err) {
     throw err
   }

src/get-files-stream.js

@@ -45,8 +45,12 @@ function loadPaths (opts, file) {
   }
 
   if (stats.isDirectory() && opts.recursive) {
-    const mg = new glob.sync.GlobSync(`${escape(file)}/**/*`, {
-      follow: followSymlinks
+    const globEscapedDir = escape(file) + (file.endsWith('/') ? '' : '/')
+    const mg = new glob.sync.GlobSync(`${globEscapedDir}**/*`, {
+      follow: followSymlinks,
+      ignore: (opts.ignore || []).map(function (ignoreGlob) {
+        return globEscapedDir + ignoreGlob
+      })
     })
 
     return mg.found
@@ -88,7 +92,7 @@ function loadPaths (opts, file) {
   }
 
   return {
-    path: file,
+    path: path.basename(file),
     content: fs.createReadStream(file)
   }
 }

test/ipfs-api/util.spec.js

@@ -60,11 +60,21 @@ describe('.util', () => {
     })
   })
 
+  it('.fsAdd add and ignore a directory', (done) => {
+    const filesPath = path.join(__dirname, '../fixtures/test-folder')
+    ipfs.util.addFromFs(filesPath, { recursive: true, ignore: ['files/**'] }, (err, result) => {
+      expect(err).to.not.exist
+      expect(result.length).to.be.below(9)
+      done()
+    })
+  })
+
   it('.fsAdd a file', (done) => {
     const filePath = path.join(__dirname, '../fixtures/testfile.txt')
     ipfs.util.addFromFs(filePath, (err, result) => {
       expect(err).to.not.exist
-      expect(result.length).to.be.above(5)
+      expect(result.length).to.be.equal(1)
+      expect(result[0].path).to.be.equal('testfile.txt')
       done()
     })
   })