Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit e11d86b

Browse files
committed
feat: migrate files to use IPLD Resolver
1 parent f41c680 commit e11d86b

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/core/components/files.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ const pull = require('pull-stream')
1111
const sort = require('pull-sort')
1212
const toStream = require('pull-stream-to-stream')
1313
const toPull = require('stream-to-pull-stream')
14+
const CID = require('cids')
1415

1516
module.exports = function files (self) {
1617
const createAddPullStream = () => {
1718
return pull(
1819
pull.map(normalizeContent),
1920
pull.flatten(),
20-
importer(self._dagService),
21+
importer(self._ipldResolver),
2122
pull.asyncMap(prepareFile.bind(null, self))
2223
)
2324
}
@@ -36,7 +37,7 @@ module.exports = function files (self) {
3637

3738
pull(
3839
pull.values(normalizeContent(data)),
39-
importer(self._dagService),
40+
importer(self._ipldResolver),
4041
pull.asyncMap(prepareFile.bind(null, self)),
4142
sort((a, b) => {
4243
if (a.path < b.path) return 1
@@ -52,7 +53,7 @@ module.exports = function files (self) {
5253
return callback(new Error('You must supply a multihash'))
5354
}
5455

55-
self._dagService.get(hash, (err, node) => {
56+
self._ipldResolver.get(new CID(hash), (err, node) => {
5657
if (err) {
5758
return callback(err)
5859
}
@@ -65,9 +66,11 @@ module.exports = function files (self) {
6566
}
6667

6768
pull(
68-
exporter(hash, self._dagService),
69+
exporter(hash, self._ipldResolver),
6970
pull.collect((err, files) => {
70-
if (err) return callback(err)
71+
if (err) {
72+
return callback(err)
73+
}
7174
callback(null, toStream.source(files[0].content))
7275
})
7376
)
@@ -76,7 +79,7 @@ module.exports = function files (self) {
7679

7780
get: promisify((hash, callback) => {
7881
callback(null, toStream.source(pull(
79-
exporter(hash, self._dagService),
82+
exporter(hash, self._ipldResolver),
8083
pull.map((file) => {
8184
if (file.content) {
8285
file.content = toStream.source(file.content)
@@ -89,15 +92,17 @@ module.exports = function files (self) {
8992
}),
9093

9194
getPull: promisify((hash, callback) => {
92-
callback(null, exporter(hash, self._dagService))
95+
callback(null, exporter(hash, self._ipldResolver))
9396
})
9497
}
9598
}
9699

97100
function prepareFile (self, file, cb) {
98101
const bs58mh = multihashes.toB58String(file.multihash)
99102
self.object.get(file.multihash, (err, node) => {
100-
if (err) return cb(err)
103+
if (err) {
104+
return cb(err)
105+
}
101106

102107
cb(null, {
103108
path: file.path || bs58mh,

0 commit comments

Comments
 (0)