This repository has been archived by the owner on Apr 18, 2024. It is now read-only.
feat!: rename, update, test, type, and ready for launch #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Upgrade this lib so we can use it for extracting paths all over the place (dagula, freeway, etc) License: MIT Signed-off-by: Oli Evans <[email protected]>
License: MIT Signed-off-by: Oli Evans <[email protected]>
alanshaw
suggested changes
Apr 26, 2023
cli.js
Outdated
| .option('-o, --output', 'Output path for CAR') | ||
| .action(async (path, car, options) => { | ||
| console.log({ path, car, options }) |
There was a problem hiding this comment.
Suggested change
| console.log({ path, car, options }) |
package.json
Outdated
| "version": "1.1.0", | ||
| "description": "Extract UnixFS paths from an existing DAG with merkle proofs.", | ||
| "description": "Extract blocks for a UnixFS paths from a DAG", |
There was a problem hiding this comment.
Suggested change
| "description": "Extract blocks for a UnixFS paths from a DAG", | |
| "description": "Extract blocks for UnixFS paths from a DAG", |
package.json
Outdated
| @@ -41,5 +47,12 @@ | |||
| "bugs": { | |||
| "url": "https://github.com/alanshaw/ipfs-car-extract/issues" | |||
| }, | |||
| "homepage": "https://github.com/alanshaw/ipfs-car-extract#readme" | |||
| "homepage": "https://github.com/alanshaw/ipfs-car-extract#readme", | |||
There was a problem hiding this comment.
Suggested change
| "homepage": "https://github.com/alanshaw/ipfs-car-extract#readme", | |
| "homepage": "https://github.com/web3-storage/ipfs-path#readme", |
There was a problem hiding this comment.
...and more of these in package.json I cannot suggest for.
| @@ -1,37 +1,43 @@ | |||
| { | |||
| "name": "ipfs-car-extract", | |||
| "name": "@web3-storage/ipfs-path", | |||
| "version": "1.1.0", | |||
| for await (const shardBlock of findShardedBlock(node, part, blockstore)) { | ||
| if (lastBlock) yield lastBlock |
There was a problem hiding this comment.
This is like it is because exportBlocks yields the block you pass to it, so you want to yield all the intermediate blocks here, but not the last one, otherwise you'll yield it twice.
Alternatively you could switch it round so that exportBlocks does not yield the root block you pass it, but is maybe a bigger change.
| test('cli extract dagPB path', async t => { | ||
| const carName = 'extract-me.car' | ||
| const outName = 'extracted.car' | ||
| t.teardown(() => { |
There was a problem hiding this comment.
oh I did not know this existed...
test.js
Outdated
Comment on lines
39
to
52
| const fsStream = Readable.from(out).pipe(fs.createWriteStream(carName)) | ||
|
|
||
| for await (const block of readable) { | ||
| await carWriter.put(block) | ||
| } | ||
|
|
||
| await carWriter.close() | ||
|
|
||
| // wait for car to be written to fs | ||
| await new Promise((resolve, reject) => { | ||
| if (fsStream.closed) return resolve(true) | ||
| fsStream.once('finish', resolve) | ||
| fsStream.once('error', reject) | ||
| }) |
There was a problem hiding this comment.
Maybe slightly simplier with pipeline from stream/promises?:
Suggested change
| const fsStream = Readable.from(out).pipe(fs.createWriteStream(carName)) | |
| for await (const block of readable) { | |
| await carWriter.put(block) | |
| } | |
| await carWriter.close() | |
| // wait for car to be written to fs | |
| await new Promise((resolve, reject) => { | |
| if (fsStream.closed) return resolve(true) | |
| fsStream.once('finish', resolve) | |
| fsStream.once('error', reject) | |
| }) | |
| const carWritten = pipeline(out, fs.createWriteStream(carName)) | |
| for await (const block of readable) { | |
| await carWriter.put(block) | |
| } | |
| await carWriter.close() | |
| // wait for car to be written to fs | |
| await carWritten |
License: MIT Signed-off-by: Oli Evans <[email protected]>
License: MIT Signed-off-by: Oli Evans <[email protected]>
alanshaw
suggested changes
Apr 27, 2023
| @@ -80,7 +77,6 @@ export function extract (blockstore, path) { | |||
| * @returns {AsyncIterable<Block>} | |||
| */ | |||
| async function * exportBlocks (blockstore, block) { | |||
| yield block | |||
There was a problem hiding this comment.
You need to yield the block before the recursive call to exportBlocks if not yielding from within.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upgrade this lib so we can use it for extracting paths all over the place (dagula, freeway, etc)
@web3-strorage/ipfs-pathand the cli is nowipfs-pathextractthe default cli command so it works without passing it as an arg.License: MIT