From 33c973ada2932febba20973319d6c44cde513302 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 10 Apr 2018 15:31:49 +0100 Subject: [PATCH] feat: Add offset/length arguments to files.cat --- package.json | 6 +++--- src/files/cat-pull-stream.js | 7 ++++++- src/files/cat-readable-stream.js | 7 ++++++- src/files/cat.js | 7 ++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5b3b1ec29..1b8739274 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "ipfs-block": "~0.7.1", "ipfs-unixfs": "~0.1.14", "ipld-dag-cbor": "^0.12.0", - "ipld-dag-pb": "^0.14.2", + "ipld-dag-pb": "^0.14.3", "is-ipfs": "^0.3.2", "is-stream": "^1.1.0", "libp2p-crypto": "^0.13.0", @@ -77,9 +77,9 @@ "go-ipfs-dep": "^0.4.14", "gulp": "^3.9.1", "hapi": "^17.3.1", - "interface-ipfs-core": "~0.61.0", + "interface-ipfs-core": "^0.64.0", "ipfs": "~0.28.2", - "ipfsd-ctl": "~0.32.0", + "ipfsd-ctl": "^0.32.1", "pre-commit": "^1.2.2", "pull-stream": "^3.6.7", "socket.io": "^2.1.0", diff --git a/src/files/cat-pull-stream.js b/src/files/cat-pull-stream.js index 13cd06e07..364f566d2 100644 --- a/src/files/cat-pull-stream.js +++ b/src/files/cat-pull-stream.js @@ -19,7 +19,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return p.end(err) } p.resolve(toPull(stream)) diff --git a/src/files/cat-readable-stream.js b/src/files/cat-readable-stream.js index 0ad80f919..58ca69c67 100644 --- a/src/files/cat-readable-stream.js +++ b/src/files/cat-readable-stream.js @@ -19,7 +19,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return pt.destroy(err) } pump(stream, pt) diff --git a/src/files/cat.js b/src/files/cat.js index 65046fb9b..ff468eb34 100644 --- a/src/files/cat.js +++ b/src/files/cat.js @@ -20,7 +20,12 @@ module.exports = (send) => { } } - send({ path: 'cat', args: hash, buffer: opts.buffer }, (err, stream) => { + const query = { + offset: opts.offset, + length: opts.length + } + + send({ path: 'cat', args: hash, buffer: opts.buffer, qs: query }, (err, stream) => { if (err) { return callback(err) } stream.pipe(bl((err, data) => {