refactor: only create new CID if not already stringy

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>
ipfs · Jul 25, 2018 · d040f26 · d040f26
1 parent 25a8c4f
commit d040f26
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/core/components/files.js b/src/core/components/files.js
@@ -98,7 +98,7 @@ function preloadFile (self, opts, file, cb) {
 
   if (!shouldPreload) return cb(null, file)
 
-  self._preload(new CID(file.hash), (err) => {
+  self._preload(file.hash, (err) => {
     // Preload error is not fatal
     if (err) console.error(err)
     cb(null, file)

diff --git a/src/core/preload.js b/src/core/preload.js
@@ -4,6 +4,7 @@ const setImmediate = require('async/setImmediate')
 const each = require('async/each')
 const toUri = require('multiaddr-to-uri')
 const debug = require('debug')
+const CID = require('cids')
 const preload = require('./runtime/preload-nodejs')
 
 const log = debug('jsipfs:preload')
@@ -44,7 +45,15 @@ module.exports = (options) => {
         return cb(err)
       }
 
-      const url = `${gatewayUri}/ipfs/${cid.toBaseEncodedString()}#${redirectOptOutHint}`
+      if (typeof cid !== 'string') {
+        try {
+          cid = new CID(cid).toBaseEncodedString()
+        } catch (err) {
+          return cb(err)
+        }
+      }
+
+      const url = `${gatewayUri}/ipfs/${cid}#${redirectOptOutHint}`
       preload(url, cb)
     }, callback)
   }