@@ -92,34 +92,6 @@ func (downloader *Downloader) DownloadSignedResources(urls []string, keys []*rsa
92
92
return validatedResources , nil
93
93
}
94
94
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
-
123
95
func (downloader * Downloader ) MustDownloadToTempDirectory (baseUrl string , fileMap config.FileInfoMap , localDirPath string ) (tempDirectoryPath string ) {
124
96
reachedEndOfFunction := false // https://stackoverflow.com/a/34851179/10513183
125
97
tempDirectoryPath = system .MustMakeTempDirectory (localDirPath )
@@ -219,6 +191,7 @@ func (downloader *Downloader) runDownloadWorkers(ctx context.Context, cancelFunc
219
191
break
220
192
case workerId := <- availableWorkerIds :
221
193
dl := NewDownloadForConcurrentUse (ctx , url , downloader .client , downloader .handler , workerId )
194
+ dl .downloader = downloader
222
195
go downloadWorker (dl , availableWorkerIds , allWorkersDoneCond , workerErrChan , processDownload )
223
196
}
224
197
}
0 commit comments