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

HeaderMatch: Refactor default header logic

Browse Source
This commit is contained in:
Sam Ford 2021-07-26 20:42:33 -04:00
parent af2c45b297
commit 83f261b6f2
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Library/Homebrew/livecheck/strategy/header_match.rb
View File

@ -24,6 +24,9 @@ module Homebrew
# The `Regexp` used to determine if the strategy applies to the URL. # The `Regexp` used to determine if the strategy applies to the URL.
URL_MATCH_REGEX = %r{^https?://}i.freeze URL_MATCH_REGEX = %r{^https?://}i.freeze
# The header fields to check when a `strategy` block isn't provided.
DEFAULT_HEADERS_TO_CHECK = ["content-disposition", "location"].freeze
# Whether the strategy can be applied to the provided URL. # Whether the strategy can be applied to the provided URL.
# The strategy will technically match any HTTP URL but is # The strategy will technically match any HTTP URL but is
# only usable with a `livecheck` block containing a regex # only usable with a `livecheck` block containing a regex
@ -62,23 +65,17 @@ module Homebrew
end end
else else
value = nil value = nil
DEFAULT_HEADERS_TO_CHECK.each do |header_name|
header_value = merged_headers[header_name]
next if header_value.blank?
if (filename = merged_headers["content-disposition"])
if regex if regex
value ||= filename[regex, 1] value = header_value[regex, 1]
else else
v = Version.parse(filename, detected_from_url: true) v = Version.parse(header_value, detected_from_url: true)
value ||= v.to_s unless v.null? value = v.to_s unless v.null?
end
end
if (location = merged_headers["location"])
if regex
value ||= location[regex, 1]
else
v = Version.parse(location, detected_from_url: true)
value ||= v.to_s unless v.null?
end end
break if value.present?
end end
value value