Skip to content

Commit 858912a

Browse files
committed
remove empty file creation, and check error when creating dirs, do not try to resume downloads
1 parent 3d2448b commit 858912a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

indexes/download/download.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,17 @@ func DownloadTool(toolRelease *cores.ToolRelease) (*paths.Path, error) {
4949
"tools",
5050
toolRelease.Tool.Name,
5151
toolRelease.Version.String())
52-
installDir.MkdirAll()
52+
if err := installDir.MkdirAll(); err != nil {
53+
logrus.Error(err)
54+
return nil, err
55+
}
5356
downloadsDir := globals.FwUploaderPath.Join("downloads")
5457
archivePath := downloadsDir.Join(resource.ArchiveFileName)
55-
archivePath.Parent().MkdirAll()
56-
if err := archivePath.WriteFile(nil); err != nil {
58+
if err := archivePath.Parent().MkdirAll(); err != nil {
5759
logrus.Error(err)
5860
return nil, err
5961
}
60-
d, err := downloader.Download(archivePath.String(), resource.URL)
62+
d, err := downloader.Download(archivePath.String(), resource.URL, downloader.NoResume)
6163
if err != nil {
6264
logrus.Error(err)
6365
return nil, err
@@ -80,12 +82,11 @@ func DownloadFirmware(firmware *firmwareindex.IndexFirmware) (*paths.Path, error
8082
firmware.Module,
8183
firmware.Version.String(),
8284
path.Base(firmware.URL))
83-
firmwarePath.Parent().MkdirAll()
84-
if err := firmwarePath.WriteFile(nil); err != nil {
85+
if err := firmwarePath.Parent().MkdirAll(); err != nil {
8586
logrus.Error(err)
8687
return nil, err
8788
}
88-
d, err := downloader.Download(firmwarePath.String(), firmware.URL)
89+
d, err := downloader.Download(firmwarePath.String(), firmware.URL, downloader.NoResume)
8990
if err != nil {
9091
logrus.Error(err)
9192
return nil, err
@@ -111,12 +112,11 @@ func DownloadSketch(loader *firmwareindex.IndexSketch) (*paths.Path, error) {
111112
sketchPath := globals.FwUploaderPath.Join(
112113
"sketch",
113114
path.Base(loader.URL))
114-
sketchPath.Parent().MkdirAll()
115-
if err := sketchPath.WriteFile(nil); err != nil {
115+
if err := sketchPath.Parent().MkdirAll(); err != nil {
116116
logrus.Error(err)
117117
return nil, err
118118
}
119-
d, err := downloader.Download(sketchPath.String(), loader.URL)
119+
d, err := downloader.Download(sketchPath.String(), loader.URL, downloader.NoResume)
120120
if err != nil {
121121
logrus.Error(err)
122122
return nil, err
@@ -232,7 +232,7 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
232232

233233
// Download index
234234
tmpGZIndex := tempDir.Join("index.gz")
235-
d, err := downloader.Download(tmpGZIndex.String(), indexArchiveURL.String())
235+
d, err := downloader.Download(tmpGZIndex.String(), indexArchiveURL.String(), downloader.NoResume)
236236
if err != nil {
237237
return nil, fmt.Errorf("downloading index %s: %s", indexURL, err)
238238
}
@@ -253,11 +253,10 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
253253
}
254254
tmpSignature := tempDir.Join("index.json.sig")
255255

256-
d, err = downloader.Download(tmpSignature.String(), signatureURL.String())
256+
d, err = downloader.Download(tmpSignature.String(), signatureURL.String(), downloader.NoResume)
257257
if err != nil {
258258
return nil, fmt.Errorf("downloading index signature %s: %s", signatureURL, err)
259259
}
260-
indexSigPath := globals.FwUploaderPath.Join(path.Base(signatureURL.Path))
261260
if err := Download(d); err != nil || d.Error() != nil {
262261
return nil, fmt.Errorf("downloading index signature %s: %s %s", indexArchiveURL, d.Error(), err)
263262
}
@@ -267,6 +266,7 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
267266
if err := globals.FwUploaderPath.MkdirAll(); err != nil { //does not overwrite if dir already present
268267
return nil, fmt.Errorf("can't create data directory %s: %s", globals.FwUploaderPath, err)
269268
}
269+
indexSigPath := globals.FwUploaderPath.Join(path.Base(signatureURL.Path))
270270
indexPath := globals.FwUploaderPath.Join(path.Base(strings.ReplaceAll(indexArchiveURL.Path, ".gz", "")))
271271
if err := tmpIndex.CopyTo(indexPath); err != nil { //does overwrite
272272
return nil, fmt.Errorf("saving downloaded index %s: %s", indexArchiveURL, err)

0 commit comments

Comments
 (0)