feat(kudari): use nobori.RegPkg

Author: madonuko

kudari/rpm.go

@@ -17,8 +17,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/klauspost/compress/zstd"
 	"github.com/terrapkg/gura/db"
-	"github.com/terrapkg/gura/util"
+	"github.com/terrapkg/gura/nobori"
 	. "github.com/terrapkg/gura/repomd"
+	"github.com/terrapkg/gura/util"
 	"go.uber.org/zap"
 )
 
@@ -188,7 +189,7 @@ func rpmFetch(repo db.Repo) {
 			pkgs[n].FullVer = fullver
 			pkgs[n].Ver = p.Version.Ver
 			util.MaybeSuicide(l, "Meta.UnmarshalJSON", pkgs[n].Meta.UnmarshalJSON(rpm2MetaJSON(p)))
-			tx.Save(&pkgs[n])
+			nobori.RegPkg(tx, &pkgs[n])
 			updated++
 		} else {
 			newpkgs = append(newpkgs, &db.Pkg{

nobori/TRACE.go

@@ -0,0 +1,38 @@
+// nobori: upstream metadata fetching from various streams
+//
+// `TRACE.go`: Obtain traces from packages.
+// Traces are currently just URLs that potentially point to upstream.
+//
+// Named after #TRACE_pr.
+
+package nobori
+
+import (
+	"encoding/json"
+
+	"github.com/terrapkg/gura/db"
+	"github.com/terrapkg/gura/repomd"
+	"github.com/terrapkg/gura/util"
+	"go.uber.org/zap"
+)
+
+func UpTrace(p db.Pkg, url_ch chan string) {
+	switch p.Repo.Type {
+	case db.Rpm:
+		rpmTrace(p, url_ch)
+	default:
+		l.DPanic("unreachable in uptrace")
+	}
+}
+
+func rpmTrace(p db.Pkg, url_ch chan string) {
+	bs, err := p.Meta.MarshalJSON()
+	if util.Yeet(l, "error marshaling package metadata", err, zap.String("id", p.ID.String())) {
+		l.DPanic("DPanic")
+		return
+	}
+
+	var meta repomd.RPMMeta
+	json.Unmarshal(bs, &meta)
+	url_ch <- meta.Url
+}

nobori/github.go

@@ -296,7 +296,7 @@ func ghRtRelease(stream *db.Stream, remain string, token *GHToken) {
 // Fetch the latest tag from a GitHub repository using the GraphQL API
 //
 // Update the stream's version if a new tag is found.
-func ghQlTagCall(prefix, owner, name string, len int, token *GHToken, qlcli ql.Client) ([]string, http.Header) {
+func ghQlTagCall(prefix, owner, name string, len int, qlcli ql.Client) ([]string, http.Header) {
 	var q struct {
 		Repository struct {
 			Refs struct {
@@ -330,7 +330,7 @@ func ghQlTagCall(prefix, owner, name string, len int, token *GHToken, qlcli ql.C
 func ghQlTag(stream *db.Stream, remain string, token *GHToken, qlcli ql.Client) {
 	prefix, remain := util.SplitOnce(remain, ' ')
 	owner, name := util.SplitOnce(remain, '/')
-	tags, headers := ghQlTagCall(prefix, owner, name, 1, token, qlcli)
+	tags, headers := ghQlTagCall(prefix, owner, name, 1, qlcli)
 	if len(tags) == 0 {
 		return
 	}
@@ -376,7 +376,7 @@ func GhStrmHdlr(pkg db.Pkg, url string) *db.Stream {
 
 	// GHFetchType: TAG
 	owner, name := util.SplitOnce(repo, '/')
-	tags, _ := ghQlTagCall("", owner, name, GH_STRM_HDLR_TEST_QL_MAX, tokenql, *qlcli)
+	tags, _ := ghQlTagCall("", owner, name, GH_STRM_HDLR_TEST_QL_MAX, *qlcli)
 	if len(tags) > 0 {
 		for _, tag := range tags {
 			if prefix, found := strings.CutSuffix(tag, pkg.Ver); found {

nobori/strm.go

@@ -4,7 +4,6 @@
 package nobori
 
 import (
-	"encoding/json"
 	"errors"
 	"maps"
 	"regexp"
@@ -13,20 +12,19 @@ import (
 
 	"github.com/mdobak/go-xerrors"
 	"github.com/terrapkg/gura/db"
-	"github.com/terrapkg/gura/repomd"
-	"github.com/terrapkg/gura/util"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 )
 
-var newStrmHdlrs = []func(p db.Pkg, url string, urls []string) bool{
-	func(p db.Pkg, url string, urls []string) bool {
+var newStrmHdlrs = []func(db *gorm.DB, p *db.Pkg, url string, urls []string) bool{
+	func(dbx *gorm.DB, p *db.Pkg, url string, urls []string) bool {
 		if !strings.HasPrefix(url, "github.com/") {
 			return false
 		}
-		strm := GhStrmHdlr(p, url)
+		strm := GhStrmHdlr(*p, url)
 		strm.Mirrors = strings.Join(urls, ",")
-		db.DB.Save(strm)
+		dbx.Save(strm)
+		p.StreamID = &strm.ID
 		return true
 	},
 }
@@ -42,24 +40,24 @@ func mangleUrl(url string) (new string) {
 }
 
 // Register package in db
-func RegPkg(p db.Pkg) error {
+func RegPkg(dbx *gorm.DB, p *db.Pkg) error {
 	if p.StreamID != nil {
-		return db.DB.Save(p).Error
+		return dbx.Save(p).Error
 	}
 	url_ch := make(chan string)
-	UpTrace(p, url_ch)
+	UpTrace(*p, url_ch)
 	close(url_ch)
 	urls := map[string]struct{}{}
 	var strm *db.Stream
 recv:
 	url, ok := <-url_ch
 	if !ok {
-		db.DB.Save(p)
-		return handleNewStrm(p, slices.Collect(maps.Keys(urls)))
+		dbx.Save(p)
+		return handleNewStrm(dbx, p, slices.Collect(maps.Keys(urls)))
 	}
 	url = mangleUrl(url)
 	urls[url] = struct{}{}
-	if e := db.DB.Find(&strm, "? IN STRING_TO_ARRAY(mirrors)", url).Error; e != nil {
+	if e := dbx.Find(&strm, "? IN STRING_TO_ARRAY(mirrors)", url).Error; e != nil {
 		if errors.Is(e, gorm.ErrRecordNotFound) {
 			goto recv
 		}
@@ -75,44 +73,23 @@ recv:
 
 	strm.Mirrors = strings.Join(slices.Collect(maps.Keys(urls)), ",")
 	p.StreamID = &strm.ID
-	if err := db.DB.Save(p).Error; err != nil {
+	if err := dbx.Save(p).Error; err != nil {
 		return xerrors.Newf("can't save package in db (pkgid %s): %w", p.ID.String(), err)
 	}
-	if err := db.DB.Save(strm).Error; err != nil {
+	if err := dbx.Save(strm).Error; err != nil {
 		return xerrors.Newf("can't save stream in db (strmid %s): %w", strm.ID.String(), err)
 	}
 	return nil
 }
 
-func handleNewStrm(p db.Pkg, urls []string) error {
+func handleNewStrm(dbx *gorm.DB, p *db.Pkg, urls []string) error {
 	for _, hdlr := range newStrmHdlrs {
 		for _, url := range urls {
-			if hdlr(p, url, urls) {
+			if hdlr(dbx, p, url, urls) {
 				return nil
 			}
 		}
 	}
 	l.Debug("didn't find any existing strm, and no strm supported", zap.String("pkgid", p.ID.String()))
-	return db.DB.Save(p).Error
-}
-
-func UpTrace(p db.Pkg, url_ch chan string) {
-	switch p.Repo.Type {
-	case db.Rpm:
-		rpmTrace(p, url_ch)
-	default:
-		l.DPanic("unreachable in uptrace")
-	}
-}
-
-func rpmTrace(p db.Pkg, url_ch chan string) {
-	bs, err := p.Meta.MarshalJSON()
-	if util.Yeet(l, "error marshaling package metadata", err, zap.String("id", p.ID.String())) {
-		l.DPanic("DPanic")
-		return
-	}
-
-	var meta repomd.RPMMeta
-	json.Unmarshal(bs, &meta)
-	url_ch <- meta.Url
+	return dbx.Save(p).Error
 }