remove pacsift workaround

rename database enum typo build -> built

.golangci.yaml

@@ -14,7 +14,7 @@ linters-settings:
     disabled-checks:
       - whyNoLint
       - filepathJoin
-  gomnd:
+  mnd:
     checks:
       - argument
       - case
@@ -27,6 +27,13 @@ linters-settings:
       - '3'
       - '4'
       - '5'
+      - '6'
+      - '7'
+      - '8'
+      - '9'
+      - '10'
+      - '100'
+      - '1000'
     ignored-functions:
       - strings.SplitN
       - os.OpenFile
@@ -42,32 +49,46 @@ linters-settings:
     allow-unused: false # report any unused nolint directives
     require-explanation: false # don't require an explanation for nolint directives
     require-specific: false # don't require nolint directives to be specific about which linter is being skipped
+  tagliatelle:
+    case:
+      use-field-name: true
+      rules:
+        # Any struct tag type can be used.
+        # Support string case: `camel`, `pascal`, `kebab`, `snake`, `upperSnake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`.
+        json: snake
+        yaml: snake
+        xml: camel
 
 linters:
-  disable-all: true
-  enable:
-    - bodyclose
+  enable-all: true
+  disable:
+    - gochecknoglobals
+    - depguard
+    - gci
+    - gofumpt
+    - goimports
+    - varnamelen
+    - funlen
+    - cyclop
+    - wsl
+    - nosnakecase
+    - nlreturn
+    - godot
+    - nestif
+    - wrapcheck
+    - gocognit
+    - gocyclo
+    - maintidx
+    - nonamedreturns
+    - exhaustivestruct
+    - exhaustruct
+    - forcetypeassert
+    - godox
+    - nakedret
+    - tagalign
+    - maligned
+    # remove for new projects
+    - errname
+    - goerr113
     - depguard
-    - dogsled
-    - dupl
-    - errcheck
-    - exportloopref
-    - gochecknoinits
-    - gocritic
-    - gofmt
-    - gomnd
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - govet
-    - lll
-    - misspell
     - noctx
-    - nolintlint
-    - staticcheck
-    - stylecheck
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - whitespace

README.md

@@ -1,27 +1,41 @@
 # ALHP
 
