Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Use Downloadable API in FromBottleLoader. #17695

Merged
merged 2 commits into from
Jul 13, 2024
+7 −20
Merged

Use Downloadable API in FromBottleLoader. #17695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
643fa83
Use `Downloadable` API in `FromBottleLoader`.
reitermarkus Jul 13, 2024
2601551
Only allow loading local bottles.
reitermarkus Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions Library/Homebrew/formulary.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,36 +592,23 @@ class FromBottleLoader < FormulaLoader
def self.try_new(ref, from: T.unsafe(nil), warn: false)
ref = ref.to_s

new(ref) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref)
new(ref) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref) && File.exist?(ref)
end

def initialize(bottle_name)
case bottle_name
when URL_START_REGEX
# The name of the formula is found between the last slash and the last hyphen.
formula_name = File.basename(bottle_name)[/(.+)-/, 1]
resource = Resource.new(formula_name) { url bottle_name }
resource.specs[:bottle] = true
downloader = resource.downloader
cached = downloader.cached_location.exist?
downloader.fetch
ohai "Pouring the cached bottle" if cached
@bottle_filename = downloader.cached_location
else
@bottle_filename = Pathname(bottle_name).realpath
end
name, full_name = Utils::Bottles.resolve_formula_names @bottle_filename
def initialize(bottle_name, warn: false)
@bottle_path = Pathname(bottle_name).realpath
name, full_name = Utils::Bottles.resolve_formula_names(@bottle_path)
super name, Formulary.path(full_name)
end

def get_formula(spec, force_bottle: false, flags: [], ignore_errors: false, **)
formula = begin
contents = Utils::Bottles.formula_contents(@bottle_filename, name:)
contents = Utils::Bottles.formula_contents(@bottle_path, name:)
Formulary.from_contents(name, path, contents, spec, force_bottle:,
flags:, ignore_errors:)
rescue FormulaUnreadableError => e
opoo <<~EOS
Unreadable formula in #{@bottle_filename}:
Unreadable formula in #{@bottle_path}:
#{e}
EOS
super
Expand All @@ -632,7 +619,7 @@ def get_formula(spec, force_bottle: false, flags: [], ignore_errors: false, **)
EOS
super
end
formula.local_bottle_path = @bottle_filename
formula.local_bottle_path = @bottle_path
formula
end
end
Expand Down