vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-08 05:50:47 +00:00
Code Issues Projects Releases Wiki Activity

Major refactoring: access to context happens in methods. #13

Browse Source
This commit is contained in:
Andrey Smirnov
2014-04-05 16:10:51 +04:00
parent 400d0da7d4
commit 2c3553ef0b
31 changed files with 333 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/db_cleanup.go
+31 -29
View File
@@ -20,9 +20,9 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
// collect information about references packages...
existingPackageRefs := debian.NewPackageRefList()
context.progress.Printf("Loading mirrors, local repos and snapshots...\n")
err = context.collectionFactory.RemoteRepoCollection().ForEach(func(repo *debian.RemoteRepo) error {
err := context.collectionFactory.RemoteRepoCollection().LoadComplete(repo)
context.Progress().Printf("Loading mirrors, local repos and snapshots...\n")
err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *debian.RemoteRepo) error {
err := context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
if err != nil {
return err
}
@@ -35,8 +35,8 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
return err
}
err = context.collectionFactory.LocalRepoCollection().ForEach(func(repo *debian.LocalRepo) error {
err := context.collectionFactory.LocalRepoCollection().LoadComplete(repo)
err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *debian.LocalRepo) error {
err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
if err != nil {
return err
}
@@ -49,8 +49,8 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
return err
}
err = context.collectionFactory.SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
err := context.collectionFactory.SnapshotCollection().LoadComplete(snapshot)
err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
err := context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
if err != nil {
return err
}
@@ -62,43 +62,45 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
}
// ... and compare it to the list of all packages
context.progress.Printf("Loading list of all packages...\n")
allPackageRefs := context.collectionFactory.PackageCollection().AllPackageRefs()
context.Progress().Printf("Loading list of all packages...\n")
allPackageRefs := context.CollectionFactory().PackageCollection().AllPackageRefs()
toDelete := allPackageRefs.Substract(existingPackageRefs)
// delete packages that are no longer referenced
context.progress.Printf("Deleting unreferenced packages (%d)...\n", toDelete.Len())
context.Progress().Printf("Deleting unreferenced packages (%d)...\n", toDelete.Len())
context.database.StartBatch()
// database can't err as collection factory already constructed
db, _ := context.Database()
db.StartBatch()
err = toDelete.ForEach(func(ref []byte) error {
return context.collectionFactory.PackageCollection().DeleteByKey(ref)
return context.CollectionFactory().PackageCollection().DeleteByKey(ref)
})
if err != nil {
return err
}
err = context.database.FinishBatch()
err = db.FinishBatch()
if err != nil {
return fmt.Errorf("unable to write to DB: %s", err)
}
// now, build a list of files that should be present in Repository (package pool)
context.progress.Printf("Building list of files referenced by packages...\n")
context.Progress().Printf("Building list of files referenced by packages...\n")
referencedFiles := make([]string, 0, existingPackageRefs.Len())
context.progress.InitBar(int64(existingPackageRefs.Len()), false)
context.Progress().InitBar(int64(existingPackageRefs.Len()), false)
err = existingPackageRefs.ForEach(func(key []byte) error {
pkg, err2 := context.collectionFactory.PackageCollection().ByKey(key)
pkg, err2 := context.CollectionFactory().PackageCollection().ByKey(key)
if err2 != nil {
return err2
}
paths, err2 := pkg.FilepathList(context.packagePool)
paths, err2 := pkg.FilepathList(context.PackagePool())
if err2 != nil {
return err2
}
referencedFiles = append(referencedFiles, paths...)
context.progress.AddBar(1)
context.Progress().AddBar(1)
return nil
})
@@ -107,11 +109,11 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
}
sort.Strings(referencedFiles)
context.progress.ShutdownBar()
context.Progress().ShutdownBar()
// build a list of files in the package pool
context.progress.Printf("Building list of files in package pool...\n")
existingFiles, err := context.packagePool.FilepathList(context.progress)
context.Progress().Printf("Building list of files in package pool...\n")
existingFiles, err := context.PackagePool().FilepathList(context.Progress())
if err != nil {
return fmt.Errorf("unable to collect file paths: %s", err)
}
@@ -120,27 +122,27 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
filesToDelete := utils.StrSlicesSubstract(existingFiles, referencedFiles)
// delete files that are no longer referenced
context.progress.Printf("Deleting unreferenced files (%d)...\n", len(filesToDelete))
context.Progress().Printf("Deleting unreferenced files (%d)...\n", len(filesToDelete))
if len(filesToDelete) > 0 {
context.progress.InitBar(int64(len(filesToDelete)), false)
context.Progress().InitBar(int64(len(filesToDelete)), false)
totalSize := int64(0)
for _, file := range filesToDelete {
size, err := context.packagePool.Remove(file)
size, err := context.PackagePool().Remove(file)
if err != nil {
return err
}
context.progress.AddBar(1)
context.Progress().AddBar(1)
totalSize += size
}
context.progress.ShutdownBar()
context.Progress().ShutdownBar()
context.progress.Printf("Disk space freed: %s...\n", utils.HumanBytes(totalSize))
context.Progress().Printf("Disk space freed: %s...\n", utils.HumanBytes(totalSize))
}
context.progress.Printf("Compacting database...\n")
err = context.database.CompactDB()
context.Progress().Printf("Compacting database...\n")
err = db.CompactDB()
return err
}