diff --git a/config/config.go b/config/config.go index d660711..09bc3a3 100644 --- a/config/config.go +++ b/config/config.go @@ -111,7 +111,7 @@ func loadConfig() error { return err } - Configs.I386List, err = loadI386List() + config.I386List, err = loadI386List() if err != nil { return err } diff --git a/domain/packages.go b/domain/packages.go index 76c4e0f..84a698c 100644 --- a/domain/packages.go +++ b/domain/packages.go @@ -22,8 +22,8 @@ type SourcePackage struct { } type SourcePackageDTO struct { - Name string `gorm:"primarykey"` - + Name string `gorm:"primarykey"` + Has32bit bool Packages []PackageInfo `gorm:"foreignKey:PackageName"` } diff --git a/packages/packages.go b/packages/packages.go index b71e0d3..0fc02ec 100644 --- a/packages/packages.go +++ b/packages/packages.go @@ -90,17 +90,23 @@ func ProcessPackages() error { updatedPackages.ForEach(func(k string, v domain.SourcePackage) bool { for _, pkg := range config.Configs.I386List { - if v.Name == pkg { + if v.Name == pkg || v.Name == pkg+"-dmo" { v.Has32bit = true + updatedPackages.Set(k, v) return true } } v.Has32bit = false + updatedPackages.Set(k, v) return true }) for _, pkg := range config.Configs.I386List { if _, ok := updatedPackages.Get(pkg); !ok { + _, ok := updatedPackages.Get(pkg + "-dmo") + if ok { + continue + } updatedPackages.Set(pkg, domain.SourcePackage{ Name: pkg, Has32bit: true, diff --git a/server.go b/server.go index 5027530..88a5945 100644 --- a/server.go +++ b/server.go @@ -55,7 +55,7 @@ func runServer(ctx context.Context) error { slog.Info("packages loaded in " + time.Since(start).String()) buildqueue.StartPackageQueueWorker(ctx) - buildqueue.StartQueueAndStatusWorker(ctx) + // buildqueue.StartQueueAndStatusWorker(ctx) cfg := fiber.Config{ JSONEncoder: json.Marshal,