Skip to content

Commit 893a08d

Browse files
committed
Actually set downloader
1 parent 56934a6 commit 893a08d

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

pkg/fetching/downloader.go

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -92,34 +92,6 @@ func (downloader *Downloader) DownloadSignedResources(urls []string, keys []*rsa
9292
return validatedResources, nil
9393
}
9494

95-
func (downloader *Downloader) DownloadBytes(fromURL string) (data []byte) {
96-
success := false
97-
var err error
98-
for !success {
99-
dl := downloader.newDownload(fromURL)
100-
data, err = ioutil.ReadAll(dl)
101-
if err != nil {
102-
log.Printf("Download of \"%s\" failed: %v", fromURL, err)
103-
}
104-
if downloader.ctx.Err() != nil {
105-
panic(downloader.ctx.Err())
106-
}
107-
success = err == nil
108-
}
109-
return
110-
}
111-
112-
func (downloader *Downloader) newDownload(resourceUrl string) *Download {
113-
return &Download{
114-
url: resourceUrl,
115-
client: downloader.client,
116-
ctx: downloader.ctx,
117-
handler: downloader.handler,
118-
workerId: 0,
119-
downloader: downloader,
120-
}
121-
}
122-
12395
func (downloader *Downloader) MustDownloadToTempDirectory(baseUrl string, fileMap config.FileInfoMap, localDirPath string) (tempDirectoryPath string) {
12496
reachedEndOfFunction := false // https://stackoverflow.com/a/34851179/10513183
12597
tempDirectoryPath = system.MustMakeTempDirectory(localDirPath)
@@ -219,6 +191,7 @@ func (downloader *Downloader) runDownloadWorkers(ctx context.Context, cancelFunc
219191
break
220192
case workerId := <-availableWorkerIds:
221193
dl := NewDownloadForConcurrentUse(ctx, url, downloader.client, downloader.handler, workerId)
194+
dl.downloader = downloader
222195
go downloadWorker(dl, availableWorkerIds, allWorkersDoneCond, workerErrChan, processDownload)
223196
}
224197
}

0 commit comments

Comments
 (0)