iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2245 from vtolstov/iso 

resume download after fail
This commit is contained in:
Mitchell Hashimoto 2015-06-22 12:03:47 -07:00
parent bf456f35f9 d98de209cb
commit aa7d3b7841
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/download.go
View File

@ -89,7 +89,7 @@ func NewDownloadClient(c *DownloadConfig) *DownloadClient {
// downloading it. // downloading it.
type Downloader interface { type Downloader interface {
Cancel() Cancel()
Download(io.Writer, *url.URL) error Download(*os.File, *url.URL) error
Progress() uint Progress() uint
Total() uint Total() uint
} }
@ -99,6 +99,8 @@ func (d *DownloadClient) Cancel() {
} }
func (d *DownloadClient) Get() (string, error) { func (d *DownloadClient) Get() (string, error) {
var f *os.File
// If we already have the file and it matches, then just return the target path. // If we already have the file and it matches, then just return the target path.
if verify, _ := d.VerifyChecksum(d.config.TargetPath); verify { if verify, _ := d.VerifyChecksum(d.config.TargetPath); verify {
log.Println("Initial checksum matched, no download needed.") log.Println("Initial checksum matched, no download needed.")
@ -131,7 +133,7 @@ func (d *DownloadClient) Get() (string, error) {
} }
// Otherwise, download using the downloader. // Otherwise, download using the downloader.
f, err := os.Create(finalPath) f, err = os.OpenFile(finalPath, os.O_RDWR|os.O_CREATE, os.FileMode(0666))
if err != nil { if err != nil {
return "", err return "", err
} }
@ -195,9 +197,9 @@ func (*HTTPDownloader) Cancel() {
// TODO(mitchellh): Implement // TODO(mitchellh): Implement
} }
func (d *HTTPDownloader) Download(dst io.Writer, src *url.URL) error { func (d *HTTPDownloader) Download(dst *os.File, src *url.URL) error {
log.Printf("Starting download: %s", src.String()) log.Printf("Starting download: %s", src.String())
req, err := http.NewRequest("GET", src.String(), nil) req, err := http.NewRequest("HEAD", src.String(), nil)
if err != nil { if err != nil {
return err return err
} }
@ -213,21 +215,47 @@ func (d *HTTPDownloader) Download(dst io.Writer, src *url.URL) error {
} }
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)
if err != nil { if err != nil || resp.StatusCode != 200 {
return err req.Method = "GET"
resp, err = httpClient.Do(req)
if err != nil {
return err
}
} }
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
log.Printf( log.Printf(
"Non-200 status code: %d. Getting error body.", resp.StatusCode) "Non-200 status code: %d. Getting error body.", resp.StatusCode)
if req.Method != "GET" {
req.Method = "GET"
resp, err = httpClient.Do(req)
if err != nil {
return err
}
}
errorBody := new(bytes.Buffer) errorBody := new(bytes.Buffer)
io.Copy(errorBody, resp.Body) io.Copy(errorBody, resp.Body)
return fmt.Errorf("HTTP error '%d'! Remote side responded:\n%s", return fmt.Errorf("HTTP error '%d'! Remote side responded:\n%s",
resp.StatusCode, errorBody.String()) resp.StatusCode, errorBody.String())
} }
req.Method = "GET"
d.progress = 0 d.progress = 0
if resp.Header.Get("Accept-Ranges") == "bytes" {
if fi, err := dst.Stat(); err == nil {
if _, err = dst.Seek(0, os.SEEK_END); err == nil {
req.Header.Set("Range", fmt.Sprintf("bytes=%d-", fi.Size()))
d.progress = uint(fi.Size())
}
}
}
resp, err = httpClient.Do(req)
if err != nil {
return err
}
d.total = uint(resp.ContentLength) d.total = uint(resp.ContentLength)
var buffer [4096]byte var buffer [4096]byte