This repository has been archived by the owner on Feb 12, 2024. It is now read-only.
files add, cat, get core + cli #197
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| 'use strict' | ||
|
|
||
| const Command = require('ronin').Command | ||
| const debug = require('debug') | ||
| const utils = require('../../utils') | ||
| const log = debug('cli:files') | ||
| log.error = debug('cli:files:error') | ||
|
|
||
| module.exports = Command.extend({ | ||
| desc: 'Download IPFS objects', | ||
|
|
||
| options: {}, | ||
|
|
||
| run: (path, options) => { | ||
| if (!path) { | ||
| throw new Error("Argument 'path' is required") | ||
| } | ||
| if (!options) { | ||
| options = {} | ||
| } | ||
| utils.getIPFS((err, ipfs) => { | ||
| if (err) { | ||
| throw err | ||
| } | ||
| ipfs.files.cat(path, (err, res) => { | ||
| if (err) { | ||
| throw (err) | ||
| } | ||
| if (res) { | ||
| res.on('file', (data) => { | ||
| data.stream.pipe(process.stdout) | ||
| }) | ||
| } | ||
|
There was a problem hiding this comment. Do we need the |
||
| }) | ||
| }) | ||
| } | ||
| }) | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| 'use strict' | ||
|
|
||
| const Command = require('ronin').Command | ||
| const debug = require('debug') | ||
| const utils = require('../../utils') | ||
| const log = debug('cli:files') | ||
| log.error = debug('cli:files:error') | ||
| var fs = require('fs') | ||
| const path = require('path') | ||
| const pathExists = require('path-exists') | ||
| const async = require('async') | ||
|
|
||
| function checkArgs (hash, outPath) { | ||
| if (!hash) { | ||
| throw new Error("Argument 'path' is required") | ||
| } | ||
| // format the output directory | ||
| if (!outPath) { | ||
| var cwd = process.cwd() | ||
| return cwd | ||
| } else { | ||
| if (!outPath.endsWith('/')) { | ||
| outPath += '/' | ||
| } | ||
| if (!outPath.startsWith('/')) { | ||
| outPath = path.join('/', outPath) | ||
| } | ||
| var directory = outPath | ||
| return directory | ||
| } | ||
| } | ||
|
|
||
| function getFiles (result, dir) { | ||
| var filePath | ||
| result.on('file', (file) => { | ||
| // Check to see if the result is in a directory | ||
| if (file.path.lastIndexOf('/') === -1) { | ||
| filePath = file.path | ||
| // Check to see if the result is a directory | ||
| if (file.dir === false) { | ||
| const ws = fs.createWriteStream(path.join(dir, file.path)) | ||
| file.stream.pipe(ws) | ||
| } else { | ||
| // Check to see if the directory has already been created | ||
| pathExists(path.join(dir, file.path)).then(exists => { | ||
| if (!exists) { | ||
| fs.mkdir(path.join(dir, file.path), (err) => { | ||
|
There was a problem hiding this comment. how about putting this into a function function ensureDir (dir) {
pathExists(dir).then((exists) => {
if (exists) {
return
}
fs.mkdir(dir, (err) => {
if (err) throw err
})
})
.catch((err) => {
throw err
})
}
ensureDir(path.join(dir, file.path))There was a problem hiding this comment. that way you can reuse it below |
||
| if (err) { | ||
| throw err | ||
| } | ||
| }) | ||
| } | ||
| }) | ||
| } | ||
| } else { | ||
| // Check to see if the directory has already been created | ||
| filePath = file.path.substring(0, file.path.lastIndexOf('/') + 1) | ||
| pathExists(path.join(dir, filePath)).then(exists => { | ||
| // Create a directory for the incoming files | ||
| if (!exists) { | ||
| async.waterfall([ | ||
|
There was a problem hiding this comment. as you are not actually passing values from one function to the next you use |
||
| (cb) => { | ||
| fs.mkdir(path.join(dir, filePath), (err) => { | ||
| if (err) { | ||
| cb(err) | ||
| } | ||
| cb(null) | ||
|
There was a problem hiding this comment. no need for There was a problem hiding this comment. or even simpler: (cb) => fs.mkdir(path.join(dir, filePath), cb) |
||
| }) | ||
| }, | ||
| (cb) => { | ||
| const ws = fs.createWriteStream(path.join(dir, file.path)) | ||
| file.stream.pipe(ws) | ||
| cb(null) | ||
| } | ||
| ], (err) => { | ||
| if (err) { | ||
| throw err | ||
| } | ||
| }) | ||
| } | ||
| // Just write the file | ||
| const ws = fs.createWriteStream(path.join(dir, file.path)) | ||
| file.stream.pipe(ws) | ||
| }) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| module.exports = Command.extend({ | ||
| desc: 'Download IPFS objects', | ||
|
|
||
| run: (hash, outPath) => { | ||
| const dir = checkArgs(hash, outPath) | ||
|
|
||
| utils.getIPFS((err, ipfs) => { | ||
| if (err) { | ||
| throw err | ||
| } | ||
| ipfs.files.get(hash, (err, result) => { | ||
| if (err) { | ||
| throw err | ||
| } | ||
| getFiles(result, dir) | ||
| }) | ||
| }) | ||
| } | ||
| }) | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a need for this return?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
inPath is not declared in this scope and needs to be returned on line 58, unless I'm missing something.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean, since there is the return of inPath in the end of the func and this assignment of inPath is within a if/else clause, you just need the return once