admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify Tap#cask_files_by_name.

Browse Source
This commit is contained in:
Markus Reiter 2024-02-23 15:03:05 +01:00
parent 977ac20b2b
commit 755c8aecad
No known key found for this signature in database
GPG Key ID: 245293B51702655B
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/cask_loader.rb
View File

@ -588,8 +588,7 @@ module Cask
def self.find_cask_in_tap(token, tap) def self.find_cask_in_tap(token, tap)
filename = "#{token}.rb" filename = "#{token}.rb"
Tap.cask_files_by_name(tap) tap.cask_files_by_name.fetch(token, tap.cask_dir/filename)
.fetch(token, tap.cask_dir/filename)
end end
end end
end end

14
Library/Homebrew/tap.rb
View File

@ -129,6 +129,7 @@ class Tap
@formula_names = nil @formula_names = nil
@formula_files = nil @formula_files = nil
@cask_files = nil @cask_files = nil
@cask_files_by_name = nil
@alias_dir = nil @alias_dir = nil
@alias_files = nil @alias_files = nil
@aliases = nil @aliases = nil
@ -590,19 +591,12 @@ class Tap
end end
end end
# A cached hash of {Cask} basenames to {Cask} file pathnames for a {Tap} # A mapping of {Cask} tokens to {Cask} file paths.
sig { params(tap: Tap).returns(T::Hash[String, Pathname]) } #
def self.cask_files_by_name(tap)
cache_key = "cask_files_by_name_#{tap}"
cache.fetch(cache_key) do |key|
cache[key] = tap.cask_files_by_name
end
end
# @private # @private
sig { returns(T::Hash[String, Pathname]) } sig { returns(T::Hash[String, Pathname]) }
def cask_files_by_name def cask_files_by_name
cask_files.each_with_object({}) do |file, hash| @cask_files_by_name ||= cask_files.each_with_object({}) do |file, hash|
# If there's more than one file with the same basename: use the longer one to prioritise more specific results. # If there's more than one file with the same basename: use the longer one to prioritise more specific results.
basename = file.basename(".rb").to_s basename = file.basename(".rb").to_s
existing_file = hash[basename] existing_file = hash[basename]