-[![](https://img.shields.io/badge/license-GPL-blue?style=flat-square)](https://git.harting.dev/anonfunc/ALHP.GO/src/branch/master/LICENSE)
-[![](https://img.shields.io/badge/package-status-informational?style=flat-square)](https://alhp.anonfunc.dev/packages.html)
-[![](https://goreportcard.com/badge/git.harting.dev/ALHP/ALHP.GO?style=flat-square)](https://goreportcard.com/report/git.harting.dev/ALHP/ALHP.GO)
-[![](https://pkg.go.dev/badge/git.harting.dev/ALHP/ALHP.GO)](https://pkg.go.dev/git.harting.dev/ALHP/ALHP.GO)
+[![](https://img.shields.io/badge/package-status-informational?style=flat-square)](https://status.alhp.dev)
+[![](https://goreportcard.com/badge/somegit.dev/ALHP/ALHP.GO?style=flat-square)](https://goreportcard.com/report/somegit.dev/ALHP/ALHP.GO)
+[![](https://pkg.go.dev/badge/somegit.dev/ALHP/ALHP.GO)](https://pkg.go.dev/somegit.dev/ALHP/ALHP.GO)
+[![](https://img.shields.io/badge/license-GPL-blue?style=flat-square)](https://somegit.dev/anonfunc/ALHP.GO/src/branch/master/LICENSE)
 [![](https://img.shields.io/liberapay/patrons/anonfunc.svg?logo=liberapay&style=flat-square)](https://liberapay.com/anonfunc/)
 
-Buildbot for Archlinux-based repos build with different
+Buildbot for Archlinux based repos with different
 [x86-64 feature levels](https://www.phoronix.com/scan.php?page=news_item&px=GCC-11-x86-64-Feature-Levels), `-O3` and
 [LTO](https://en.wikipedia.org/wiki/Interprocedural_optimization).
 
-> ⚠️ NVIDIA graphic users using the **proprietary driver** is highly recommended reading the
-> [FAQ about Linux kernel modules](#directly-linked-kernel-modules) ⚠️
+> [!WARNING]
+> NVIDIA graphics users using the **proprietary driver** are strongly encouraged to read the
+> [FAQ about Linux kernel modules](#directly-linked-kernel-modules) before enabling any repos.
 
-## Quickstart
+---
+<!-- TOC -->
+* [Quick Start](#quick-start)
+* [FAQ](#faq)
+* [Matrix](#matrix)
+* [Donations](#donations)
+* [License and Legal](#license-and-legal)
+<!-- TOC -->
+
+---
+
+## Quick Start
 
 ### 1. Check your system for support
 
-> **Important**: Before you enable any of these repos, check if your system supports the feature level you want to enable
-(e.g. `x86-64-v3`).
-> **If you don't check beforehand, you might be unable to boot your system anymore and need to downgrade any package that you may have upgraded.**
+> [!CAUTION]
+> Before enabling any of these repos, make sure that your system supports the level of functionality you want to
+> enable (e.g. `x86-64-v3`).
+> **If you don't check first, you may not be able to boot your system and will have to downgrade any packages you may
+have upgraded.**
 
-Check which feature-levels your CPU supports with
+Check which feature levels your CPU supports with
 
 ```bash
 /lib/ld-linux-x86-64.so.2 --help
@@ -36,10 +50,14 @@ Subdirectories of glibc-hwcaps directories, in priority order:
   x86-64-v2 (supported, searched)
 ```
 
+> [!NOTE]
+> ALHP repos for `x86-64-v2`, `x86-64-v3` and `x86-64-v4` are currently available. You can see all available
+> repositories [here](https://alhp.dev/).
+
 ### 2. Install keyring & mirrorlist
 
 Install [alhp-keyring](https://aur.archlinux.org/packages/alhp-keyring/)
-and [alhp-mirrorlist](https://aur.archlinux.org/packages/alhp-mirrorlist/) from **AUR**.
+and [alhp-mirrorlist](https://aur.archlinux.org/packages/alhp-mirrorlist/) from the **AUR**.
 
 Example with `yay`:
 
@@ -51,15 +69,16 @@ yay -S alhp-keyring alhp-mirrorlist
 
 ### 3. Choose a mirror (optional)
 
-Edit `/etc/pacman.d/alhp-mirrorlist` and comment out/in mirrors you want to have enabled/disabled. Per default selected
-is a cloudflare-based mirror which
-[*should* provide decent speed worldwide](https://git.harting.dev/ALHP/ALHP.GO/issues/38#issuecomment-891).
-> Note: Only `alhp.harting.dev` is hosted by ALHP directly. If you have problems with a mirror,
-> open an issue at [the mirrorlist repo](https://git.harting.dev/ALHP/alhp-mirrorlist).
+Edit `/etc/pacman.d/alhp-mirrorlist` and comment in/out the mirrors you want to enable/disable.
+By default, a CDN mirror provided by ALHP is selected.
+> [!NOTE]
+> `cdn.alhp.dev` and `alhp.dev` are provided directly by ALHP. If you have problems with a mirror,
+> open an issue at [the mirrorlist repo](https://somegit.dev/ALHP/alhp-mirrorlist).
 
-### 4. Modify /etc/pacman.conf
+### 4. Modify pacman.conf
 
-Add the appropriate repos **above** your regular Archlinux repos.
+Add the ALHP repos to your `/etc/pacman.conf`. Make sure the appropriate ALHP repository is **above** the Archlinux
+repo.
 
 Example for `x86-64-v3`:
 
@@ -67,82 +86,112 @@ Example for `x86-64-v3`:
 [core-x86-64-v3]
 Include = /etc/pacman.d/alhp-mirrorlist
 
-[extra-x86-64-v3]
-Include = /etc/pacman.d/alhp-mirrorlist
-
-[community-x86-64-v3]
-Include = /etc/pacman.d/alhp-mirrorlist
-
 [core]
 Include = /etc/pacman.d/mirrorlist
 
+[extra-x86-64-v3]
+Include = /etc/pacman.d/alhp-mirrorlist
+
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-[community]
+# if you need [multilib] support
+[multilib-x86-64-v3]
+Include = /etc/pacman.d/alhp-mirrorlist
+
+[multilib]
 Include = /etc/pacman.d/mirrorlist
 ```
 
 Replace `x86-64-v3` with the x86-64 feature level you want to enable.
-> ALHP only builds for `x86-64-v3` and `x86-64-v2` at the moment (list is subject to change). You can see all available repositories
-> [here](https://alhp.harting.dev/).
 
-### 5. Update package database and upgrade:
+> [!TIP]
+> Multiple layers can be stacked as described in https://somegit.dev/ALHP/ALHP.GO/issues/255#issuecomment-3335.
+
+### 5. Update package database and upgrade
 
 ```
 pacman -Suy
 ```
 
-## How to disable
+## FAQ
 
-To disable ALHP remove all *x86-64-vX* entries in `/etc/pacman.conf` and remove `alhp-keyring` and `alhp-mirrorlist`.
+### Remove ALHP packages
+
+To disable ALHP, remove all *x86-64-vX* entries in `/etc/pacman.conf` and remove `alhp-keyring` and `alhp-mirrorlist`.
+
+After that, you can update pacman's databases and downgrade all packages, like
 
-After that you can refresh pacmans databases and downgrade all packages like:
 ```
 pacman -Suuy
 ```
 
-## FAQ
-
 ### LTO
 
-Enabled for all packages build after 04 Nov 2021 12:07:00
-UTC. [More details.](https://git.harting.dev/anonfunc/ALHP.GO/issues/52)
+Enabled for all packages built after 04 Nov 2021 12:07:00
+UTC. [More details.](https://somegit.dev/ALHP/ALHP.GO/issues/52)
 LTO status is visible per package on the package status page.
 
-### Linux Kernel
+### Linux Kernel packages
 
-ALHP provides patched kernels (except `linux-zen`, which has these patches already applied) that build
-with `-march=x86-64-vN`. Thanks to
-[graysky](https://github.com/graysky2) for providing [these patches](https://github.com/graysky2/kernel_compiler_patch).
+`KCFLAGS`/`KCPPFLAGS` are used to build the kernel packages with our additional flags.
 
 ### Directly linked kernel modules
 
-**Above-mentioned patching breaks all directly linked modules** like `nvidia` (not `nvidia-dkms`) or
-`virtualbox-host-modules-arch` (not `virtualbox-host-dkms`). **Their respective `dkms`-variant is not affected**. This
-issue is being tracked in #68, a solution is being worked on.
+Due to our increase in pkgrel, building the kernel packages **will break any directly linked modules** such as `nvidia`
+(not `nvidia-dkms`) or `virtualbox-host-modules-arch` (not `virtualbox-host-dkms`). **Their respective `dkms`-variant is
+not affected**. This issue is being tracked in #68, a solution is being worked on.
 
 ### Mirrors
 
 You want to mirror ALHP? You are welcome to do
-so, [see alhp-mirrorlist for how to become one](https://git.harting.dev/ALHP/alhp-mirrorlist#how-to-become-a-mirror).
+so, [see alhp-mirrorlist for how to become one](https://somegit.dev/ALHP/alhp-mirrorlist#how-to-become-a-mirror).
 
 ### What packages are built
 
 Packages [excluded](https://www.reddit.com/r/archlinux/comments/oflged/alhp_archlinux_recompiled_for_x8664v3_experimental/h4fkinu?utm_source=share&utm_medium=web2x&context=3)
-from building (besides all 'any' architecture packages) are being listed in issue #16.
-Also [package status page](https://alhp.anonfunc.dev/packages.html).
+from building (besides all `any` architecture packages) are being listed in issue #16.
+See also [package status page](https://status.alhp.dev) (search for `blacklisted`).
+
+### Why is package X not up-to-date
+
+Also relevant for: **I can't find package X / Application X fails to start because it links to an old/newer lib**
+
+ALHP builds packages **after** they are released in the official Archlinux repos (excluding `[*-testing]`).
+This will cause packages to be delayed if the current batch contains many packages, or packages that take a while to
+build (e.g. `chromium`).
+
+You can always check on the progress of the current build cycle on the [package status page](https://status.alhp.dev).
+Please refrain from opening issues caused by packages currently in queue/not yet build/not yet moved to the repo.
+Please keep in mind that large rebuilds such as `openssl` or `python` can take days to complete on our current build
+hardware.
 
 ### Debug symbols
 
-ALHP provides a debuginfod instance under `debuginfod.harting.dev`.
+ALHP provides a debuginfod instance under `debuginfod.alhp.dev`.
 
 To use it, have `debuginfod` installed on your system and add it to your `DEBUGINFOD_URLS` with:
 
 ```bash
-echo "https://debuginfod.harting.dev" > /etc/debuginfod/alhp.urls
+echo "https://debuginfod.alhp.dev" > /etc/debuginfod/alhp.urls
 ```
 
+### Switch between levels
+
+If you want to switch between levels, e.g. from `x86-64-v3` to `x86-64-v4`, you need to revert to official packages
+first, and then enable your desired repos again.
+
+1. Comment out or remove the ALHP repo entries in `/etc/pacman.conf`.
+2. Downgrade packages with `pacman -Suuy`.
+3. Clear pacman's package cache with `pacman -Scc`.
+4. Uncomment/add your desired repos to `/etc/pacman.conf` and update with `pacman -Suy`.
+
+## Matrix
+
+For any non-issue questions, or if you just want to chat, ALHP has a Matrix
+room [here](https://matrix.to/#/#alhp:ofsg.eu) (`#alhp@ofsg.eu`). You can also find me (@idlegandalf)
+in `#archlinux:archlinux.org`.
+
 ## Donations
 
 I appreciate any money you want to throw my way, but donations are strictly optional. Donations are primarily used to
@@ -153,4 +202,5 @@ work ALHP would not be possible.
 
 ## License and Legal
 
-This project including all of its source files is released under the terms of the GNU General Public License version 2 (or any later version). See [LICENSE](https://git.harting.dev/ALHP/ALHP.GO/src/branch/master/LICENSE) for details.
+This project and all of its source code is released under the terms of the GNU General Public License, version 2
+or any later version. See [LICENSE](https://somegit.dev/ALHP/ALHP.GO/src/branch/master/LICENSE) for details.

buildmanager.go

@@ -0,0 +1,480 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"github.com/c2h5oh/datasize"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sethvargo/go-retry"
+	log "github.com/sirupsen/logrus"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"strings"
+	"sync"
+	"time"
+)
+
+const MaxUnknownBuilder = 2
+
+type BuildManager struct {
+	repoPurge    map[string]chan []*ProtoPackage
+	repoAdd      map[string]chan []*ProtoPackage
+	repoWG       *sync.WaitGroup
+	alpmMutex    *sync.RWMutex
+	building     []*ProtoPackage
+	buildingLock *sync.RWMutex
+	queueSignal  chan struct{}
+	metrics      struct {
+		queueSize *prometheus.GaugeVec
+	}
+}
+
+func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) error {
+	var (
+		doneQ         []*ProtoPackage
+		doneQLock     = new(sync.RWMutex)
+		unknownBuilds bool
+		queueNoMatch  bool
+	)
+
+	for len(doneQ) != len(queue) {
+		up := 0
+		b.buildingLock.RLock()
+		if (pkgList2MaxMem(b.building) < conf.Build.MemoryLimit &&
+			!unknownBuilds && !queueNoMatch) ||
+			(unknownBuilds && len(b.building) < MaxUnknownBuilder) {
+			queueNoMatch = true
+			b.buildingLock.RUnlock()
+			for _, pkg := range queue {
+				// check if package is already build
+				doneQLock.RLock()
+				if ContainsPkg(doneQ, pkg, true) {
+					doneQLock.RUnlock()
+					continue
+				}
+				doneQLock.RUnlock()
+
+				// check if package is already building (we do not build packages from different marchs simultaneously)
+				b.buildingLock.RLock()
+				if ContainsPkg(b.building, pkg, false) {
+					log.Debugf("[Q] skipped already building package %s->%s", pkg.FullRepo, pkg.Pkgbase)
+					b.buildingLock.RUnlock()
+					continue
+				}
+				b.buildingLock.RUnlock()
+
+				// only check for memory on known-memory-builds
+				// otherwise build them one-at-a-time
+				// TODO: add initial compile mode for new repos
+				if !unknownBuilds {
+					// check if package has unknown memory usage
+					if pkg.DBPackage.MaxRss == nil {
+						log.Debugf("[Q] skipped unknown package %s->%s", pkg.FullRepo, pkg.Pkgbase)
+						up++
+						continue
+					}
+
+					// check if package can be built with current memory limit
+					if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit { //nolint:gosec
+						log.Warningf("[Q] %s->%s exeeds memory limit: %s->%s", pkg.FullRepo, pkg.Pkgbase,
+							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit) //nolint:gosec
+						doneQLock.Lock()
+						doneQ = append(doneQ, pkg)
+						doneQLock.Unlock()
+						b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Dec()
+						continue
+					}
+
+					b.buildingLock.RLock()
+					currentMemLoad := pkgList2MaxMem(b.building)
+					b.buildingLock.RUnlock()
+
+					// check if package can be build right now
+					if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit { //nolint:gosec
+						log.Debugf("[Q] skipped package with max_rss %s while load %s: %s->%s",
+							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March) //nolint:gosec
+						continue
+					}
+				} else {
+					b.buildingLock.RLock()
+					if len(b.building) >= MaxUnknownBuilder {
+						b.buildingLock.RUnlock()
+						continue
+					}
+					b.buildingLock.RUnlock()
+				}
+
+				b.buildingLock.Lock()
+				b.building = append(b.building, pkg)
+				b.buildingLock.Unlock()
+				queueNoMatch = false
+				b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Dec()
+				b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "building").Inc()
+
+				go func(pkg *ProtoPackage) {
+					dur, err := pkg.build(ctx)
+					b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "building").Dec()
+					if err != nil && !errors.Is(err, ErrorNotEligible) {
+						log.Warningf("[Q] error building package %s->%s in %s: %s", pkg.FullRepo, pkg.Pkgbase, dur, err)
+						b.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
+					} else if err == nil {
+						log.Infof("[Q] build successful: %s->%s (%s)", pkg.FullRepo, pkg.Pkgbase, dur)
+						b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "built").Inc()
+					}
+					doneQLock.Lock()
+					b.buildingLock.Lock()
+					doneQ = append(doneQ, pkg)
+
+					for i := 0; i < len(b.building); i++ {
+						if b.building[i].PkgbaseEquals(pkg, true) {
+							b.building = append(b.building[:i], b.building[i+1:]...)
+							break
+						}
+					}
+					doneQLock.Unlock()
+					b.buildingLock.Unlock()
+					b.queueSignal <- struct{}{}
+				}(pkg)
+			}
+		} else {
+			log.Debugf("[Q] memory/build limit reached, waiting for package to finish...")
+			b.buildingLock.RUnlock()
+			<-b.queueSignal
+			queueNoMatch = false
+		}
+
+		// if only unknown packages are left, enable unknown buildmode
+		b.buildingLock.RLock()
+		if up == len(queue)-(len(doneQ)+len(b.building)) {
+			unknownBuilds = true
+		}
+		b.buildingLock.RUnlock()
+	}
+	return nil
+}
+
+func (b *BuildManager) repoWorker(ctx context.Context, repo string) {
+	for {
+		select {
+		case pkgL := <-b.repoAdd[repo]:
+			b.repoWG.Add(1)
+			toAdd := make([]string, 0)
+			for _, pkg := range pkgL {
+				toAdd = append(toAdd, pkg.PkgFiles...)
+			}
+
+			args := []string{"-s", "-v", "-p", "-n", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch, repo) + ".db.tar.xz"}
+			args = append(args, toAdd...)
+			cmd := exec.CommandContext(ctx, "repo-add", args...)
+			res, err := cmd.CombinedOutput()
+			log.Debug(string(res))
+			if err != nil && cmd.ProcessState.ExitCode() != 1 {
+				log.Panicf("%s while repo-add: %v", string(res), err)
+			}
+
+			for _, pkg := range pkgL {
+				err = pkg.toDBPackage(ctx, true)
+				if err != nil {
+					log.Warningf("error getting db entry for %s: %v", pkg.Pkgbase, err)
+					continue
+				}
+
+				pkgUpd := pkg.DBPackage.Update().
+					SetStatus(dbpackage.StatusLatest).
+					ClearSkipReason().
+					SetRepoVersion(pkg.Version).
+					SetTagRev(pkg.State.TagRev)
+
+				if _, err := os.Stat(filepath.Join(conf.Basedir.Debug, pkg.March,
+					pkg.DBPackage.Packages[0]+"-debug-"+pkg.Version+"-"+conf.Arch+".pkg.tar.zst")); err == nil {
+					pkgUpd = pkgUpd.SetDebugSymbols(dbpackage.DebugSymbolsAvailable)
+				} else {
+					pkgUpd = pkgUpd.SetDebugSymbols(dbpackage.DebugSymbolsNotAvailable)
+				}
+				if pkg.DBPackage, err = pkgUpd.Save(ctx); err != nil {
+					log.Error(err)
+				}
+			}
+
+			cmd = exec.CommandContext(ctx, "paccache", "-rc", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch), "-k", "1") //nolint:gosec
+			res, err = cmd.CombinedOutput()
+			log.Debug(string(res))
+			if err != nil {
+				log.Warningf("error running paccache: %v", err)
+			}
+
+			err = updateLastUpdated()
+			if err != nil {
+				log.Warningf("error updating lastupdate: %v", err)
+			}
+			b.repoWG.Done()
+		case pkgL := <-b.repoPurge[repo]:
+			for _, pkg := range pkgL {
+				if _, err := os.Stat(filepath.Join(conf.Basedir.Repo, pkg.FullRepo, "os", conf.Arch, pkg.FullRepo) + ".db.tar.xz"); err != nil {
+					continue
+				}
+				if len(pkg.PkgFiles) == 0 {
+					if err := pkg.findPkgFiles(); err != nil {
+						log.Warningf("[%s/%s] unable to find files: %v", pkg.FullRepo, pkg.Pkgbase, err)
+						continue
+					} else if len(pkg.PkgFiles) == 0 {
+						if pkg.DBPackage != nil {
+							err = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(ctx)
+							if err != nil {
+								log.Error(err)
+							}
+						}
+						continue
+					}
+				}
+
+				var realPkgs []string
+				for _, filePath := range pkg.PkgFiles {
+					if _, err := os.Stat(filePath); err == nil {
+						realPkgs = append(realPkgs, Package(filePath).Name())
+					}
+				}
+
+				if len(realPkgs) == 0 {
+					continue
+				}
+
+				b.repoWG.Add(1)
+				args := []string{"-s", "-v", filepath.Join(conf.Basedir.Repo, pkg.FullRepo, "os", conf.Arch, pkg.FullRepo) + ".db.tar.xz"}
+				args = append(args, realPkgs...)
+				cmd := exec.CommandContext(ctx, "repo-remove", args...)
+				res, err := cmd.CombinedOutput()
+				log.Debug(string(res))
+				if err != nil && cmd.ProcessState.ExitCode() == 1 {
+					log.Warningf("error while deleting package %s: %s", pkg.Pkgbase, string(res))
+				}
+
+				if pkg.DBPackage != nil {
+					err = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(ctx)
+					if err != nil {
+						log.Error(err)
+					}
+				}
+
+				for _, file := range pkg.PkgFiles {
+					_ = os.Remove(file)
+					_ = os.Remove(file + ".sig")
+				}
+				err = updateLastUpdated()
+				if err != nil {
+					log.Warningf("error updating lastupdate: %v", err)
+				}
+				b.repoWG.Done()
+			}
+		}
+	}
+}
+
+func (b *BuildManager) syncWorker(ctx context.Context) error {
+	err := os.MkdirAll(conf.Basedir.Work, 0o755)
+	if err != nil {
+		log.Fatalf("error creating work dir %s: %v", conf.Basedir.Work, err)
+	}
+
+	gitPath := filepath.Join(conf.Basedir.Work, stateDir)
+	for {
+		if _, err := os.Stat(gitPath); os.IsNotExist(err) {
+			cmd := exec.CommandContext(ctx, "git", "clone", "--depth=1", conf.StateRepo, gitPath) //nolint:gosec
+			res, err := cmd.CombinedOutput()
+			log.Debug(string(res))
+			if err != nil {
+				log.Fatalf("error cloning state repo: %v", err)
+			}
+		} else if err == nil {
+			cmd := exec.CommandContext(ctx, "git", "reset", "--hard")
+			cmd.Dir = gitPath
+			res, err := cmd.CombinedOutput()
+			log.Debug(string(res))
+			if err != nil {
+				log.Fatalf("error reseting state repo: %v", err)
+			}
+
+			cmd = exec.CommandContext(ctx, "git", "pull")
+			cmd.Dir = gitPath
+			res, err = cmd.CombinedOutput()
+			log.Debug(string(res))
+			if err != nil {
+				log.Warningf("failed to update state repo: %v", err)
+			}
+		}
+
+		// housekeeping
+		wg := new(sync.WaitGroup)
+		for _, repo := range repos {
+			wg.Add(1)
+			splitRepo := strings.Split(repo, "-")
+			go func() {
+				err := housekeeping(ctx, splitRepo[0], strings.Join(splitRepo[1:], "-"), wg)
+				if err != nil {
+					log.Warningf("[%s] housekeeping failed: %v", repo, err)
+				}
+			}()
+		}
+		wg.Wait()
+
+		err := logHK(ctx)
+		if err != nil {
+			log.Warningf("log-housekeeping failed: %v", err)
+		}
+		debugHK()
+
+		// fetch updates between sync runs
+		b.alpmMutex.Lock()
+		err = alpmHandle.Release()
+		if err != nil {
+			log.Fatalf("error releasing ALPM handle: %v", err)
+		}
+
+		if err := retry.Fibonacci(ctx, 1*time.Second, func(_ context.Context) error {
+			if err := setupChroot(ctx); err != nil {
+				log.Warningf("unable to upgrade chroot, trying again later")
+				return retry.RetryableError(err)
+			}
+			return nil
+		}); err != nil {
+			log.Fatal(err)
+		}
+
+		alpmHandle, err = initALPM(filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot),
+			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot, "/var/lib/pacman"))
+		if err != nil {
+			log.Warningf("error while alpm-init: %v", err)
+		}
+		b.alpmMutex.Unlock()
+
+		queue, err := b.genQueue(ctx)
+		if err != nil {
+			log.Errorf("error building queue: %v", err)
+			return err
+		}
+
+		log.Debugf("build-queue with %d items", len(queue))
+		err = b.buildQueue(ctx, queue)
+		if err != nil {
+			return err
+		}
+
+		if ctx.Err() == nil {
+			for _, repo := range repos {
+				err = movePackagesLive(ctx, repo)
+				if err != nil {
+					log.Errorf("[%s] error moving packages live: %v", repo, err)
+				}
+			}
+		} else {
+			return ctx.Err()
+		}
+
+		b.metrics.queueSize.Reset()
+		log.Debugf("build-cycle finished")
+		time.Sleep(time.Duration(*checkInterval) * time.Minute)
+	}
+}
+
+func (b *BuildManager) genQueue(ctx context.Context) ([]*ProtoPackage, error) {
+	stateFiles, err := Glob(filepath.Join(conf.Basedir.Work, stateDir, "**/*"))
+	if err != nil {
+		return nil, fmt.Errorf("error scanning for state-files: %w", err)
+	}
+
+	var pkgbuilds []*ProtoPackage
+	for _, stateFile := range stateFiles {
+		stat, err := os.Stat(stateFile)
+		if err != nil || stat.IsDir() || strings.Contains(stateFile, ".git") || strings.Contains(stateFile, "README.md") {
+			continue
+		}
+
+		repo, subRepo, arch, err := stateFileMeta(stateFile)
+		if err != nil {
+			log.Warningf("[QG] error generating statefile metadata %s: %v", stateFile, err)
+			continue
+		}
+
+		if !Contains(conf.Repos, repo) || (subRepo != nil && Contains(conf.Blacklist.Repo, *subRepo)) {
+			continue
+		}
+
+		rawState, err := os.ReadFile(stateFile)
+		if err != nil {
+			log.Warningf("[QG] cannot read statefile %s: %v", stateFile, err)
+			continue
+		}
+
+		state, err := parseState(string(rawState))
+		if err != nil {
+			log.Warningf("[QG] cannot parse statefile %s: %v", stateFile, err)
+			continue
+		}
+
+		for _, march := range conf.March {
+			pkg := &ProtoPackage{
+				Pkgbase:  state.Pkgbase,
+				Repo:     dbpackage.Repository(repo),
+				March:    march,
+				FullRepo: repo + "-" + march,
+				State:    state,
+				Version:  state.PkgVer,
+				Arch:     arch,
+			}
+
+			err = pkg.toDBPackage(ctx, false)
+			if err != nil {
+				log.Warningf("[QG] error getting/creating dbpackage %s: %v", state.Pkgbase, err)
+				continue
+			}
+
+			if !pkg.isAvailable(ctx, alpmHandle) {
+				log.Debugf("[QG] %s->%s not available on mirror, skipping build", pkg.FullRepo, pkg.Pkgbase)
+				continue
+			}
+
+			aBuild, err := pkg.IsBuilt()
+			if err != nil {
+				log.Warningf("[QG] %s->%s error determining built packages: %v", pkg.FullRepo, pkg.Pkgbase, err)
+			}
+			if aBuild {
+				log.Infof("[QG] %s->%s already built, skipping build", pkg.FullRepo, pkg.Pkgbase)
+				continue
+			}
+
+			if pkg.DBPackage == nil {
+				err = pkg.toDBPackage(ctx, true)
+				if err != nil {
+					log.Warningf("[QG] error getting/creating dbpackage %s: %v", state.Pkgbase, err)
+					continue
+				}
+			}
+
+			if pkg.DBPackage.TagRev != nil && *pkg.DBPackage.TagRev == state.TagRev {
+				continue
+			}
+
+			// try download .SRCINFO from repo
+			srcInfo, err := downloadSRCINFO(pkg.DBPackage.Pkgbase, state.TagRev)
+			if err == nil {
+				pkg.Srcinfo = srcInfo
+			}
+
+			if !pkg.isEligible(ctx) {
+				continue
+			}
+
+			pkg.DBPackage, err = pkg.DBPackage.Update().SetStatus(dbpackage.StatusQueued).Save(ctx)
+			if err != nil {
+				log.Warningf("[QG] error updating dbpackage %s: %v", state.Pkgbase, err)
+			}
+			pkgbuilds = append(pkgbuilds, pkg)
+			b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Inc()
+		}
+	}
+
+	return pkgbuilds, nil
+}

config_dist.yaml

@@ -2,24 +2,10 @@ arch: x86_64
 repos:
   - core
   - extra
-  - community
 
-svn2git:
-  upstream-core-extra: "https://github.com/archlinux/svntogit-packages.git"
-  upstream-community: "https://github.com/archlinux/svntogit-community.git"
+state_repo: "https://gitlab.archlinux.org/archlinux/packaging/state.git"
 
-kernel_to_patch:
-  - linux
-  - linux-lts
-  - linux-zen
-  - linux-hardened
-
-kernel_patches:
-  4.19: "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-4.19-5.4.patch"
-  5.5: "none"
-  5.8: "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-5.8-5.14.patch"
-  5.15: "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-5.15%2B.patch"
-  linux-zen: "skip"
+max_clone_retries: 100
 
 db:
   driver: pgx
@@ -47,23 +33,18 @@ blacklist:
     - llvm
     - rust
 
-status:
-  class:
-    skipped: "secondary"
-    queued: "warning"
-    latest: "primary"
-    failed: "danger"
-    signing: "success"
-    building: "info"
-    unknown: "dark"
-
 build:
   # number of workers total
   worker: 4
   makej: 8
   checks: true
-  # builds over this threshold are considered slow (in cpu-time-seconds)
-  slow_queue_threshold: 14400.0
+  # how much memory ALHP should use
+  # this will also decide how many builds will run concurrently,
+  # since ALHP will try to optimise the queue for speed while not going over this limit
+  memory_limit: "16gb"
 
 logging:
   level: INFO
+
+metrics:
+  port: 9568

ent/client.go

@@ -7,13 +7,14 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"reflect"
 
-	"git.harting.dev/ALHP/ALHP.GO/ent/migrate"
-
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/migrate"
 
+	"entgo.io/ent"
 	"entgo.io/ent/dialect"
 	"entgo.io/ent/dialect/sql"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 )
 
 // Client is the client that holds all ent builders.
@@ -21,22 +22,76 @@ type Client struct {
 	config
 	// Schema is the client for creating, migrating and dropping schema.
 	Schema *migrate.Schema
-	// DbPackage is the client for interacting with the DbPackage builders.
-	DbPackage *DbPackageClient
+	// DBPackage is the client for interacting with the DBPackage builders.
+	DBPackage *DBPackageClient
 }
 
 // NewClient creates a new client configured with the given options.
 func NewClient(opts ...Option) *Client {
-	cfg := config{log: log.Println, hooks: &hooks{}}
-	cfg.options(opts...)
-	client := &Client{config: cfg}
+	client := &Client{config: newConfig(opts...)}
 	client.init()
 	return client
 }
 
 func (c *Client) init() {
 	c.Schema = migrate.NewSchema(c.driver)
-	c.DbPackage = NewDbPackageClient(c.config)
+	c.DBPackage = NewDBPackageClient(c.config)
+}
+
+type (
+	// config is the configuration for the client and its builder.
+	config struct {
+		// driver used for executing database requests.
+		driver dialect.Driver
+		// debug enable a debug logging.
+		debug bool
+		// log used for logging on debug mode.
+		log func(...any)
+		// hooks to execute on mutations.
+		hooks *hooks
+		// interceptors to execute on queries.
+		inters *inters
+	}
+	// Option function to configure the client.
+	Option func(*config)
+)
+
+// newConfig creates a new config for the client.
+func newConfig(opts ...Option) config {
+	cfg := config{log: log.Println, hooks: &hooks{}, inters: &inters{}}
+	cfg.options(opts...)
+	return cfg
+}
+
+// options applies the options on the config object.
+func (c *config) options(opts ...Option) {
+	for _, opt := range opts {
+		opt(c)
+	}
+	if c.debug {
+		c.driver = dialect.Debug(c.driver, c.log)
+	}
+}
+
+// Debug enables debug logging on the ent.Driver.
+func Debug() Option {
+	return func(c *config) {
+		c.debug = true
+	}
+}
+
+// Log sets the logging function for debug mode.
+func Log(fn func(...any)) Option {
+	return func(c *config) {
+		c.log = fn
+	}
+}
+
+// Driver configures the client driver.
+func Driver(driver dialect.Driver) Option {
+	return func(c *config) {
+		c.driver = driver
+	}
 }
 
 // Open opens a database/sql.DB specified by the driver name and
@@ -55,11 +110,14 @@ func Open(driverName, dataSourceName string, options ...Option) (*Client, error)
 	}
 }
 
+// ErrTxStarted is returned when trying to start a new transaction from a transactional client.
+var ErrTxStarted = errors.New("ent: cannot start a transaction within a transaction")
+
 // Tx returns a new transactional client. The provided context
 // is used until the transaction is committed or rolled back.
 func (c *Client) Tx(ctx context.Context) (*Tx, error) {
 	if _, ok := c.driver.(*txDriver); ok {
-		return nil, errors.New("ent: cannot start a transaction within a transaction")
+		return nil, ErrTxStarted
 	}
 	tx, err := newTx(ctx, c.driver)
 	if err != nil {
@@ -70,7 +128,7 @@ func (c *Client) Tx(ctx context.Context) (*Tx, error) {
 	return &Tx{
 		ctx:       ctx,
 		config:    cfg,
-		DbPackage: NewDbPackageClient(cfg),
+		DBPackage: NewDBPackageClient(cfg),
 	}, nil
 }
 
@@ -90,14 +148,14 @@ func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error)
 	return &Tx{
 		ctx:       ctx,
 		config:    cfg,
-		DbPackage: NewDbPackageClient(cfg),
+		DBPackage: NewDBPackageClient(cfg),
 	}, nil
 }
 
 // Debug returns a new debug-client. It's used to get verbose logging on specific operations.
 //
 //	client.Debug().
-//		DbPackage.
+//		DBPackage.
 //		Query().
 //		Count(ctx)
 func (c *Client) Debug() *Client {
@@ -119,87 +177,126 @@ func (c *Client) Close() error {
 // Use adds the mutation hooks to all the entity clients.
 // In order to add hooks to a specific client, call: `client.Node.Use(...)`.
 func (c *Client) Use(hooks ...Hook) {
-	c.DbPackage.Use(hooks...)
+	c.DBPackage.Use(hooks...)
 }
 
-// DbPackageClient is a client for the DbPackage schema.
-type DbPackageClient struct {
+// Intercept adds the query interceptors to all the entity clients.
+// In order to add interceptors to a specific client, call: `client.Node.Intercept(...)`.
+func (c *Client) Intercept(interceptors ...Interceptor) {
+	c.DBPackage.Intercept(interceptors...)
+}
+
+// Mutate implements the ent.Mutator interface.
+func (c *Client) Mutate(ctx context.Context, m Mutation) (Value, error) {
+	switch m := m.(type) {
+	case *DBPackageMutation:
+		return c.DBPackage.mutate(ctx, m)
+	default:
+		return nil, fmt.Errorf("ent: unknown mutation type %T", m)
+	}
+}
+
+// DBPackageClient is a client for the DBPackage schema.
+type DBPackageClient struct {
 	config
 }
 
-// NewDbPackageClient returns a client for the DbPackage from the given config.
-func NewDbPackageClient(c config) *DbPackageClient {
-	return &DbPackageClient{config: c}
+// NewDBPackageClient returns a client for the DBPackage from the given config.
+func NewDBPackageClient(c config) *DBPackageClient {
+	return &DBPackageClient{config: c}
 }
 
 // Use adds a list of mutation hooks to the hooks stack.
 // A call to `Use(f, g, h)` equals to `dbpackage.Hooks(f(g(h())))`.
-func (c *DbPackageClient) Use(hooks ...Hook) {
-	c.hooks.DbPackage = append(c.hooks.DbPackage, hooks...)
+func (c *DBPackageClient) Use(hooks ...Hook) {
+	c.hooks.DBPackage = append(c.hooks.DBPackage, hooks...)
 }
 
-// Create returns a builder for creating a DbPackage entity.
-func (c *DbPackageClient) Create() *DbPackageCreate {
-	mutation := newDbPackageMutation(c.config, OpCreate)
-	return &DbPackageCreate{config: c.config, hooks: c.Hooks(), mutation: mutation}
+// Intercept adds a list of query interceptors to the interceptors stack.
+// A call to `Intercept(f, g, h)` equals to `dbpackage.Intercept(f(g(h())))`.
+func (c *DBPackageClient) Intercept(interceptors ...Interceptor) {
+	c.inters.DBPackage = append(c.inters.DBPackage, interceptors...)
 }
 
-// CreateBulk returns a builder for creating a bulk of DbPackage entities.
-func (c *DbPackageClient) CreateBulk(builders ...*DbPackageCreate) *DbPackageCreateBulk {
-	return &DbPackageCreateBulk{config: c.config, builders: builders}
+// Create returns a builder for creating a DBPackage entity.
+func (c *DBPackageClient) Create() *DBPackageCreate {
+	mutation := newDBPackageMutation(c.config, OpCreate)
+	return &DBPackageCreate{config: c.config, hooks: c.Hooks(), mutation: mutation}
 }
 
-// Update returns an update builder for DbPackage.
-func (c *DbPackageClient) Update() *DbPackageUpdate {
-	mutation := newDbPackageMutation(c.config, OpUpdate)
-	return &DbPackageUpdate{config: c.config, hooks: c.Hooks(), mutation: mutation}
+// CreateBulk returns a builder for creating a bulk of DBPackage entities.
+func (c *DBPackageClient) CreateBulk(builders ...*DBPackageCreate) *DBPackageCreateBulk {
+	return &DBPackageCreateBulk{config: c.config, builders: builders}
+}
+
+// MapCreateBulk creates a bulk creation builder from the given slice. For each item in the slice, the function creates
+// a builder and applies setFunc on it.
+func (c *DBPackageClient) MapCreateBulk(slice any, setFunc func(*DBPackageCreate, int)) *DBPackageCreateBulk {
+	rv := reflect.ValueOf(slice)
+	if rv.Kind() != reflect.Slice {
+		return &DBPackageCreateBulk{err: fmt.Errorf("calling to DBPackageClient.MapCreateBulk with wrong type %T, need slice", slice)}
+	}
+	builders := make([]*DBPackageCreate, rv.Len())
+	for i := 0; i < rv.Len(); i++ {
+		builders[i] = c.Create()
+		setFunc(builders[i], i)
+	}
+	return &DBPackageCreateBulk{config: c.config, builders: builders}
+}
+
+// Update returns an update builder for DBPackage.
+func (c *DBPackageClient) Update() *DBPackageUpdate {
+	mutation := newDBPackageMutation(c.config, OpUpdate)
+	return &DBPackageUpdate{config: c.config, hooks: c.Hooks(), mutation: mutation}
 }
 
 // UpdateOne returns an update builder for the given entity.
-func (c *DbPackageClient) UpdateOne(dp *DbPackage) *DbPackageUpdateOne {
-	mutation := newDbPackageMutation(c.config, OpUpdateOne, withDbPackage(dp))
-	return &DbPackageUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation}
+func (c *DBPackageClient) UpdateOne(dp *DBPackage) *DBPackageUpdateOne {
+	mutation := newDBPackageMutation(c.config, OpUpdateOne, withDBPackage(dp))
+	return &DBPackageUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation}
 }
 
 // UpdateOneID returns an update builder for the given id.
-func (c *DbPackageClient) UpdateOneID(id int) *DbPackageUpdateOne {
-	mutation := newDbPackageMutation(c.config, OpUpdateOne, withDbPackageID(id))
-	return &DbPackageUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation}
+func (c *DBPackageClient) UpdateOneID(id int) *DBPackageUpdateOne {
+	mutation := newDBPackageMutation(c.config, OpUpdateOne, withDBPackageID(id))
+	return &DBPackageUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation}
 }
 
-// Delete returns a delete builder for DbPackage.
-func (c *DbPackageClient) Delete() *DbPackageDelete {
-	mutation := newDbPackageMutation(c.config, OpDelete)
-	return &DbPackageDelete{config: c.config, hooks: c.Hooks(), mutation: mutation}
+// Delete returns a delete builder for DBPackage.
+func (c *DBPackageClient) Delete() *DBPackageDelete {
+	mutation := newDBPackageMutation(c.config, OpDelete)
+	return &DBPackageDelete{config: c.config, hooks: c.Hooks(), mutation: mutation}
 }
 
 // DeleteOne returns a builder for deleting the given entity.
-func (c *DbPackageClient) DeleteOne(dp *DbPackage) *DbPackageDeleteOne {
+func (c *DBPackageClient) DeleteOne(dp *DBPackage) *DBPackageDeleteOne {
 	return c.DeleteOneID(dp.ID)
 }
 
 // DeleteOneID returns a builder for deleting the given entity by its id.
-func (c *DbPackageClient) DeleteOneID(id int) *DbPackageDeleteOne {
+func (c *DBPackageClient) DeleteOneID(id int) *DBPackageDeleteOne {
 	builder := c.Delete().Where(dbpackage.ID(id))
 	builder.mutation.id = &id
 	builder.mutation.op = OpDeleteOne
-	return &DbPackageDeleteOne{builder}
+	return &DBPackageDeleteOne{builder}
 }
 
-// Query returns a query builder for DbPackage.
-func (c *DbPackageClient) Query() *DbPackageQuery {
-	return &DbPackageQuery{
+// Query returns a query builder for DBPackage.
+func (c *DBPackageClient) Query() *DBPackageQuery {
+	return &DBPackageQuery{
 		config: c.config,
+		ctx:    &QueryContext{Type: TypeDBPackage},
+		inters: c.Interceptors(),
 	}
 }
 
-// Get returns a DbPackage entity by its id.
-func (c *DbPackageClient) Get(ctx context.Context, id int) (*DbPackage, error) {
+// Get returns a DBPackage entity by its id.
+func (c *DBPackageClient) Get(ctx context.Context, id int) (*DBPackage, error) {
 	return c.Query().Where(dbpackage.ID(id)).Only(ctx)
 }
 
 // GetX is like Get, but panics if an error occurs.
-func (c *DbPackageClient) GetX(ctx context.Context, id int) *DbPackage {
+func (c *DBPackageClient) GetX(ctx context.Context, id int) *DBPackage {
 	obj, err := c.Get(ctx, id)
 	if err != nil {
 		panic(err)
@@ -208,6 +305,36 @@ func (c *DbPackageClient) GetX(ctx context.Context, id int) *DbPackage {
 }
 
 // Hooks returns the client hooks.
-func (c *DbPackageClient) Hooks() []Hook {
-	return c.hooks.DbPackage
+func (c *DBPackageClient) Hooks() []Hook {
+	return c.hooks.DBPackage
 }
+
+// Interceptors returns the client interceptors.
+func (c *DBPackageClient) Interceptors() []Interceptor {
+	return c.inters.DBPackage
+}
+
+func (c *DBPackageClient) mutate(ctx context.Context, m *DBPackageMutation) (Value, error) {
+	switch m.Op() {
+	case OpCreate:
+		return (&DBPackageCreate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx)
+	case OpUpdate:
+		return (&DBPackageUpdate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx)
+	case OpUpdateOne:
+		return (&DBPackageUpdateOne{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx)
+	case OpDelete, OpDeleteOne:
+		return (&DBPackageDelete{config: c.config, hooks: c.Hooks(), mutation: m}).Exec(ctx)
+	default:
+		return nil, fmt.Errorf("ent: unknown DBPackage mutation op: %q", m.Op())
+	}
+}
+
+// hooks and interceptors per client, for fast access.
+type (
+	hooks struct {
+		DBPackage []ent.Hook
+	}
+	inters struct {
+		DBPackage []ent.Interceptor
+	}
+)

ent/config.go

@@ -1,59 +0,0 @@
-// Code generated by ent, DO NOT EDIT.
-
-package ent
-
-import (
-	"entgo.io/ent"
-	"entgo.io/ent/dialect"
-)
-
-// Option function to configure the client.
-type Option func(*config)
-
-// Config is the configuration for the client and its builder.
-type config struct {
-	// driver used for executing database requests.
-	driver dialect.Driver
-	// debug enable a debug logging.
-	debug bool
-	// log used for logging on debug mode.
-	log func(...any)
-	// hooks to execute on mutations.
-	hooks *hooks
-}
-
-// hooks per client, for fast access.
-type hooks struct {
-	DbPackage []ent.Hook
-}
-
-// Options applies the options on the config object.
-func (c *config) options(opts ...Option) {
-	for _, opt := range opts {
-		opt(c)
-	}
-	if c.debug {
-		c.driver = dialect.Debug(c.driver, c.log)
-	}
-}
-
-// Debug enables debug logging on the ent.Driver.
-func Debug() Option {
-	return func(c *config) {
-		c.debug = true
-	}
-}
-
-// Log sets the logging function for debug mode.
-func Log(fn func(...any)) Option {
-	return func(c *config) {
-		c.log = fn
-	}
-}
-
-// Driver configures the client driver.
-func Driver(driver dialect.Driver) Option {
-	return func(c *config) {
-		c.driver = driver
-	}
-}

ent/context.go

@@ -1,33 +0,0 @@
-// Code generated by ent, DO NOT EDIT.
-
-package ent
-
-import (
-	"context"
-)
-
-type clientCtxKey struct{}
-
-// FromContext returns a Client stored inside a context, or nil if there isn't one.
-func FromContext(ctx context.Context) *Client {
-	c, _ := ctx.Value(clientCtxKey{}).(*Client)
-	return c
-}
-
-// NewContext returns a new context with the given Client attached.
-func NewContext(parent context.Context, c *Client) context.Context {
-	return context.WithValue(parent, clientCtxKey{}, c)
-}
-
-type txCtxKey struct{}
-
-// TxFromContext returns a Tx stored inside a context, or nil if there isn't one.
-func TxFromContext(ctx context.Context) *Tx {
-	tx, _ := ctx.Value(txCtxKey{}).(*Tx)
-	return tx
-}
-
-// NewTxContext returns a new context with the given Tx attached.
-func NewTxContext(parent context.Context, tx *Tx) context.Context {
-	return context.WithValue(parent, txCtxKey{}, tx)
-}

ent/dbpackage.go

@@ -8,12 +8,13 @@ import (
 	"strings"
 	"time"
 
+	"entgo.io/ent"
 	"entgo.io/ent/dialect/sql"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 )
 
-// DbPackage is the model entity for the DbPackage schema.
-type DbPackage struct {
+// DBPackage is the model entity for the DBPackage schema.
+type DBPackage struct {
 	config `json:"-"`
 	// ID of the ent.
 	ID int `json:"id,omitempty"`
@@ -37,8 +38,6 @@ type DbPackage struct {
 	BuildTimeStart time.Time `json:"build_time_start,omitempty"`
 	// Updated holds the value of the "updated" field.
 	Updated time.Time `json:"updated,omitempty"`
-	// Hash holds the value of the "hash" field.
-	Hash string `json:"hash,omitempty"`
 	// Lto holds the value of the "lto" field.
 	Lto dbpackage.Lto `json:"lto,omitempty"`
 	// LastVersionBuild holds the value of the "last_version_build" field.
@@ -57,16 +56,13 @@ type DbPackage struct {
 	IoIn *int64 `json:"io_in,omitempty"`
 	// IoOut holds the value of the "io_out" field.
 	IoOut *int64 `json:"io_out,omitempty"`
-	// Srcinfo holds the value of the "srcinfo" field.
-	Srcinfo *string `json:"srcinfo,omitempty"`
-	// SrcinfoHash holds the value of the "srcinfo_hash" field.
-	SrcinfoHash string `json:"srcinfo_hash,omitempty"`
-	// Pkgbuild holds the value of the "pkgbuild" field.
-	Pkgbuild string `json:"pkgbuild,omitempty"`
+	// TagRev holds the value of the "tag_rev" field.
+	TagRev       *string `json:"tag_rev,omitempty"`
+	selectValues sql.SelectValues
 }
 
 // scanValues returns the types for scanning values from sql.Rows.
-func (*DbPackage) scanValues(columns []string) ([]any, error) {
+func (*DBPackage) scanValues(columns []string) ([]any, error) {
 	values := make([]any, len(columns))
 	for i := range columns {
 		switch columns[i] {
@@ -74,20 +70,20 @@ func (*DbPackage) scanValues(columns []string) ([]any, error) {
 			values[i] = new([]byte)
 		case dbpackage.FieldID, dbpackage.FieldMaxRss, dbpackage.FieldUTime, dbpackage.FieldSTime, dbpackage.FieldIoIn, dbpackage.FieldIoOut:
 			values[i] = new(sql.NullInt64)
-		case dbpackage.FieldPkgbase, dbpackage.FieldStatus, dbpackage.FieldSkipReason, dbpackage.FieldRepository, dbpackage.FieldMarch, dbpackage.FieldVersion, dbpackage.FieldRepoVersion, dbpackage.FieldHash, dbpackage.FieldLto, dbpackage.FieldLastVersionBuild, dbpackage.FieldDebugSymbols, dbpackage.FieldSrcinfo, dbpackage.FieldSrcinfoHash, dbpackage.FieldPkgbuild:
+		case dbpackage.FieldPkgbase, dbpackage.FieldStatus, dbpackage.FieldSkipReason, dbpackage.FieldRepository, dbpackage.FieldMarch, dbpackage.FieldVersion, dbpackage.FieldRepoVersion, dbpackage.FieldLto, dbpackage.FieldLastVersionBuild, dbpackage.FieldDebugSymbols, dbpackage.FieldTagRev:
 			values[i] = new(sql.NullString)
 		case dbpackage.FieldBuildTimeStart, dbpackage.FieldUpdated, dbpackage.FieldLastVerified:
 			values[i] = new(sql.NullTime)
 		default:
-			return nil, fmt.Errorf("unexpected column %q for type DbPackage", columns[i])
+			values[i] = new(sql.UnknownType)
 		}
 	}
 	return values, nil
 }
 
 // assignValues assigns the values that were returned from sql.Rows (after scanning)
-// to the DbPackage fields.
-func (dp *DbPackage) assignValues(columns []string, values []any) error {
+// to the DBPackage fields.
+func (dp *DBPackage) assignValues(columns []string, values []any) error {
 	if m, n := len(values), len(columns); m < n {
 		return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
 	}
@@ -161,12 +157,6 @@ func (dp *DbPackage) assignValues(columns []string, values []any) error {
 			} else if value.Valid {
 				dp.Updated = value.Time
 			}
-		case dbpackage.FieldHash:
-			if value, ok := values[i].(*sql.NullString); !ok {
-				return fmt.Errorf("unexpected type %T for field hash", values[i])
-			} else if value.Valid {
-				dp.Hash = value.String
-			}
 		case dbpackage.FieldLto:
 			if value, ok := values[i].(*sql.NullString); !ok {
 				return fmt.Errorf("unexpected type %T for field lto", values[i])
@@ -226,52 +216,48 @@ func (dp *DbPackage) assignValues(columns []string, values []any) error {
 				dp.IoOut = new(int64)
 				*dp.IoOut = value.Int64
 			}
-		case dbpackage.FieldSrcinfo:
+		case dbpackage.FieldTagRev:
 			if value, ok := values[i].(*sql.NullString); !ok {
-				return fmt.Errorf("unexpected type %T for field srcinfo", values[i])
+				return fmt.Errorf("unexpected type %T for field tag_rev", values[i])
 			} else if value.Valid {
-				dp.Srcinfo = new(string)
-				*dp.Srcinfo = value.String
-			}
-		case dbpackage.FieldSrcinfoHash:
-			if value, ok := values[i].(*sql.NullString); !ok {
-				return fmt.Errorf("unexpected type %T for field srcinfo_hash", values[i])
-			} else if value.Valid {
-				dp.SrcinfoHash = value.String
-			}
-		case dbpackage.FieldPkgbuild:
-			if value, ok := values[i].(*sql.NullString); !ok {
-				return fmt.Errorf("unexpected type %T for field pkgbuild", values[i])
-			} else if value.Valid {
-				dp.Pkgbuild = value.String
+				dp.TagRev = new(string)
+				*dp.TagRev = value.String
 			}
+		default:
+			dp.selectValues.Set(columns[i], values[i])
 		}
 	}
 	return nil
 }
 
-// Update returns a builder for updating this DbPackage.
-// Note that you need to call DbPackage.Unwrap() before calling this method if this DbPackage
-// was returned from a transaction, and the transaction was committed or rolled back.
-func (dp *DbPackage) Update() *DbPackageUpdateOne {
-	return (&DbPackageClient{config: dp.config}).UpdateOne(dp)
+// Value returns the ent.Value that was dynamically selected and assigned to the DBPackage.
+// This includes values selected through modifiers, order, etc.
+func (dp *DBPackage) Value(name string) (ent.Value, error) {
+	return dp.selectValues.Get(name)
 }
 
-// Unwrap unwraps the DbPackage entity that was returned from a transaction after it was closed,
+// Update returns a builder for updating this DBPackage.
+// Note that you need to call DBPackage.Unwrap() before calling this method if this DBPackage
+// was returned from a transaction, and the transaction was committed or rolled back.
+func (dp *DBPackage) Update() *DBPackageUpdateOne {
+	return NewDBPackageClient(dp.config).UpdateOne(dp)
+}
+
+// Unwrap unwraps the DBPackage entity that was returned from a transaction after it was closed,
 // so that all future queries will be executed through the driver which created the transaction.
-func (dp *DbPackage) Unwrap() *DbPackage {
+func (dp *DBPackage) Unwrap() *DBPackage {
 	_tx, ok := dp.config.driver.(*txDriver)
 	if !ok {
-		panic("ent: DbPackage is not a transactional entity")
+		panic("ent: DBPackage is not a transactional entity")
 	}
 	dp.config.driver = _tx.drv
 	return dp
 }
 
 // String implements the fmt.Stringer.
-func (dp *DbPackage) String() string {
+func (dp *DBPackage) String() string {
 	var builder strings.Builder
-	builder.WriteString("DbPackage(")
+	builder.WriteString("DBPackage(")
 	builder.WriteString(fmt.Sprintf("id=%v, ", dp.ID))
 	builder.WriteString("pkgbase=")
 	builder.WriteString(dp.Pkgbase)
@@ -303,9 +289,6 @@ func (dp *DbPackage) String() string {
 	builder.WriteString("updated=")
 	builder.WriteString(dp.Updated.Format(time.ANSIC))
 	builder.WriteString(", ")
-	builder.WriteString("hash=")
-	builder.WriteString(dp.Hash)
-	builder.WriteString(", ")
 	builder.WriteString("lto=")
 	builder.WriteString(fmt.Sprintf("%v", dp.Lto))
 	builder.WriteString(", ")
@@ -343,25 +326,13 @@ func (dp *DbPackage) String() string {
 		builder.WriteString(fmt.Sprintf("%v", *v))
 	}
 	builder.WriteString(", ")
-	if v := dp.Srcinfo; v != nil {
-		builder.WriteString("srcinfo=")
+	if v := dp.TagRev; v != nil {
+		builder.WriteString("tag_rev=")
 		builder.WriteString(*v)
 	}
-	builder.WriteString(", ")
-	builder.WriteString("srcinfo_hash=")
-	builder.WriteString(dp.SrcinfoHash)
-	builder.WriteString(", ")
-	builder.WriteString("pkgbuild=")
-	builder.WriteString(dp.Pkgbuild)
 	builder.WriteByte(')')
 	return builder.String()
 }
 
-// DbPackages is a parsable slice of DbPackage.
-type DbPackages []*DbPackage
-
-func (dp DbPackages) config(cfg config) {
-	for _i := range dp {
-		dp[_i].config = cfg
-	}
-}
+// DBPackages is a parsable slice of DBPackage.
+type DBPackages []*DBPackage

ent/dbpackage/dbpackage.go

@@ -4,6 +4,8 @@ package dbpackage
 
 import (
 	"fmt"
+
+	"entgo.io/ent/dialect/sql"
 )
 
 const (
@@ -31,8 +33,6 @@ const (
 	FieldBuildTimeStart = "build_time_start"
 	// FieldUpdated holds the string denoting the updated field in the database.
 	FieldUpdated = "updated"
-	// FieldHash holds the string denoting the hash field in the database.
-	FieldHash = "hash"
 	// FieldLto holds the string denoting the lto field in the database.
 	FieldLto = "lto"
 	// FieldLastVersionBuild holds the string denoting the last_version_build field in the database.
@@ -51,12 +51,8 @@ const (
 	FieldIoIn = "io_in"
 	// FieldIoOut holds the string denoting the io_out field in the database.
 	FieldIoOut = "io_out"
-	// FieldSrcinfo holds the string denoting the srcinfo field in the database.
-	FieldSrcinfo = "srcinfo"
-	// FieldSrcinfoHash holds the string denoting the srcinfo_hash field in the database.
-	FieldSrcinfoHash = "srcinfo_hash"
-	// FieldPkgbuild holds the string denoting the pkgbuild field in the database.
-	FieldPkgbuild = "pkgbuild"
+	// FieldTagRev holds the string denoting the tag_rev field in the database.
+	FieldTagRev = "tag_rev"
 	// Table holds the table name of the dbpackage in the database.
 	Table = "db_packages"
 )
@@ -74,7 +70,6 @@ var Columns = []string{
 	FieldRepoVersion,
 	FieldBuildTimeStart,
 	FieldUpdated,
-	FieldHash,
 	FieldLto,
 	FieldLastVersionBuild,
 	FieldLastVerified,
@@ -84,9 +79,7 @@ var Columns = []string{
 	FieldSTime,
 	FieldIoIn,
 	FieldIoOut,
-	FieldSrcinfo,
-	FieldSrcinfoHash,
-	FieldPkgbuild,
+	FieldTagRev,
 }
 
 // ValidColumn reports if the column name is valid (part of the table columns).
@@ -116,7 +109,7 @@ const DefaultStatus = StatusUnknown
 const (
 	StatusSkipped  Status = "skipped"
 	StatusFailed   Status = "failed"
-	StatusBuild    Status = "build"
+	StatusBuilt    Status = "built"
 	StatusQueued   Status = "queued"
 	StatusDelayed  Status = "delayed"
 	StatusBuilding Status = "building"
@@ -132,7 +125,7 @@ func (s Status) String() string {
 // StatusValidator is a validator for the "status" field enum values. It is called by the builders before save.
 func StatusValidator(s Status) error {
 	switch s {
-	case StatusSkipped, StatusFailed, StatusBuild, StatusQueued, StatusDelayed, StatusBuilding, StatusLatest, StatusSigning, StatusUnknown:
+	case StatusSkipped, StatusFailed, StatusBuilt, StatusQueued, StatusDelayed, StatusBuilding, StatusLatest, StatusSigning, StatusUnknown:
 		return nil
 	default:
 		return fmt.Errorf("dbpackage: invalid enum value for status field: %q", s)
@@ -144,9 +137,9 @@ type Repository string
 
 // Repository values.
 const (
-	RepositoryExtra     Repository = "extra"
-	RepositoryCore      Repository = "core"
-	RepositoryCommunity Repository = "community"
+	RepositoryExtra    Repository = "extra"
+	RepositoryCore     Repository = "core"
+	RepositoryMultilib Repository = "multilib"
 )
 
 func (r Repository) String() string {
@@ -156,7 +149,7 @@ func (r Repository) String() string {
 // RepositoryValidator is a validator for the "repository" field enum values. It is called by the builders before save.
 func RepositoryValidator(r Repository) error {
 	switch r {
-	case RepositoryExtra, RepositoryCore, RepositoryCommunity:
+	case RepositoryExtra, RepositoryCore, RepositoryMultilib:
 		return nil
 	default:
 		return fmt.Errorf("dbpackage: invalid enum value for repository field: %q", r)
@@ -217,3 +210,106 @@ func DebugSymbolsValidator(ds DebugSymbols) error {
 		return fmt.Errorf("dbpackage: invalid enum value for debug_symbols field: %q", ds)
 	}
 }
+
+// OrderOption defines the ordering options for the DBPackage queries.
+type OrderOption func(*sql.Selector)
+
+// ByID orders the results by the id field.
+func ByID(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldID, opts...).ToFunc()
+}
+
+// ByPkgbase orders the results by the pkgbase field.
+func ByPkgbase(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldPkgbase, opts...).ToFunc()
+}
+
+// ByStatus orders the results by the status field.
+func ByStatus(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldStatus, opts...).ToFunc()
+}
+
+// BySkipReason orders the results by the skip_reason field.
+func BySkipReason(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldSkipReason, opts...).ToFunc()
+}
+
+// ByRepository orders the results by the repository field.
+func ByRepository(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldRepository, opts...).ToFunc()
+}
+
+// ByMarch orders the results by the march field.
+func ByMarch(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldMarch, opts...).ToFunc()
+}
+
+// ByVersion orders the results by the version field.
+func ByVersion(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldVersion, opts...).ToFunc()
+}
+
+// ByRepoVersion orders the results by the repo_version field.
+func ByRepoVersion(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldRepoVersion, opts...).ToFunc()
+}
+
+// ByBuildTimeStart orders the results by the build_time_start field.
+func ByBuildTimeStart(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldBuildTimeStart, opts...).ToFunc()
+}
+
+// ByUpdated orders the results by the updated field.
+func ByUpdated(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldUpdated, opts...).ToFunc()
+}
+
+// ByLto orders the results by the lto field.
+func ByLto(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldLto, opts...).ToFunc()
+}
+
+// ByLastVersionBuild orders the results by the last_version_build field.
+func ByLastVersionBuild(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldLastVersionBuild, opts...).ToFunc()
+}
+
+// ByLastVerified orders the results by the last_verified field.
+func ByLastVerified(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldLastVerified, opts...).ToFunc()
+}
+
+// ByDebugSymbols orders the results by the debug_symbols field.
+func ByDebugSymbols(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldDebugSymbols, opts...).ToFunc()
+}
+
+// ByMaxRss orders the results by the max_rss field.
+func ByMaxRss(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldMaxRss, opts...).ToFunc()
+}
+
+// ByUTime orders the results by the u_time field.
+func ByUTime(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldUTime, opts...).ToFunc()
+}
+
+// BySTime orders the results by the s_time field.
+func BySTime(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldSTime, opts...).ToFunc()
+}
+
+// ByIoIn orders the results by the io_in field.
+func ByIoIn(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldIoIn, opts...).ToFunc()
+}
+
+// ByIoOut orders the results by the io_out field.
+func ByIoOut(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldIoOut, opts...).ToFunc()
+}
+
+// ByTagRev orders the results by the tag_rev field.
+func ByTagRev(opts ...sql.OrderTermOption) OrderOption {
+	return sql.OrderByField(FieldTagRev, opts...).ToFunc()
+}

ent/dbpackage_create.go

@@ -10,36 +10,36 @@ import (
 
 	"entgo.io/ent/dialect/sql/sqlgraph"
 	"entgo.io/ent/schema/field"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 )
 
-// DbPackageCreate is the builder for creating a DbPackage entity.
-type DbPackageCreate struct {
+// DBPackageCreate is the builder for creating a DBPackage entity.
+type DBPackageCreate struct {
 	config
-	mutation *DbPackageMutation
+	mutation *DBPackageMutation
 	hooks    []Hook
 }
 
 // SetPkgbase sets the "pkgbase" field.
-func (dpc *DbPackageCreate) SetPkgbase(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetPkgbase(s string) *DBPackageCreate {
 	dpc.mutation.SetPkgbase(s)
 	return dpc
 }
 
 // SetPackages sets the "packages" field.
-func (dpc *DbPackageCreate) SetPackages(s []string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetPackages(s []string) *DBPackageCreate {
 	dpc.mutation.SetPackages(s)
 	return dpc
 }
 
 // SetStatus sets the "status" field.
-func (dpc *DbPackageCreate) SetStatus(d dbpackage.Status) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetStatus(d dbpackage.Status) *DBPackageCreate {
 	dpc.mutation.SetStatus(d)
 	return dpc
 }
 
 // SetNillableStatus sets the "status" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableStatus(d *dbpackage.Status) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableStatus(d *dbpackage.Status) *DBPackageCreate {
 	if d != nil {
 		dpc.SetStatus(*d)
 	}
@@ -47,13 +47,13 @@ func (dpc *DbPackageCreate) SetNillableStatus(d *dbpackage.Status) *DbPackageCre
 }
 
 // SetSkipReason sets the "skip_reason" field.
-func (dpc *DbPackageCreate) SetSkipReason(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetSkipReason(s string) *DBPackageCreate {
 	dpc.mutation.SetSkipReason(s)
 	return dpc
 }
 
 // SetNillableSkipReason sets the "skip_reason" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableSkipReason(s *string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableSkipReason(s *string) *DBPackageCreate {
 	if s != nil {
 		dpc.SetSkipReason(*s)
 	}
@@ -61,25 +61,25 @@ func (dpc *DbPackageCreate) SetNillableSkipReason(s *string) *DbPackageCreate {
 }
 
 // SetRepository sets the "repository" field.
-func (dpc *DbPackageCreate) SetRepository(d dbpackage.Repository) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetRepository(d dbpackage.Repository) *DBPackageCreate {
 	dpc.mutation.SetRepository(d)
 	return dpc
 }
 
 // SetMarch sets the "march" field.
-func (dpc *DbPackageCreate) SetMarch(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetMarch(s string) *DBPackageCreate {
 	dpc.mutation.SetMarch(s)
 	return dpc
 }
 
 // SetVersion sets the "version" field.
-func (dpc *DbPackageCreate) SetVersion(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetVersion(s string) *DBPackageCreate {
 	dpc.mutation.SetVersion(s)
 	return dpc
 }
 
 // SetNillableVersion sets the "version" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableVersion(s *string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableVersion(s *string) *DBPackageCreate {
 	if s != nil {
 		dpc.SetVersion(*s)
 	}
@@ -87,13 +87,13 @@ func (dpc *DbPackageCreate) SetNillableVersion(s *string) *DbPackageCreate {
 }
 
 // SetRepoVersion sets the "repo_version" field.
-func (dpc *DbPackageCreate) SetRepoVersion(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetRepoVersion(s string) *DBPackageCreate {
 	dpc.mutation.SetRepoVersion(s)
 	return dpc
 }
 
 // SetNillableRepoVersion sets the "repo_version" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableRepoVersion(s *string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableRepoVersion(s *string) *DBPackageCreate {
 	if s != nil {
 		dpc.SetRepoVersion(*s)
 	}
@@ -101,13 +101,13 @@ func (dpc *DbPackageCreate) SetNillableRepoVersion(s *string) *DbPackageCreate {
 }
 
 // SetBuildTimeStart sets the "build_time_start" field.
-func (dpc *DbPackageCreate) SetBuildTimeStart(t time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetBuildTimeStart(t time.Time) *DBPackageCreate {
 	dpc.mutation.SetBuildTimeStart(t)
 	return dpc
 }
 
 // SetNillableBuildTimeStart sets the "build_time_start" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableBuildTimeStart(t *time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableBuildTimeStart(t *time.Time) *DBPackageCreate {
 	if t != nil {
 		dpc.SetBuildTimeStart(*t)
 	}
@@ -115,41 +115,27 @@ func (dpc *DbPackageCreate) SetNillableBuildTimeStart(t *time.Time) *DbPackageCr
 }
 
 // SetUpdated sets the "updated" field.
-func (dpc *DbPackageCreate) SetUpdated(t time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetUpdated(t time.Time) *DBPackageCreate {
 	dpc.mutation.SetUpdated(t)
 	return dpc
 }
 
 // SetNillableUpdated sets the "updated" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableUpdated(t *time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableUpdated(t *time.Time) *DBPackageCreate {
 	if t != nil {
 		dpc.SetUpdated(*t)
 	}
 	return dpc
 }
 
-// SetHash sets the "hash" field.
-func (dpc *DbPackageCreate) SetHash(s string) *DbPackageCreate {
-	dpc.mutation.SetHash(s)
-	return dpc
-}
-
-// SetNillableHash sets the "hash" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableHash(s *string) *DbPackageCreate {
-	if s != nil {
-		dpc.SetHash(*s)
-	}
-	return dpc
-}
-
 // SetLto sets the "lto" field.
-func (dpc *DbPackageCreate) SetLto(d dbpackage.Lto) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetLto(d dbpackage.Lto) *DBPackageCreate {
 	dpc.mutation.SetLto(d)
 	return dpc
 }
 
 // SetNillableLto sets the "lto" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableLto(d *dbpackage.Lto) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableLto(d *dbpackage.Lto) *DBPackageCreate {
 	if d != nil {
 		dpc.SetLto(*d)
 	}
@@ -157,13 +143,13 @@ func (dpc *DbPackageCreate) SetNillableLto(d *dbpackage.Lto) *DbPackageCreate {
 }
 
 // SetLastVersionBuild sets the "last_version_build" field.
-func (dpc *DbPackageCreate) SetLastVersionBuild(s string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetLastVersionBuild(s string) *DBPackageCreate {
 	dpc.mutation.SetLastVersionBuild(s)
 	return dpc
 }
 
 // SetNillableLastVersionBuild sets the "last_version_build" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableLastVersionBuild(s *string) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableLastVersionBuild(s *string) *DBPackageCreate {
 	if s != nil {
 		dpc.SetLastVersionBuild(*s)
 	}
@@ -171,13 +157,13 @@ func (dpc *DbPackageCreate) SetNillableLastVersionBuild(s *string) *DbPackageCre
 }
 
 // SetLastVerified sets the "last_verified" field.
-func (dpc *DbPackageCreate) SetLastVerified(t time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetLastVerified(t time.Time) *DBPackageCreate {
 	dpc.mutation.SetLastVerified(t)
 	return dpc
 }
 
 // SetNillableLastVerified sets the "last_verified" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableLastVerified(t *time.Time) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableLastVerified(t *time.Time) *DBPackageCreate {
 	if t != nil {
 		dpc.SetLastVerified(*t)
 	}
@@ -185,13 +171,13 @@ func (dpc *DbPackageCreate) SetNillableLastVerified(t *time.Time) *DbPackageCrea
 }
 
 // SetDebugSymbols sets the "debug_symbols" field.
-func (dpc *DbPackageCreate) SetDebugSymbols(ds dbpackage.DebugSymbols) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetDebugSymbols(ds dbpackage.DebugSymbols) *DBPackageCreate {
 	dpc.mutation.SetDebugSymbols(ds)
 	return dpc
 }
 
 // SetNillableDebugSymbols sets the "debug_symbols" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableDebugSymbols(ds *dbpackage.DebugSymbols) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableDebugSymbols(ds *dbpackage.DebugSymbols) *DBPackageCreate {
 	if ds != nil {
 		dpc.SetDebugSymbols(*ds)
 	}
@@ -199,13 +185,13 @@ func (dpc *DbPackageCreate) SetNillableDebugSymbols(ds *dbpackage.DebugSymbols)
 }
 
 // SetMaxRss sets the "max_rss" field.
-func (dpc *DbPackageCreate) SetMaxRss(i int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetMaxRss(i int64) *DBPackageCreate {
 	dpc.mutation.SetMaxRss(i)
 	return dpc
 }
 
 // SetNillableMaxRss sets the "max_rss" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableMaxRss(i *int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableMaxRss(i *int64) *DBPackageCreate {
 	if i != nil {
 		dpc.SetMaxRss(*i)
 	}
@@ -213,13 +199,13 @@ func (dpc *DbPackageCreate) SetNillableMaxRss(i *int64) *DbPackageCreate {
 }
 
 // SetUTime sets the "u_time" field.
-func (dpc *DbPackageCreate) SetUTime(i int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetUTime(i int64) *DBPackageCreate {
 	dpc.mutation.SetUTime(i)
 	return dpc
 }
 
 // SetNillableUTime sets the "u_time" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableUTime(i *int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableUTime(i *int64) *DBPackageCreate {
 	if i != nil {
 		dpc.SetUTime(*i)
 	}
@@ -227,13 +213,13 @@ func (dpc *DbPackageCreate) SetNillableUTime(i *int64) *DbPackageCreate {
 }
 
 // SetSTime sets the "s_time" field.
-func (dpc *DbPackageCreate) SetSTime(i int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetSTime(i int64) *DBPackageCreate {
 	dpc.mutation.SetSTime(i)
 	return dpc
 }
 
 // SetNillableSTime sets the "s_time" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableSTime(i *int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableSTime(i *int64) *DBPackageCreate {
 	if i != nil {
 		dpc.SetSTime(*i)
 	}
@@ -241,13 +227,13 @@ func (dpc *DbPackageCreate) SetNillableSTime(i *int64) *DbPackageCreate {
 }
 
 // SetIoIn sets the "io_in" field.
-func (dpc *DbPackageCreate) SetIoIn(i int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetIoIn(i int64) *DBPackageCreate {
 	dpc.mutation.SetIoIn(i)
 	return dpc
 }
 
 // SetNillableIoIn sets the "io_in" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableIoIn(i *int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableIoIn(i *int64) *DBPackageCreate {
 	if i != nil {
 		dpc.SetIoIn(*i)
 	}
@@ -255,116 +241,46 @@ func (dpc *DbPackageCreate) SetNillableIoIn(i *int64) *DbPackageCreate {
 }
 
 // SetIoOut sets the "io_out" field.
-func (dpc *DbPackageCreate) SetIoOut(i int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetIoOut(i int64) *DBPackageCreate {
 	dpc.mutation.SetIoOut(i)
 	return dpc
 }
 
 // SetNillableIoOut sets the "io_out" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableIoOut(i *int64) *DbPackageCreate {
+func (dpc *DBPackageCreate) SetNillableIoOut(i *int64) *DBPackageCreate {
 	if i != nil {
 		dpc.SetIoOut(*i)
 	}
 	return dpc
 }
 
-// SetSrcinfo sets the "srcinfo" field.
-func (dpc *DbPackageCreate) SetSrcinfo(s string) *DbPackageCreate {
-	dpc.mutation.SetSrcinfo(s)
+// SetTagRev sets the "tag_rev" field.
+func (dpc *DBPackageCreate) SetTagRev(s string) *DBPackageCreate {
+	dpc.mutation.SetTagRev(s)
 	return dpc
 }
 
-// SetNillableSrcinfo sets the "srcinfo" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableSrcinfo(s *string) *DbPackageCreate {
+// SetNillableTagRev sets the "tag_rev" field if the given value is not nil.
+func (dpc *DBPackageCreate) SetNillableTagRev(s *string) *DBPackageCreate {
 	if s != nil {
-		dpc.SetSrcinfo(*s)
+		dpc.SetTagRev(*s)
 	}
 	return dpc
 }
 
-// SetSrcinfoHash sets the "srcinfo_hash" field.
-func (dpc *DbPackageCreate) SetSrcinfoHash(s string) *DbPackageCreate {
-	dpc.mutation.SetSrcinfoHash(s)
-	return dpc
-}
-
-// SetNillableSrcinfoHash sets the "srcinfo_hash" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillableSrcinfoHash(s *string) *DbPackageCreate {
-	if s != nil {
-		dpc.SetSrcinfoHash(*s)
-	}
-	return dpc
-}
-
-// SetPkgbuild sets the "pkgbuild" field.
-func (dpc *DbPackageCreate) SetPkgbuild(s string) *DbPackageCreate {
-	dpc.mutation.SetPkgbuild(s)
-	return dpc
-}
-
-// SetNillablePkgbuild sets the "pkgbuild" field if the given value is not nil.
-func (dpc *DbPackageCreate) SetNillablePkgbuild(s *string) *DbPackageCreate {
-	if s != nil {
-		dpc.SetPkgbuild(*s)
-	}
-	return dpc
-}
-
-// Mutation returns the DbPackageMutation object of the builder.
-func (dpc *DbPackageCreate) Mutation() *DbPackageMutation {
+// Mutation returns the DBPackageMutation object of the builder.
+func (dpc *DBPackageCreate) Mutation() *DBPackageMutation {
 	return dpc.mutation
 }
 
-// Save creates the DbPackage in the database.
-func (dpc *DbPackageCreate) Save(ctx context.Context) (*DbPackage, error) {
-	var (
-		err  error
-		node *DbPackage
-	)
+// Save creates the DBPackage in the database.
+func (dpc *DBPackageCreate) Save(ctx context.Context) (*DBPackage, error) {
 	dpc.defaults()
-	if len(dpc.hooks) == 0 {
-		if err = dpc.check(); err != nil {
-			return nil, err
-		}
-		node, err = dpc.sqlSave(ctx)
-	} else {
-		var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
-			mutation, ok := m.(*DbPackageMutation)
-			if !ok {
-				return nil, fmt.Errorf("unexpected mutation type %T", m)
-			}
-			if err = dpc.check(); err != nil {
-				return nil, err
-			}
-			dpc.mutation = mutation
-			if node, err = dpc.sqlSave(ctx); err != nil {
-				return nil, err
-			}
-			mutation.id = &node.ID
-			mutation.done = true
-			return node, err
-		})
-		for i := len(dpc.hooks) - 1; i >= 0; i-- {
-			if dpc.hooks[i] == nil {
-				return nil, fmt.Errorf("ent: uninitialized hook (forgotten import ent/runtime?)")
-			}
-			mut = dpc.hooks[i](mut)
-		}
-		v, err := mut.Mutate(ctx, dpc.mutation)
-		if err != nil {
-			return nil, err
-		}
-		nv, ok := v.(*DbPackage)
-		if !ok {
-			return nil, fmt.Errorf("unexpected node type %T returned from DbPackageMutation", v)
-		}
-		node = nv
-	}
-	return node, err
+	return withHooks(ctx, dpc.sqlSave, dpc.mutation, dpc.hooks)
 }
 
 // SaveX calls Save and panics if Save returns an error.
-func (dpc *DbPackageCreate) SaveX(ctx context.Context) *DbPackage {
+func (dpc *DBPackageCreate) SaveX(ctx context.Context) *DBPackage {
 	v, err := dpc.Save(ctx)
 	if err != nil {
 		panic(err)
@@ -373,20 +289,20 @@ func (dpc *DbPackageCreate) SaveX(ctx context.Context) *DbPackage {
 }
 
 // Exec executes the query.
-func (dpc *DbPackageCreate) Exec(ctx context.Context) error {
+func (dpc *DBPackageCreate) Exec(ctx context.Context) error {
 	_, err := dpc.Save(ctx)
 	return err
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (dpc *DbPackageCreate) ExecX(ctx context.Context) {
+func (dpc *DBPackageCreate) ExecX(ctx context.Context) {
 	if err := dpc.Exec(ctx); err != nil {
 		panic(err)
 	}
 }
 
 // defaults sets the default values of the builder before save.
-func (dpc *DbPackageCreate) defaults() {
+func (dpc *DBPackageCreate) defaults() {
 	if _, ok := dpc.mutation.Status(); !ok {
 		v := dbpackage.DefaultStatus
 		dpc.mutation.SetStatus(v)
@@ -402,50 +318,53 @@ func (dpc *DbPackageCreate) defaults() {
 }
 
 // check runs all checks and user-defined validators on the builder.
-func (dpc *DbPackageCreate) check() error {
+func (dpc *DBPackageCreate) check() error {
 	if _, ok := dpc.mutation.Pkgbase(); !ok {
-		return &ValidationError{Name: "pkgbase", err: errors.New(`ent: missing required field "DbPackage.pkgbase"`)}
+		return &ValidationError{Name: "pkgbase", err: errors.New(`ent: missing required field "DBPackage.pkgbase"`)}
 	}
 	if v, ok := dpc.mutation.Pkgbase(); ok {
 		if err := dbpackage.PkgbaseValidator(v); err != nil {
-			return &ValidationError{Name: "pkgbase", err: fmt.Errorf(`ent: validator failed for field "DbPackage.pkgbase": %w`, err)}
+			return &ValidationError{Name: "pkgbase", err: fmt.Errorf(`ent: validator failed for field "DBPackage.pkgbase": %w`, err)}
 		}
 	}
 	if v, ok := dpc.mutation.Status(); ok {
 		if err := dbpackage.StatusValidator(v); err != nil {
-			return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "DbPackage.status": %w`, err)}
+			return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "DBPackage.status": %w`, err)}
 		}
 	}
 	if _, ok := dpc.mutation.Repository(); !ok {
-		return &ValidationError{Name: "repository", err: errors.New(`ent: missing required field "DbPackage.repository"`)}
+		return &ValidationError{Name: "repository", err: errors.New(`ent: missing required field "DBPackage.repository"`)}
 	}
 	if v, ok := dpc.mutation.Repository(); ok {
 		if err := dbpackage.RepositoryValidator(v); err != nil {
-			return &ValidationError{Name: "repository", err: fmt.Errorf(`ent: validator failed for field "DbPackage.repository": %w`, err)}
+			return &ValidationError{Name: "repository", err: fmt.Errorf(`ent: validator failed for field "DBPackage.repository": %w`, err)}
 		}
 	}
 	if _, ok := dpc.mutation.March(); !ok {
-		return &ValidationError{Name: "march", err: errors.New(`ent: missing required field "DbPackage.march"`)}
+		return &ValidationError{Name: "march", err: errors.New(`ent: missing required field "DBPackage.march"`)}
 	}
 	if v, ok := dpc.mutation.March(); ok {
 		if err := dbpackage.MarchValidator(v); err != nil {
-			return &ValidationError{Name: "march", err: fmt.Errorf(`ent: validator failed for field "DbPackage.march": %w`, err)}
+			return &ValidationError{Name: "march", err: fmt.Errorf(`ent: validator failed for field "DBPackage.march": %w`, err)}
 		}
 	}
 	if v, ok := dpc.mutation.Lto(); ok {
 		if err := dbpackage.LtoValidator(v); err != nil {
-			return &ValidationError{Name: "lto", err: fmt.Errorf(`ent: validator failed for field "DbPackage.lto": %w`, err)}
+			return &ValidationError{Name: "lto", err: fmt.Errorf(`ent: validator failed for field "DBPackage.lto": %w`, err)}
 		}
 	}
 	if v, ok := dpc.mutation.DebugSymbols(); ok {
 		if err := dbpackage.DebugSymbolsValidator(v); err != nil {
-			return &ValidationError{Name: "debug_symbols", err: fmt.Errorf(`ent: validator failed for field "DbPackage.debug_symbols": %w`, err)}
+			return &ValidationError{Name: "debug_symbols", err: fmt.Errorf(`ent: validator failed for field "DBPackage.debug_symbols": %w`, err)}
 		}
 	}
 	return nil
 }
 
-func (dpc *DbPackageCreate) sqlSave(ctx context.Context) (*DbPackage, error) {
+func (dpc *DBPackageCreate) sqlSave(ctx context.Context) (*DBPackage, error) {
+	if err := dpc.check(); err != nil {
+		return nil, err
+	}
 	_node, _spec := dpc.createSpec()
 	if err := sqlgraph.CreateNode(ctx, dpc.driver, _spec); err != nil {
 		if sqlgraph.IsConstraintError(err) {
@@ -455,19 +374,15 @@ func (dpc *DbPackageCreate) sqlSave(ctx context.Context) (*DbPackage, error) {
 	}
 	id := _spec.ID.Value.(int64)
 	_node.ID = int(id)
+	dpc.mutation.id = &_node.ID
+	dpc.mutation.done = true
 	return _node, nil
 }
 
-func (dpc *DbPackageCreate) createSpec() (*DbPackage, *sqlgraph.CreateSpec) {
+func (dpc *DBPackageCreate) createSpec() (*DBPackage, *sqlgraph.CreateSpec) {
 	var (
-		_node = &DbPackage{config: dpc.config}
-		_spec = &sqlgraph.CreateSpec{
-			Table: dbpackage.Table,
-			ID: &sqlgraph.FieldSpec{
-				Type:   field.TypeInt,
-				Column: dbpackage.FieldID,
-			},
-		}
+		_node = &DBPackage{config: dpc.config}
+		_spec = sqlgraph.NewCreateSpec(dbpackage.Table, sqlgraph.NewFieldSpec(dbpackage.FieldID, field.TypeInt))
 	)
 	if value, ok := dpc.mutation.Pkgbase(); ok {
 		_spec.SetField(dbpackage.FieldPkgbase, field.TypeString, value)
@@ -509,10 +424,6 @@ func (dpc *DbPackageCreate) createSpec() (*DbPackage, *sqlgraph.CreateSpec) {
 		_spec.SetField(dbpackage.FieldUpdated, field.TypeTime, value)
 		_node.Updated = value
 	}
-	if value, ok := dpc.mutation.Hash(); ok {
-		_spec.SetField(dbpackage.FieldHash, field.TypeString, value)
-		_node.Hash = value
-	}
 	if value, ok := dpc.mutation.Lto(); ok {
 		_spec.SetField(dbpackage.FieldLto, field.TypeEnum, value)
 		_node.Lto = value
@@ -549,38 +460,34 @@ func (dpc *DbPackageCreate) createSpec() (*DbPackage, *sqlgraph.CreateSpec) {
 		_spec.SetField(dbpackage.FieldIoOut, field.TypeInt64, value)
 		_node.IoOut = &value
 	}
-	if value, ok := dpc.mutation.Srcinfo(); ok {
-		_spec.SetField(dbpackage.FieldSrcinfo, field.TypeString, value)
-		_node.Srcinfo = &value
-	}
-	if value, ok := dpc.mutation.SrcinfoHash(); ok {
-		_spec.SetField(dbpackage.FieldSrcinfoHash, field.TypeString, value)
-		_node.SrcinfoHash = value
-	}
-	if value, ok := dpc.mutation.Pkgbuild(); ok {
-		_spec.SetField(dbpackage.FieldPkgbuild, field.TypeString, value)
-		_node.Pkgbuild = value
+	if value, ok := dpc.mutation.TagRev(); ok {
+		_spec.SetField(dbpackage.FieldTagRev, field.TypeString, value)
+		_node.TagRev = &value
 	}
 	return _node, _spec
 }
 
-// DbPackageCreateBulk is the builder for creating many DbPackage entities in bulk.
-type DbPackageCreateBulk struct {
+// DBPackageCreateBulk is the builder for creating many DBPackage entities in bulk.
+type DBPackageCreateBulk struct {
 	config
-	builders []*DbPackageCreate
+	err      error
+	builders []*DBPackageCreate
 }
 
-// Save creates the DbPackage entities in the database.
-func (dpcb *DbPackageCreateBulk) Save(ctx context.Context) ([]*DbPackage, error) {
+// Save creates the DBPackage entities in the database.
+func (dpcb *DBPackageCreateBulk) Save(ctx context.Context) ([]*DBPackage, error) {
+	if dpcb.err != nil {
+		return nil, dpcb.err
+	}
 	specs := make([]*sqlgraph.CreateSpec, len(dpcb.builders))
-	nodes := make([]*DbPackage, len(dpcb.builders))
+	nodes := make([]*DBPackage, len(dpcb.builders))
 	mutators := make([]Mutator, len(dpcb.builders))
 	for i := range dpcb.builders {
 		func(i int, root context.Context) {
 			builder := dpcb.builders[i]
 			builder.defaults()
 			var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
-				mutation, ok := m.(*DbPackageMutation)
+				mutation, ok := m.(*DBPackageMutation)
 				if !ok {
 					return nil, fmt.Errorf("unexpected mutation type %T", m)
 				}
@@ -588,8 +495,8 @@ func (dpcb *DbPackageCreateBulk) Save(ctx context.Context) ([]*DbPackage, error)
 					return nil, err
 				}
 				builder.mutation = mutation
-				nodes[i], specs[i] = builder.createSpec()
 				var err error
+				nodes[i], specs[i] = builder.createSpec()
 				if i < len(mutators)-1 {
 					_, err = mutators[i+1].Mutate(root, dpcb.builders[i+1].mutation)
 				} else {
@@ -627,7 +534,7 @@ func (dpcb *DbPackageCreateBulk) Save(ctx context.Context) ([]*DbPackage, error)
 }
 
 // SaveX is like Save, but panics if an error occurs.
-func (dpcb *DbPackageCreateBulk) SaveX(ctx context.Context) []*DbPackage {
+func (dpcb *DBPackageCreateBulk) SaveX(ctx context.Context) []*DBPackage {
 	v, err := dpcb.Save(ctx)
 	if err != nil {
 		panic(err)
@@ -636,13 +543,13 @@ func (dpcb *DbPackageCreateBulk) SaveX(ctx context.Context) []*DbPackage {
 }
 
 // Exec executes the query.
-func (dpcb *DbPackageCreateBulk) Exec(ctx context.Context) error {
+func (dpcb *DBPackageCreateBulk) Exec(ctx context.Context) error {
 	_, err := dpcb.Save(ctx)
 	return err
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (dpcb *DbPackageCreateBulk) ExecX(ctx context.Context) {
+func (dpcb *DBPackageCreateBulk) ExecX(ctx context.Context) {
 	if err := dpcb.Exec(ctx); err != nil {
 		panic(err)
 	}

ent/dbpackage_delete.go

@@ -4,62 +4,34 @@ package ent
 
 import (
 	"context"
-	"fmt"
 
 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqlgraph"
 	"entgo.io/ent/schema/field"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
-	"git.harting.dev/ALHP/ALHP.GO/ent/predicate"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/predicate"
 )
 
-// DbPackageDelete is the builder for deleting a DbPackage entity.
-type DbPackageDelete struct {
+// DBPackageDelete is the builder for deleting a DBPackage entity.
+type DBPackageDelete struct {
 	config
 	hooks    []Hook
-	mutation *DbPackageMutation
+	mutation *DBPackageMutation
 }
 
-// Where appends a list predicates to the DbPackageDelete builder.
-func (dpd *DbPackageDelete) Where(ps ...predicate.DbPackage) *DbPackageDelete {
+// Where appends a list predicates to the DBPackageDelete builder.
+func (dpd *DBPackageDelete) Where(ps ...predicate.DBPackage) *DBPackageDelete {
 	dpd.mutation.Where(ps...)
 	return dpd
 }
 
 // Exec executes the deletion query and returns how many vertices were deleted.
-func (dpd *DbPackageDelete) Exec(ctx context.Context) (int, error) {
-	var (
-		err      error
-		affected int
-	)
-	if len(dpd.hooks) == 0 {
-		affected, err = dpd.sqlExec(ctx)
-	} else {
-		var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
-			mutation, ok := m.(*DbPackageMutation)
-			if !ok {
-				return nil, fmt.Errorf("unexpected mutation type %T", m)
-			}
-			dpd.mutation = mutation
-			affected, err = dpd.sqlExec(ctx)
-			mutation.done = true
-			return affected, err
-		})
-		for i := len(dpd.hooks) - 1; i >= 0; i-- {
-			if dpd.hooks[i] == nil {
-				return 0, fmt.Errorf("ent: uninitialized hook (forgotten import ent/runtime?)")
-			}
-			mut = dpd.hooks[i](mut)
-		}
-		if _, err := mut.Mutate(ctx, dpd.mutation); err != nil {
-			return 0, err
-		}
-	}
-	return affected, err
+func (dpd *DBPackageDelete) Exec(ctx context.Context) (int, error) {
+	return withHooks(ctx, dpd.sqlExec, dpd.mutation, dpd.hooks)
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (dpd *DbPackageDelete) ExecX(ctx context.Context) int {
+func (dpd *DBPackageDelete) ExecX(ctx context.Context) int {
 	n, err := dpd.Exec(ctx)
 	if err != nil {
 		panic(err)
@@ -67,16 +39,8 @@ func (dpd *DbPackageDelete) ExecX(ctx context.Context) int {
 	return n
 }
 
-func (dpd *DbPackageDelete) sqlExec(ctx context.Context) (int, error) {
-	_spec := &sqlgraph.DeleteSpec{
-		Node: &sqlgraph.NodeSpec{
-			Table: dbpackage.Table,
-			ID: &sqlgraph.FieldSpec{
-				Type:   field.TypeInt,
-				Column: dbpackage.FieldID,
-			},
-		},
-	}
+func (dpd *DBPackageDelete) sqlExec(ctx context.Context) (int, error) {
+	_spec := sqlgraph.NewDeleteSpec(dbpackage.Table, sqlgraph.NewFieldSpec(dbpackage.FieldID, field.TypeInt))
 	if ps := dpd.mutation.predicates; len(ps) > 0 {
 		_spec.Predicate = func(selector *sql.Selector) {
 			for i := range ps {
@@ -88,16 +52,23 @@ func (dpd *DbPackageDelete) sqlExec(ctx context.Context) (int, error) {
 	if err != nil && sqlgraph.IsConstraintError(err) {
 		err = &ConstraintError{msg: err.Error(), wrap: err}
 	}
+	dpd.mutation.done = true
 	return affected, err
 }
 
-// DbPackageDeleteOne is the builder for deleting a single DbPackage entity.
-type DbPackageDeleteOne struct {
-	dpd *DbPackageDelete
+// DBPackageDeleteOne is the builder for deleting a single DBPackage entity.
+type DBPackageDeleteOne struct {
+	dpd *DBPackageDelete
+}
+
+// Where appends a list predicates to the DBPackageDelete builder.
+func (dpdo *DBPackageDeleteOne) Where(ps ...predicate.DBPackage) *DBPackageDeleteOne {
+	dpdo.dpd.mutation.Where(ps...)
+	return dpdo
 }
 
 // Exec executes the deletion query.
-func (dpdo *DbPackageDeleteOne) Exec(ctx context.Context) error {
+func (dpdo *DBPackageDeleteOne) Exec(ctx context.Context) error {
 	n, err := dpdo.dpd.Exec(ctx)
 	switch {
 	case err != nil:
@@ -110,6 +81,8 @@ func (dpdo *DbPackageDeleteOne) Exec(ctx context.Context) error {
 }
 
 // ExecX is like Exec, but panics if an error occurs.
-func (dpdo *DbPackageDeleteOne) ExecX(ctx context.Context) {
-	dpdo.dpd.ExecX(ctx)
+func (dpdo *DBPackageDeleteOne) ExecX(ctx context.Context) {
+	if err := dpdo.Exec(ctx); err != nil {
+		panic(err)
+	}
 }

ent/dbpackage_query.go

@@ -7,63 +7,62 @@ import (
 	"fmt"
 	"math"
 
+	"entgo.io/ent"
 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqlgraph"
 	"entgo.io/ent/schema/field"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
-	"git.harting.dev/ALHP/ALHP.GO/ent/predicate"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/predicate"
 )
 
-// DbPackageQuery is the builder for querying DbPackage entities.
-type DbPackageQuery struct {
+// DBPackageQuery is the builder for querying DBPackage entities.
+type DBPackageQuery struct {
 	config
-	limit      *int
-	offset     *int
-	unique     *bool
-	order      []OrderFunc
-	fields     []string
-	predicates []predicate.DbPackage
+	ctx        *QueryContext
+	order      []dbpackage.OrderOption
+	inters     []Interceptor
+	predicates []predicate.DBPackage
 	modifiers  []func(*sql.Selector)
 	// intermediate query (i.e. traversal path).
 	sql  *sql.Selector
 	path func(context.Context) (*sql.Selector, error)
 }
 
-// Where adds a new predicate for the DbPackageQuery builder.
-func (dpq *DbPackageQuery) Where(ps ...predicate.DbPackage) *DbPackageQuery {
+// Where adds a new predicate for the DBPackageQuery builder.
+func (dpq *DBPackageQuery) Where(ps ...predicate.DBPackage) *DBPackageQuery {
 	dpq.predicates = append(dpq.predicates, ps...)
 	return dpq
 }
 
-// Limit adds a limit step to the query.
-func (dpq *DbPackageQuery) Limit(limit int) *DbPackageQuery {
-	dpq.limit = &limit
+// Limit the number of records to be returned by this query.
+func (dpq *DBPackageQuery) Limit(limit int) *DBPackageQuery {
+	dpq.ctx.Limit = &limit
 	return dpq
 }
 
-// Offset adds an offset step to the query.
-func (dpq *DbPackageQuery) Offset(offset int) *DbPackageQuery {
-	dpq.offset = &offset
+// Offset to start from.
+func (dpq *DBPackageQuery) Offset(offset int) *DBPackageQuery {
+	dpq.ctx.Offset = &offset
 	return dpq
 }
 
 // Unique configures the query builder to filter duplicate records on query.
 // By default, unique is set to true, and can be disabled using this method.
-func (dpq *DbPackageQuery) Unique(unique bool) *DbPackageQuery {
-	dpq.unique = &unique
+func (dpq *DBPackageQuery) Unique(unique bool) *DBPackageQuery {
+	dpq.ctx.Unique = &unique
 	return dpq
 }
 
-// Order adds an order step to the query.
-func (dpq *DbPackageQuery) Order(o ...OrderFunc) *DbPackageQuery {
+// Order specifies how the records should be ordered.
+func (dpq *DBPackageQuery) Order(o ...dbpackage.OrderOption) *DBPackageQuery {
 	dpq.order = append(dpq.order, o...)
 	return dpq
 }
 
-// First returns the first DbPackage entity from the query.
-// Returns a *NotFoundError when no DbPackage was found.
-func (dpq *DbPackageQuery) First(ctx context.Context) (*DbPackage, error) {
-	nodes, err := dpq.Limit(1).All(ctx)
+// First returns the first DBPackage entity from the query.
+// Returns a *NotFoundError when no DBPackage was found.
+func (dpq *DBPackageQuery) First(ctx context.Context) (*DBPackage, error) {
+	nodes, err := dpq.Limit(1).All(setContextOp(ctx, dpq.ctx, ent.OpQueryFirst))
 	if err != nil {
 		return nil, err
 	}
@@ -74,7 +73,7 @@ func (dpq *DbPackageQuery) First(ctx context.Context) (*DbPackage, error) {
 }
 
 // FirstX is like First, but panics if an error occurs.
-func (dpq *DbPackageQuery) FirstX(ctx context.Context) *DbPackage {
+func (dpq *DBPackageQuery) FirstX(ctx context.Context) *DBPackage {
 	node, err := dpq.First(ctx)
 	if err != nil && !IsNotFound(err) {
 		panic(err)
@@ -82,11 +81,11 @@ func (dpq *DbPackageQuery) FirstX(ctx context.Context) *DbPackage {
 	return node
 }
 
-// FirstID returns the first DbPackage ID from the query.
-// Returns a *NotFoundError when no DbPackage ID was found.
-func (dpq *DbPackageQuery) FirstID(ctx context.Context) (id int, err error) {
+// FirstID returns the first DBPackage ID from the query.
+// Returns a *NotFoundError when no DBPackage ID was found.
+func (dpq *DBPackageQuery) FirstID(ctx context.Context) (id int, err error) {
 	var ids []int
-	if ids, err = dpq.Limit(1).IDs(ctx); err != nil {
+	if ids, err = dpq.Limit(1).IDs(setContextOp(ctx, dpq.ctx, ent.OpQueryFirstID)); err != nil {
 		return
 	}
 	if len(ids) == 0 {
@@ -97,7 +96,7 @@ func (dpq *DbPackageQuery) FirstID(ctx context.Context) (id int, err error) {
 }
 
 // FirstIDX is like FirstID, but panics if an error occurs.
-func (dpq *DbPackageQuery) FirstIDX(ctx context.Context) int {
+func (dpq *DBPackageQuery) FirstIDX(ctx context.Context) int {
 	id, err := dpq.FirstID(ctx)
 	if err != nil && !IsNotFound(err) {
 		panic(err)
@@ -105,11 +104,11 @@ func (dpq *DbPackageQuery) FirstIDX(ctx context.Context) int {
 	return id
 }
 
-// Only returns a single DbPackage entity found by the query, ensuring it only returns one.
-// Returns a *NotSingularError when more than one DbPackage entity is found.
-// Returns a *NotFoundError when no DbPackage entities are found.
-func (dpq *DbPackageQuery) Only(ctx context.Context) (*DbPackage, error) {
-	nodes, err := dpq.Limit(2).All(ctx)
+// Only returns a single DBPackage entity found by the query, ensuring it only returns one.
+// Returns a *NotSingularError when more than one DBPackage entity is found.
+// Returns a *NotFoundError when no DBPackage entities are found.
+func (dpq *DBPackageQuery) Only(ctx context.Context) (*DBPackage, error) {
+	nodes, err := dpq.Limit(2).All(setContextOp(ctx, dpq.ctx, ent.OpQueryOnly))
 	if err != nil {
 		return nil, err
 	}
@@ -124,7 +123,7 @@ func (dpq *DbPackageQuery) Only(ctx context.Context) (*DbPackage, error) {
 }
 
 // OnlyX is like Only, but panics if an error occurs.
-func (dpq *DbPackageQuery) OnlyX(ctx context.Context) *DbPackage {
+func (dpq *DBPackageQuery) OnlyX(ctx context.Context) *DBPackage {
 	node, err := dpq.Only(ctx)
 	if err != nil {
 		panic(err)
@@ -132,12 +131,12 @@ func (dpq *DbPackageQuery) OnlyX(ctx context.Context) *DbPackage {
 	return node
 }
 
-// OnlyID is like Only, but returns the only DbPackage ID in the query.
-// Returns a *NotSingularError when more than one DbPackage ID is found.
+// OnlyID is like Only, but returns the only DBPackage ID in the query.
+// Returns a *NotSingularError when more than one DBPackage ID is found.
 // Returns a *NotFoundError when no entities are found.
-func (dpq *DbPackageQuery) OnlyID(ctx context.Context) (id int, err error) {
+func (dpq *DBPackageQuery) OnlyID(ctx context.Context) (id int, err error) {
 	var ids []int
-	if ids, err = dpq.Limit(2).IDs(ctx); err != nil {
+	if ids, err = dpq.Limit(2).IDs(setContextOp(ctx, dpq.ctx, ent.OpQueryOnlyID)); err != nil {
 		return
 	}
 	switch len(ids) {
@@ -152,7 +151,7 @@ func (dpq *DbPackageQuery) OnlyID(ctx context.Context) (id int, err error) {
 }
 
 // OnlyIDX is like OnlyID, but panics if an error occurs.
-func (dpq *DbPackageQuery) OnlyIDX(ctx context.Context) int {
+func (dpq *DBPackageQuery) OnlyIDX(ctx context.Context) int {
 	id, err := dpq.OnlyID(ctx)
 	if err != nil {
 		panic(err)
@@ -160,16 +159,18 @@ func (dpq *DbPackageQuery) OnlyIDX(ctx context.Context) int {
 	return id
 }
 
-// All executes the query and returns a list of DbPackages.
-func (dpq *DbPackageQuery) All(ctx context.Context) ([]*DbPackage, error) {
+// All executes the query and returns a list of DBPackages.
+func (dpq *DBPackageQuery) All(ctx context.Context) ([]*DBPackage, error) {
+	ctx = setContextOp(ctx, dpq.ctx, ent.OpQueryAll)
 	if err := dpq.prepareQuery(ctx); err != nil {
 		return nil, err
 	}
-	return dpq.sqlAll(ctx)
+	qr := querierAll[[]*DBPackage, *DBPackageQuery]()
+	return withInterceptors[[]*DBPackage](ctx, dpq, qr, dpq.inters)
 }
 
 // AllX is like All, but panics if an error occurs.
-func (dpq *DbPackageQuery) AllX(ctx context.Context) []*DbPackage {
+func (dpq *DBPackageQuery) AllX(ctx context.Context) []*DBPackage {
 	nodes, err := dpq.All(ctx)
 	if err != nil {
 		panic(err)
@@ -177,17 +178,20 @@ func (dpq *DbPackageQuery) AllX(ctx context.Context) []*DbPackage {
 	return nodes
 }
 
-// IDs executes the query and returns a list of DbPackage IDs.
-func (dpq *DbPackageQuery) IDs(ctx context.Context) ([]int, error) {
-	var ids []int
-	if err := dpq.Select(dbpackage.FieldID).Scan(ctx, &ids); err != nil {
+// IDs executes the query and returns a list of DBPackage IDs.
+func (dpq *DBPackageQuery) IDs(ctx context.Context) (ids []int, err error) {
+	if dpq.ctx.Unique == nil && dpq.path != nil {
+		dpq.Unique(true)
+	}
+	ctx = setContextOp(ctx, dpq.ctx, ent.OpQueryIDs)
+	if err = dpq.Select(dbpackage.FieldID).Scan(ctx, &ids); err != nil {
 		return nil, err
 	}
 	return ids, nil
 }
 
 // IDsX is like IDs, but panics if an error occurs.
-func (dpq *DbPackageQuery) IDsX(ctx context.Context) []int {
+func (dpq *DBPackageQuery) IDsX(ctx context.Context) []int {
 	ids, err := dpq.IDs(ctx)
 	if err != nil {
 		panic(err)
@@ -196,15 +200,16 @@ func (dpq *DbPackageQuery) IDsX(ctx context.Context) []int {
 }
 
 // Count returns the count of the given query.
-func (dpq *DbPackageQuery) Count(ctx context.Context) (int, error) {
+func (dpq *DBPackageQuery) Count(ctx context.Context) (int, error) {
+	ctx = setContextOp(ctx, dpq.ctx, ent.OpQueryCount)
 	if err := dpq.prepareQuery(ctx); err != nil {
 		return 0, err
 	}
-	return dpq.sqlCount(ctx)
+	return withInterceptors[int](ctx, dpq, querierCount[*DBPackageQuery](), dpq.inters)
 }
 
 // CountX is like Count, but panics if an error occurs.
-func (dpq *DbPackageQuery) CountX(ctx context.Context) int {
+func (dpq *DBPackageQuery) CountX(ctx context.Context) int {
 	count, err := dpq.Count(ctx)
 	if err != nil {
 		panic(err)
@@ -213,15 +218,20 @@ func (dpq *DbPackageQuery) CountX(ctx context.Context) int {
 }
 
 // Exist returns true if the query has elements in the graph.
-func (dpq *DbPackageQuery) Exist(ctx context.Context) (bool, error) {
-	if err := dpq.prepareQuery(ctx); err != nil {
-		return false, err
+func (dpq *DBPackageQuery) Exist(ctx context.Context) (bool, error) {
+	ctx = setContextOp(ctx, dpq.ctx, ent.OpQueryExist)
+	switch _, err := dpq.FirstID(ctx); {
+	case IsNotFound(err):
+		return false, nil
+	case err != nil:
+		return false, fmt.Errorf("ent: check existence: %w", err)
+	default:
+		return true, nil
 	}
-	return dpq.sqlExist(ctx)
 }
 
 // ExistX is like Exist, but panics if an error occurs.
-func (dpq *DbPackageQuery) ExistX(ctx context.Context) bool {
+func (dpq *DBPackageQuery) ExistX(ctx context.Context) bool {
 	exist, err := dpq.Exist(ctx)
 	if err != nil {
 		panic(err)
@@ -229,22 +239,22 @@ func (dpq *DbPackageQuery) ExistX(ctx context.Context) bool {
 	return exist
 }
 
-// Clone returns a duplicate of the DbPackageQuery builder, including all associated steps. It can be
+// Clone returns a duplicate of the DBPackageQuery builder, including all associated steps. It can be
 // used to prepare common query builders and use them differently after the clone is made.
-func (dpq *DbPackageQuery) Clone() *DbPackageQuery {
+func (dpq *DBPackageQuery) Clone() *DBPackageQuery {
 	if dpq == nil {
 		return nil
 	}
-	return &DbPackageQuery{
+	return &DBPackageQuery{
 		config:     dpq.config,
-		limit:      dpq.limit,
-		offset:     dpq.offset,
-		order:      append([]OrderFunc{}, dpq.order...),
-		predicates: append([]predicate.DbPackage{}, dpq.predicates...),
+		ctx:        dpq.ctx.Clone(),
+		order:      append([]dbpackage.OrderOption{}, dpq.order...),
+		inters:     append([]Interceptor{}, dpq.inters...),
+		predicates: append([]predicate.DBPackage{}, dpq.predicates...),
 		// clone intermediate query.
-		sql:    dpq.sql.Clone(),
-		path:   dpq.path,
-		unique: dpq.unique,
+		sql:       dpq.sql.Clone(),
+		path:      dpq.path,
+		modifiers: append([]func(*sql.Selector){}, dpq.modifiers...),
 	}
 }
 
@@ -258,21 +268,16 @@ func (dpq *DbPackageQuery) Clone() *DbPackageQuery {
 //		Count int `json:"count,omitempty"`
 //	}
 //
-//	client.DbPackage.Query().
+//	client.DBPackage.Query().
 //		GroupBy(dbpackage.FieldPkgbase).
 //		Aggregate(ent.Count()).
 //		Scan(ctx, &v)
-func (dpq *DbPackageQuery) GroupBy(field string, fields ...string) *DbPackageGroupBy {
-	grbuild := &DbPackageGroupBy{config: dpq.config}
-	grbuild.fields = append([]string{field}, fields...)
-	grbuild.path = func(ctx context.Context) (prev *sql.Selector, err error) {
-		if err := dpq.prepareQuery(ctx); err != nil {
-			return nil, err
-		}
-		return dpq.sqlQuery(ctx), nil
-	}
+func (dpq *DBPackageQuery) GroupBy(field string, fields ...string) *DBPackageGroupBy {
+	dpq.ctx.Fields = append([]string{field}, fields...)
+	grbuild := &DBPackageGroupBy{build: dpq}
+	grbuild.flds = &dpq.ctx.Fields
 	grbuild.label = dbpackage.Label
-	grbuild.flds, grbuild.scan = &grbuild.fields, grbuild.Scan
+	grbuild.scan = grbuild.Scan
 	return grbuild
 }
 
@@ -285,24 +290,34 @@ func (dpq *DbPackageQuery) GroupBy(field string, fields ...string) *DbPackageGro
 //		Pkgbase string `json:"pkgbase,omitempty"`
 //	}
 //
-//	client.DbPackage.Query().
+//	client.DBPackage.Query().
 //		Select(dbpackage.FieldPkgbase).
 //		Scan(ctx, &v)
-func (dpq *DbPackageQuery) Select(fields ...string) *DbPackageSelect {
-	dpq.fields = append(dpq.fields, fields...)
-	selbuild := &DbPackageSelect{DbPackageQuery: dpq}
-	selbuild.label = dbpackage.Label
-	selbuild.flds, selbuild.scan = &dpq.fields, selbuild.Scan
-	return selbuild
+func (dpq *DBPackageQuery) Select(fields ...string) *DBPackageSelect {
+	dpq.ctx.Fields = append(dpq.ctx.Fields, fields...)
+	sbuild := &DBPackageSelect{DBPackageQuery: dpq}
+	sbuild.label = dbpackage.Label
+	sbuild.flds, sbuild.scan = &dpq.ctx.Fields, sbuild.Scan
+	return sbuild
 }
 
-// Aggregate returns a DbPackageSelect configured with the given aggregations.
-func (dpq *DbPackageQuery) Aggregate(fns ...AggregateFunc) *DbPackageSelect {
+// Aggregate returns a DBPackageSelect configured with the given aggregations.
+func (dpq *DBPackageQuery) Aggregate(fns ...AggregateFunc) *DBPackageSelect {
 	return dpq.Select().Aggregate(fns...)
 }
 
-func (dpq *DbPackageQuery) prepareQuery(ctx context.Context) error {
-	for _, f := range dpq.fields {
+func (dpq *DBPackageQuery) prepareQuery(ctx context.Context) error {
+	for _, inter := range dpq.inters {
+		if inter == nil {
+			return fmt.Errorf("ent: uninitialized interceptor (forgotten import ent/runtime?)")
+		}
+		if trv, ok := inter.(Traverser); ok {
+			if err := trv.Traverse(ctx, dpq); err != nil {
+				return err
+			}
+		}
+	}
+	for _, f := range dpq.ctx.Fields {
 		if !dbpackage.ValidColumn(f) {
 			return &ValidationError{Name: f, err: fmt.Errorf("ent: invalid field %q for query", f)}
 		}
@@ -317,16 +332,16 @@ func (dpq *DbPackageQuery) prepareQuery(ctx context.Context) error {
 	return nil
 }
 
-func (dpq *DbPackageQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*DbPackage, error) {
+func (dpq *DBPackageQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*DBPackage, error) {
 	var (
-		nodes = []*DbPackage{}
+		nodes = []*DBPackage{}
 		_spec = dpq.querySpec()
 	)
 	_spec.ScanValues = func(columns []string) ([]any, error) {
-		return (*DbPackage).scanValues(nil, columns)
+		return (*DBPackage).scanValues(nil, columns)
 	}
 	_spec.Assign = func(columns []string, values []any) error {
-		node := &DbPackage{config: dpq.config}
+		node := &DBPackage{config: dpq.config}
 		nodes = append(nodes, node)
 		return node.assignValues(columns, values)
 	}
@@ -345,46 +360,27 @@ func (dpq *DbPackageQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*D
 	return nodes, nil
 }
 
-func (dpq *DbPackageQuery) sqlCount(ctx context.Context) (int, error) {
+func (dpq *DBPackageQuery) sqlCount(ctx context.Context) (int, error) {
 	_spec := dpq.querySpec()
 	if len(dpq.modifiers) > 0 {
 		_spec.Modifiers = dpq.modifiers
 	}
-	_spec.Node.Columns = dpq.fields
-	if len(dpq.fields) > 0 {
-		_spec.Unique = dpq.unique != nil && *dpq.unique
+	_spec.Node.Columns = dpq.ctx.Fields
+	if len(dpq.ctx.Fields) > 0 {
+		_spec.Unique = dpq.ctx.Unique != nil && *dpq.ctx.Unique
 	}
 	return sqlgraph.CountNodes(ctx, dpq.driver, _spec)
 }
 
-func (dpq *DbPackageQuery) sqlExist(ctx context.Context) (bool, error) {
-	switch _, err := dpq.FirstID(ctx); {
-	case IsNotFound(err):
-		return false, nil
-	case err != nil:
-		return false, fmt.Errorf("ent: check existence: %w", err)
-	default:
-		return true, nil
-	}
-}
-
-func (dpq *DbPackageQuery) querySpec() *sqlgraph.QuerySpec {
-	_spec := &sqlgraph.QuerySpec{
-		Node: &sqlgraph.NodeSpec{
-			Table:   dbpackage.Table,
-			Columns: dbpackage.Columns,
-			ID: &sqlgraph.FieldSpec{
-				Type:   field.TypeInt,
-				Column: dbpackage.FieldID,
-			},
-		},
-		From:   dpq.sql,
-		Unique: true,
-	}
-	if unique := dpq.unique; unique != nil {
+func (dpq *DBPackageQuery) querySpec() *sqlgraph.QuerySpec {
+	_spec := sqlgraph.NewQuerySpec(dbpackage.Table, dbpackage.Columns, sqlgraph.NewFieldSpec(dbpackage.FieldID, field.TypeInt))
+	_spec.From = dpq.sql
+	if unique := dpq.ctx.Unique; unique != nil {
 		_spec.Unique = *unique
+	} else if dpq.path != nil {
+		_spec.Unique = true
 	}
-	if fields := dpq.fields; len(fields) > 0 {
+	if fields := dpq.ctx.Fields; len(fields) > 0 {
 		_spec.Node.Columns = make([]string, 0, len(fields))
 		_spec.Node.Columns = append(_spec.Node.Columns, dbpackage.FieldID)
 		for i := range fields {
@@ -400,10 +396,10 @@ func (dpq *DbPackageQuery) querySpec() *sqlgraph.QuerySpec {
 			}
 		}
 	}
-	if limit := dpq.limit; limit != nil {
+	if limit := dpq.ctx.Limit; limit != nil {
 		_spec.Limit = *limit
 	}
-	if offset := dpq.offset; offset != nil {
+	if offset := dpq.ctx.Offset; offset != nil {
 		_spec.Offset = *offset
 	}
 	if ps := dpq.order; len(ps) > 0 {
@@ -416,10 +412,10 @@ func (dpq *DbPackageQuery) querySpec() *sqlgraph.QuerySpec {
 	return _spec
 }
 
-func (dpq *DbPackageQuery) sqlQuery(ctx context.Context) *sql.Selector {
+func (dpq *DBPackageQuery) sqlQuery(ctx context.Context) *sql.Selector {
 	builder := sql.Dialect(dpq.driver.Dialect())
 	t1 := builder.Table(dbpackage.Table)
-	columns := dpq.fields
+	columns := dpq.ctx.Fields
 	if len(columns) == 0 {
 		columns = dbpackage.Columns
 	}
@@ -428,7 +424,7 @@ func (dpq *DbPackageQuery) sqlQuery(ctx context.Context) *sql.Selector {
 		selector = dpq.sql
 		selector.Select(selector.Columns(columns...)...)
 	}
-	if dpq.unique != nil && *dpq.unique {
+	if dpq.ctx.Unique != nil && *dpq.ctx.Unique {
 		selector.Distinct()
 	}
 	for _, m := range dpq.modifiers {
@@ -440,122 +436,106 @@ func (dpq *DbPackageQuery) sqlQuery(ctx context.Context) *sql.Selector {
 	for _, p := range dpq.order {
 		p(selector)
 	}
-	if offset := dpq.offset; offset != nil {
+	if offset := dpq.ctx.Offset; offset != nil {
 		// limit is mandatory for offset clause. We start
 		// with default value, and override it below if needed.
 		selector.Offset(*offset).Limit(math.MaxInt32)
 	}
-	if limit := dpq.limit; limit != nil {
+	if limit := dpq.ctx.Limit; limit != nil {
 		selector.Limit(*limit)
 	}
 	return selector
 }
 
 // Modify adds a query modifier for attaching custom logic to queries.
-func (dpq *DbPackageQuery) Modify(modifiers ...func(s *sql.Selector)) *DbPackageSelect {
+func (dpq *DBPackageQuery) Modify(modifiers ...func(s *sql.Selector)) *DBPackageSelect {
 	dpq.modifiers = append(dpq.modifiers, modifiers...)
 	return dpq.Select()
 }
 
-// DbPackageGroupBy is the group-by builder for DbPackage entities.
-type DbPackageGroupBy struct {
-	config
+// DBPackageGroupBy is the group-by builder for DBPackage entities.
+type DBPackageGroupBy struct {
 	selector
-	fields []string
-	fns    []AggregateFunc
-	// intermediate query (i.e. traversal path).
-	sql  *sql.Selector
-	path func(context.Context) (*sql.Selector, error)
+	build *DBPackageQuery
 }
 
 // Aggregate adds the given aggregation functions to the group-by query.
-func (dpgb *DbPackageGroupBy) Aggregate(fns ...AggregateFunc) *DbPackageGroupBy {
+func (dpgb *DBPackageGroupBy) Aggregate(fns ...AggregateFunc) *DBPackageGroupBy {
 	dpgb.fns = append(dpgb.fns, fns...)
 	return dpgb
 }
 
-// Scan applies the group-by query and scans the result into the given value.
-func (dpgb *DbPackageGroupBy) Scan(ctx context.Context, v any) error {
-	query, err := dpgb.path(ctx)
-	if err != nil {
+// Scan applies the selector query and scans the result into the given value.
+func (dpgb *DBPackageGroupBy) Scan(ctx context.Context, v any) error {
+	ctx = setContextOp(ctx, dpgb.build.ctx, ent.OpQueryGroupBy)
+	if err := dpgb.build.prepareQuery(ctx); err != nil {
 		return err
 	}
-	dpgb.sql = query
-	return dpgb.sqlScan(ctx, v)
+	return scanWithInterceptors[*DBPackageQuery, *DBPackageGroupBy](ctx, dpgb.build, dpgb, dpgb.build.inters, v)
 }
 
-func (dpgb *DbPackageGroupBy) sqlScan(ctx context.Context, v any) error {
-	for _, f := range dpgb.fields {
-		if !dbpackage.ValidColumn(f) {
-			return &ValidationError{Name: f, err: fmt.Errorf("invalid field %q for group-by", f)}
-		}
+func (dpgb *DBPackageGroupBy) sqlScan(ctx context.Context, root *DBPackageQuery, v any) error {
+	selector := root.sqlQuery(ctx).Select()
+	aggregation := make([]string, 0, len(dpgb.fns))
+	for _, fn := range dpgb.fns {
+		aggregation = append(aggregation, fn(selector))
 	}
-	selector := dpgb.sqlQuery()
+	if len(selector.SelectedColumns()) == 0 {
+		columns := make([]string, 0, len(*dpgb.flds)+len(dpgb.fns))
+		for _, f := range *dpgb.flds {
+			columns = append(columns, selector.C(f))
+		}
+		columns = append(columns, aggregation...)
+		selector.Select(columns...)
+	}
+	selector.GroupBy(selector.Columns(*dpgb.flds...)...)
 	if err := selector.Err(); err != nil {
 		return err
 	}
 	rows := &sql.Rows{}
 	query, args := selector.Query()
-	if err := dpgb.driver.Query(ctx, query, args, rows); err != nil {
+	if err := dpgb.build.driver.Query(ctx, query, args, rows); err != nil {
 		return err
 	}
 	defer rows.Close()
 	return sql.ScanSlice(rows, v)
 }
 
-func (dpgb *DbPackageGroupBy) sqlQuery() *sql.Selector {
-	selector := dpgb.sql.Select()
-	aggregation := make([]string, 0, len(dpgb.fns))
-	for _, fn := range dpgb.fns {
-		aggregation = append(aggregation, fn(selector))
-	}
-	if len(selector.SelectedColumns()) == 0 {
-		columns := make([]string, 0, len(dpgb.fields)+len(dpgb.fns))
-		for _, f := range dpgb.fields {
-			columns = append(columns, selector.C(f))
-		}
-		columns = append(columns, aggregation...)
-		selector.Select(columns...)
-	}
-	return selector.GroupBy(selector.Columns(dpgb.fields...)...)
-}
-
-// DbPackageSelect is the builder for selecting fields of DbPackage entities.
-type DbPackageSelect struct {
-	*DbPackageQuery
+// DBPackageSelect is the builder for selecting fields of DBPackage entities.
+type DBPackageSelect struct {
+	*DBPackageQuery
 	selector
-	// intermediate query (i.e. traversal path).
-	sql *sql.Selector
 }
 
 // Aggregate adds the given aggregation functions to the selector query.
-func (dps *DbPackageSelect) Aggregate(fns ...AggregateFunc) *DbPackageSelect {
+func (dps *DBPackageSelect) Aggregate(fns ...AggregateFunc) *DBPackageSelect {
 	dps.fns = append(dps.fns, fns...)
 	return dps
 }
 
 // Scan applies the selector query and scans the result into the given value.
-func (dps *DbPackageSelect) Scan(ctx context.Context, v any) error {
+func (dps *DBPackageSelect) Scan(ctx context.Context, v any) error {
+	ctx = setContextOp(ctx, dps.ctx, ent.OpQuerySelect)
 	if err := dps.prepareQuery(ctx); err != nil {
 		return err
 	}
-	dps.sql = dps.DbPackageQuery.sqlQuery(ctx)
-	return dps.sqlScan(ctx, v)
+	return scanWithInterceptors[*DBPackageQuery, *DBPackageSelect](ctx, dps.DBPackageQuery, dps, dps.inters, v)
 }
 
-func (dps *DbPackageSelect) sqlScan(ctx context.Context, v any) error {
+func (dps *DBPackageSelect) sqlScan(ctx context.Context, root *DBPackageQuery, v any) error {
+	selector := root.sqlQuery(ctx)
 	aggregation := make([]string, 0, len(dps.fns))
 	for _, fn := range dps.fns {
-		aggregation = append(aggregation, fn(dps.sql))
+		aggregation = append(aggregation, fn(selector))
 	}
 	switch n := len(*dps.selector.flds); {
 	case n == 0 && len(aggregation) > 0:
-		dps.sql.Select(aggregation...)
+		selector.Select(aggregation...)
 	case n != 0 && len(aggregation) > 0:
-		dps.sql.AppendSelect(aggregation...)
+		selector.AppendSelect(aggregation...)
 	}
 	rows := &sql.Rows{}
-	query, args := dps.sql.Query()
+	query, args := selector.Query()
 	if err := dps.driver.Query(ctx, query, args, rows); err != nil {
 		return err
 	}
@@ -564,7 +544,7 @@ func (dps *DbPackageSelect) sqlScan(ctx context.Context, v any) error {
 }
 
 // Modify adds a query modifier for attaching custom logic to queries.
-func (dps *DbPackageSelect) Modify(modifiers ...func(s *sql.Selector)) *DbPackageSelect {
+func (dps *DBPackageSelect) Modify(modifiers ...func(s *sql.Selector)) *DBPackageSelect {
 	dps.modifiers = append(dps.modifiers, modifiers...)
 	return dps
 }

ent/ent.go

@@ -6,53 +6,84 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"reflect"
+	"sync"
 
 	"entgo.io/ent"
 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqlgraph"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 )
 
 // ent aliases to avoid import conflicts in user's code.
 type (
-	Op         = ent.Op
-	Hook       = ent.Hook
-	Value      = ent.Value
-	Query      = ent.Query
-	Policy     = ent.Policy
-	Mutator    = ent.Mutator
-	Mutation   = ent.Mutation
-	MutateFunc = ent.MutateFunc
+	Op            = ent.Op
+	Hook          = ent.Hook
+	Value         = ent.Value
+	Query         = ent.Query
+	QueryContext  = ent.QueryContext
+	Querier       = ent.Querier
+	QuerierFunc   = ent.QuerierFunc
+	Interceptor   = ent.Interceptor
+	InterceptFunc = ent.InterceptFunc
+	Traverser     = ent.Traverser
+	TraverseFunc  = ent.TraverseFunc
+	Policy        = ent.Policy
+	Mutator       = ent.Mutator
+	Mutation      = ent.Mutation
+	MutateFunc    = ent.MutateFunc
 )
 
+type clientCtxKey struct{}
+
+// FromContext returns a Client stored inside a context, or nil if there isn't one.
+func FromContext(ctx context.Context) *Client {
+	c, _ := ctx.Value(clientCtxKey{}).(*Client)
+	return c
+}
+
+// NewContext returns a new context with the given Client attached.
+func NewContext(parent context.Context, c *Client) context.Context {
+	return context.WithValue(parent, clientCtxKey{}, c)
+}
+
+type txCtxKey struct{}
+
+// TxFromContext returns a Tx stored inside a context, or nil if there isn't one.
+func TxFromContext(ctx context.Context) *Tx {
+	tx, _ := ctx.Value(txCtxKey{}).(*Tx)
+	return tx
+}
+
+// NewTxContext returns a new context with the given Tx attached.
+func NewTxContext(parent context.Context, tx *Tx) context.Context {
+	return context.WithValue(parent, txCtxKey{}, tx)
+}
+
 // OrderFunc applies an ordering on the sql selector.
+// Deprecated: Use Asc/Desc functions or the package builders instead.
 type OrderFunc func(*sql.Selector)
 
-// columnChecker returns a function indicates if the column exists in the given column.
-func columnChecker(table string) func(string) error {
-	checks := map[string]func(string) bool{
-		dbpackage.Table: dbpackage.ValidColumn,
-	}
-	check, ok := checks[table]
-	if !ok {
-		return func(string) error {
-			return fmt.Errorf("unknown table %q", table)
-		}
-	}
-	return func(column string) error {
-		if !check(column) {
-			return fmt.Errorf("unknown column %q for table %q", column, table)
-		}
-		return nil
-	}
+var (
+	initCheck   sync.Once
+	columnCheck sql.ColumnCheck
+)
+
+// checkColumn checks if the column exists in the given table.
+func checkColumn(table, column string) error {
+	initCheck.Do(func() {
+		columnCheck = sql.NewColumnCheck(map[string]func(string) bool{
+			dbpackage.Table: dbpackage.ValidColumn,
+		})
+	})
+	return columnCheck(table, column)
 }
 
 // Asc applies the given fields in ASC order.
-func Asc(fields ...string) OrderFunc {
+func Asc(fields ...string) func(*sql.Selector) {
 	return func(s *sql.Selector) {
-		check := columnChecker(s.TableName())
 		for _, f := range fields {
-			if err := check(f); err != nil {
+			if err := checkColumn(s.TableName(), f); err != nil {
 				s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)})
 			}
 			s.OrderBy(sql.Asc(s.C(f)))
@@ -61,11 +92,10 @@ func Asc(fields ...string) OrderFunc {
 }
 
 // Desc applies the given fields in DESC order.
-func Desc(fields ...string) OrderFunc {
+func Desc(fields ...string) func(*sql.Selector) {
 	return func(s *sql.Selector) {
-		check := columnChecker(s.TableName())
 		for _, f := range fields {
-			if err := check(f); err != nil {
+			if err := checkColumn(s.TableName(), f); err != nil {
 				s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)})
 			}
 			s.OrderBy(sql.Desc(s.C(f)))
@@ -97,8 +127,7 @@ func Count() AggregateFunc {
 // Max applies the "max" aggregation function on the given field of each group.
 func Max(field string) AggregateFunc {
 	return func(s *sql.Selector) string {
-		check := columnChecker(s.TableName())
-		if err := check(field); err != nil {
+		if err := checkColumn(s.TableName(), field); err != nil {
 			s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
 			return ""
 		}
@@ -109,8 +138,7 @@ func Max(field string) AggregateFunc {
 // Mean applies the "mean" aggregation function on the given field of each group.
 func Mean(field string) AggregateFunc {
 	return func(s *sql.Selector) string {
-		check := columnChecker(s.TableName())
-		if err := check(field); err != nil {
+		if err := checkColumn(s.TableName(), field); err != nil {
 			s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
 			return ""
 		}
@@ -121,8 +149,7 @@ func Mean(field string) AggregateFunc {
 // Min applies the "min" aggregation function on the given field of each group.
 func Min(field string) AggregateFunc {
 	return func(s *sql.Selector) string {
-		check := columnChecker(s.TableName())
-		if err := check(field); err != nil {
+		if err := checkColumn(s.TableName(), field); err != nil {
 			s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
 			return ""
 		}
@@ -133,8 +160,7 @@ func Min(field string) AggregateFunc {
 // Sum applies the "sum" aggregation function on the given field of each group.
 func Sum(field string) AggregateFunc {
 	return func(s *sql.Selector) string {
-		check := columnChecker(s.TableName())
-		if err := check(field); err != nil {
+		if err := checkColumn(s.TableName(), field); err != nil {
 			s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
 			return ""
 		}
@@ -462,5 +488,121 @@ func (s *selector) BoolX(ctx context.Context) bool {
 	return v
 }
 
+// withHooks invokes the builder operation with the given hooks, if any.
+func withHooks[V Value, M any, PM interface {
+	*M
+	Mutation
+}](ctx context.Context, exec func(context.Context) (V, error), mutation PM, hooks []Hook) (value V, err error) {
+	if len(hooks) == 0 {
+		return exec(ctx)
+	}
+	var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
+		mutationT, ok := any(m).(PM)
+		if !ok {
+			return nil, fmt.Errorf("unexpected mutation type %T", m)
+		}
+		// Set the mutation to the builder.
+		*mutation = *mutationT
+		return exec(ctx)
+	})
+	for i := len(hooks) - 1; i >= 0; i-- {
+		if hooks[i] == nil {
+			return value, fmt.Errorf("ent: uninitialized hook (forgotten import ent/runtime?)")
+		}
+		mut = hooks[i](mut)
+	}
+	v, err := mut.Mutate(ctx, mutation)
+	if err != nil {
+		return value, err
+	}
+	nv, ok := v.(V)
+	if !ok {
+		return value, fmt.Errorf("unexpected node type %T returned from %T", v, mutation)
+	}
+	return nv, nil
+}
+
+// setContextOp returns a new context with the given QueryContext attached (including its op) in case it does not exist.
+func setContextOp(ctx context.Context, qc *QueryContext, op string) context.Context {
+	if ent.QueryFromContext(ctx) == nil {
+		qc.Op = op
+		ctx = ent.NewQueryContext(ctx, qc)
+	}
+	return ctx
+}
+
+func querierAll[V Value, Q interface {
+	sqlAll(context.Context, ...queryHook) (V, error)
+}]() Querier {
+	return QuerierFunc(func(ctx context.Context, q Query) (Value, error) {
+		query, ok := q.(Q)
+		if !ok {
+			return nil, fmt.Errorf("unexpected query type %T", q)
+		}
+		return query.sqlAll(ctx)
+	})
+}
+
+func querierCount[Q interface {
+	sqlCount(context.Context) (int, error)
+}]() Querier {
+	return QuerierFunc(func(ctx context.Context, q Query) (Value, error) {
+		query, ok := q.(Q)
+		if !ok {
+			return nil, fmt.Errorf("unexpected query type %T", q)
+		}
+		return query.sqlCount(ctx)
+	})
+}
+
+func withInterceptors[V Value](ctx context.Context, q Query, qr Querier, inters []Interceptor) (v V, err error) {
+	for i := len(inters) - 1; i >= 0; i-- {
+		qr = inters[i].Intercept(qr)
+	}
+	rv, err := qr.Query(ctx, q)
+	if err != nil {
+		return v, err
+	}
+	vt, ok := rv.(V)
+	if !ok {
+		return v, fmt.Errorf("unexpected type %T returned from %T. expected type: %T", vt, q, v)
+	}
+	return vt, nil
+}
+
+func scanWithInterceptors[Q1 ent.Query, Q2 interface {
+	sqlScan(context.Context, Q1, any) error
+}](ctx context.Context, rootQuery Q1, selectOrGroup Q2, inters []Interceptor, v any) error {
+	rv := reflect.ValueOf(v)
+	var qr Querier = QuerierFunc(func(ctx context.Context, q Query) (Value, error) {
+		query, ok := q.(Q1)
+		if !ok {
+			return nil, fmt.Errorf("unexpected query type %T", q)
+		}
+		if err := selectOrGroup.sqlScan(ctx, query, v); err != nil {
+			return nil, err
+		}
+		if k := rv.Kind(); k == reflect.Pointer && rv.Elem().CanInterface() {
+			return rv.Elem().Interface(), nil
+		}
+		return v, nil
+	})
+	for i := len(inters) - 1; i >= 0; i-- {
+		qr = inters[i].Intercept(qr)
+	}
+	vv, err := qr.Query(ctx, rootQuery)
+	if err != nil {
+		return err
+	}
+	switch rv2 := reflect.ValueOf(vv); {
+	case rv.IsNil(), rv2.IsNil(), rv.Kind() != reflect.Pointer:
+	case rv.Type() == rv2.Type():
+		rv.Elem().Set(rv2.Elem())
+	case rv.Elem().Type() == rv2.Type():
+		rv.Elem().Set(rv2)
+	}
+	return nil
+}
+
 // queryHook describes an internal hook for the different sqlAll methods.
 type queryHook func(context.Context, *sqlgraph.QuerySpec)

ent/enttest/enttest.go

@@ -5,12 +5,12 @@ package enttest
 import (
 	"context"
 
-	"git.harting.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent"
 	// required by schema hooks.
-	_ "git.harting.dev/ALHP/ALHP.GO/ent/runtime"
+	_ "somegit.dev/ALHP/ALHP.GO/ent/runtime"
 
 	"entgo.io/ent/dialect/sql/schema"
-	"git.harting.dev/ALHP/ALHP.GO/ent/migrate"
+	"somegit.dev/ALHP/ALHP.GO/ent/migrate"
 )
 
 type (

ent/hook/hook.go

@@ -6,20 +6,19 @@ import (
 	"context"
 	"fmt"
 
-	"git.harting.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent"
 )
 
-// The DbPackageFunc type is an adapter to allow the use of ordinary
-// function as DbPackage mutator.
-type DbPackageFunc func(context.Context, *ent.DbPackageMutation) (ent.Value, error)
+// The DBPackageFunc type is an adapter to allow the use of ordinary
+// function as DBPackage mutator.
+type DBPackageFunc func(context.Context, *ent.DBPackageMutation) (ent.Value, error)
 
 // Mutate calls f(ctx, m).
-func (f DbPackageFunc) Mutate(ctx context.Context, m ent.Mutation) (ent.Value, error) {
-	mv, ok := m.(*ent.DbPackageMutation)
-	if !ok {
-		return nil, fmt.Errorf("unexpected mutation type %T. expect *ent.DbPackageMutation", m)
+func (f DBPackageFunc) Mutate(ctx context.Context, m ent.Mutation) (ent.Value, error) {
+	if mv, ok := m.(*ent.DBPackageMutation); ok {
+		return f(ctx, mv)
 	}
-	return f(ctx, mv)
+	return nil, fmt.Errorf("unexpected mutation type %T. expect *ent.DBPackageMutation", m)
 }
 
 // Condition is a hook condition function.

ent/migrate/schema.go

@@ -13,15 +13,14 @@ var (
 		{Name: "id", Type: field.TypeInt, Increment: true},
 		{Name: "pkgbase", Type: field.TypeString},
 		{Name: "packages", Type: field.TypeJSON, Nullable: true},
-		{Name: "status", Type: field.TypeEnum, Nullable: true, Enums: []string{"skipped", "failed", "build", "queued", "delayed", "building", "latest", "signing", "unknown"}, Default: "unknown"},
+		{Name: "status", Type: field.TypeEnum, Nullable: true, Enums: []string{"skipped", "failed", "built", "queued", "delayed", "building", "latest", "signing", "unknown"}, Default: "unknown"},
 		{Name: "skip_reason", Type: field.TypeString, Nullable: true},
-		{Name: "repository", Type: field.TypeEnum, Enums: []string{"extra", "core", "community"}},
+		{Name: "repository", Type: field.TypeEnum, Enums: []string{"extra", "core", "multilib"}},
 		{Name: "march", Type: field.TypeString},
 		{Name: "version", Type: field.TypeString, Nullable: true},
 		{Name: "repo_version", Type: field.TypeString, Nullable: true},
 		{Name: "build_time_start", Type: field.TypeTime, Nullable: true},
 		{Name: "updated", Type: field.TypeTime, Nullable: true},
-		{Name: "hash", Type: field.TypeString, Nullable: true},
 		{Name: "lto", Type: field.TypeEnum, Nullable: true, Enums: []string{"enabled", "unknown", "disabled", "auto_disabled"}, Default: "unknown"},
 		{Name: "last_version_build", Type: field.TypeString, Nullable: true},
 		{Name: "last_verified", Type: field.TypeTime, Nullable: true},
@@ -31,9 +30,7 @@ var (
 		{Name: "s_time", Type: field.TypeInt64, Nullable: true},
 		{Name: "io_in", Type: field.TypeInt64, Nullable: true},
 		{Name: "io_out", Type: field.TypeInt64, Nullable: true},
-		{Name: "srcinfo", Type: field.TypeString, Nullable: true, Size: 2147483647},
-		{Name: "srcinfo_hash", Type: field.TypeString, Nullable: true},
-		{Name: "pkgbuild", Type: field.TypeString, Nullable: true},
+		{Name: "tag_rev", Type: field.TypeString, Nullable: true},
 	}
 	// DbPackagesTable holds the schema information for the "db_packages" table.
 	DbPackagesTable = &schema.Table{

ent/predicate/predicate.go

@@ -6,5 +6,5 @@ import (
 	"entgo.io/ent/dialect/sql"
 )
 
-// DbPackage is the predicate function for dbpackage builders.
-type DbPackage func(*sql.Selector)
+// DBPackage is the predicate function for dbpackage builders.
+type DBPackage func(*sql.Selector)

ent/runtime.go

@@ -3,15 +3,15 @@
 package ent
 
 import (
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
-	"git.harting.dev/ALHP/ALHP.GO/ent/schema"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"somegit.dev/ALHP/ALHP.GO/ent/schema"
 )
 
 // The init function reads all schema descriptors with runtime code
 // (default values, validators, hooks and policies) and stitches it
 // to their package variables.
 func init() {
-	dbpackageFields := schema.DbPackage{}.Fields()
+	dbpackageFields := schema.DBPackage{}.Fields()
 	_ = dbpackageFields
 	// dbpackageDescPkgbase is the schema descriptor for pkgbase field.
 	dbpackageDescPkgbase := dbpackageFields[0].Descriptor()

ent/runtime/runtime.go

@@ -2,9 +2,9 @@
 
 package runtime
 
-// The schema-stitching logic is generated in git.harting.dev/ALHP/ALHP.GO/ent/runtime.go
+// The schema-stitching logic is generated in somegit.dev/ALHP/ALHP.GO/ent/runtime.go
 
 const (
-	Version = "v0.11.4"                                         // Version of ent codegen.
-	Sum     = "h1:grwVY0fp31BZ6oEo3YrXenAuv8VJmEw7F/Bi6WqeH3Q=" // Sum of ent codegen.
+	Version = "v0.14.2"                                         // Version of ent codegen.
+	Sum     = "h1:ywld/j2Rx4EmnIKs8eZ29cbFA1zpB+DA9TLL5l3rlq0=" // Sum of ent codegen.
 )

ent/schema/dbpackage.go

@@ -5,25 +5,25 @@ import (
 	"entgo.io/ent/schema/field"
 )
 
-// DbPackage holds the schema definition for the DbPackage entity.
-type DbPackage struct {
+// DBPackage holds the schema definition for the DbPackage entity.
+type DBPackage struct {
 	ent.Schema
 }
 
-// Fields of the DbPackage.
-func (DbPackage) Fields() []ent.Field {
+// Fields of the DBPackage.
+func (DBPackage) Fields() []ent.Field {
 	return []ent.Field{
 		field.String("pkgbase").NotEmpty().Immutable(),
 		field.Strings("packages").Optional(),
-		field.Enum("status").Values("skipped", "failed", "build", "queued", "delayed", "building", "latest", "signing", "unknown").Default("unknown").Optional(),
+		field.Enum("status").Values("skipped", "failed", "built", "queued", "delayed", "building",
+			"latest", "signing", "unknown").Default("unknown").Optional(),
 		field.String("skip_reason").Optional(),
-		field.Enum("repository").Values("extra", "core", "community"),
+		field.Enum("repository").Values("extra", "core", "multilib"),
 		field.String("march").NotEmpty().Immutable(),
 		field.String("version").Optional(),
 		field.String("repo_version").Optional(),
 		field.Time("build_time_start").Optional(),
 		field.Time("updated").Optional(),
-		field.String("hash").Optional(),
 		field.Enum("lto").Values("enabled", "unknown", "disabled", "auto_disabled").Default("unknown").Optional(),
 		field.String("last_version_build").Optional(),
 		field.Time("last_verified").Optional(),
@@ -33,13 +33,11 @@ func (DbPackage) Fields() []ent.Field {
 		field.Int64("s_time").Optional().Nillable(),
 		field.Int64("io_in").Optional().Nillable(),
 		field.Int64("io_out").Optional().Nillable(),
-		field.Text("srcinfo").Optional().Nillable(),
-		field.String("srcinfo_hash").Optional(),
-		field.String("pkgbuild").Optional(),
+		field.String("tag_rev").Optional().Nillable(),
 	}
 }
 
-// Edges of the DbPackage.
-func (DbPackage) Edges() []ent.Edge {
+// Edges of the DBPackage.
+func (DBPackage) Edges() []ent.Edge {
 	return nil
 }

ent/tx.go

@@ -12,8 +12,8 @@ import (
 // Tx is a transactional client that is created by calling Client.Tx().
 type Tx struct {
 	config
-	// DbPackage is the client for interacting with the DbPackage builders.
-	DbPackage *DbPackageClient
+	// DBPackage is the client for interacting with the DBPackage builders.
+	DBPackage *DBPackageClient
 
 	// lazily loaded.
 	client     *Client
@@ -145,7 +145,7 @@ func (tx *Tx) Client() *Client {
 }
 
 func (tx *Tx) init() {
-	tx.DbPackage = NewDbPackageClient(tx.config)
+	tx.DBPackage = NewDBPackageClient(tx.config)
 }
 
 // txDriver wraps the given dialect.Tx with a nop dialect.Driver implementation.
@@ -155,7 +155,7 @@ func (tx *Tx) init() {
 // of them in order to commit or rollback the transaction.
 //
 // If a closed transaction is embedded in one of the generated entities, and the entity
-// applies a query, for example: DbPackage.QueryXXX(), the query will be executed
+// applies a query, for example: DBPackage.QueryXXX(), the query will be executed
 // through the driver which created this transaction.
 //
 // Note that txDriver is not goroutine safe.

flags.yaml

@@ -7,7 +7,7 @@ common:
   cflags:
     - "-mtune=generic": ~
     - "-O2": "-O3"
-    - "-mpclmul" # https://git.harting.dev/ALHP/ALHP.GO/issues/92
+    - "-mpclmul" # https://somegit.dev/ALHP/ALHP.GO/issues/92
     - "-march=x86-64": "-march=$march$"
 
   options:
@@ -16,20 +16,29 @@ common:
   buildenv:
     - "color": "!color" # color messes up the log output
 
-  goamd64: "$level$" # https://git.harting.dev/ALHP/ALHP.GO/issues/116
+  goamd64: "$level$" # https://somegit.dev/ALHP/ALHP.GO/issues/116
   packager: "ALHP $march$ <alhp@harting.dev>"
   makeflags: "-j$buildproc$"
-  # https://git.harting.dev/ALHP/ALHP.GO/issues/110
-  rustflags: |-
-    -Copt-level=3 -Ctarget-cpu=$march$
+  # https://somegit.dev/ALHP/ALHP.GO/issues/110
+  rustflags:
+    - "-Copt-level=3"
+    - "-Ctarget-cpu=$march$"
+    - "-Clink-arg=-z"
+    - "-Clink-arg=pack-relative-relocs"
   ltoflags:
     - "-falign-functions=32" # https://github.com/InBetweenNames/gentooLTO/issues/164
+  kcflags: " -march=$march$ -O3"
+  kcppflags: " -march=$march$ -O3"
+  fcflags: "$FFLAGS"
+  fflags:
+    - "-O2": "-O3"
+    - "-march=$march$"
 
 lto:
   rustflags:
-    - "-Clto=fat"
     - "-Ccodegen-units=1"
-    - "-Clinker-plugin-lto"
 
   options:
     - "!lto": "lto"
+
+  cargo_profile_release_lto: "fat"

go.mod

@@ -1,43 +1,58 @@
-module git.harting.dev/ALHP/ALHP.GO
+module somegit.dev/ALHP/ALHP.GO
 
-go 1.18
+go 1.23.0
+
+toolchain go1.23.1
 
 require (
-	entgo.io/ent v0.11.4
-	github.com/Jguer/go-alpm/v2 v2.1.2
+	entgo.io/ent v0.14.3
+	github.com/Jguer/go-alpm/v2 v2.2.2
 	github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5
 	github.com/Morganamilo/go-srcinfo v1.0.0
-	github.com/google/uuid v1.3.0
-	github.com/jackc/pgx/v4 v4.17.2
-	github.com/otiai10/copy v1.9.0
-	github.com/sethvargo/go-retry v0.2.3
-	github.com/sirupsen/logrus v1.9.0
-	github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3
-	golang.org/x/sync v0.1.0
+	github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
+	github.com/gobwas/glob v0.2.3
+	github.com/google/uuid v1.6.0
+	github.com/jackc/pgx/v4 v4.18.3
+	github.com/otiai10/copy v1.14.1
+	github.com/prometheus/client_golang v1.21.1
+	github.com/sethvargo/go-retry v0.3.0
+	github.com/sirupsen/logrus v1.9.3
+	github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117
 	gopkg.in/yaml.v2 v2.4.0
-	lukechampine.com/blake3 v1.1.7
 )
 
 require (
-	ariga.io/atlas v0.8.2 // indirect
+	ariga.io/atlas v0.32.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/go-openapi/inflect v0.19.0 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/hashicorp/hcl/v2 v2.15.0 // indirect
+	github.com/go-openapi/inflect v0.21.1 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.13.0 // indirect
+	github.com/jackc/pgconn v1.14.3 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.1 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgtype v1.14.4 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/zclconf/go-cty v1.12.1 // indirect
-	golang.org/x/crypto v0.3.0 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/otiai10/mint v1.6.3 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/zclconf/go-cty v1.16.2 // indirect
+	github.com/zclconf/go-cty-yaml v1.1.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )

go.sum

@@ -1,11 +1,16 @@
-ariga.io/atlas v0.8.2 h1:uXRegk0Zd7nlCYC60tdx12xUvN2NmeGTc2MB5HnnbkA=
-ariga.io/atlas v0.8.2/go.mod h1:ft47uSh5hWGDCmQC9DsztZg6Xk+KagM5Ts/mZYKb9JE=
-entgo.io/ent v0.11.4 h1:grwVY0fp31BZ6oEo3YrXenAuv8VJmEw7F/Bi6WqeH3Q=
-entgo.io/ent v0.11.4/go.mod h1:fnQIXL36RYnCk/9nvG4aE7YHBFZhCycfh7wMjY5p7SE=
+ariga.io/atlas v0.31.1-0.20250212144724-069be8033e83 h1:nX4HXncwIdvQ8/8sIUIf1nyCkK8qdBaHQ7EtzPpuiGE=
+ariga.io/atlas v0.31.1-0.20250212144724-069be8033e83/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w=
+ariga.io/atlas v0.32.0 h1:y+77nueMrExLiKlz1CcPKh/nU7VSlWfBbwCShsJyvCw=
+ariga.io/atlas v0.32.0/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w=
+entgo.io/ent v0.14.2 h1:ywld/j2Rx4EmnIKs8eZ29cbFA1zpB+DA9TLL5l3rlq0=
+entgo.io/ent v0.14.2/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
+entgo.io/ent v0.14.3 h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=
+entgo.io/ent v0.14.3/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
-github.com/Jguer/go-alpm/v2 v2.1.2 h1:CGTIxzuEpT9Q3a7IBrx0E6acoYoaHX2Z93UOApPDhgU=
-github.com/Jguer/go-alpm/v2 v2.1.2/go.mod h1:uLQcTMNM904dRiGU+/JDtDdd7Nd8mVbEVaHjhmziT7w=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/Jguer/go-alpm/v2 v2.2.2 h1:sPwUoZp1X5Tw6K6Ba1lWvVJfcgVNEGVcxARLBttZnC0=
+github.com/Jguer/go-alpm/v2 v2.2.2/go.mod h1:lfe8gSe83F/KERaQvEfrSqQ4n+8bES+ZIyKWR/gm3MI=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5 h1:TMscPjkb1ThXN32LuFY5bEYIcXZx3YlwzhS1GxNpn/c=
@@ -14,8 +19,16 @@ github.com/Morganamilo/go-srcinfo v1.0.0 h1:Wh4nEF+HJWo+29hnxM18Q2hi+DUf0GejS13+
 github.com/Morganamilo/go-srcinfo v1.0.0/go.mod h1:MP6VGY1NNpVUmYIEgoM9acix95KQqIRyqQ0hCLsyYUY=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
+github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
+github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
+github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4=
+github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -28,19 +41,25 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=
-github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4=
+github.com/go-openapi/inflect v0.21.0 h1:FoBjBTQEcbg2cJUWX6uwL9OyIW8eqc9k4KhN4lfbeYk=
+github.com/go-openapi/inflect v0.21.0/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw=
+github.com/go-openapi/inflect v0.21.1 h1:swwdJV4YPbuQaz68rHiBeQj+MWeBjDDNyEAi78Fhu4g=
+github.com/go-openapi/inflect v0.21.1/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
+github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
+github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hashicorp/hcl/v2 v2.15.0 h1:CPDXO6+uORPjKflkWCCwoWc9uRp+zSIPcCQ+BrxV7m8=
-github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
+github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -51,8 +70,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys=
-github.com/jackc/pgconn v1.13.0/go.mod h1:AnowpAqO4CMIIJNZl2VJp+KrkAZciAkhEl0W0JIobpI=
+github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
+github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
@@ -61,6 +80,7 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
@@ -68,94 +88,125 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y=
-github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
+github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w=
-github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgtype v1.14.4 h1:fKuNiCumbKTAIxQwXfB/nsrnkEI6bPJrrSiMKgbJ2j8=
+github.com/jackc/pgtype v1.14.4/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E=
-github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw=
+github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
+github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
+github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.1 h1:U33DW0aiEj633gHYw3LoDNfkDiYnE5Q8M/TKJn2f2jI=
-github.com/klauspost/cpuid/v2 v2.2.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
+github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/otiai10/copy v1.9.0 h1:7KFNiCgZ91Ru4qW4CWPf/7jqtxLagGRmIxWldPP9VY4=
-github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3FczI=
-github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
-github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
-github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
-github.com/otiai10/mint v1.4.0 h1:umwcf7gbpEwf7WFzqmWwSv0CzbeMsae2u9ZvpP8j2q4=
-github.com/otiai10/mint v1.4.0/go.mod h1:gifjb2MYOoULtKLqUAEILUG/9KONW6f7YsJ6vQLTlFI=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
+github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
+github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
+github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
+github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
-github.com/sethvargo/go-retry v0.2.3 h1:oYlgvIvsju3jNbottWABtbnoLC+GDtLdBHxKWxQm/iU=
-github.com/sethvargo/go-retry v0.2.3/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw=
+github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
+github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 h1:shC1HB1UogxN5Ech3Yqaaxj1X/P656PPCB4RbojIJqc=
-github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg=
-github.com/zclconf/go-cty v1.12.1 h1:PcupnljUm9EIvbgSHQnHhUr3fO6oFmkOrvs2BAFNXXY=
-github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 h1:67A5tweHp3C7osHjrYsy6pQZ00bYkTTttZ7kiOwwHeA=
+github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
+github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+github.com/zclconf/go-cty-yaml v1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0=
+github.com/zclconf/go-cty-yaml v1.1.0/go.mod h1:9YLUH4g7lOhVWqUbctnVlZ5KLpg7JAprQNgxSZ1Gyxs=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -177,23 +228,38 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -205,22 +271,36 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -228,15 +308,27 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -246,5 +338,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0=
-lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=

housekeeping.go

@@ -0,0 +1,355 @@
+package main
+
+import (
+	"context"
+	log "github.com/sirupsen/logrus"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"somegit.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
+	"strings"
+	"sync"
+	"time"
+)
+
+func housekeeping(ctx context.Context, repo, march string, wg *sync.WaitGroup) error {
+	defer wg.Done()
+	fullRepo := repo + "-" + march
+	log.Debugf("[%s] start housekeeping", fullRepo)
+	packages, err := Glob(filepath.Join(conf.Basedir.Repo, fullRepo, "/**/*.pkg.tar.zst"))
+	if err != nil {
+		return err
+	}
+
+	log.Debugf("[HK/%s] removing orphans, signature check", fullRepo)
+	for _, path := range packages {
+		mPackage := Package(path)
+
+		dbPkg, err := mPackage.DBPackage(ctx, db)
+		if ent.IsNotFound(err) {
+			log.Infof("[HK] removing orphan %s->%s", fullRepo, filepath.Base(path))
+			pkg := &ProtoPackage{
+				FullRepo: *mPackage.FullRepo(),
+				PkgFiles: []string{path},
+				March:    *mPackage.MArch(),
+			}
+			buildManager.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
+			continue
+		} else if err != nil {
+			log.Warningf("[HK] error fetching %s->%q from db: %v", fullRepo, path, err)
+			continue
+		}
+
+		pkg := &ProtoPackage{
+			Pkgbase:   dbPkg.Pkgbase,
+			Repo:      mPackage.Repo(),
+			FullRepo:  *mPackage.FullRepo(),
+			DBPackage: dbPkg,
+			March:     *mPackage.MArch(),
+			Arch:      *mPackage.Arch(),
+		}
+
+		// check if package is still part of repo
+		dbs, err := alpmHandle.SyncDBs()
+		if err != nil {
+			return err
+		}
+		buildManager.alpmMutex.Lock()
+		pkgResolved, err := dbs.FindSatisfier(mPackage.Name())
+		buildManager.alpmMutex.Unlock()
+		if err != nil ||
+			pkgResolved.DB().Name() != pkg.DBPackage.Repository.String() ||
+			pkgResolved.DB().Name() != pkg.Repo.String() ||
+			pkgResolved.Architecture() != pkg.Arch ||
+			pkgResolved.Name() != mPackage.Name() ||
+			MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages) {
+			switch {
+			case err != nil:
+				log.Infof("[HK] %s->%s not included in repo (resolve error: %v)", pkg.FullRepo, mPackage.Name(), err)
+			case pkgResolved.DB().Name() != pkg.DBPackage.Repository.String():
+				log.Infof("[HK] %s->%s not included in repo (repo mismatch: repo:%s != db:%s)", pkg.FullRepo,
+					mPackage.Name(), pkgResolved.DB().Name(), pkg.DBPackage.Repository.String())
+			case pkgResolved.DB().Name() != pkg.Repo.String():
+				log.Infof("[HK] %s->%s not included in repo (repo mismatch: repo:%s != pkg:%s)", pkg.FullRepo,
+					mPackage.Name(), pkgResolved.DB().Name(), pkg.Repo.String())
+			case pkgResolved.Architecture() != pkg.Arch:
+				log.Infof("[HK] %s->%s not included in repo (arch mismatch: repo:%s != pkg:%s)", pkg.FullRepo,
+					mPackage.Name(), pkgResolved.Architecture(), pkg.Arch)
+			case pkgResolved.Name() != mPackage.Name():
+				log.Infof("[HK] %s->%s not included in repo (name mismatch: repo:%s != pkg:%s)", pkg.FullRepo,
+					mPackage.Name(), pkgResolved.Name(), mPackage.Name())
+			case MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages):
+				log.Infof("[HK] %s->%s not included in repo (blacklisted pkgbase %s)", pkg.FullRepo, mPackage.Name(), pkg.Pkgbase)
+			}
+
+			// package not found on mirror/db -> not part of any repo anymore
+			err = pkg.findPkgFiles()
+			if err != nil {
+				log.Errorf("[HK] %s->%s unable to get pkg-files: %v", pkg.FullRepo, mPackage.Name(), err)
+				continue
+			}
+			err = db.DBPackage.DeleteOne(pkg.DBPackage).Exec(ctx)
+			pkg.DBPackage = nil
+			buildManager.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
+			if err != nil {
+				return err
+			}
+			continue
+		}
+
+		if pkg.DBPackage.LastVerified.Before(pkg.DBPackage.BuildTimeStart) {
+			err := pkg.DBPackage.Update().SetLastVerified(time.Now().UTC()).Exec(ctx)
+			if err != nil {
+				return err
+			}
+			// check if pkg signature is valid
+			valid, err := mPackage.HasValidSignature()
+			if err != nil {
+				return err
+			}
+			if !valid {
+				log.Infof("[HK] %s->%s invalid package signature", pkg.FullRepo, pkg.Pkgbase)
+				buildManager.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
+				continue
+			}
+		}
+
+		// compare db-version with repo version
+		repoVer, err := pkg.repoVersion()
+		if err == nil && repoVer != dbPkg.RepoVersion {
+			log.Infof("[HK] %s->%s update repoVersion %s->%s", pkg.FullRepo, pkg.Pkgbase, dbPkg.RepoVersion, repoVer)
+			pkg.DBPackage, err = pkg.DBPackage.Update().SetRepoVersion(repoVer).ClearTagRev().Save(context.Background())
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	// check all packages from db for existence
+	dbPackages, err := db.DBPackage.Query().Where(
+		dbpackage.And(
+			dbpackage.RepositoryEQ(dbpackage.Repository(repo)),
+			dbpackage.March(march),
+		)).All(context.Background())
+	if err != nil {
+		return err
+	}
+
+	log.Debugf("[HK/%s] checking %d packages from database", fullRepo, len(dbPackages))
+
+	for _, dbPkg := range dbPackages {
+		pkg := &ProtoPackage{
+			Pkgbase:   dbPkg.Pkgbase,
+			Repo:      dbPkg.Repository,
+			March:     dbPkg.March,
+			FullRepo:  dbPkg.Repository.String() + "-" + dbPkg.March,
+			DBPackage: dbPkg,
+		}
+
+		if !pkg.isAvailable(ctx, alpmHandle) {
+			log.Infof("[HK] %s->%s not found on mirror, removing", pkg.FullRepo, pkg.Pkgbase)
+			err = db.DBPackage.DeleteOne(dbPkg).Exec(context.Background())
+			if err != nil {
+				log.Errorf("[HK] error deleting package %s->%s: %v", pkg.FullRepo, dbPkg.Pkgbase, err)
+			}
+			continue
+		}
+
+		switch {
+		case dbPkg.Status == dbpackage.StatusLatest && dbPkg.RepoVersion != "":
+			// check lastVersionBuild
+			if dbPkg.LastVersionBuild != dbPkg.RepoVersion {
+				log.Infof("[HK] %s->%s updating lastVersionBuild %s -> %s", fullRepo, dbPkg.Pkgbase, dbPkg.LastVersionBuild, dbPkg.RepoVersion)
+				nDBPkg, err := dbPkg.Update().SetLastVersionBuild(dbPkg.RepoVersion).Save(ctx)
+				if err != nil {
+					log.Warningf("[HK] error updating lastVersionBuild for %s->%s: %v", fullRepo, dbPkg.Pkgbase, err)
+				} else {
+					dbPkg = nDBPkg
+				}
+			}
+
+			var existingSplits []string
+			var missingSplits []string
+			for _, splitPkg := range dbPkg.Packages {
+				pkgFile := filepath.Join(conf.Basedir.Repo, fullRepo, "os", conf.Arch,
+					splitPkg+"-"+dbPkg.RepoVersion+"-"+conf.Arch+".pkg.tar.zst")
+				_, err = os.Stat(pkgFile)
+				switch {
+				case os.IsNotExist(err):
+					missingSplits = append(missingSplits, splitPkg)
+				case err != nil:
+					log.Warningf("[HK] error reading package-file %s: %v", splitPkg, err)
+				default:
+					existingSplits = append(existingSplits, pkgFile)
+				}
+			}
+			if len(missingSplits) > 0 {
+				log.Infof("[HK] %s->%s missing split-package(s): %s", fullRepo, dbPkg.Pkgbase, missingSplits)
+				pkg.DBPackage, err = pkg.DBPackage.Update().
+					ClearRepoVersion().
+					ClearTagRev().
+					SetStatus(dbpackage.StatusQueued).
+					Save(ctx)
+				if err != nil {
+					return err
+				}
+
+				pkg := &ProtoPackage{
+					FullRepo:  fullRepo,
+					PkgFiles:  existingSplits,
+					March:     march,
+					DBPackage: dbPkg,
+				}
+				buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
+			}
+
+			rawState, err := os.ReadFile(filepath.Join(conf.Basedir.Work, stateDir, dbPkg.Repository.String()+"-"+conf.Arch, dbPkg.Pkgbase))
+			if err != nil {
+				log.Infof("[HK] state not found for %s->%s: %v, removing package", fullRepo, dbPkg.Pkgbase, err)
+				pkg := &ProtoPackage{
+					FullRepo:  fullRepo,
+					PkgFiles:  existingSplits,
+					March:     march,
+					DBPackage: dbPkg,
+				}
+				buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
+				continue
+			}
+
+			state, err := parseState(string(rawState))
+			if err != nil {
+				log.Warningf("[HK] error parsing state file for %s->%s: %v", fullRepo, dbPkg.Pkgbase, err)
+				continue
+			}
+
+			if dbPkg.TagRev != nil && state.TagRev == *dbPkg.TagRev && state.PkgVer != dbPkg.Version {
+				log.Infof("[HK] reseting package %s->%s with mismatched state information (%s!=%s)",
+					fullRepo, dbPkg.Pkgbase, state.PkgVer, dbPkg.Version)
+				err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().Exec(ctx)
+				if err != nil {
+					return err
+				}
+			}
+		case dbPkg.Status == dbpackage.StatusLatest && dbPkg.RepoVersion == "":
+			log.Infof("[HK] reseting missing package %s->%s with no repo version", fullRepo, dbPkg.Pkgbase)
+			err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().ClearRepoVersion().Exec(ctx)
+			if err != nil {
+				return err
+			}
+		case dbPkg.Status == dbpackage.StatusSkipped && dbPkg.RepoVersion != "" && !strings.HasPrefix(dbPkg.SkipReason, "delayed"):
+			log.Infof("[HK] delete skipped package %s->%s", fullRepo, dbPkg.Pkgbase)
+			pkg := &ProtoPackage{
+				FullRepo:  fullRepo,
+				March:     march,
+				DBPackage: dbPkg,
+			}
+			buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
+		case dbPkg.Status == dbpackage.StatusSkipped && dbPkg.SkipReason == "blacklisted" && !MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages):
+			log.Infof("[HK] requeue previously blacklisted package %s->%s", fullRepo, dbPkg.Pkgbase)
+			err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearSkipReason().ClearTagRev().Exec(context.Background())
+			if err != nil {
+				return err
+			}
+		case dbPkg.Status == dbpackage.StatusFailed && dbPkg.RepoVersion != "":
+			log.Infof("[HK] package %s->%s failed but still present in repo, removing", fullRepo, dbPkg.Pkgbase)
+			pkg := &ProtoPackage{
+				FullRepo:  fullRepo,
+				March:     march,
+				DBPackage: dbPkg,
+			}
+			buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
+		}
+	}
+
+	log.Debugf("[HK/%s] all tasks finished", fullRepo)
+	return nil
+}
+
+func logHK(ctx context.Context) error {
+	// check if package for log exists and if error can be fixed by rebuild
+	logFiles, err := Glob(filepath.Join(conf.Basedir.Repo, logDir, "/**/*.log"))
+	if err != nil {
+		return err
+	}
+
+	for _, logFile := range logFiles {
+		pathSplit := strings.Split(logFile, string(filepath.Separator))
+		extSplit := strings.Split(filepath.Base(logFile), ".")
+		pkgbase := strings.Join(extSplit[:len(extSplit)-1], ".")
+		march := pathSplit[len(pathSplit)-2]
+
+		pkg := ProtoPackage{
+			Pkgbase: pkgbase,
+			March:   march,
+		}
+
+		if exists, err := pkg.exists(); err != nil {
+			return err
+		} else if !exists {
+			_ = os.Remove(logFile)
+			continue
+		}
+
+		pkgSkipped, err := db.DBPackage.Query().Where(
+			dbpackage.Pkgbase(pkg.Pkgbase),
+			dbpackage.March(pkg.March),
+			dbpackage.StatusEQ(dbpackage.StatusSkipped),
+		).Exist(ctx)
+		if err != nil {
+			return err
+		}
+
+		if pkgSkipped {
+			_ = os.Remove(logFile)
+			continue
+		}
+
+		logContent, err := os.ReadFile(logFile)
+		if err != nil {
+			return err
+		}
+		sLogContent := string(logContent)
+
+		if rePortError.MatchString(sLogContent) || reSigError.MatchString(sLogContent) || reDownloadError.MatchString(sLogContent) ||
+			reDownloadError2.MatchString(sLogContent) {
+			rows, err := db.DBPackage.Update().Where(dbpackage.Pkgbase(pkg.Pkgbase), dbpackage.March(pkg.March),
+				dbpackage.StatusEQ(dbpackage.StatusFailed)).ClearTagRev().SetStatus(dbpackage.StatusQueued).Save(ctx)
+			if err != nil {
+				return err
+			}
+
+			if rows > 0 {
+				log.Infof("[HK/%s/%s] fixable build-error detected, requeueing package (%d)", pkg.March, pkg.Pkgbase, rows)
+			}
+		} else if reLdError.MatchString(sLogContent) || reRustLTOError.MatchString(sLogContent) {
+			rows, err := db.DBPackage.Update().Where(
+				dbpackage.Pkgbase(pkg.Pkgbase),
+				dbpackage.March(pkg.March),
+				dbpackage.StatusEQ(dbpackage.StatusFailed),
+				dbpackage.LtoNotIn(dbpackage.LtoAutoDisabled, dbpackage.LtoDisabled),
+			).ClearTagRev().SetStatus(dbpackage.StatusQueued).SetLto(dbpackage.LtoAutoDisabled).Save(ctx)
+			if err != nil {
+				return err
+			}
+
+			if rows > 0 {
+				log.Infof("[HK/%s/%s] fixable build-error detected (linker-error), requeueing package (%d)", pkg.March, pkg.Pkgbase, rows)
+			}
+		}
+	}
+	return nil
+}
+
+func debugHK() {
+	for _, march := range conf.March {
+		if _, err := os.Stat(filepath.Join(conf.Basedir.Debug, march)); err == nil {
+			log.Debugf("[DHK/%s] start cleanup debug packages", march)
+			cleanCmd := exec.Command("paccache", "-rc", filepath.Join(conf.Basedir.Debug, march), "-k", "1")
+			res, err := cleanCmd.CombinedOutput()
+			if err != nil {
+				log.Warningf("[DHK/%s] cleanup debug packages failed: %v (%s)", march, err, string(res))
+			}
+		}
+	}
+}

main.go

@@ -5,27 +5,18 @@ import (
 	"entgo.io/ent/dialect"
 	"entgo.io/ent/dialect/sql"
 	"flag"
-	"fmt"
-	"git.harting.dev/ALHP/ALHP.GO/ent"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
-	"git.harting.dev/ALHP/ALHP.GO/ent/migrate"
 	"github.com/Jguer/go-alpm/v2"
 	_ "github.com/jackc/pgx/v4/stdlib"
-	"github.com/sethvargo/go-retry"
 	log "github.com/sirupsen/logrus"
 	"github.com/wercker/journalhook"
-	"golang.org/x/sync/semaphore"
 	"gopkg.in/yaml.v2"
-	"html/template"
-	"math"
 	"os"
-	"os/exec"
 	"os/signal"
 	"path/filepath"
-	"strings"
+	"somegit.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent/migrate"
 	"sync"
 	"syscall"
-	"time"
 )
 
 var (
@@ -36,449 +27,9 @@ var (
 	db            *ent.Client
 	journalLog    = flag.Bool("journal", false, "Log to systemd journal instead of stdout")
 	checkInterval = flag.Int("interval", 5, "How often svn2git should be checked in minutes (default: 5)")
+	configFile    = flag.String("config", "config.yaml", "set config file name/path")
 )
 
-func (b *BuildManager) htmlWorker(ctx context.Context) {
-	type Pkg struct {
-		Pkgbase              string
-		Status               string
-		Class                string
-		Skip                 string
-		Version              string
-		Svn2GitVersion       string
-		BuildDate            string
-		BuildDuration        time.Duration
-		Checked              string
-		Log                  string
-		LTO                  bool
-		LTOUnknown           bool
-		LTODisabled          bool
-		LTOAutoDisabled      bool
-		DebugSym             bool
-		DebugSymNotAvailable bool
-		DebugSymUnknown      bool
-	}
-
-	type Repo struct {
-		Name     string
-		Packages []Pkg
-	}
-
-	type March struct {
-		Name  string
-		Repos []Repo
-	}
-
-	type tpl struct {
-		March       []March
-		Generated   string
-		Latest      int
-		Failed      int
-		Skipped     int
-		Queued      int
-		LTOEnabled  int
-		LTOUnknown  int
-		LTODisabled int
-	}
-
-	for {
-		gen := &tpl{}
-
-		for _, march := range conf.March {
-			addMarch := March{
-				Name: march,
-			}
-
-			for _, repo := range conf.Repos {
-				addRepo := Repo{
-					Name: repo,
-				}
-
-				pkgs := db.DbPackage.Query().Order(ent.Asc(dbpackage.FieldPkgbase)).
-					Where(dbpackage.MarchEQ(march), dbpackage.RepositoryEQ(dbpackage.Repository(repo))).AllX(ctx)
-
-				for _, pkg := range pkgs {
-					addPkg := Pkg{
-						Pkgbase:        pkg.Pkgbase,
-						Status:         strings.ToUpper(pkg.Status.String()),
-						Class:          statusID2string(pkg.Status),
-						Skip:           pkg.SkipReason,
-						Version:        pkg.RepoVersion,
-						Svn2GitVersion: pkg.Version,
-					}
-
-					if pkg.STime != nil && pkg.UTime != nil {
-						addPkg.BuildDuration = time.Duration(*pkg.STime+*pkg.UTime) * time.Second
-					}
-
-					if !pkg.BuildTimeStart.IsZero() {
-						addPkg.BuildDate = pkg.BuildTimeStart.UTC().Format(time.RFC1123)
-					}
-
-					if !pkg.Updated.IsZero() {
-						addPkg.Checked = pkg.Updated.UTC().Format(time.RFC1123)
-					}
-
-					if pkg.Status == dbpackage.StatusFailed {
-						addPkg.Log = fmt.Sprintf("%s/%s/%s.log", logDir, pkg.March, pkg.Pkgbase)
-					}
-
-					switch pkg.Lto {
-					case dbpackage.LtoUnknown:
-						if pkg.Status != dbpackage.StatusSkipped && pkg.Status != dbpackage.StatusFailed {
-							addPkg.LTOUnknown = true
-						}
-					case dbpackage.LtoEnabled:
-						addPkg.LTO = true
-					case dbpackage.LtoDisabled:
-						addPkg.LTODisabled = true
-					case dbpackage.LtoAutoDisabled:
-						addPkg.LTOAutoDisabled = true
-					}
-
-					switch pkg.DebugSymbols {
-					case dbpackage.DebugSymbolsUnknown:
-						if pkg.Status != dbpackage.StatusSkipped && pkg.Status != dbpackage.StatusFailed {
-							addPkg.DebugSymUnknown = true
-						}
-					case dbpackage.DebugSymbolsAvailable:
-						addPkg.DebugSym = true
-					case dbpackage.DebugSymbolsNotAvailable:
-						addPkg.DebugSymNotAvailable = true
-					}
-
-					addRepo.Packages = append(addRepo.Packages, addPkg)
-				}
-				addMarch.Repos = append(addMarch.Repos, addRepo)
-			}
-			gen.March = append(gen.March, addMarch)
-		}
-
-		gen.Generated = time.Now().UTC().Format(time.RFC1123)
-
-		var v []struct {
-			Status dbpackage.Status `json:"status"`
-			Count  int              `json:"count"`
-		}
-
-		db.DbPackage.Query().GroupBy(dbpackage.FieldStatus).Aggregate(ent.Count()).ScanX(ctx, &v)
-
-		for _, c := range v {
-			switch c.Status {
-			case dbpackage.StatusFailed:
-				gen.Failed = c.Count
-			case dbpackage.StatusSkipped:
-				gen.Skipped = c.Count
-			case dbpackage.StatusLatest:
-				gen.Latest = c.Count
-			case dbpackage.StatusQueued:
-				gen.Queued = c.Count
-			}
-		}
-
-		var v2 []struct {
-			Status dbpackage.Lto `json:"lto"`
-			Count  int           `json:"count"`
-		}
-
-		db.DbPackage.Query().Where(dbpackage.StatusNEQ(dbpackage.StatusSkipped)).
-			GroupBy(dbpackage.FieldLto).Aggregate(ent.Count()).ScanX(ctx, &v2)
-
-		for _, c := range v2 {
-			switch c.Status {
-			case dbpackage.LtoUnknown:
-				gen.LTOUnknown = c.Count
-			case dbpackage.LtoDisabled, dbpackage.LtoAutoDisabled:
-				gen.LTODisabled += c.Count
-			case dbpackage.LtoEnabled:
-				gen.LTOEnabled = c.Count
-			}
-		}
-
-		statusTpl, err := template.ParseFiles("tpl/packages.html")
-		if err != nil {
-			log.Warningf("[HTML] Error parsing template file: %v", err)
-			continue
-		}
-
-		f, err := os.OpenFile(filepath.Join(conf.Basedir.Repo, "packages.html"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o644)
-		if err != nil {
-			log.Warningf("[HTML] Erro ropening output file: %v", err)
-			continue
-		}
-		err = statusTpl.Execute(f, gen)
-		if err != nil {
-			log.Warningf("[HTML] Error filling template: %v", err)
-		}
-		_ = f.Close()
-
-		time.Sleep(time.Minute * 5)
-	}
-}
-
-func (b *BuildManager) repoWorker(repo string) {
-	for {
-		select {
-		case pkgL := <-b.repoAdd[repo]:
-			b.repoWG.Add(1)
-			toAdd := make([]string, 0)
-			for _, pkg := range pkgL {
-				toAdd = append(toAdd, pkg.PkgFiles...)
-			}
-
-			args := []string{"-s", "-v", "-p", "-n", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch, repo) + ".db.tar.xz"}
-			args = append(args, toAdd...)
-			cmd := exec.Command("repo-add", args...)
-			res, err := cmd.CombinedOutput()
-			log.Debug(string(res))
-			if err != nil && cmd.ProcessState.ExitCode() != 1 {
-				log.Panicf("%s while repo-add: %v", string(res), err)
-			}
-
-			for _, pkg := range pkgL {
-				pkg.toDBPackage(true)
-				if _, err := os.Stat(filepath.Join(conf.Basedir.Debug, pkg.March,
-					pkg.DBPackage.Packages[0]+"-debug-"+pkg.Version+"-"+conf.Arch+".pkg.tar.zst")); err == nil {
-					pkg.DBPackage = pkg.DBPackage.Update().
-						SetStatus(dbpackage.StatusLatest).
-						ClearSkipReason().
-						SetDebugSymbols(dbpackage.DebugSymbolsAvailable).
-						SetRepoVersion(pkg.Version).
-						SetHash(pkg.Hash).
-						SaveX(context.Background())
-				} else {
-					pkg.DBPackage = pkg.DBPackage.Update().
-						SetStatus(dbpackage.StatusLatest).
-						ClearSkipReason().
-						SetDebugSymbols(dbpackage.DebugSymbolsNotAvailable).
-						SetRepoVersion(pkg.Version).
-						SetHash(pkg.Hash).
-						SaveX(context.Background())
-				}
-			}
-
-			cmd = exec.Command("paccache", "-rc", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch), "-k", "1") //nolint:gosec
-			res, err = cmd.CombinedOutput()
-			log.Debug(string(res))
-			if err != nil {
-				log.Warningf("Error running paccache: %v", err)
-			}
-			err = updateLastUpdated()
-			if err != nil {
-				log.Warningf("Error updating lastupdate: %v", err)
-			}
-			b.repoWG.Done()
-		case pkgL := <-b.repoPurge[repo]:
-			for _, pkg := range pkgL {
-				if _, err := os.Stat(filepath.Join(conf.Basedir.Repo, pkg.FullRepo, "os", conf.Arch, pkg.FullRepo) + ".db.tar.xz"); err != nil {
-					continue
-				}
-				if len(pkg.PkgFiles) == 0 {
-					if err := pkg.findPkgFiles(); err != nil {
-						log.Warningf("[%s/%s] Unable to find files: %v", pkg.FullRepo, pkg.Pkgbase, err)
-						continue
-					} else if len(pkg.PkgFiles) == 0 {
-						continue
-					}
-				}
-
-				var realPkgs []string
-				for _, filePath := range pkg.PkgFiles {
-					if _, err := os.Stat(filePath); err == nil {
-						realPkgs = append(realPkgs, Package(filePath).Name())
-					}
-				}
-
-				if len(realPkgs) == 0 {
-					continue
-				}
-
-				b.repoWG.Add(1)
-				args := []string{"-s", "-v", filepath.Join(conf.Basedir.Repo, pkg.FullRepo, "os", conf.Arch, pkg.FullRepo) + ".db.tar.xz"}
-				args = append(args, realPkgs...)
-				cmd := exec.Command("repo-remove", args...)
-				res, err := cmd.CombinedOutput()
-				log.Debug(string(res))
-				if err != nil && cmd.ProcessState.ExitCode() == 1 {
-					log.Warningf("Error while deleting package %s: %s", pkg.Pkgbase, string(res))
-				}
-
-				if pkg.DBPackage != nil {
-					_ = pkg.DBPackage.Update().ClearRepoVersion().ClearHash().Exec(context.Background())
-				}
-
-				for _, file := range pkg.PkgFiles {
-					_ = os.Remove(file)
-					_ = os.Remove(file + ".sig")
-				}
-				err = updateLastUpdated()
-				if err != nil {
-					log.Warningf("Error updating lastupdate: %v", err)
-				}
-				b.repoWG.Done()
-			}
-		}
-	}
-}
-
-func (b *BuildManager) syncWorker(ctx context.Context) error {
-	err := os.MkdirAll(filepath.Join(conf.Basedir.Work, upstreamDir), 0o755)
-	if err != nil {
-		log.Fatalf("Error creating upstream dir: %v", err)
-	}
-
-	for {
-		for gitDir, gitURL := range conf.Svn2git {
-			gitPath := filepath.Join(conf.Basedir.Work, upstreamDir, gitDir)
-
-			if _, err := os.Stat(gitPath); os.IsNotExist(err) {
-				cmd := exec.Command("git", "clone", "--depth=1", gitURL, gitPath)
-				res, err := cmd.CombinedOutput()
-				log.Debug(string(res))
-				if err != nil {
-					log.Fatalf("Error running git clone: %v", err)
-				}
-			} else if err == nil {
-				cmd := exec.Command("git", "reset", "--hard")
-				cmd.Dir = gitPath
-				res, err := cmd.CombinedOutput()
-				log.Debug(string(res))
-				if err != nil {
-					log.Fatalf("Error running git reset: %v", err)
-				}
-
-				cmd = exec.Command("git", "pull")
-				cmd.Dir = gitPath
-				res, err = cmd.CombinedOutput()
-				log.Debug(string(res))
-				if err != nil {
-					log.Warningf("Failed to update git repo %s: %v", gitDir, err)
-				}
-			}
-		}
-
-		// housekeeping
-		wg := new(sync.WaitGroup)
-		for _, repo := range repos {
-			wg.Add(1)
-			splitRepo := strings.Split(repo, "-")
-			repo := repo
-			go func() {
-				err := housekeeping(splitRepo[0], strings.Join(splitRepo[1:], "-"), wg)
-				if err != nil {
-					log.Warningf("[%s] housekeeping failed: %v", repo, err)
-				}
-			}()
-		}
-		wg.Wait()
-
-		err := logHK()
-		if err != nil {
-			log.Warningf("log-housekeeping failed: %v", err)
-		}
-
-		// fetch updates between sync runs
-		b.alpmMutex.Lock()
-		err = alpmHandle.Release()
-		if err != nil {
-			log.Fatalf("Error releasing ALPM handle: %v", err)
-		}
-
-		if err := retry.Fibonacci(ctx, 1*time.Second, func(ctx context.Context) error {
-			if err := setupChroot(); err != nil {
-				log.Warningf("Unable to upgrade chroot, trying again later.")
-				return retry.RetryableError(err)
-			}
-			return nil
-		}); err != nil {
-			log.Fatal(err)
-		}
-
-		alpmHandle, err = initALPM(filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot),
-			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot, "/var/lib/pacman"))
-		if err != nil {
-			log.Warningf("Error while ALPM-init: %v", err)
-		}
-		b.alpmMutex.Unlock()
-
-		// do refreshSRCINFOs twice here
-		// since MirrorLatest depends on the DB being correct, there can be packages queued which should not be queued,
-		// so we check them twice to eliminate those.
-		log.Debugf("generating build-queue for PKGBUILDs found in %s", filepath.Join(conf.Basedir.Work, upstreamDir, "/**/PKGBUILD"))
-		err = b.refreshSRCINFOs(ctx, filepath.Join(conf.Basedir.Work, upstreamDir, "/**/PKGBUILD"))
-		if err != nil {
-			log.Fatalf("error refreshing PKGBUILDs: %v", err)
-		}
-		log.Debugf("regenerating build-queue for PKGBUILDs found in %s", filepath.Join(conf.Basedir.Work, upstreamDir, "/**/PKGBUILD"))
-		err = b.refreshSRCINFOs(ctx, filepath.Join(conf.Basedir.Work, upstreamDir, "/**/PKGBUILD"))
-		if err != nil {
-			log.Fatalf("error refreshing PKGBUILDs: %v", err)
-		}
-
-		queue, err := b.queue()
-		if err != nil {
-			log.Warningf("Error building buildQueue: %v", err)
-		} else {
-			log.Debugf("buildQueue with %d items", len(queue))
-			var fastQueue []*ProtoPackage
-			var slowQueue []*ProtoPackage
-
-			maxDiff := 0.0
-			cutOff := 0.0
-			for i := 0; i < len(queue); i++ {
-				if i+1 < len(queue) {
-					if math.Abs(queue[i].Priority()-queue[i+1].Priority()) > maxDiff {
-						maxDiff = math.Abs(queue[i].Priority() - queue[i+1].Priority())
-						cutOff = queue[i].Priority()
-					}
-				}
-			}
-
-			for _, pkg := range queue {
-				if pkg.Priority() > cutOff && cutOff >= conf.Build.SlowQueueThreshold {
-					slowQueue = append(slowQueue, pkg)
-				} else {
-					fastQueue = append(fastQueue, pkg)
-				}
-			}
-
-			if len(fastQueue) > 0 && len(slowQueue) > 0 {
-				log.Infof("Skipping slowQueue=%d in favor of fastQueue=%d", len(slowQueue), len(fastQueue))
-				slowQueue = []*ProtoPackage{}
-			}
-
-			err = b.buildQueue(fastQueue, ctx)
-			if err != nil {
-				return err
-			}
-
-			err = b.buildQueue(slowQueue, ctx)
-			if err != nil {
-				return err
-			}
-
-			if err := b.sem.Acquire(ctx, int64(conf.Build.Worker)); err != nil {
-				return err
-			}
-			b.sem.Release(int64(conf.Build.Worker))
-		}
-
-		if ctx.Err() == nil {
-			for _, repo := range repos {
-				err = movePackagesLive(repo)
-				if err != nil {
-					log.Errorf("[%s] Error moving packages live: %v", repo, err)
-				}
-			}
-		} else {
-			return ctx.Err()
-		}
-
-		log.Debugf("build-cycle finished")
-		time.Sleep(time.Duration(*checkInterval) * time.Minute)
-	}
-}
-
 func main() {
 	killSignals := make(chan os.Signal, 1)
 	signal.Notify(killSignals, syscall.SIGINT, syscall.SIGTERM)
@@ -488,19 +39,19 @@ func main() {
 
 	flag.Parse()
 
-	confStr, err := os.ReadFile("config.yaml")
+	confStr, err := os.ReadFile(*configFile)
 	if err != nil {
-		log.Fatalf("Error reading config file: %v", err)
+		log.Fatalf("error reading config file: %v", err)
 	}
 
 	err = yaml.Unmarshal(confStr, &conf)
 	if err != nil {
-		log.Fatalf("Error parsing config file: %v", err)
+		log.Fatalf("error parsing config file: %v", err)
 	}
 
 	lvl, err := log.ParseLevel(conf.Logging.Level)
 	if err != nil {
-		log.Fatalf("Error parsing log level from config: %v", err)
+		log.Fatalf("error parsing log level from config: %v", err)
 	}
 	log.SetLevel(lvl)
 	if *journalLog {
@@ -509,18 +60,18 @@ func main() {
 
 	err = syscall.Setpriority(syscall.PRIO_PROCESS, 0, 5)
 	if err != nil {
-		log.Warningf("Failed to drop priority: %v", err)
+		log.Infof("failed to drop priority: %v", err)
 	}
 
 	err = os.MkdirAll(conf.Basedir.Repo, 0o755)
 	if err != nil {
-		log.Fatalf("Error creating repo dir: %v", err)
+		log.Fatalf("error creating repo dir: %v", err)
 	}
 
 	if conf.DB.Driver == "pgx" {
 		pdb, err := sql.Open("pgx", conf.DB.ConnectTo)
 		if err != nil {
-			log.Fatalf("Failed to open database %s: %v", conf.DB.ConnectTo, err)
+			log.Fatalf("failed to open database %s: %v", conf.DB.ConnectTo, err)
 		}
 
 		drv := sql.OpenDB(dialect.Postgres, pdb.DB())
@@ -528,44 +79,48 @@ func main() {
 	} else {
 		db, err = ent.Open(conf.DB.Driver, conf.DB.ConnectTo)
 		if err != nil {
-			log.Panicf("Failed to open database %s: %v", conf.DB.ConnectTo, err)
+			log.Panicf("failed to open database %s: %v", conf.DB.ConnectTo, err)
 		}
 		defer func(Client *ent.Client) {
 			_ = Client.Close()
 		}(db)
 	}
 
-	if err := db.Schema.Create(context.Background(), migrate.WithDropIndex(true), migrate.WithDropColumn(true)); err != nil {
-		log.Panicf("Automigrate failed: %v", err)
+	ctx, cancel := context.WithCancel(context.Background())
+	if err := db.Schema.Create(ctx, migrate.WithDropIndex(true), migrate.WithDropColumn(true)); err != nil {
+		log.Panicf("automigrate failed: %v", err)
 	}
 
 	buildManager = &BuildManager{
-		repoPurge: make(map[string]chan []*ProtoPackage),
-		repoAdd:   make(map[string]chan []*ProtoPackage),
-		sem:       semaphore.NewWeighted(int64(conf.Build.Worker)),
+		repoPurge:    make(map[string]chan []*ProtoPackage),
+		repoAdd:      make(map[string]chan []*ProtoPackage),
+		queueSignal:  make(chan struct{}),
+		alpmMutex:    new(sync.RWMutex),
+		building:     []*ProtoPackage{},
+		buildingLock: new(sync.RWMutex),
+		repoWG:       new(sync.WaitGroup),
 	}
 
-	err = setupChroot()
+	buildManager.setupMetrics(conf.Metrics.Port)
+
+	err = setupChroot(ctx)
 	if err != nil {
-		log.Panicf("Unable to setup chroot: %v", err)
+		log.Panicf("unable to setup chroot: %v", err)
 	}
-	err = syncMarchs()
+	err = syncMarchs(ctx)
 	if err != nil {
-		log.Panicf("Error syncing marchs: %v", err)
+		log.Panicf("error syncing marchs: %v", err)
 	}
 
 	alpmHandle, err = initALPM(filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot),
 		filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot, "/var/lib/pacman"))
 	if err != nil {
-		log.Panicf("Error while ALPM-init: %v", err)
+		log.Panicf("error while ALPM-init: %v", err)
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-
 	go func() {
 		_ = buildManager.syncWorker(ctx)
 	}()
-	go buildManager.htmlWorker(ctx)
 
 killLoop:
 	for {
@@ -573,22 +128,22 @@ killLoop:
 		case <-killSignals:
 			break killLoop
 		case <-reloadSignals:
-			confStr, err := os.ReadFile("config.yaml")
+			confStr, err := os.ReadFile(*configFile)
 			if err != nil {
-				log.Panicf("Unable to open config: %v", err)
+				log.Panicf("unable to open config: %v", err)
 			}
 
 			err = yaml.Unmarshal(confStr, &conf)
 			if err != nil {
-				log.Panicf("Unable to parse config: %v", err)
+				log.Panicf("unable to parse config: %v", err)
 			}
 
 			lvl, err := log.ParseLevel(conf.Logging.Level)
 			if err != nil {
-				log.Panicf("Failure setting logging level: %v", err)
+				log.Panicf("failure setting logging level: %v", err)
 			}
 			log.SetLevel(lvl)
-			log.Infof("Config reloaded")
+			log.Infof("config reloaded")
 		}
 	}
 

metrics.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+)
+
+func (b *BuildManager) setupMetrics(port uint32) {
+	b.metrics.queueSize = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "build_queue_size",
+		Help: "Build queue size",
+	}, []string{"repository", "status"})
+
+	mux := http.NewServeMux()
+	mux.Handle("/", promhttp.Handler())
+	go func() {
+		err := http.ListenAndServe(fmt.Sprintf(":%d", port), mux) //nolint:gosec
+		if err != nil {
+			log.Errorf("failed to start metrics server: %v", err)
+		}
+	}()
+}

package.go

@@ -5,11 +5,11 @@ import (
 	"entgo.io/ent/dialect/sql"
 	"entgo.io/ent/dialect/sql/sqljson"
 	"fmt"
-	"git.harting.dev/ALHP/ALHP.GO/ent"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
 	log "github.com/sirupsen/logrus"
 	"os/exec"
 	"path/filepath"
+	"somegit.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 	"strings"
 )
 
@@ -22,9 +22,10 @@ func (pkg Package) Name() string {
 }
 
 // MArch returns package's march
-func (pkg Package) MArch() string {
+func (pkg Package) MArch() *string {
 	splitPath := strings.Split(string(pkg), string(filepath.Separator))
-	return strings.Join(strings.Split(splitPath[len(splitPath)-4], "-")[1:], "-")
+	res := strings.Join(strings.Split(splitPath[len(splitPath)-4], "-")[1:], "-")
+	return &res
 }
 
 // Repo returns package's dbpackage.Repository
@@ -34,9 +35,9 @@ func (pkg Package) Repo() dbpackage.Repository {
 }
 
 // FullRepo returns package's dbpackage.Repository-march
-func (pkg Package) FullRepo() string {
+func (pkg Package) FullRepo() *string {
 	splitPath := strings.Split(string(pkg), string(filepath.Separator))
-	return splitPath[len(splitPath)-4]
+	return &splitPath[len(splitPath)-4]
 }
 
 // Version returns version extracted from package
@@ -46,10 +47,10 @@ func (pkg Package) Version() string {
 }
 
 // Arch returns package's Architecture
-func (pkg Package) Arch() string {
+func (pkg Package) Arch() *string {
 	fNameSplit := strings.Split(filepath.Base(string(pkg)), "-")
 	fNameSplit = strings.Split(fNameSplit[len(fNameSplit)-1], ".")
-	return fNameSplit[0]
+	return &fNameSplit[0]
 }
 
 // HasValidSignature returns if package has valid detached signature file
@@ -69,22 +70,22 @@ func (pkg Package) HasValidSignature() (bool, error) {
 }
 
 // DBPackage returns ent.DBPackage for package
-func (pkg Package) DBPackage(db *ent.Client) (*ent.DbPackage, error) {
-	return pkg.DBPackageIsolated(pkg.MArch(), pkg.Repo(), db)
+func (pkg Package) DBPackage(ctx context.Context, db *ent.Client) (*ent.DBPackage, error) {
+	return pkg.DBPackageIsolated(ctx, *pkg.MArch(), pkg.Repo(), db)
 }
 
 // DBPackageIsolated returns ent.DBPackage like DBPackage, but not relying on the path for march and repo
-func (pkg Package) DBPackageIsolated(march string, repo dbpackage.Repository, db *ent.Client) (*ent.DbPackage, error) {
-	dbPkg, err := db.DbPackage.Query().Where(func(s *sql.Selector) {
+func (pkg Package) DBPackageIsolated(ctx context.Context, march string, repo dbpackage.Repository, db *ent.Client) (*ent.DBPackage, error) {
+	dbPkg, err := db.DBPackage.Query().Where(func(s *sql.Selector) {
 		s.Where(
 			sql.And(
 				sqljson.ValueContains(dbpackage.FieldPackages, pkg.Name()),
 				sql.EQ(dbpackage.FieldMarch, march),
 				sql.EQ(dbpackage.FieldRepository, repo)),
 		)
-	}).Only(context.Background())
+	}).Only(ctx)
 	if ent.IsNotFound(err) {
-		log.Debugf("Not found in database: %s", pkg.Name())
+		log.Debugf("not found in database: %s", pkg.Name())
 		return nil, err
 	} else if err != nil {
 		return nil, err

pkgbuild.go

@@ -1,25 +0,0 @@
-package main
-
-import (
-	"path/filepath"
-	"strings"
-)
-
-type PKGBUILD string
-
-// FullRepo returns full-repo from PKGBUILD'S path
-func (p PKGBUILD) FullRepo() string {
-	sPkgbuild := strings.Split(string(p), string(filepath.Separator))
-	return sPkgbuild[len(sPkgbuild)-2]
-}
-
-// Repo returns repo from PKGBUILD's path
-func (p PKGBUILD) Repo() string {
-	return strings.Split(p.FullRepo(), "-")[0]
-}
-
-// PkgBase returns pkgbase from PKGBUILD's path
-func (p PKGBUILD) PkgBase() string {
-	sPkgbuild := strings.Split(string(p), string(filepath.Separator))
-	return sPkgbuild[len(sPkgbuild)-4]
-}

proto_package.go

@@ -3,23 +3,21 @@ package main
 import (
 	"bytes"
 	"context"
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
-	"git.harting.dev/ALHP/ALHP.GO/ent"
-	"git.harting.dev/ALHP/ALHP.GO/ent/dbpackage"
 	"github.com/Jguer/go-alpm/v2"
 	"github.com/Morganamilo/go-srcinfo"
+	"github.com/c2h5oh/datasize"
 	"github.com/google/uuid"
 	"github.com/otiai10/copy"
+	"github.com/sethvargo/go-retry"
 	log "github.com/sirupsen/logrus"
 	"io"
-	"math/rand"
-	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"somegit.dev/ALHP/ALHP.GO/ent"
+	"somegit.dev/ALHP/ALHP.GO/ent/dbpackage"
 	"strconv"
 	"strings"
 	"syscall"
@@ -28,7 +26,6 @@ import (
 
 type ProtoPackage struct {
 	Pkgbase   string
-	Pkgbuild  string
 	Srcinfo   *srcinfo.Srcinfo
 	Arch      string
 	PkgFiles  []string
@@ -36,141 +33,75 @@ type ProtoPackage struct {
 	March     string
 	FullRepo  string
 	Version   string
-	Hash      string
-	DBPackage *ent.DbPackage
+	DBPackage *ent.DBPackage
+	Pkgbuild  string
+	State     *StateInfo
 }
 
-func (p *ProtoPackage) isEligible(ctx context.Context) (bool, error) {
-	if err := p.genSrcinfo(); err != nil {
-		return false, fmt.Errorf("error generating SRCINFO: %w", err)
-	}
-	p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch)
+var (
+	ErrorNotEligible = errors.New("package is not eligible")
+)
 
-	if !p.isAvailable(alpmHandle) {
-		log.Debugf("[%s/%s] Not available on mirror, skipping build", p.FullRepo, p.Pkgbase)
-		return false, nil
-	}
-
-	p.toDBPackage(true)
+func (p *ProtoPackage) isEligible(ctx context.Context) bool {
 	skipping := false
 	switch {
-	case Contains(p.Srcinfo.Arch, "any"):
-		log.Debugf("Skipped %s: any-Package", p.Srcinfo.Pkgbase)
+	case p.Arch == "any":
+		log.Debugf("skipped %s: any-package", p.Pkgbase)
 		p.DBPackage.SkipReason = "arch = any"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
-	case Contains(conf.Blacklist.Packages, p.Srcinfo.Pkgbase):
-		log.Debugf("Skipped %s: blacklisted package", p.Srcinfo.Pkgbase)
+	case MatchGlobList(p.Pkgbase, conf.Blacklist.Packages):
+		log.Debugf("skipped %s: package on no-build list", p.Pkgbase)
 		p.DBPackage.SkipReason = "blacklisted"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
-	case Contains(p.Srcinfo.MakeDepends, "ghc") || Contains(p.Srcinfo.MakeDepends, "haskell-ghc") ||
-		Contains(p.Srcinfo.Depends, "ghc") || Contains(p.Srcinfo.Depends, "haskell-ghc"):
-		log.Debugf("Skipped %s: haskell package", p.Srcinfo.Pkgbase)
-		p.DBPackage.SkipReason = "blacklisted (haskell)"
+	case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit: //nolint:gosec
+		log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB) //nolint:gosec
+		p.DBPackage.SkipReason = "memory limit exceeded"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
 	case p.isPkgFailed():
-		log.Debugf("Skipped %s: failed build", p.Srcinfo.Pkgbase)
+		log.Debugf("skipped %s: failed build", p.Pkgbase)
 		skipping = true
+	case p.Srcinfo != nil:
+		// skip haskell packages, since they cannot be optimized currently (no -O3 & march has no effect as far as I know)
+		if Contains(p.Srcinfo.MakeDepends, "ghc") || Contains(p.Srcinfo.MakeDepends, "haskell-ghc") ||
+			Contains(p.Srcinfo.Depends, "ghc") || Contains(p.Srcinfo.Depends, "haskell-ghc") {
+			log.Debugf("skipped %s: haskell", p.Pkgbase)
+			p.DBPackage.SkipReason = "haskell"
+			p.DBPackage.Status = dbpackage.StatusSkipped
+			skipping = true
+		}
 	}
 
 	if skipping {
-		p.DBPackage = p.DBPackage.Update().SetUpdated(time.Now()).SetVersion(p.Version).
-			SetPackages(packages2slice(p.Srcinfo.Packages)).SetStatus(p.DBPackage.Status).
-			SetSkipReason(p.DBPackage.SkipReason).SetHash(p.Hash).SaveX(ctx)
-		return false, nil
-	} else {
-		p.DBPackage = p.DBPackage.Update().SetUpdated(time.Now()).SetPackages(packages2slice(p.Srcinfo.Packages)).SetVersion(p.Version).SaveX(ctx)
+		p.DBPackage = p.DBPackage.Update().SetUpdated(time.Now()).SetVersion(p.Version).SetStatus(p.DBPackage.Status).
+			SetSkipReason(p.DBPackage.SkipReason).SetTagRev(p.State.TagRev).SaveX(ctx)
+		return false
 	}
+	p.DBPackage = p.DBPackage.Update().SetUpdated(time.Now()).SetVersion(p.Version).SaveX(ctx)
 
-	if Contains(conf.Blacklist.LTO, p.Pkgbase) {
+	if Contains(conf.Blacklist.LTO, p.Pkgbase) && p.DBPackage.Lto != dbpackage.LtoDisabled {
 		p.DBPackage = p.DBPackage.Update().SetLto(dbpackage.LtoDisabled).SaveX(ctx)
 	}
 
 	repoVer, err := p.repoVersion()
 	if err != nil {
 		p.DBPackage = p.DBPackage.Update().ClearRepoVersion().SaveX(ctx)
-	} else if err == nil && alpm.VerCmp(repoVer, p.Version) > 0 {
-		log.Debugf("Skipped %s: Version in repo higher than in PKGBUILD (%s < %s)", p.Srcinfo.Pkgbase, p.Version, repoVer)
-		p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusLatest).ClearSkipReason().SetHash(p.Hash).SaveX(ctx)
-		return false, nil
+	} else if alpm.VerCmp(repoVer, p.Version) > 0 {
+		log.Debugf("skipped %s: version in repo higher than in PKGBUILD (%s < %s)", p.Pkgbase, p.Version, repoVer)
+		p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusLatest).ClearSkipReason().SetTagRev(p.State.TagRev).SaveX(ctx)
+		return false
 	}
 
-	isLatest, local, syncVersion, err := p.isMirrorLatest(alpmHandle)
-	if err != nil {
-		switch err.(type) {
-		default:
-			return false, fmt.Errorf("error solving deps: %w", err)
-		case MultiplePKGBUILDError:
-			log.Infof("Skipped %s: Multiple PKGBUILDs for dependency found: %v", p.Srcinfo.Pkgbase, err)
-			p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason("multiple PKGBUILD for dep. found").SaveX(ctx)
-			return false, err
-		case UnableToSatisfyError:
-			log.Infof("Skipped %s: unable to resolve dependencies: %v", p.Srcinfo.Pkgbase, err)
-			p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason("unable to resolve dependencies").SaveX(ctx)
-			return false, err
-		}
-	}
-
-	p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusQueued).SaveX(ctx)
-
-	if !isLatest {
-		if local != nil {
-			log.Infof("Delayed %s: not all dependencies are up to date (local: %s==%s, sync: %s==%s)",
-				p.Srcinfo.Pkgbase, local.Name(), local.Version(), local.Name(), syncVersion)
-			p.DBPackage.Update().SetStatus(dbpackage.StatusDelayed).
-				SetSkipReason(fmt.Sprintf("waiting for %s==%s", local.Name(), syncVersion)).ExecX(ctx)
-
-			// Returning an error here causes the package to be purged.
-			// Purge delayed packages in case delay is caused by inconsistencies in svn2git.
-			// Worst case would be clients downloading a package update twice, once from their official mirror,
-			// and then after build from ALHP. Best case we prevent a not buildable package from staying in the repos
-			// in an outdated version.
-			if time.Since(local.BuildDate()).Hours() >= 48 && p.DBPackage.RepoVersion != "" {
-				return false, errors.New("overdue package waiting")
-			}
-		} else {
-			log.Infof("Delayed %s: not all dependencies are up to date or resolvable", p.Srcinfo.Pkgbase)
-			p.DBPackage.Update().SetStatus(dbpackage.StatusDelayed).SetSkipReason("waiting for mirror").ExecX(ctx)
-		}
-		return false, nil
-	}
-
-	return true, nil
+	return true
 }
 
 func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
-	// Sleep randomly here to add some delay, avoiding two pacman instances trying to download the same package,
-	// which leads to errors when it's trying to remove the same temporary download file.
-	// This can be removed as soon as we can pass separate cache locations to makechrootpkg.
-	rand.Seed(time.Now().UnixNano())
-	time.Sleep(time.Duration(rand.Float32()*60) * time.Second) //nolint:gosec
 	start := time.Now().UTC()
 	chroot := "build_" + uuid.New().String()
 
-	if p.Version == "" {
-		if p.Srcinfo == nil {
-			err := p.genSrcinfo()
-			if err != nil {
-				return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err)
-			}
-		}
-
-		p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch)
-	}
-
-	log.Infof("[%s/%s/%s] Build starting", p.FullRepo, p.Pkgbase, p.Version)
-
-	p.toDBPackage(true)
-	p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(ctx)
-
-	err := p.importKeys()
-	if err != nil {
-		log.Warningf("[%s/%s/%s] Failed to import pgp keys: %v", p.FullRepo, p.Pkgbase, p.Version, err)
-	}
-
-	buildFolder, err := p.setupBuildDir()
+	buildFolder, err := p.setupBuildDir(ctx)
 	if err != nil {
 		return time.Since(start), fmt.Errorf("error setting up build folder: %w", err)
 	}
@@ -183,6 +114,71 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		}
 	}()
 
+	err = p.genSrcinfo()
+	if err != nil {
+		return time.Since(start), fmt.Errorf("error generating srcinfo: %w", err)
+	}
+	p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch)
+	p.DBPackage = p.DBPackage.Update().SetPackages(packages2slice(p.Srcinfo.Packages)).SaveX(ctx)
+
+	// skip haskell packages, since they cannot be optimized currently (no -O3 & march has no effect as far as I know)
+	if Contains(p.Srcinfo.MakeDepends, "ghc") || Contains(p.Srcinfo.MakeDepends, "haskell-ghc") ||
+		Contains(p.Srcinfo.Depends, "ghc") || Contains(p.Srcinfo.Depends, "haskell-ghc") {
+		p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason("haskell").SetTagRev(p.State.TagRev).SaveX(ctx)
+		buildManager.repoPurge[p.FullRepo] <- []*ProtoPackage{p}
+		return time.Since(start), ErrorNotEligible
+	}
+
+	isLatest, local, syncVersion, err := p.isMirrorLatest(alpmHandle)
+	if err != nil {
+		var multipleStateFilesError MultipleStateFilesError
+		var unableToSatisfyError UnableToSatisfyError
+		switch {
+		default:
+			return time.Since(start), fmt.Errorf("error solving deps: %w", err)
+		case errors.As(err, &multipleStateFilesError):
+			log.Infof("skipped %s: multiple PKGBUILDs for dependency found: %v", p.Srcinfo.Pkgbase, err)
+			p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason("multiple PKGBUILD for dep. found").SaveX(ctx)
+			return time.Since(start), err
+		case errors.As(err, &unableToSatisfyError):
+			log.Infof("skipped %s: unable to resolve dependencies: %v", p.Srcinfo.Pkgbase, err)
+			p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusSkipped).SetSkipReason("unable to resolve dependencies").SaveX(ctx)
+			return time.Since(start), ErrorNotEligible
+		}
+	}
+
+	if !isLatest {
+		if local != nil {
+			log.Infof("delayed %s: not all dependencies are up to date (local: %s==%s, sync: %s==%s)",
+				p.Srcinfo.Pkgbase, local.Name(), local.Version(), local.Name(), syncVersion)
+			p.DBPackage.Update().SetStatus(dbpackage.StatusDelayed).
+				SetSkipReason(fmt.Sprintf("waiting for %s==%s", local.Name(), syncVersion)).ExecX(ctx)
+
+			// Returning an error here causes the package to be purged.
+			// Purge delayed packages in case delay is caused by inconsistencies in state.
+			// Worst case would be clients downloading a package update twice, once from their official mirror,
+			// and then after build from ALHP. Best case we prevent a not buildable package from staying in the repos
+			// in an outdated version.
+			if time.Since(local.BuildDate()).Hours() >= 48 && p.DBPackage.RepoVersion != "" {
+				return time.Since(start), errors.New("overdue package waiting")
+			}
+		} else {
+			log.Infof("delayed %s: not all dependencies are up to date or resolvable", p.Srcinfo.Pkgbase)
+			p.DBPackage.Update().SetStatus(dbpackage.StatusDelayed).SetSkipReason("waiting for mirror").ExecX(ctx)
+		}
+
+		return time.Since(start), ErrorNotEligible
+	}
+
+	log.Infof("[P] build starting: %s->%s->%s", p.FullRepo, p.Pkgbase, p.Version)
+
+	p.DBPackage = p.DBPackage.Update().SetStatus(dbpackage.StatusBuilding).ClearSkipReason().SaveX(ctx)
+
+	err = p.importKeys()
+	if err != nil {
+		log.Warningf("[P] failed to import pgp keys for %s->%s->%s: %v", p.FullRepo, p.Pkgbase, p.Version, err)
+	}
+
 	buildNo := 1
 	versionSlice := strings.Split(p.DBPackage.LastVersionBuild, ".")
 	if strings.Join(versionSlice[:len(versionSlice)-1], ".") == p.Version {
@@ -198,14 +194,6 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		return time.Since(start), fmt.Errorf("error while increasing pkgrel: %w", err)
 	}
 
-	if Contains(conf.KernelToPatch, p.Pkgbase) {
-		err = p.prepareKernelPatches()
-		if err != nil {
-			p.DBPackage.Update().SetStatus(dbpackage.StatusFailed).SetSkipReason("failed to apply patch").SetHash(p.Hash).ExecX(ctx)
-			return time.Since(start), fmt.Errorf("error modifying PKGBUILD for kernel patch: %w", err)
-		}
-	}
-
 	p.PkgFiles = []string{}
 
 	// default to LTO
@@ -217,21 +205,33 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 	cmd := exec.CommandContext(ctx, "makechrootpkg", "-c", "-D", filepath.Join(conf.Basedir.Work, makepkgDir), //nolint:gosec
 		"-l", chroot, "-r", filepath.Join(conf.Basedir.Work, chrootDir), "--", "-m", "--noprogressbar", "--config",
 		filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkgFile, p.March)))
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	cmd.Dir = filepath.Dir(p.Pkgbuild)
 	var out bytes.Buffer
 	cmd.Stdout = &out
 	cmd.Stderr = &out
 
-	err = cmd.Start()
-	if err != nil {
+	if err = cmd.Start(); err != nil {
 		return time.Since(start), fmt.Errorf("error starting build: %w", err)
 	}
 
+	pgid, err := syscall.Getpgid(cmd.Process.Pid)
+	if err != nil {
+		log.Errorf("error getting PGID: %v", err)
+	}
+
+	done := make(chan bool)
+	result := make(chan int64)
+	go pollMemoryUsage(pgid, 1*time.Second, done, result)
+
 	err = cmd.Wait()
+	close(done)
+	peakMem := <-result
+	close(result)
 
 	Rusage, ok := cmd.ProcessState.SysUsage().(*syscall.Rusage)
 	if !ok {
-		log.Panicf("Rusage is not of type *syscall.Rusage, are we running on unix-like?")
+		log.Panicf("rusage is not of type *syscall.Rusage, are we running on unix-like?")
 	}
 
 	if err != nil {
@@ -242,19 +242,21 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		if p.DBPackage.Lto != dbpackage.LtoAutoDisabled && p.DBPackage.Lto != dbpackage.LtoDisabled &&
 			(reLdError.MatchString(out.String()) || reRustLTOError.MatchString(out.String())) {
 			p.DBPackage.Update().SetStatus(dbpackage.StatusQueued).SetSkipReason("non-LTO rebuild").SetLto(dbpackage.LtoAutoDisabled).ExecX(ctx)
-			return time.Since(start), fmt.Errorf("ld/lto-incomp error detected, LTO disabled")
+			return time.Since(start), errors.New("ld/lto-incompatibility error detected, LTO disabled")
 		}
 
-		if reDownloadError.MatchString(out.String()) || rePortError.MatchString(out.String()) || reSigError.MatchString(out.String()) {
+		if reDownloadError.MatchString(out.String()) || reDownloadError2.MatchString(out.String()) ||
+			rePortError.MatchString(out.String()) || reSigError.MatchString(out.String()) {
 			p.DBPackage.Update().SetStatus(dbpackage.StatusQueued).ExecX(ctx)
-			return time.Since(start), fmt.Errorf("known builderror detected")
+			return time.Since(start), errors.New("known build error detected")
 		}
 
 		err = os.MkdirAll(filepath.Join(conf.Basedir.Repo, logDir, p.March), 0o755)
 		if err != nil {
 			return time.Since(start), fmt.Errorf("error creating logdir: %w", err)
 		}
-		err = os.WriteFile(filepath.Join(conf.Basedir.Repo, logDir, p.March, p.Pkgbase+".log"), out.Bytes(), 0o644) //nolint:gosec
+		err = os.WriteFile(filepath.Join(conf.Basedir.Repo, logDir, p.March, p.Pkgbase+".log"), //nolint:gosec
+			[]byte(strings.ToValidUTF8(out.String(), "")), 0o644)
 		if err != nil {
 			return time.Since(start), fmt.Errorf("error warting to logdir: %w", err)
 		}
@@ -263,12 +265,13 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 			SetStatus(dbpackage.StatusFailed).
 			ClearSkipReason().
 			SetBuildTimeStart(start).
-			SetMaxRss(Rusage.Maxrss).
-			SetIoOut(Rusage.Oublock).
-			SetIoIn(Rusage.Inblock).
-			SetUTime(Rusage.Utime.Sec).
-			SetSTime(Rusage.Stime.Sec).
-			SetHash(p.Hash).
+			ClearMaxRss().
+			ClearLastVersionBuild().
+			ClearIoOut().
+			ClearIoIn().
+			ClearUTime().
+			ClearSTime().
+			SetTagRev(p.State.TagRev).
 			ExecX(ctx)
 		return time.Since(start), fmt.Errorf("build failed: exit code %d", cmd.ProcessState.ExitCode())
 	}
@@ -279,7 +282,7 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 	}
 
 	if len(pkgFiles) == 0 {
-		return time.Since(start), fmt.Errorf("no build-artifacts found")
+		return time.Since(start), errors.New("no build-artifacts found")
 	}
 
 	for _, file := range pkgFiles {
@@ -318,48 +321,28 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		}
 	}
 
+	updatePkg := p.DBPackage.Update().
+		SetStatus(dbpackage.StatusBuilt).
+		SetLto(dbpackage.LtoEnabled).
+		SetBuildTimeStart(start).
+		SetLastVersionBuild(p.Version).
+		SetTagRev(p.State.TagRev).
+		SetMaxRss(peakMem).
+		SetIoOut(Rusage.Oublock).
+		SetIoIn(Rusage.Inblock).
+		SetUTime(Rusage.Utime.Sec).
+		SetSTime(Rusage.Stime.Sec)
+
 	if p.DBPackage.Lto != dbpackage.LtoDisabled && p.DBPackage.Lto != dbpackage.LtoAutoDisabled {
-		p.DBPackage.Update().
-			SetStatus(dbpackage.StatusBuild).
-			SetLto(dbpackage.LtoEnabled).
-			SetBuildTimeStart(start).
-			SetLastVersionBuild(p.Version).
-			SetHash(p.Hash).
-			SetMaxRss(Rusage.Maxrss).
-			SetIoOut(Rusage.Oublock).
-			SetIoIn(Rusage.Inblock).
-			SetUTime(Rusage.Utime.Sec).
-			SetSTime(Rusage.Stime.Sec).
-			ExecX(ctx)
-	} else {
-		p.DBPackage.Update().
-			SetStatus(dbpackage.StatusBuild).
-			SetBuildTimeStart(start).
-			SetLastVersionBuild(p.Version).
-			SetMaxRss(Rusage.Maxrss).
-			SetIoOut(Rusage.Oublock).
-			SetIoIn(Rusage.Inblock).
-			SetUTime(Rusage.Utime.Sec).
-			SetSTime(Rusage.Stime.Sec).
-			SetHash(p.Hash).ExecX(ctx)
+		updatePkg.SetLto(dbpackage.LtoEnabled)
 	}
 
+	updatePkg.ExecX(ctx)
+
 	return time.Since(start), nil
 }
 
-func (p *ProtoPackage) Priority() float64 {
-	if p.DBPackage == nil {
-		return 0
-	}
-
-	if p.DBPackage.STime == nil || p.DBPackage.UTime == nil {
-		return 0
-	} else {
-		return float64(*p.DBPackage.STime + *p.DBPackage.UTime)
-	}
-}
-
-func (p *ProtoPackage) setupBuildDir() (string, error) {
+func (p *ProtoPackage) setupBuildDir(ctx context.Context) (string, error) {
 	buildDir := filepath.Join(conf.Basedir.Work, buildDir, p.March, p.Pkgbase+"-"+p.Version)
 
 	err := cleanBuildDir(buildDir, "")
@@ -372,30 +355,39 @@ func (p *ProtoPackage) setupBuildDir() (string, error) {
 		return "", err
 	}
 
-	files, err := filepath.Glob(filepath.Join(filepath.Dir(p.Pkgbuild), "*"))
-	if err != nil {
+	gitlabPath := reReplaceSinglePlus.ReplaceAllString(p.Pkgbase, "$1-$2")
+	gitlabPath = reReplaceRemainingPlus.ReplaceAllString(gitlabPath, "plus")
+	gitlabPath = reReplaceSpecialChars.ReplaceAllString(gitlabPath, "-")
+	gitlabPath = reReplaceUnderscore.ReplaceAllString(gitlabPath, "-")
+	gitlabPath = reReplaceTree.ReplaceAllString(gitlabPath, "unix-tree")
+
+	gr := retry.NewFibonacci(10 * time.Second)
+	gr = retry.WithMaxRetries(conf.MaxCloneRetries, gr)
+
+	if err := retry.Do(ctx, gr, func(ctx context.Context) error {
+		cmd := exec.CommandContext(ctx, "git", "clone", "--depth", "1", "--branch", p.State.TagVer, //nolint:gosec
+			fmt.Sprintf("https://gitlab.archlinux.org/archlinux/packaging/packages/%s.git", gitlabPath), buildDir)
+		res, err := cmd.CombinedOutput()
+		log.Debug(string(res))
+		if err != nil {
+			return retry.RetryableError(err)
+		}
+		return nil
+	}); err != nil {
 		return "", err
 	}
-
-	for _, file := range files {
-		err = copy.Copy(file, filepath.Join(buildDir, filepath.Base(file)))
-		if err != nil {
-			return "", err
-		}
-	}
-
 	p.Pkgbuild = filepath.Join(buildDir, "PKGBUILD")
+
 	return buildDir, nil
 }
 
 func (p *ProtoPackage) repoVersion() (string, error) {
-	err := p.findPkgFiles()
-	if err != nil {
+	if err := p.findPkgFiles(); err != nil {
 		return "", err
 	}
 
 	if len(p.PkgFiles) == 0 {
-		return "", fmt.Errorf("not found")
+		return "", errors.New("not found")
 	}
 
 	fNameSplit := strings.Split(p.PkgFiles[0], "-")
@@ -431,7 +423,24 @@ func (p *ProtoPackage) increasePkgRel(buildNo int) error {
 		return err
 	}
 
-	nStr := rePkgRel.ReplaceAllLiteralString(string(fStr), "pkgrel="+p.Srcinfo.Pkgrel+"."+strconv.Itoa(buildNo))
+	// increase buildno if already existing
+	var nStr string
+	if strings.Contains(p.Srcinfo.Pkgrel, ".") {
+		pkgRelSplit := strings.Split(p.Srcinfo.Pkgrel, ".")
+		pkgRelBuildNo, err := strconv.Atoi(pkgRelSplit[len(pkgRelSplit)-1])
+		if err != nil {
+			return err
+		}
+
+		nStr = rePkgRel.ReplaceAllLiteralString(string(fStr), "pkgrel="+pkgRelSplit[0]+"."+strconv.Itoa(buildNo+pkgRelBuildNo))
+		versionSplit := strings.Split(p.Version, "-")
+		versionSplit[len(versionSplit)-1] = pkgRelSplit[0] + "." + strconv.Itoa(buildNo+pkgRelBuildNo)
+		p.Version = strings.Join(versionSplit, "-")
+	} else {
+		nStr = rePkgRel.ReplaceAllLiteralString(string(fStr), "pkgrel="+p.Srcinfo.Pkgrel+"."+strconv.Itoa(buildNo))
+		p.Version += "." + strconv.Itoa(buildNo)
+	}
+
 	_, err = f.Seek(0, 0)
 	if err != nil {
 		return err
@@ -446,101 +455,6 @@ func (p *ProtoPackage) increasePkgRel(buildNo int) error {
 		return err
 	}
 
-	p.Version += "." + strconv.Itoa(buildNo)
-	return nil
-}
-
-func (p *ProtoPackage) prepareKernelPatches() error {
-	f, err := os.OpenFile(p.Pkgbuild, os.O_RDWR, 0o644)
-	if err != nil {
-		return err
-	}
-
-	defer func(f *os.File) {
-		err := f.Close()
-		if err != nil {
-			panic(err)
-		}
-	}(f)
-
-	fStr, err := io.ReadAll(f)
-	if err != nil {
-		return err
-	}
-
-	// choose best suited patch based on kernel version
-	var curVer string
-	for k := range conf.KernelPatches {
-		if k == p.Pkgbase {
-			curVer = k
-			break
-		}
-		if alpm.VerCmp(p.Srcinfo.Pkgver, k) >= 0 && alpm.VerCmp(k, curVer) >= 0 {
-			curVer = k
-		}
-	}
-
-	newPKGBUILD := string(fStr)
-	switch {
-	case conf.KernelPatches[curVer] == "none":
-		return fmt.Errorf("no patch available")
-	case conf.KernelPatches[curVer] == "skip":
-		log.Debugf("[KP] skipped patching for %s", p.Pkgbase)
-	default:
-		log.Debugf("[KP] choose patch %s for kernel %s", curVer, p.Srcinfo.Pkgver)
-		orgSource := rePkgSource.FindStringSubmatch(newPKGBUILD)
-		if orgSource == nil || len(orgSource) < 1 {
-			return fmt.Errorf("no source=() found")
-		}
-		sources := strings.Split(orgSource[1], "\n")
-		sources = append(sources, fmt.Sprintf("%q", conf.KernelPatches[curVer]))
-		newPKGBUILD = rePkgSource.ReplaceAllLiteralString(newPKGBUILD, fmt.Sprintf("source=(%s)", strings.Join(sources, "\n")))
-		resp, err := http.Get(conf.KernelPatches[curVer]) //nolint:bodyclose,noctx
-		if err != nil || resp.StatusCode != 200 {
-			return err
-		}
-		h := sha256.New()
-		_, err = io.Copy(h, resp.Body)
-		defer func(Body io.ReadCloser) {
-			_ = Body.Close()
-		}(resp.Body)
-		if err != nil {
-			return err
-		}
-		orgSums := rePkgSum.FindStringSubmatch(newPKGBUILD)
-		if orgSums == nil || len(orgSums) < 1 {
-			return fmt.Errorf("no sha256sums=() found")
-		}
-		sums := strings.Split(orgSums[1], "\n")
-		sums = append(sums, fmt.Sprintf("'%s'", hex.EncodeToString(h.Sum(nil))))
-		newPKGBUILD = rePkgSum.ReplaceAllLiteralString(newPKGBUILD, fmt.Sprintf("sha256sums=(\n%s\n)", strings.Join(sums, "\n")))
-	}
-
-	// enable config option
-	switch {
-	case strings.Contains(p.March, "v4"):
-		newPKGBUILD = strings.Replace(newPKGBUILD, "make olddefconfig\n", "echo CONFIG_GENERIC_CPU4=y >> .config\nmake olddefconfig\n", 1)
-	case strings.Contains(p.March, "v3"):
-		newPKGBUILD = strings.Replace(newPKGBUILD, "make olddefconfig\n", "echo CONFIG_GENERIC_CPU3=y >> .config\nmake olddefconfig\n", 1)
-	case strings.Contains(p.March, "v2"):
-		newPKGBUILD = strings.Replace(newPKGBUILD, "make olddefconfig\n", "echo CONFIG_GENERIC_CPU2=y >> .config\nmake olddefconfig\n", 1)
-	}
-
-	// empty file before writing
-	_, err = f.Seek(0, 0)
-	if err != nil {
-		return err
-	}
-	err = f.Truncate(0)
-	if err != nil {
-		return err
-	}
-
-	_, err = f.WriteString(newPKGBUILD)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -563,20 +477,54 @@ func (p *ProtoPackage) importKeys() error {
 	return nil
 }
 
-func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
+func (p *ProtoPackage) isAvailable(ctx context.Context, h *alpm.Handle) bool {
 	dbs, err := h.SyncDBs()
 	if err != nil {
 		return false
 	}
 
 	buildManager.alpmMutex.Lock()
+	defer buildManager.alpmMutex.Unlock()
+
 	var pkg alpm.IPackage
-	if p.Srcinfo != nil {
+	switch {
+	case p.Srcinfo != nil:
 		pkg, err = dbs.FindSatisfier(p.Srcinfo.Packages[0].Pkgname)
-	} else {
+	case p.DBPackage != nil && len(p.DBPackage.Packages) > 0:
 		pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0])
+	default:
+		cmd := exec.CommandContext(ctx, "unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(), //nolint:gosec
+			"--sysroot="+filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot))
+		var res []byte
+		res, err = cmd.Output()
+		if err != nil {
+			log.Warningf("error getting packages from pacsift for %s: %v", p.Pkgbase, err)
+			return false
+		} else if len(res) == 0 {
+			log.Warningf("error getting packages from pacsift for %s", p.Pkgbase)
+			return false
+		}
+
+		if len(strings.Split(strings.TrimSpace(string(res)), "\n")) > 0 {
+			pacsiftLines := strings.Split(strings.TrimSpace(string(res)), "\n")
+
+			var splitPkgs []string
+			for _, line := range pacsiftLines {
+				splitPkgs = append(splitPkgs, strings.Split(line, "/")[1])
+			}
+
+			if p.DBPackage != nil {
+				p.DBPackage, err = p.DBPackage.Update().SetPackages(splitPkgs).Save(ctx)
+				if err != nil {
+					return false
+				}
+			}
+			pkg, err = dbs.FindSatisfier(splitPkgs[0])
+		} else {
+			log.Warningf("error getting packages from pacsift for %s", p.Pkgbase)
+			return false
+		}
 	}
-	buildManager.alpmMutex.Unlock()
 	if err != nil {
 		log.Debugf("error resolving %s: %v", p.Pkgbase, err)
 		return false
@@ -596,27 +544,31 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
 	return true
 }
 
-func (p *ProtoPackage) SVN2GITVersion(h *alpm.Handle) (string, error) {
-	if p.Pkgbuild == "" && p.Pkgbase == "" {
-		return "", fmt.Errorf("invalid arguments")
+func (p *ProtoPackage) GitVersion(h *alpm.Handle) (string, error) {
+	if p.Pkgbase == "" {
+		return "", errors.New("invalid arguments")
 	}
 
-	pkgBuilds, _ := Glob(filepath.Join(conf.Basedir.Work, upstreamDir, "**/"+p.Pkgbase+"/repos/*/PKGBUILD"))
+	stateFiles, _ := Glob(filepath.Join(conf.Basedir.Work, stateDir, "**/"+p.Pkgbase))
 
-	var fPkgbuilds []string
-	for _, pkgbuild := range pkgBuilds {
-		mPkgbuild := PKGBUILD(pkgbuild)
-		if mPkgbuild.FullRepo() == "trunk" || containsSubStr(mPkgbuild.FullRepo(), conf.Blacklist.Repo) {
+	var fStateFiles []string
+	for _, stateFile := range stateFiles {
+		_, subRepo, _, err := stateFileMeta(stateFile)
+		if err != nil {
 			continue
 		}
 
-		if !Contains(fPkgbuilds, pkgbuild) {
-			fPkgbuilds = append(fPkgbuilds, pkgbuild)
+		if subRepo != nil {
+			continue
+		}
+
+		if !Contains(fStateFiles, stateFile) {
+			fStateFiles = append(fStateFiles, stateFile)
 		}
 	}
 
-	if len(fPkgbuilds) > 1 {
-		log.Infof("%s: multiple PKGBUILD found, try resolving from mirror", p.Pkgbase)
+	if len(fStateFiles) > 1 {
+		log.Infof("%s: multiple statefiles found, try resolving from mirror", p.Pkgbase)
 		dbs, err := h.SyncDBs()
 		if err != nil {
 			return "", err
@@ -629,55 +581,37 @@ func (p *ProtoPackage) SVN2GITVersion(h *alpm.Handle) (string, error) {
 			return "", err
 		}
 
-	pkgloop:
-		for _, pkgbuild := range fPkgbuilds {
-			repo := strings.Split(filepath.Base(filepath.Dir(pkgbuild)), "-")[0]
-			upstreamA := strings.Split(filepath.Dir(pkgbuild), "/")
-			upstream := upstreamA[len(upstreamA)-4]
+		for _, stateFile := range fStateFiles {
+			repo, _, _, err := stateFileMeta(stateFile)
+			if err != nil {
+				continue
+			}
 
-			switch upstream {
-			case "upstream-core-extra":
-				if iPackage.DB().Name() == repo && (repo == "extra" || repo == "core") {
-					fPkgbuilds = []string{pkgbuild}
-					break pkgloop
-				}
-			case "upstream-community":
-				if iPackage.DB().Name() == repo && repo == "community" {
-					fPkgbuilds = []string{pkgbuild}
-					break pkgloop
-				}
+			if iPackage.DB().Name() == repo {
+				fStateFiles = []string{stateFile}
+				break
 			}
 		}
 
-		if len(fPkgbuilds) > 1 {
-			return "", MultiplePKGBUILDError{fmt.Errorf("%s: multiple PKGBUILD found: %s", p.Pkgbase, fPkgbuilds)}
+		if len(fStateFiles) > 1 {
+			return "", MultipleStateFilesError{fmt.Errorf("%s: multiple statefiles found: %s", p.Pkgbase, fStateFiles)}
 		}
-		log.Infof("%s: resolving successful: MirrorRepo=%s; PKGBUILD chosen: %s", p.Pkgbase, iPackage.DB().Name(), fPkgbuilds[0])
-	} else if len(fPkgbuilds) == 0 {
-		return "", fmt.Errorf("%s: no matching PKGBUILD found (searched: %s, canidates: %s)", p.Pkgbase,
-			filepath.Join(conf.Basedir.Work, upstreamDir, "**/"+p.Pkgbase+"/repos/*/PKGBUILD"), pkgBuilds)
+		log.Infof("%s: resolving successful: MirrorRepo=%s; statefile chosen: %s", p.Pkgbase, iPackage.DB().Name(), fStateFiles[0])
+	} else if len(fStateFiles) == 0 {
+		return "", fmt.Errorf("%s: no matching statefile found (searched: %s, canidates: %s)", p.Pkgbase,
+			filepath.Join(conf.Basedir.Work, stateDir, "**/"+p.Pkgbase), stateFiles)
 	}
 
-	pPkg := PKGBUILD(fPkgbuilds[0])
-	dbPkg, err := db.DbPackage.Query().Where(dbpackage.RepositoryEQ(dbpackage.Repository(pPkg.Repo())),
-		dbpackage.March(p.March), dbpackage.Pkgbase(p.Pkgbase)).Only(context.Background())
-	if err == nil {
-		return dbPkg.Version, nil
-	}
-
-	cmd := exec.Command("makepkg", "--printsrcinfo")
-	cmd.Dir = filepath.Dir(fPkgbuilds[0])
-	res, err := cmd.Output()
+	rawState, err := os.ReadFile(fStateFiles[0])
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("error reading statefile %s: %w", fStateFiles[0], err)
 	}
-
-	info, err := srcinfo.Parse(string(res))
+	state, err := parseState(string(rawState))
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("error parsing statefile: %w", err)
 	}
 
-	return constructVersion(info.Pkgver, info.Pkgrel, info.Epoch), nil
+	return state.PkgVer, nil
 }
 
 func (p *ProtoPackage) isPkgFailed() bool {
@@ -685,14 +619,6 @@ func (p *ProtoPackage) isPkgFailed() bool {
 		return false
 	}
 
-	if err := p.genSrcinfo(); err != nil {
-		return false
-	}
-
-	if p.Version == "" {
-		p.Version = constructVersion(p.Srcinfo.Pkgver, p.Srcinfo.Pkgrel, p.Srcinfo.Epoch)
-	}
-
 	if alpm.VerCmp(p.DBPackage.Version, p.Version) < 0 {
 		return false
 	}
@@ -704,15 +630,6 @@ func (p *ProtoPackage) genSrcinfo() error {
 		return nil
 	}
 
-	if p.DBPackage != nil && p.DBPackage.Srcinfo != nil {
-		var err error
-		p.Srcinfo, err = srcinfo.Parse(*p.DBPackage.Srcinfo)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
 	cmd := exec.Command("makepkg", "--printsrcinfo", "-p", filepath.Base(p.Pkgbuild)) //nolint:gosec
 	cmd.Dir = filepath.Dir(p.Pkgbuild)
 	res, err := cmd.CombinedOutput()
@@ -724,11 +641,7 @@ func (p *ProtoPackage) genSrcinfo() error {
 	if err != nil {
 		return err
 	}
-
 	p.Srcinfo = info
-	if p.DBPackage != nil {
-		p.DBPackage = p.DBPackage.Update().SetSrcinfoHash(p.Hash).SetSrcinfo(string(res)).SaveX(context.Background())
-	}
 
 	return nil
 }
@@ -740,15 +653,15 @@ func (p *ProtoPackage) findPkgFiles() error {
 	}
 
 	if p.DBPackage == nil && p.Srcinfo == nil {
-		return fmt.Errorf("unable to find pkgfiles without dbpkg or srcinfo present")
+		return errors.New("unable to find pkgfiles without dbpkg or srcinfo present")
 	}
 
 	var realPkgs []string
 	if p.DBPackage != nil {
 		realPkgs = append(realPkgs, p.DBPackage.Packages...)
 	} else {
-		for _, realPkg := range p.Srcinfo.Packages {
-			realPkgs = append(realPkgs, realPkg.Pkgname)
+		for i := range p.Srcinfo.Packages {
+			realPkgs = append(realPkgs, p.Srcinfo.Packages[i].Pkgname)
 		}
 	}
 
@@ -767,27 +680,35 @@ func (p *ProtoPackage) findPkgFiles() error {
 	return nil
 }
 
-func (p *ProtoPackage) toDBPackage(create bool) {
+func (p *ProtoPackage) toDBPackage(ctx context.Context, create bool) error {
 	if p.DBPackage != nil {
-		return
+		return nil
 	}
 
-	dbPkg, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March),
-		dbpackage.RepositoryEQ(p.Repo))).Only(context.Background())
-	if err != nil && create {
-		dbPkg = db.DbPackage.Create().
+	dbPkg, err := db.DBPackage.Query().Where(
+		dbpackage.Pkgbase(p.Pkgbase),
+		dbpackage.March(p.March),
+		dbpackage.RepositoryEQ(p.Repo),
+	).Only(ctx)
+	if err != nil && ent.IsNotFound(err) && create {
+		dbPkg, err = db.DBPackage.Create().
 			SetPkgbase(p.Pkgbase).
 			SetMarch(p.March).
-			SetPackages(packages2slice(p.Srcinfo.Packages)).
 			SetRepository(p.Repo).
-			SaveX(context.Background())
+			Save(ctx)
+		if err != nil {
+			return err
+		}
+	} else if err != nil && !ent.IsNotFound(err) {
+		return err
 	}
 
 	p.DBPackage = dbPkg
+	return nil
 }
 
 func (p *ProtoPackage) exists() (bool, error) {
-	dbPkg, err := db.DbPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March))).Exist(context.Background())
+	dbPkg, err := db.DBPackage.Query().Where(dbpackage.And(dbpackage.Pkgbase(p.Pkgbase), dbpackage.March(p.March))).Exist(context.Background())
 	if err != nil {
 		return false, err
 	}
@@ -795,7 +716,7 @@ func (p *ProtoPackage) exists() (bool, error) {
 	return dbPkg, nil
 }
 
-func (p *ProtoPackage) isMirrorLatest(h *alpm.Handle) (latest bool, foundPkg alpm.IPackage, version string, err error) {
+func (p *ProtoPackage) isMirrorLatest(h *alpm.Handle) (latest bool, foundPkg *alpm.Package, version string, err error) {
 	dbs, err := h.SyncDBs()
 	if err != nil {
 		return false, nil, "", err
@@ -818,20 +739,42 @@ func (p *ProtoPackage) isMirrorLatest(h *alpm.Handle) (latest bool, foundPkg alp
 			return false, nil, "", UnableToSatisfyError{err}
 		}
 
-		svn2gitVer, err := (&ProtoPackage{
+		svn2gitVer, err := (&ProtoPackage{ //nolint:exhaustruct,exhaustivestruct
 			Pkgbase: pkg.Base(),
 			March:   p.March,
-		}).SVN2GITVersion(h)
+		}).GitVersion(h)
 		if err != nil {
 			return false, nil, "", err
 		} else if svn2gitVer == "" {
-			return false, nil, "", fmt.Errorf("no svn2git version")
+			return false, nil, "", errors.New("no svn2git version")
 		}
 
 		if alpm.VerCmp(svn2gitVer, pkg.Version()) > 0 {
-			return false, pkg, svn2gitVer, nil
+			switch v := pkg.(type) {
+			case *alpm.Package:
+				return false, v, svn2gitVer, nil
+			default:
+				return false, nil, "", fmt.Errorf("invalid package type: %T", pkg)
+			}
 		}
 	}
 
 	return true, nil, "", nil
 }
+
+func (p *ProtoPackage) PkgbaseEquals(p2 *ProtoPackage, marchSensitive bool) bool {
+	return (marchSensitive && (p.Pkgbase == p2.Pkgbase && p.FullRepo == p2.FullRepo)) || (!marchSensitive && p.Pkgbase == p2.Pkgbase)
+}
+
+func (p *ProtoPackage) IsBuilt() (bool, error) {
+	if p.DBPackage == nil {
+		return false, nil
+	}
+
+	matches, err := filepath.Glob(filepath.Join(conf.Basedir.Work, waitingDir, p.FullRepo, p.DBPackage.Packages[0]+"*-x86_64.pkg.tar.zst"))
+	if err != nil {
+		return false, err
+	}
+
+	return len(matches) > 0, nil
+}

proto_package_test.go

@@ -51,10 +51,55 @@ package() {
 # vim:set sw=2 et:
 `
 
-func TestIncreasePkgRel(t *testing.T) {
-	pkgbuild, err := os.CreateTemp("", "")
+const PkgbuildTestWithPkgrelSub = `# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+
+pkgname=gnome-todo
+pkgver=41.0+r69+ga9a5b7cd
+pkgrel=1.1
+pkgdesc="Task manager for GNOME"
+url="https://wiki.gnome.org/Apps/Todo"
+arch=(x86_64)
+license=(GPL)
+depends=(evolution-data-server libpeas python gtk4 libportal-gtk4 libadwaita)
+makedepends=(gobject-introspection appstream-glib git meson yelp-tools)
+groups=(gnome-extra)
+_commit=a9a5b7cdde0244331d2d49220f04018be60c018e  # master
+source=("git+https://gitlab.gnome.org/GNOME/gnome-todo.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^GNOME_TODO_//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
+
+}
+
+prepare() {
+  cd $pkgname
+}
+
+build() {
+  arch-meson $pkgname build
+  meson compile -C build
+}
+
+check() (
+  glib-compile-schemas "${GSETTINGS_SCHEMA_DIR:=$PWD/$pkgname/data}"
+  export GSETTINGS_SCHEMA_DIR
+
+  meson test -C build --print-errorlogs
+)
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 et:
+`
+
+func TestIncreasePkgRel(t *testing.T) { //nolint:paralleltest
+	pkgbuild, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
-		t.Fatal("Unable to setup temp. PKGBUILD")
+		t.Fatal("unable to setup temp. PKGBUILD")
 	}
 	defer func(name string) {
 		_ = os.Remove(name)
@@ -62,7 +107,7 @@ func TestIncreasePkgRel(t *testing.T) {
 
 	_, err = pkgbuild.WriteString(PkgbuildTest)
 	if err != nil {
-		t.Fatal("Unable to write to temp. PKGBUILD")
+		t.Fatal("unable to write to temp. PKGBUILD")
 	}
 	_ = pkgbuild.Close()
 
@@ -95,3 +140,48 @@ func TestIncreasePkgRel(t *testing.T) {
 		t.Fail()
 	}
 }
+
+func TestIncreasePkgRelWithPkgSub(t *testing.T) { //nolint:paralleltest
+	pkgbuild, err := os.CreateTemp(t.TempDir(), "")
+	if err != nil {
+		t.Fatal("unable to setup temp. PKGBUILD")
+	}
+	defer func(name string) {
+		_ = os.Remove(name)
+	}(pkgbuild.Name())
+
+	_, err = pkgbuild.WriteString(PkgbuildTestWithPkgrelSub)
+	if err != nil {
+		t.Fatal("unable to write to temp. PKGBUILD")
+	}
+	_ = pkgbuild.Close()
+
+	buildPkg := &ProtoPackage{
+		Pkgbase:  "gnome-todo",
+		Pkgbuild: pkgbuild.Name(),
+	}
+
+	err = buildPkg.increasePkgRel(1)
+	if err != nil {
+		t.Logf("increasePkgRel: %v", err)
+		t.Fail()
+	}
+
+	versionSplit := strings.Split(buildPkg.Version, "-")
+	if versionSplit[len(versionSplit)-1] != "1.2" {
+		t.Logf("increasePkgRel: expected 1.2 pkgrel, got: %s", buildPkg.Version)
+		t.Fail()
+	}
+
+	buildPkg.Srcinfo = nil
+	err = buildPkg.genSrcinfo()
+	if err != nil {
+		t.Logf("increasePkgRel: %v", err)
+		t.Fail()
+	}
+
+	if buildPkg.Srcinfo.Pkgrel != "1.2" {
+		t.Logf("increasePkgRel: expected 1.2 pkgrel, got: %s", buildPkg.Srcinfo.Pkgrel)
+		t.Fail()
+	}
+}

tpl/packages.html

@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta content="width=device-width, initial-scale=1" name="viewport">
-
-    <title>ALHP Status</title>
-
-    <meta content="dark light" name="color-scheme">
-    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap-dark-5@1.1.3/dist/css/bootstrap-dark.css"
-          integrity="sha256-jtwIepgD1ro9ko1W5a6PAGr8IUIXA3FqBZPAXNYVREE=" rel="stylesheet">
-    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.2.0/css/fork-awesome.min.css"
-          integrity="sha256-XoaMnoYC5TH6/+ihMEnospgm0J1PM/nioxbOUdnM8HY=" rel="stylesheet">
-    <style>
-        .accordion:last-child {
-            padding-bottom: 8vh;
-        }
-
-        .info-box {
-            overflow: hidden;
-            white-space: nowrap;
-        }
-    </style>
-</head>
-<body style="background: #111217 !important;">
-<nav class="navbar navbar-expand-lg sticky-top navbar-light bg-info">
-    <div class="container">
-        <div class="d-flex justify-content-start">
-            <span class="navbar-brand align-middle">ALHP Status</span>
-            <span class="navbar-text">
-            <a class="align-middle" href="https://git.harting.dev/anonfunc/ALHP.GO"><i
-                    class="fa fa-gitea fs-4"></i></a>
-          </span>
-        </div>
-
-        <div class="d-flex justify-content-end">
-            <input type="search" placeholder="Search for packages.." class="form-control" id="table-sort-input"
-                   title="Search for package"/>
-        </div>
-    </div>
-</nav>
-
-<div class="container">
-
-    <div class="pt-4 pb-4">
-        <h4>Buildserver Stats</h4>
-        <iframe allowtransparency="true" class="container-fluid rounded-1 overflow-hidden" height="330px"
-                src="https://stats.harting.dev/public-dashboards/0fb04abb0c5e4b7390cf26a98e6dead1"></iframe>
-    </div>
-
-    {{range $march := .March}}
-    <h3 class="mt-5">{{$march.Name}}</h3>
-    <div class="accordion" id="accordion-{{$march.Name}}">
-        {{range $repo := $march.Repos}}
-        <div class="accordion-item bg-opacity-25">
-            <h2 class="accordion-header" id="heading-{{$march.Name}}-{{$repo.Name}}">
-                <button aria-controls="collapse-{{$march.Name}}-{{$repo.Name}}" aria-expanded="false"
-                        class="accordion-button"
-                        data-bs-target="#collapse-{{$march.Name}}-{{$repo.Name}}"
-                        data-bs-toggle="collapse"
-                        type="button">{{$repo.Name}}-{{$march.Name}}
-                </button>
-            </h2>
-            <div aria-labelledby="heading-{{$march.Name}}-{{$repo.Name}}"
-                 class="accordion-collapse collapse show"
-                 data-bs-parent="#accordion-{{$march.Name}}" id="collapse-{{$march.Name}}-{{$repo.Name}}">
-                <div class="accordion-body overflow-auto">
-                    <table class="table table-sorted">
-                        <thead>
-                        <tr>
-                            <th scope="col">Pkgbase</th>
-                            <th scope="col">Status</th>
-                            <th scope="col">Reason</th>
-                            <th class="text-center" scope="col"
-                                title="link time optimization&#10;does not guarantee that package is actually build with LTO">
-                                LTO
-                            </th>
-                            <th class="text-center" scope="col" title="Debug-symbols available via debuginfod">DS
-                            </th>
-                            <th scope="col">Archlinux Version</th>
-                            <th scope="col">{{$repo.Name}}-{{$march.Name}} Version</th>
-                            <th class="text-end" scope="col">Info</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        {{range $pkg := $repo.Packages}}
-                        <tr class="table-{{$pkg.Class}}"
-                            id="{{$repo.Name}}-{{$march.Name}}-{{$pkg.Pkgbase}}">
-                            <td>{{$pkg.Pkgbase}}</td>
-                            <td>{{$pkg.Status}}</td>
-                            <td>{{$pkg.Skip}}</td>
-                            <td class="text-center fs-6">
-                                {{if $pkg.LTO}}<i class="fa fa-check fa-lg" style="color: var(--bs-success)"
-                                                  title="build with LTO"></i>{{end}}
-                                {{if $pkg.LTODisabled}}<i class="fa fa-times fa-lg" style="color: var(--bs-danger)"
-                                                          title="LTO explicitly disabled"></i>{{end}}
-                                {{if $pkg.LTOAutoDisabled}}<i class="fa fa-times-circle-o fa-lg"
-                                                              style="color: var(--bs-danger)"
-                                                              title="LTO automatically disabled"></i>{{end}}
-                                {{if $pkg.LTOUnknown}}<i class="fa fa-hourglass-o fa-lg"
-                                                         title="not build with LTO yet"></i>{{end}}
-                            </td>
-                            <td class="text-center fs-6">
-                                {{if $pkg.DebugSym}}<i class="fa fa-check fa-lg" style="color: var(--bs-success)"
-                                                       title="Debug symbols available"></i>{{end}}
-                                {{if $pkg.DebugSymNotAvailable}}<i class="fa fa-times fa-lg"
-                                                                   style="color: var(--bs-danger)"
-                                                                   title="Not build with debug symbols"></i>{{end}}
-                                {{if $pkg.DebugSymUnknown}}<i class="fa fa-hourglass-o fa-lg"
-                                                              title="Not build yet"></i>{{end}}
-                            </td>
-                            <td>{{$pkg.Svn2GitVersion}}</td>
-                            <td>{{$pkg.Version}}</td>
-                            <td class="text-end info-box">
-                                {{with $pkg.Log}}<a href="{{.}}" title="build log"
-                            ><i class="fa fa-file-text fa-lg"></i></a
-                            >{{end}}
-                                <a class="text-decoration-none fw-bold"
-                                   href="https://archlinux.org/packages/?q={{$pkg.Pkgbase}}" title="ArchWeb">AW</a>
-                                <a data-bs-html="true" data-bs-placement="bottom" data-bs-toggle="tooltip"
-                                   href="#{{$repo.Name}}-{{$march.Name}}-{{$pkg.Pkgbase}}"
-                                   title="{{if $pkg.BuildDate}}Build on {{$pkg.BuildDate}}&#10;{{end}}{{if $pkg.BuildDuration}}CPU-Time: {{$pkg.BuildDuration}}&#10;{{end}}Last checked on {{$pkg.Checked}}">
-                                    <i class="fa fa-info-circle fa-lg"></i></a>
-                            </td>
-                        </tr>
-                        {{end}}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-        {{end}}
-    </div>
-    {{end}}
-</div>
-
-<footer class="text-center text-lg-start bg-dark mt-3 fixed-bottom">
-    <div class="p-2 text-center">
-        {{.Latest}} <span class="text-primary">build</span>
-        {{.Queued}} <span class="text-warning">queued</span>
-        {{.Skipped}} <span class="text-secondary">skipped</span>
-        {{.Failed}} <span class="text-danger">failed</span>
-        ||
-        LTO: {{.LTOEnabled}} <span class="text-success">enabled</span>
-        {{.LTODisabled}} <span class="text-danger">disabled</span>
-        {{.LTOUnknown}} <span class="text-secondary">unknown</span>
-        ||
-        <span class="text-muted">{{.Generated}}</span>
-    </div>
-</footer>
-
-<script crossorigin="anonymous"
-        integrity="sha256-9SEPo+fwJFpMUet/KACSwO+Z/dKMReF9q4zFhU/fT9M="
-        src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
-<script>
-    let input = document.getElementById('table-sort-input');
-    let timeout = null;
-
-    input.addEventListener('input', function (e) {
-        clearTimeout(timeout);
-
-        timeout = setTimeout(searchFilter, 200);
-    });
-
-    function searchFilter() {
-        let input, filter, tr, td, i, txtValue;
-        input = document.getElementById('table-sort-input')
-        filter = input.value.toUpperCase()
-        const tables = document.getElementsByClassName('table-sorted');
-        for (let j = 0; j < tables.length; j++) {
-            tr = tables[j].getElementsByTagName('tr')
-            for (i = 0; i < tr.length; i++) {
-                td = tr[i].getElementsByTagName('td')[0]
-                if (td) {
-                    txtValue = td.textContent || td.innerText
-                    if (txtValue.toUpperCase().indexOf(filter) > -1) {
-                        tr[i].style.display = ''
-                    } else {
-                        tr[i].style.display = 'none'
-                    }
-                }
-            }
-        }
-    }
-</script>
-</body>
-</html>