fix: file support when added as object (#2105)

License: MIT Signed-off-by: Alan Shaw <[email protected]>
ipfs · May 24, 2019 · ba80e40 · ba80e40
1 parent 7815c2f
commit ba80e40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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": "~0.104.0",
     "ipfsd-ctl": "~0.42.0",
     "libp2p-websocket-star": "~0.10.2",
     "ncp": "^2.0.0",

diff --git 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) }
       }
     }