This repository has been archived by the owner on Jul 3, 2019. It is now read-only.
feat(read): change hasContent to return {sri, size} #88
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
added 3 commits
April 22, 2017 19:25
Some changes were needed to handle the changes of pickContentSri result,
which is now `{sri, lstat}` instead of `sri`.
Fixes #87
zkat
suggested changes
Apr 22, 2017
lib/content/read.js
Outdated
| .catch({code: 'ENOENT'}, () => false) | ||
| .catch({code: 'EPERM'}, err => { | ||
| if (process.platform !== 'win32') { | ||
| throw err | ||
| } else { | ||
| return false | ||
| } | ||
| }).then(sri => sri || false) | ||
| }).then((content) => { |
There was a problem hiding this comment.
No parens around single-var fat-arrows
lib/content/read.js
Outdated
| @@ -34,7 +35,8 @@ function readStream (cache, integrity, opts) { | |||
| const stream = new PassThrough() | |||
| pickContentSri( | |||
| cache, integrity | |||
| ).then(sri => { | |||
| ).then((content) => { | |||
There was a problem hiding this comment.
No parens around single-var fat-arrows
lib/content/read.js
Outdated
| @@ -13,7 +13,8 @@ BB.promisifyAll(fs) | |||
| module.exports = read | |||
| function read (cache, integrity, opts) { | |||
| opts = opts || {} | |||
| return pickContentSri(cache, integrity).then(sri => { | |||
| return pickContentSri(cache, integrity).then((content) => { | |||
There was a problem hiding this comment.
No parens around single-var fat-arrows
lib/content/rm.js
Outdated
| @@ -8,7 +8,8 @@ const rimraf = BB.promisify(require('rimraf')) | |||
|
|
|||
| module.exports = rm | |||
| function rm (cache, integrity) { | |||
| return hasContent(cache, integrity).then(sri => { | |||
| return hasContent(cache, integrity).then((content) => { | |||
There was a problem hiding this comment.
No parens around single-var fat-arrows
| @@ -52,34 +54,33 @@ function readStream (cache, integrity, opts) { | |||
| module.exports.hasContent = hasContent | |||
| function hasContent (cache, integrity) { | |||
There was a problem hiding this comment.
https://github.com/zkat/cacache/blob/latest/test/content.read.js#L135-L148 will need to be updated
zkat
reviewed
Apr 22, 2017
lib/content/read.js
Outdated
| }).then(sri => sri || false) | ||
| }).then((content) => { | ||
| if (!content.sri) return false | ||
| return ({ sri: content.sri, size: content.stat.size || 0 }) |
There was a problem hiding this comment.
Probably don't need this || 0 anymore!
|
Changed the bits you adressed and tried to make a test that makes sense, if I can somehow make it better, just tell me :) |
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.
Some changes were needed to handle the changes of pickContentSri result,
which is now
{sri, lstat}instead ofsri.Fixes #87