Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Check if cached downloads are up-to-date. #5217

Merged
merged 1 commit into from
Nov 4, 2018
Merged

Check if cached downloads are up-to-date. #5217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 21 additions & 12 deletions Library/Homebrew/download_strategy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,18 @@ def fetch

ohai "Downloading #{url}"

if cached_location.exist?
resolved_url, _, url_time = resolve_url_basename_time(url)

fresh = if cached_location.exist? && url_time
url_time <= cached_location.mtime
else
true
end

if cached_location.exist? && fresh
puts "Already downloaded: #{cached_location}"
else
begin
resolved_url, = resolve_url_and_basename(url)

_fetch(url: url, resolved_url: resolved_url)
rescue ErrorDuringExecution
raise CurlDownloadStrategyError, url
Expand Down Expand Up @@ -324,11 +330,11 @@ def clear_cache

def resolved_url_and_basename
return @resolved_url_and_basename if defined?(@resolved_url_and_basename)

@resolved_url_and_basename = resolve_url_and_basename(url)
resolved_url, basename, = resolve_url_basename_time(url)
@resolved_url_and_basename = [resolved_url, basename]
end

def resolve_url_and_basename(url)
def resolve_url_basename_time(url)
if ENV["HOMEBREW_ARTIFACT_DOMAIN"]
url = url.sub(%r{^((ht|f)tps?://)?}, ENV["HOMEBREW_ARTIFACT_DOMAIN"].chomp("/") + "/")
end
Expand Down Expand Up @@ -356,9 +362,15 @@ def resolve_url_and_basename(url)
lines.map { |line| line[/^Content\-Disposition:\s*(?:inline|attachment);\s*filename=(["']?)([^;]+)\1/i, 2] }
.compact

time =
lines.map { |line| line[/^Last\-Modified:\s*(.+)/i, 1] }
.compact
.map(&Time.public_method(:parse))
.last

basename = filenames.last || parse_basename(redirect_url)

[redirect_url, basename]
[redirect_url, basename, time]
end

def _fetch(url:, resolved_url:)
Expand Down Expand Up @@ -419,12 +431,9 @@ def mirrors

private

def resolve_url_and_basename(url)
def resolve_url_basename_time(url)
if url == self.url
[
"#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}",
File.basename(apache_mirrors["path_info"]),
]
super("#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}")
else
super
end
Expand Down