chore: make --add an option instead of a command

Author: calmh

internal/add/add.go

@@ -2,7 +2,6 @@ package publish
 
 import (
 	"crypto"
-	"encoding/hex"
 	"fmt"
 	"io"
 
@@ -30,10 +29,8 @@ func newSigner(keychain io.Reader) (*signer, error) {
 		if err != nil {
 			return nil, err
 		}
-		switch key := pkt.(type) {
-		case *packet.PrivateKey:
+		if key, ok := pkt.(*packet.PrivateKey); ok {
 			if !key.IsSubkey && key.PublicKey.PublicKey != nil {
-				fmt.Println("private", hex.EncodeToString(key.PublicKey.Fingerprint[:]), key.IsSubkey)
 				s.keys = append(s.keys, key)
 			}
 		}

internal/publish/pgp.go

@@ -1,19 +1,29 @@
 package publish
 
 import (
+	"errors"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
+
+	"pault.ag/go/debian/deb"
 )
 
 type CLI struct {
-	Dists        string   `arg:"" required:"" help:"Path to dists directory" type:"existingdir" env:"EZAPT_DISTS"`
-	KeepVersions int      `help:"Number of versions to keep" default:"2" env:"EZAPT_KEEP_VERSIONS"`
-	Keyring      string   `required:"" help:"Path to GPG keyring" type:"existingfile" env:"EZAPT_KEYRING"`
-	SignUser     []string `help:"GPG user to sign with" env:"EZAPT_SIGN_USER" default:"37C84554E7E0A261E4F76E1ED26E6ED000654A3E,FBA2E162F2F44657B38F0309E5665F9BD5970C47"`
+	Dists        string `required:"" help:"Path to dists directory" type:"existingdir" env:"EZAPT_DISTS"`
+	KeepVersions int    `help:"Number of versions to keep" default:"2" env:"EZAPT_KEEP_VERSIONS"`
+	Keyring      string `required:"" help:"Path to GPG keyring" type:"existingfile" env:"EZAPT_KEYRING"`
+	Add          string `help:"Path to packages to add" type:"existingdir" env:"EZAPT_ADD"`
 }
 
 func (c *CLI) Run() error {
+	if c.Add != "" {
+		if err := c.add(); err != nil {
+			return fmt.Errorf("add: %w", err)
+		}
+	}
+
 	pkgs, err := scanPackages(c.Dists)
 	if err != nil {
 		return fmt.Errorf("publish: %w", err)
@@ -50,3 +60,43 @@ func (c *CLI) Run() error {
 
 	return nil
 }
+
+func (c *CLI) add() error {
+	return filepath.Walk(c.Add, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+		if filepath.Ext(path) != ".deb" {
+			return nil
+		}
+
+		deb, cl, err := deb.LoadFile(path)
+		if err != nil {
+			return err
+		}
+		defer cl()
+
+		// If we have foo/syncthing/candidate/whatever.deb, grab the
+		// syncthing/candidate part
+		repoPath, err := filepath.Rel(c.Add, path)
+		if err != nil {
+			return err
+		}
+		repoPath = filepath.Dir(repoPath)
+
+		newPath := filepath.Join(c.Dists, repoPath, "binary-"+deb.Control.Architecture.String(), filepath.Base(path))
+		slog.Info("Adding package", "package", deb.Control.Package, "version", deb.Control.Version, "architecture", deb.Control.Architecture, "to", newPath)
+		if err := os.MkdirAll(filepath.Dir(newPath), 0o700); err != nil {
+			return err
+		}
+		if err := os.Link(path, newPath); errors.Is(err, os.ErrExist) {
+			// never mind
+		} else if err != nil {
+			return err
+		}
+		return nil
+	})
+}

internal/publish/publish.go

@@ -4,17 +4,11 @@ import (
 	"log/slog"
 
 	"github.com/alecthomas/kong"
-	"kastelo.dev/ezapt/internal/add"
 	"kastelo.dev/ezapt/internal/publish"
 )
 
-type CLI struct {
-	Publish publish.CLI `cmd:"" help:"Publish packages to a repository."`
-	Add     add.CLI     `cmd:"" help:"Add packages to a repository."`
-}
-
 func main() {
-	var cli CLI
+	var cli publish.CLI
 	ctx := kong.Parse(&cli)
 	if err := ctx.Run(); err != nil {
 		slog.Error("Failed to run", "error", err)