From 8992da288c60477aaf11a252df89eddadfbb0edd Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Thu, 23 May 2019 21:32:14 +0100 Subject: [PATCH 1/3] fix: file support when added as object License: MIT Signed-off-by: Alan Shaw --- src/core/components/files-regular/add-pull-stream.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/components/files-regular/add-pull-stream.js b/src/core/components/files-regular/add-pull-stream.js index c976fcf5df..8f46c8913f 100644 --- a/src/core/components/files-regular/add-pull-stream.js +++ b/src/core/components/files-regular/add-pull-stream.js @@ -74,12 +74,16 @@ function normalizeContent (content, opts) { } if (data && data.content && typeof data.content !== 'function') { + if (supportsFileReader && kindOf(data.content) === 'file') { + data = { path: data.path, content: toPull.source(streamFromFileReader(data.content)) } + } + if (Buffer.isBuffer(data.content)) { - data.content = pullValues([data.content]) + data = { path: data.path, content: pullValues([data.content]) } } if (isStream.readable(data.content)) { - data.content = toPull.source(data.content) + data = { path: data.path, content: toPull.source(data.content) } } } From a9d37c1dbd17c28da92457981cd756af1ac6ae64 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Thu, 23 May 2019 21:34:56 +0100 Subject: [PATCH 2/3] chore: update interface-ipfs-core dep License: MIT Signed-off-by: Alan Shaw --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e3a5cb166..63639d8db4 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "execa": "^1.0.0", "form-data": "^2.3.3", "hat": "0.0.3", - "interface-ipfs-core": "~0.103.0", + "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#fix/file-support", "ipfsd-ctl": "~0.42.0", "libp2p-websocket-star": "~0.10.2", "ncp": "^2.0.0", From 0c4f0a79c53ebd2ed87a82ca73c651850a76a96d Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Fri, 24 May 2019 09:08:25 +0100 Subject: [PATCH 3/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63639d8db4..fb51528c2c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "execa": "^1.0.0", "form-data": "^2.3.3", "hat": "0.0.3", - "interface-ipfs-core": "github:ipfs/interface-js-ipfs-core#fix/file-support", + "interface-ipfs-core": "~0.104.0", "ipfsd-ctl": "~0.42.0", "libp2p-websocket-star": "~0.10.2", "ncp": "^2.0.0",