Fix for Opal::Cache::FileCache.dir_writable? #2529
Merged
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
elia
requested changes
Mar 16, 2023
lib/opal/cache/file_cache.rb
Outdated
Comment on lines
81
to
90
| # Check if we can robustly mkdir_p a directory. | ||
| def self.dir_writable?(*paths) | ||
| dir = nil | ||
| paths = paths.reduce([]) do |a, b| | ||
| [*a, dir = a.last ? File.expand_path(b, a.last) : b] | ||
| dir = "/" | ||
| until paths.empty? | ||
| dir = File.expand_path(paths.shift, dir) | ||
| ok = File.directory?(dir) && File.writable?(dir) if File.exist?(dir) | ||
| end | ||
|
|
||
| File.exist?(paths.first) && | ||
| paths.reverse.all? do |i| | ||
| !File.exist?(i) || (File.directory?(i) && File.writable?(i)) | ||
| end | ||
|
|
||
| dir | ||
| dir if ok |
There was a problem hiding this comment.
Nice improvement!
Since expand_path accepts nil as the second argument it can be skipped, which makes it compatible with windows, also added a check on the first path segment to ensure it exist, it being the "root".
def self.dir_writable?(*paths)
return false unless File.exist?(paths.first)
until paths.empty?
dir = File.expand_path(paths.shift, dir)
ok = File.directory?(dir) && File.writable?(dir) if File.exist?(dir)
end
dir if ok
endThere was a problem hiding this comment.
Ah, Windows compatibility, didn't think of that one.
The PR is marked as "changes requested" but you already made the changes, so I'm not sure if you're waiting on something from me?
There was a problem hiding this comment.
We haven't committed that change to the branch. We did now :) Merging in a moment
…gardless of the dir being writeable or not Co-authored-by: hmdne <54514036+hmdne@users.noreply.github.com> Co-authored-by: Elia <elia@schito.me>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
which previously returned truthy regardless of the dir being writeable or not, resulting in
dir_writable?(Dir.home, '.cache', 'opal')being always true, even for non-login user (with $HOME set to /nonexistent)