@@ -11,13 +11,14 @@ const pull = require('pull-stream')
11
11
const sort = require ( 'pull-sort' )
12
12
const toStream = require ( 'pull-stream-to-stream' )
13
13
const toPull = require ( 'stream-to-pull-stream' )
14
+ const CID = require ( 'cids' )
14
15
15
16
module . exports = function files ( self ) {
16
17
const createAddPullStream = ( ) => {
17
18
return pull (
18
19
pull . map ( normalizeContent ) ,
19
20
pull . flatten ( ) ,
20
- importer ( self . _dagService ) ,
21
+ importer ( self . _ipldResolver ) ,
21
22
pull . asyncMap ( prepareFile . bind ( null , self ) )
22
23
)
23
24
}
@@ -36,7 +37,7 @@ module.exports = function files (self) {
36
37
37
38
pull (
38
39
pull . values ( normalizeContent ( data ) ) ,
39
- importer ( self . _dagService ) ,
40
+ importer ( self . _ipldResolver ) ,
40
41
pull . asyncMap ( prepareFile . bind ( null , self ) ) ,
41
42
sort ( ( a , b ) => {
42
43
if ( a . path < b . path ) return 1
@@ -52,7 +53,7 @@ module.exports = function files (self) {
52
53
return callback ( new Error ( 'You must supply a multihash' ) )
53
54
}
54
55
55
- self . _dagService . get ( hash , ( err , node ) => {
56
+ self . _ipldResolver . get ( new CID ( hash ) , ( err , node ) => {
56
57
if ( err ) {
57
58
return callback ( err )
58
59
}
@@ -65,9 +66,11 @@ module.exports = function files (self) {
65
66
}
66
67
67
68
pull (
68
- exporter ( hash , self . _dagService ) ,
69
+ exporter ( hash , self . _ipldResolver ) ,
69
70
pull . collect ( ( err , files ) => {
70
- if ( err ) return callback ( err )
71
+ if ( err ) {
72
+ return callback ( err )
73
+ }
71
74
callback ( null , toStream . source ( files [ 0 ] . content ) )
72
75
} )
73
76
)
@@ -76,7 +79,7 @@ module.exports = function files (self) {
76
79
77
80
get : promisify ( ( hash , callback ) => {
78
81
callback ( null , toStream . source ( pull (
79
- exporter ( hash , self . _dagService ) ,
82
+ exporter ( hash , self . _ipldResolver ) ,
80
83
pull . map ( ( file ) => {
81
84
if ( file . content ) {
82
85
file . content = toStream . source ( file . content )
@@ -89,15 +92,17 @@ module.exports = function files (self) {
89
92
} ) ,
90
93
91
94
getPull : promisify ( ( hash , callback ) => {
92
- callback ( null , exporter ( hash , self . _dagService ) )
95
+ callback ( null , exporter ( hash , self . _ipldResolver ) )
93
96
} )
94
97
}
95
98
}
96
99
97
100
function prepareFile ( self , file , cb ) {
98
101
const bs58mh = multihashes . toB58String ( file . multihash )
99
102
self . object . get ( file . multihash , ( err , node ) => {
100
- if ( err ) return cb ( err )
103
+ if ( err ) {
104
+ return cb ( err )
105
+ }
101
106
102
107
cb ( null , {
103
108
path : file . path || bs58mh ,
0 commit comments