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

Merge pull request #4598 from reitermarkus/temporary_path

Browse Source 
Move `temporary_path` to `AbstractFileDownloadStrategy`.
This commit is contained in:
Markus Reiter 2018-08-03 17:46:08 +02:00 committed by GitHub
commit 74cace5b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/download_strategy.rb
View File

@ -176,9 +176,12 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
end end
class AbstractFileDownloadStrategy < AbstractDownloadStrategy class AbstractFileDownloadStrategy < AbstractDownloadStrategy
attr_reader :temporary_path
def initialize(url, name, version, **meta) def initialize(url, name, version, **meta)
super super
@cached_location = HOMEBREW_CACHE/"#{name}-#{version}#{ext}" @cached_location = HOMEBREW_CACHE/"#{name}-#{version}#{ext}"
@temporary_path = Pathname.new("#{cached_location}.incomplete")
end end
def stage def stage
@ -203,12 +206,11 @@ class AbstractFileDownloadStrategy < AbstractDownloadStrategy
end end
class CurlDownloadStrategy < AbstractFileDownloadStrategy class CurlDownloadStrategy < AbstractFileDownloadStrategy
attr_reader :mirrors, :temporary_path attr_reader :mirrors
def initialize(url, name, version, **meta) def initialize(url, name, version, **meta)
super super
@mirrors = meta.fetch(:mirrors, []) @mirrors = meta.fetch(:mirrors, [])
@temporary_path = Pathname.new("#{cached_location}.incomplete")
end end
def fetch def fetch
@ -507,12 +509,8 @@ end
# url "scp://example.com/src/abc.1.0.tar.gz" # url "scp://example.com/src/abc.1.0.tar.gz"
# ... # ...
class ScpDownloadStrategy < AbstractFileDownloadStrategy class ScpDownloadStrategy < AbstractFileDownloadStrategy
attr_reader :temporary_path
def initialize(url, name, version, **meta) def initialize(url, name, version, **meta)
super super
@cached_location = HOMEBREW_CACHE/"#{name}-#{version}#{ext}"
@temporary_path = Pathname.new("#{cached_location}.incomplete")
parse_url_pattern parse_url_pattern
end end