fix: tag stdin with mtime and mode when piping to cli 'add'

Converts the stdin stream to file object and tags that file with the mtime and mode. fixes ipfs#2763
kanej · Mar 24, 2020 · 4a5c571 · 4a5c571
1 parent bfba767
commit 4a5c571
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/packages/ipfs/src/cli/commands/add.js b/packages/ipfs/src/cli/commands/add.js
@@ -236,7 +236,11 @@ module.exports = {
         mode: argv.mode,
         mtime
       })
-      : getStdin() // Pipe directly to ipfs.add
+      : {
+        content: getStdin(),
+        mode: argv.mode,
+        mtime
+      } // Pipe to ipfs.add tagging with mode and mtime
 
     let finalCid
 

diff --git a/packages/ipfs/test/cli/files.js b/packages/ipfs/test/cli/files.js
@@ -157,7 +157,9 @@ describe('files', () => {
   it('add from pipe', async () => {
     const cid = new CID('QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
 
-    ipfs.add.withArgs(matchIterable(), defaultAddArgs()).returns([{
+    ipfs.add.withArgs(sinon.match({
+      content: matchIterable()
+    }), defaultAddArgs()).returns([{
       cid,
       path: 'readme'
     }])
@@ -173,6 +175,28 @@ describe('files', () => {
     expect(out).to.equal(`added ${cid} ${cid}\n`)
   })
 
+  it('add from pipe with mtime=100', async () => {
+    const cid = new CID('QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')
+
+    ipfs.add.withArgs(sinon.match({
+      content: matchIterable(),
+      mtime: { secs: 100 }
+    }), defaultAddArgs()).returns([{
+      cid,
+      path: 'readme'
+    }])
+
+    const proc = cli('add --mtime=100', {
+      ipfs,
+      getStdin: function * () {
+        yield Buffer.from('hello\n')
+      }
+    })
+
+    const out = await proc
+    expect(out).to.equal(`added ${cid} ${cid}\n`)
+  })
+
   it('add --quiet', async () => {
     const cid = new CID('QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB')