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

Commit cc75c70

Browse files
committed
exporter: exporting link size insteaf of node size to mimc go-ipfs
1 parent 0761139 commit cc75c70

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/exporter/dir-flat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const cat = require('pull-cat')
66
// Logic to export a unixfs directory.
77
module.exports = dirExporter
88

9-
function dirExporter (node, name, path, pathRest, resolve, dag, parent, depth) {
9+
function dirExporter (node, name, path, pathRest, resolve, size, dag, parent, depth) {
1010
const accepts = pathRest[0]
1111

1212
const dir = {

src/exporter/dir-hamt-sharded.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const cleanHash = require('./clean-multihash')
77
// Logic to export a unixfs directory.
88
module.exports = shardedDirExporter
99

10-
function shardedDirExporter (node, name, path, pathRest, resolve, dag, parent, depth) {
10+
function shardedDirExporter (node, name, path, pathRest, resolve, size, dag, parent, depth) {
1111
let dir
1212
if (!parent || (parent.path !== path)) {
1313
dir = {

src/exporter/file.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const pull = require('pull-stream')
77
const paramap = require('pull-paramap')
88

99
// Logic to export a single (possibly chunked) unixfs file.
10-
module.exports = (node, name, path, pathRest, resolve, dag, parent, depth) => {
10+
module.exports = (node, name, path, pathRest, resolve, size, dag, parent, depth) => {
1111
function getData (node) {
1212
try {
1313
const file = UnixFS.unmarshal(node.data)
@@ -43,7 +43,7 @@ module.exports = (node, name, path, pathRest, resolve, dag, parent, depth) => {
4343
name: name,
4444
path: path,
4545
hash: node.multihash,
46-
size: file.fileSize(),
46+
size: size || file.fileSize(),
4747
type: 'file'
4848
}])
4949
}

src/exporter/object.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
const CID = require('cids')
44
const pull = require('pull-stream')
55

6-
module.exports = (node, name, path, pathRest, resolve, dag, parent, depth) => {
6+
module.exports = (node, name, path, pathRest, resolve, size, dag, parent, depth) => {
77
let newNode
88
if (pathRest.length) {
99
const pathElem = pathRest[0]

src/exporter/resolve.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ function createResolver (dag, options, depth, parent) {
4848
)
4949

5050
function resolveItem (node, item) {
51-
return resolve(node, item.name, item.path, item.pathRest, dag, item.parent || parent, item.depth)
51+
return resolve(node, item.name, item.path, item.pathRest, item.size, dag, item.parent || parent, item.depth)
5252
}
5353

54-
function resolve (node, name, path, pathRest, dag, parentNode, depth) {
54+
function resolve (node, name, path, pathRest, size, dag, parentNode, depth) {
5555
const type = typeOf(node)
5656
const nodeResolver = resolvers[type]
5757
if (!nodeResolver) {
5858
return pull.error(new Error('Unkown node type ' + type))
5959
}
6060
const resolveDeep = createResolver(dag, options, depth, node)
61-
return nodeResolver(node, name, path, pathRest, resolveDeep, dag, parentNode, depth)
61+
return nodeResolver(node, name, path, pathRest, resolveDeep, size, dag, parentNode, depth)
6262
}
6363
}
6464

test/builder-dir-sharding.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ module.exports = (repo) => {
9191
expect(nodes[0].path).to.be.eql(expectedHash)
9292
expect(mh.toB58String(nodes[0].hash)).to.be.eql(expectedHash)
9393
expect(nodes[1].path).to.be.eql(expectedHash + '/b')
94-
expect(nodes[1].size).to.be.eql(21)
94+
expect(nodes[1].size).to.be.eql(29)
9595
pull(
9696
nodes[1].content,
9797
pull.collect(collected)

0 commit comments

Comments
 (0)