vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-01-12 03:21:33 +00:00
Code Issues Projects Releases Wiki Activity

Use progress when downloading repo.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-04 12:38:32 +04:00
parent 679fc3e5fd
commit ab468bcac4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
debian/remote.go vendored
View File

@@ -200,7 +200,7 @@ func (repo *RemoteRepo) Fetch(d utils.Downloader) error {
func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageCollection, packageRepo *Repository, ignoreMismatch bool) error {
list := NewPackageList()
fmt.Printf("Downloading & parsing package files...\n")
d.GetProgress().Printf("Downloading & parsing package files...\n")
// Download and parse all Release files
for _, component := range repo.Components {
@@ -230,10 +230,13 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
}
}
fmt.Printf("Saving packages to database...\n")
d.GetProgress().Printf("Saving packages to database...\n")
d.GetProgress().InitBar(int64(list.Len()), false)
// Save package meta information to DB
err := list.ForEach(func(p *Package) error {
d.GetProgress().Add(1)
return packageCollection.Update(p)
})
@@ -241,7 +244,9 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
return fmt.Errorf("unable to save packages to db: %s", err)
}
fmt.Printf("Building download queue...\n")
d.GetProgress().ShutdownBar()
d.GetProgress().Printf("Building download queue...\n")
// Build download queue
queued := make(map[string]PackageDownloadTask, list.Len())
@@ -271,7 +276,9 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
return fmt.Errorf("unable to build download queue: %s", err)
}
fmt.Printf("Download queue: %d items, %.2f GiB size\n", count, float64(downloadSize)/(1024.0*1024.0*1024.0))
d.GetProgress().Printf("Download queue: %d items, %.2f GiB size\n", count, float64(downloadSize)/(1024.0*1024.0*1024.0))
d.GetProgress().InitBar(downloadSize, true)
// Download all package files
ch := make(chan error, len(queued))
@@ -291,6 +298,8 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
count--
}
d.GetProgress().ShutdownBar()
if len(errors) > 0 {
return fmt.Errorf("download errors:\n %s\n", strings.Join(errors, "\n "))
}