kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-01 23:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop ResolveDeps, and the Tree structure #20

Browse Source
This commit is contained in:
Ettore Di Giacinto
2019-11-29 19:01:46 +01:00
parent b5381e0248
commit 66cd6d1027
12 changed files with 72 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/tree/builder/gentoo/gentoo.go
View File

@@ -49,32 +49,24 @@ type GentooBuilder struct {
DBType MemoryDB
}
type GentooTree struct {
*tree.DefaultTree
}
type EbuildParser interface {
ScanEbuild(string, pkg.Tree) ([]pkg.Package, error)
ScanEbuild(string) ([]pkg.Package, error)
}
func (gt *GentooTree) Prelude() string {
return "/usr/portage/"
}
func (gb *GentooBuilder) scanEbuild(path string, t pkg.Tree) error {
func (gb *GentooBuilder) scanEbuild(path string, db pkg.PackageDatabase) error {
defer func() {
if r := recover(); r != nil {
Error(r)
}
}()
pkgs, err := gb.EbuildParser.ScanEbuild(path, t)
pkgs, err := gb.EbuildParser.ScanEbuild(path)
if err != nil {
return err
}
for _, p := range pkgs {
_, err := t.GetPackageSet().FindPackage(p)
_, err := db.FindPackage(p)
if err != nil {
_, err := t.GetPackageSet().CreatePackage(p)
_, err := db.CreatePackage(p)
if err != nil {
return err
}
@@ -83,12 +75,12 @@ func (gb *GentooBuilder) scanEbuild(path string, t pkg.Tree) error {
return nil
}
func (gb *GentooBuilder) worker(i int, wg *sync.WaitGroup, s <-chan string, t pkg.Tree) {
func (gb *GentooBuilder) worker(i int, wg *sync.WaitGroup, s <-chan string, db pkg.PackageDatabase) {
defer wg.Done()
for path := range s {
Info("#"+strconv.Itoa(i), "parsing", path)
err := gb.scanEbuild(path, t)
err := gb.scanEbuild(path, db)
if err != nil {
Error(path, ":", err.Error())
}
@@ -96,25 +88,24 @@ func (gb *GentooBuilder) worker(i int, wg *sync.WaitGroup, s <-chan string, t pk
}
func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
func (gb *GentooBuilder) Generate(dir string) (pkg.PackageDatabase, error) {
var toScan = make(chan string)
Spinner(27)
defer SpinnerStop()
var gtree *GentooTree
var db pkg.PackageDatabase
// Support for
switch gb.DBType {
case InMemory:
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
db = pkg.NewInMemoryDatabase(false)
case BoltDB:
tmpfile, err := ioutil.TempFile("", "boltdb")
if err != nil {
return nil, err
}
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewBoltDatabase(tmpfile.Name())}}
db = pkg.NewBoltDatabase(tmpfile.Name())
default:
gtree = &GentooTree{DefaultTree: &tree.DefaultTree{Packages: pkg.NewInMemoryDatabase(false)}}
db = pkg.NewInMemoryDatabase(false)
}
Debug("Concurrency", gb.Concurrency)
@@ -122,7 +113,7 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
var wg = new(sync.WaitGroup)
for i := 0; i < gb.Concurrency; i++ {
wg.Add(1)
go gb.worker(i, wg, toScan, gtree)
go gb.worker(i, wg, toScan, db)
}
// TODO: Handle cleaning after? Cleanup implemented in GetPackageSet().Clean()
@@ -142,9 +133,8 @@ func (gb *GentooBuilder) Generate(dir string) (pkg.Tree, error) {
close(toScan)
wg.Wait()
if err != nil {
return gtree, err
return db, err
}
Info("Resolving deps")
return gtree, gtree.ResolveDeps(gb.Concurrency)
return db, nil
}

6
pkg/tree/builder/gentoo/gentoo_test.go
View File

@@ -26,7 +26,7 @@ import (
type FakeParser struct {
}
func (f *FakeParser) ScanEbuild(path string, t pkg.Tree) ([]pkg.Package, error) {
func (f *FakeParser) ScanEbuild(path string) ([]pkg.Package, error) {
return []pkg.Package{&pkg.DefaultPackage{Name: path}}, nil
}
@@ -38,10 +38,10 @@ var _ = Describe("GentooBuilder", func() {
gb := NewGentooBuilder(&FakeParser{}, 20, dbType)
tree, err := gb.Generate("../../../../tests/fixtures/overlay")
defer func() {
Expect(tree.GetPackageSet().Clean()).ToNot(HaveOccurred())
Expect(tree.Clean()).ToNot(HaveOccurred())
}()
Expect(err).ToNot(HaveOccurred())
Expect(len(tree.GetPackageSet().GetPackages())).To(Equal(10))
Expect(len(tree.GetPackages())).To(Equal(10))
})
}
})

2
pkg/tree/builder/gentoo/simpleparser.go
View File

@@ -247,7 +247,7 @@ func SourceFile(ctx context.Context, path string, pkg *_gentoo.GentooPackage) (m
}
// ScanEbuild returns a list of packages (always one with SimpleEbuildParser) decoded from an ebuild.
func (ep *SimpleEbuildParser) ScanEbuild(path string, tree pkg.Tree) ([]pkg.Package, error) {
func (ep *SimpleEbuildParser) ScanEbuild(path string) ([]pkg.Package, error) {
Debug("Starting parsing of ebuild", path)
pkgstr := filepath.Base(path)

9
pkg/tree/builder/gentoo/simpleparser_test.go
View File

@@ -651,14 +651,13 @@ var _ = Describe("GentooBuilder", func() {
tree, err := gb.Generate("../../../../tests/fixtures/overlay")
Expect(err).ToNot(HaveOccurred())
defer func() {
Expect(tree.GetPackageSet().Clean()).ToNot(HaveOccurred())
Expect(tree.Clean()).ToNot(HaveOccurred())
}()
Expect(len(tree.GetPackageSet().GetPackages())).To(Equal(10))
Expect(len(tree.GetPackages())).To(Equal(10))
for _, p := range tree.World() {
for _, pid := range tree.GetPackageSet().GetPackages() {
p, err := tree.GetPackageSet().GetPackage(pid)
Expect(err).ToNot(HaveOccurred())
Expect(p.GetName()).To(ContainSubstring("pinentry"))
Expect(p.GetVersion()).To(ContainSubstring("1."))
}