More CaskLoader improvements.
#16621
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
reitermarkus
force-pushed
the
cask-loader-improvements
branch
from
ece19a3 to
fca915c
Compare
reitermarkus
force-pushed
the
cask-loader-improvements
branch
from
fca915c to
76d8d6c
Compare
reitermarkus
requested review from
Bo98 and
apainintheneck
and removed request for
Bo98
apainintheneck
approved these changes
Feb 9, 2024
Comment on lines
-259
to
+263
| (!CoreTap.instance.installed? && Homebrew::API::Formula.all_formulae.key?(path.basename)) | ||
| (!CoreTap.instance.installed? && Homebrew::API::Formula.all_formulae.key?(path.basename.to_s)) | ||
| paths << formula_path | ||
| end | ||
| if cask_path.exist? || | ||
| (!CoreCaskTap.instance.installed? && Homebrew::API::Cask.all_casks.key?(path.basename)) | ||
| (!CoreCaskTap.instance.installed? && Homebrew::API::Cask.all_casks.key?(path.basename.to_s)) |
There was a problem hiding this comment.
I guess this somehow got coerced to strings before. Otherwise, I'm not really sure how this ever worked.
There was a problem hiding this comment.
I think it's because we have a Pathname#to_str monkey-patch.
Comment on lines
117
to
+118
| @path = path | ||
| @tap = Homebrew::API.tap_from_source_download(path) | ||
| @tap = Tap.from_path(path) || Homebrew::API.tap_from_source_download(path) |
There was a problem hiding this comment.
I think this might even be a touch faster here. The Homebrew::API.tap_from_source_download method is quite slow when it gets called a lot in commands like brew readall. This change in logic means it will get called less in that scenario though I plan on opening a PR soon to move from Pathname#relative_path_from in that method to a regex to speed things up anyway.
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.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?