gentoo/simpleparser: Fix parsing of RDEPEND on multiple level

2025-09-25 06:24:46 +00:00 · 2019-11-04 18:08:38 +01:00
parent aa829acf80
commit 0e3952cbd8
2 changed files with 233 additions and 108 deletions
--- a/pkg/tree/builder/gentoo/simpleparser.go
+++ b/pkg/tree/builder/gentoo/simpleparser.go
@@ -44,7 +44,7 @@ type SimpleEbuildParser struct {
 type GentooDependency struct {
 	Use          string
 	UseCondition _gentoo.PackageCond
-	SubDeps      []*_gentoo.GentooPackage
+	SubDeps      []*GentooDependency
 	Dep          *_gentoo.GentooPackage
 }

@@ -56,7 +56,7 @@ func NewGentooDependency(pkg, use string) (*GentooDependency, error) {
 	var err error
 	ans := &GentooDependency{
 		Use:     use,
-		SubDeps: make([]*_gentoo.GentooPackage, 0),
+		SubDeps: make([]*GentooDependency, 0),
 	}

 	if strings.HasPrefix(use, "!") {
@@ -66,6 +66,12 @@ func NewGentooDependency(pkg, use string) (*GentooDependency, error) {

 	if pkg != "" {
 		ans.Dep, err = _gentoo.ParsePackageStr(pkg)
+
+		// TODO: Fix this on parsing phase for handle correctly ${PV}
+		if strings.HasSuffix(ans.Dep.Name, "-") {
+			ans.Dep.Name = ans.Dep.Name[:len(ans.Dep.Name)-1]
+		}
+
 		if err != nil {
 			return nil, err
 		}
@@ -74,8 +80,25 @@ func NewGentooDependency(pkg, use string) (*GentooDependency, error) {
 	return ans, nil
 }

-func (d *GentooDependency) AddSubDependency(pkg string) (*_gentoo.GentooPackage, error) {
-	ans, err := _gentoo.ParsePackageStr(pkg)
+func (d *GentooDependency) GetDepsList() []*GentooDependency {
+	ans := make([]*GentooDependency, 0)
+
+	if len(d.SubDeps) > 0 {
+		for _, d2 := range d.SubDeps {
+			list := d2.GetDepsList()
+			ans = append(ans, list...)
+		}
+	}
+
+	if d.Dep != nil {
+		ans = append(ans, d)
+	}
+
+	return ans
+}
+
+func (d *GentooDependency) AddSubDependency(pkg, use string) (*GentooDependency, error) {
+	ans, err := NewGentooDependency(pkg, use)
 	if err != nil {
 		return nil, err
 	}
@@ -86,8 +109,9 @@ func (d *GentooDependency) AddSubDependency(pkg string) (*_gentoo.GentooPackage,
 }

 func ParseRDEPEND(rdepend string) (*GentooRDEPEND, error) {
-	var lastdep *GentooDependency
+	var lastdep []*GentooDependency = make([]*GentooDependency, 0)
 	var pendingDep = false
+	var dep *GentooDependency
 	var err error

 	ans := &GentooRDEPEND{
@@ -105,16 +129,23 @@ func ParseRDEPEND(rdepend string) (*GentooRDEPEND, error) {
 			if strings.Index(rr, "?") > 0 {
 				// use flag present

-				dep, err := NewGentooDependency("", rr[:strings.Index(rr, "?")])
+				if pendingDep {
+					dep, err = lastdep[len(lastdep)-1].AddSubDependency("", rr[:strings.Index(rr, "?")])
 					if err != nil {
 						return nil, err
 					}
-				if strings.Index(rr, ")") < 0 {
-					pendingDep = true
-					lastdep = dep
+				} else {
+					dep, err = NewGentooDependency("", rr[:strings.Index(rr, "?")])
+					if err != nil {
+						return nil, err
+					}
+					ans.Dependencies = append(ans.Dependencies, dep)
 				}

-				ans.Dependencies = append(ans.Dependencies, dep)
+				if strings.Index(rr, ")") < 0 {
+					pendingDep = true
+					lastdep = append(lastdep, dep)
+				}

 				fields := strings.Split(rr[strings.Index(rr, "?")+1:], " ")
 				for _, f := range fields {
@@ -123,7 +154,7 @@ func ParseRDEPEND(rdepend string) (*GentooRDEPEND, error) {
 						continue
 					}

-					_, err = dep.AddSubDependency(f)
+					_, err = dep.AddSubDependency(f, "")
 					if err != nil {
 						return nil, err
 					}
@@ -136,15 +167,17 @@ func ParseRDEPEND(rdepend string) (*GentooRDEPEND, error) {
 					if f == ")" || f == "(" || f == "" {
 						continue
 					}
-					_, err = lastdep.AddSubDependency(f)
+					_, err = lastdep[len(lastdep)-1].AddSubDependency(f, "")
 					if err != nil {
 						return nil, err
 					}
 				}

 				if strings.Index(rr, ")") >= 0 {
+					lastdep = lastdep[:len(lastdep)-1]
+					if len(lastdep) == 0 {
 						pendingDep = false
-					lastdep = nil
+					}
 				}

 			} else {
@@ -224,36 +257,24 @@ func (ep *SimpleEbuildParser) ScanEbuild(path string, tree pkg.Tree) ([]pkg.Pack
 		pack.PackageRequires = []*pkg.DefaultPackage{}
 		for _, d := range gRDEPEND.Dependencies {

+			deps := d.GetDepsList()
+
 			// TODO: See how handle use flags enabled.
-			if d.Use != "" {
-				for _, d2 := range d.SubDeps {
-
+			// and if it's correct get list of deps directly.
+			for _, d2 := range deps {
 				//TODO: Resolve to db or create a new one.
 				dep := &pkg.DefaultPackage{
-						Name:     d2.Name,
-						Version:  d2.Version + d2.VersionSuffix,
-						Category: d2.Category,
+					Name:     d2.Dep.Name,
+					Version:  d2.Dep.Version + d2.Dep.VersionSuffix,
+					Category: d2.Dep.Category,
 				}
-					if d2.Condition == _gentoo.PkgCondNot {
+				if d2.Dep.Condition == _gentoo.PkgCondNot {
 					pack.PackageConflicts = append(pack.PackageConflicts, dep)
 				} else {
 					pack.PackageRequires = append(pack.PackageRequires, dep)
 				}
 			}
-			} else {

-				//TODO: Resolve to db or create a new one.
-				dep := &pkg.DefaultPackage{
-					Name:     d.Dep.Name,
-					Version:  d.Dep.Version + d.Dep.VersionSuffix,
-					Category: d.Dep.Category,
-				}
-				if d.Dep.Condition == _gentoo.PkgCondNot {
-					pack.PackageConflicts = append(pack.PackageConflicts, dep)
-				} else {
-					pack.PackageRequires = append(pack.PackageRequires, dep)
-				}
-			}
 		}

 	}
--- a/pkg/tree/builder/gentoo/simpleparser_test.go
+++ b/pkg/tree/builder/gentoo/simpleparser_test.go
@@ -51,7 +51,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -66,7 +66,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sabayon-artwork-grub",
 						Category: "x11-themes",
@@ -81,7 +81,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -123,7 +123,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -138,7 +138,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sabayon-artwork-grub",
 						Category: "x11-themes",
@@ -153,7 +153,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -171,11 +171,18 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "mount",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps: []*_gentoo.GentooPackage{&_gentoo.GentooPackage{
+					SubDeps: []*GentooDependency{
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:     "fuse",
 								Category: "sys-fs",
 								Slot:     "0",
-					}},
+							},
+						},
+					},
 					Dep: nil,
 				},
 			))
@@ -210,7 +217,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -225,7 +232,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sabayon-artwork-grub",
 						Category: "x11-themes",
@@ -240,7 +247,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -258,13 +265,22 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "mount",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps: []*_gentoo.GentooPackage{
-						&_gentoo.GentooPackage{
+					SubDeps: []*GentooDependency{
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:     "fuse",
 								Category: "sys-fs",
 								Slot:     "0",
 							},
-						&_gentoo.GentooPackage{
+						},
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:          "pmount",
 								Category:      "sys-apps",
 								Condition:     _gentoo.PkgCondEqual,
@@ -273,6 +289,7 @@ var _ = Describe("GentooBuilder", func() {
 								Slot:          "=",
 							},
 						},
+					},
 					Dep: nil,
 				},
 			))
@@ -307,7 +324,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -322,7 +339,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sabayon-artwork-grub",
 						Category: "x11-themes",
@@ -337,7 +354,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -355,13 +372,22 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "mount",
 					UseCondition: _gentoo.PkgCondNot,
-					SubDeps: []*_gentoo.GentooPackage{
-						&_gentoo.GentooPackage{
+					SubDeps: []*GentooDependency{
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:     "fuse",
 								Category: "sys-fs",
 								Slot:     "0",
 							},
-						&_gentoo.GentooPackage{
+						},
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:          "pmount",
 								Category:      "sys-apps",
 								Condition:     _gentoo.PkgCondEqual,
@@ -370,6 +396,7 @@ var _ = Describe("GentooBuilder", func() {
 								Slot:          "=",
 							},
 						},
+					},
 					Dep: nil,
 				},
 			))
@@ -404,7 +431,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -419,7 +446,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -437,13 +464,22 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "mount",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps: []*_gentoo.GentooPackage{
-						&_gentoo.GentooPackage{
+					SubDeps: []*GentooDependency{
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:     "fuse",
 								Category: "sys-fs",
 								Slot:     "0",
 							},
-						&_gentoo.GentooPackage{
+						},
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:          "pmount",
 								Category:      "sys-apps",
 								Condition:     _gentoo.PkgCondEqual,
@@ -452,6 +488,7 @@ var _ = Describe("GentooBuilder", func() {
 								Slot:          "=",
 							},
 						},
+					},
 					Dep: nil,
 				},
 			))
@@ -485,7 +522,48 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
+					Dep: &_gentoo.GentooPackage{
+						Name:     "sbsigntools",
+						Category: "app-crypt",
+						Slot:     "0",
+					},
+				},
+			))
+		})
+	})
+
+	Context("Parse RDEPEND7", func() {
+
+		rdepend := `
+	app-crypt/sbsigntools
+	>=sys-libs/ncurses-5.2-r5:0=
+	mount? (
+		sys-fs/fuse
+		=sys-apps/pmount-0.9.99_alpha-r5:=
+		ext2? (
+			sys-fs/genext2fs
+		)
+	)
+`
+		gr, err := ParseRDEPEND(rdepend)
+		It("Check error", func() {
+			Expect(err).Should(BeNil())
+		})
+		It("Check gr", func() {
+			Expect(gr).ShouldNot(BeNil())
+		})
+
+		It("Check deps #", func() {
+			Expect(len(gr.Dependencies)).Should(Equal(3))
+		})
+
+		It("Check dep1", func() {
+			Expect(*gr.Dependencies[0]).Should(Equal(
+				GentooDependency{
+					Use:          "",
+					UseCondition: _gentoo.PkgCondInvalid,
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:     "sbsigntools",
 						Category: "app-crypt",
@@ -500,7 +578,7 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps:      make([]*_gentoo.GentooPackage, 0),
+					SubDeps:      make([]*GentooDependency, 0),
 					Dep: &_gentoo.GentooPackage{
 						Name:          "ncurses",
 						Category:      "sys-libs",
@@ -518,13 +596,22 @@ var _ = Describe("GentooBuilder", func() {
 				GentooDependency{
 					Use:          "mount",
 					UseCondition: _gentoo.PkgCondInvalid,
-					SubDeps: []*_gentoo.GentooPackage{
-						&_gentoo.GentooPackage{
+					SubDeps: []*GentooDependency{
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:     "fuse",
 								Category: "sys-fs",
 								Slot:     "0",
 							},
-						&_gentoo.GentooPackage{
+						},
+						&GentooDependency{
+							Use:          "",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps:      make([]*GentooDependency, 0),
+							Dep: &_gentoo.GentooPackage{
 								Name:          "pmount",
 								Category:      "sys-apps",
 								Condition:     _gentoo.PkgCondEqual,
@@ -533,8 +620,25 @@ var _ = Describe("GentooBuilder", func() {
 								Slot:          "=",
 							},
 						},
+						&GentooDependency{
+							Use:          "ext2",
+							UseCondition: _gentoo.PkgCondInvalid,
+							SubDeps: []*GentooDependency{
+								&GentooDependency{
+									Use:          "",
+									UseCondition: _gentoo.PkgCondInvalid,
+									SubDeps:      make([]*GentooDependency, 0),
+									Dep: &_gentoo.GentooPackage{
+										Name:     "genext2fs",
+										Category: "sys-fs",
+										Slot:     "0",
+									},
+								},
+							},
 							Dep: nil,
 						},
+					},
+				},
 			))
 		})