feat: implement PushCategoryCommand for pushing locale markdown files

- Added a new command `PushCategoryCommand` to push locale markdown files as separate OCI layers from a specified scroll directory.
- Removed the deprecated `PushMetaCommand` and updated the `PushCommand` to include the new category command.
- Enhanced the OCI client to support pushing categories with a regex pattern for file matching.

Author: MarcStdt

cmd/registry_push.go

@@ -94,7 +94,7 @@ var PushCommand = &cobra.Command{
 }
 
 func init() {
-	PushCommand.AddCommand(PushMetaCommand)
+	PushCommand.AddCommand(PushCategoryCommand)
 
 	PushCommand.Flags().StringVarP(&minRam, "min-ram", "r", minRam, "Minimum RAM required to run the application. (Will be added as a manifest annotation gg.druid.scroll.minRam)")
 	PushCommand.Flags().StringVarP(&minCpu, "min-cpu", "c", minCpu, "Minimum CPU required to run the application. (Will be added as a manifest annotation gg.druid.scroll.minCpu)")

cmd/registry_push_category.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"fmt"
+	"path"
+
+	"github.com/highcard-dev/daemon/internal/core/services/registry"
+	"github.com/highcard-dev/daemon/internal/utils/logger"
+	"github.com/spf13/cobra"
+	"go.uber.org/zap"
+)
+
+var pushCategoryNamePattern string
+
+// druid push category <repo> <category> <scrollDir>
+var PushCategoryCommand = &cobra.Command{
+	Use:   "category",
+	Short: "Push locale markdown files (e.g. de-DE.md) from a scroll directory as separate OCI layers.",
+	Args:  cobra.RangeArgs(2, 3),
+	RunE: func(cmd *cobra.Command, args []string) error {
+
+		credStore := LoadRegistryStore()
+		if !credStore.HasCredentials() {
+			return fmt.Errorf("no registry credentials configured. Please use `druid registry login` to set them")
+		}
+
+		repo := args[0]
+		category := args[1]
+		scrollDir := "."
+		if len(args) == 3 {
+			scrollDir = args[2]
+		}
+
+		fullPath := path.Join(cwd, scrollDir)
+
+		logger.Log().Info("Pushing "+repo+" category to registry", zap.String("scrollDir", fullPath))
+
+		ociClient := registry.NewOciClient(credStore)
+
+		_, err := ociClient.PushCategory(fullPath, repo, category, pushCategoryNamePattern)
+
+		if err != nil {
+			return err
+		}
+
+		logger.Log().Info("Pushed " + repo + " category to registry")
+		return nil
+	},
+}
+
+func init() {
+	PushCategoryCommand.Flags().StringVar(&pushCategoryNamePattern, "match", "", "Regexp matching file basenames to push (default: locale markdown like de-DE.md)")
+}

cmd/registry_push_meta.go

@@ -85,7 +85,6 @@ type OciRegistryInterface interface {
 	PullSelective(dir string, artifact string, includeData bool, progress *domain.SnapshotProgress) error
 	CanUpdateTag(descriptor v1.Descriptor, folder string, tag string) (bool, error)
 	Push(folder string, repo string, tag string, overrides map[string]string, packMeta bool, scrollFile *domain.File) (v1.Descriptor, error)
-	PushMeta(folder string, repo string) (v1.Descriptor, error)
 }
 
 type CronManagerInterface interface {

internal/core/ports/services_ports.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -357,19 +358,58 @@ func (c *OciClient) packFolders(fs *file.Store, dirs []string, artifactType doma
 	return fileDescriptors, nil
 }
 
-func (c *OciClient) createMetaDescriptors(fs *file.Store, folder string, fsPath string) ([]v1.Descriptor, error) {
+// DefaultCategoryMarkdownPattern matches locale markdown basenames such as de-DE.md (used by PushCategory).
+const DefaultCategoryMarkdownPattern = `^[a-z]{2}-[A-Z]{2}\.md$`
+
+// createMetaDescriptors packs children of folder/fsPath as meta layers. If namePattern is non-empty,
+// it must be a valid regexp; only non-empty regular files whose basename matches are included (directories are skipped).
+// If namePattern is empty, every immediate child is passed to packFolders (directories may become archives).
+func (c *OciClient) createMetaDescriptors(fs *file.Store, folder string, fsPath string, namePattern string) ([]v1.Descriptor, error) {
 	metaPath := filepath.Join(folder, fsPath)
 	exists, _ := utils.FileExists(metaPath)
 	if !exists {
-		return []v1.Descriptor{}, fmt.Errorf("meta file %s not found", metaPath)
+		return nil, fmt.Errorf("meta file %s not found", metaPath)
 	}
-	fsFileNames := []string{}
-	subitems, _ := os.ReadDir(metaPath)
-	for _, subitem := range subitems {
-		fsFileNames = append(fsFileNames, subitem.Name())
+
+	entries, err := os.ReadDir(metaPath)
+	if err != nil {
+		return nil, fmt.Errorf("read meta directory: %w", err)
+	}
+
+	var fileRE *regexp.Regexp
+	if namePattern != "" {
+		fileRE, err = regexp.Compile(namePattern)
+		if err != nil {
+			return nil, fmt.Errorf("invalid name pattern: %w", err)
+		}
+	}
+
+	names := make([]string, 0, len(entries))
+	for _, e := range entries {
+		if fileRE != nil {
+			if e.IsDir() || !fileRE.MatchString(e.Name()) {
+				continue
+			}
+			fi, err := e.Info()
+			if err != nil {
+				return nil, fmt.Errorf("stat %s: %w", filepath.Join(metaPath, e.Name()), err)
+			}
+			if !fi.Mode().IsRegular() {
+				continue
+			}
+			if fi.Size() == 0 {
+				logger.Log().Warn("Skipping empty meta file", zap.String("path", filepath.Join(metaPath, e.Name())))
+				continue
+			}
+		}
+		names = append(names, e.Name())
 	}
 
-	return c.packFolders(fs, fsFileNames, domain.ArtifactTypeScrollMeta, fsPath)
+	if fileRE != nil && len(names) == 0 {
+		return nil, fmt.Errorf("no files matching pattern %q in %s", namePattern, metaPath)
+	}
+
+	return c.packFolders(fs, names, domain.ArtifactTypeScrollMeta, fsPath)
 }
 
 // pushBlobWithRetry pushes a single blob from src to dst, retrying up to
@@ -425,7 +465,7 @@ func pushBlobWithRetry(ctx context.Context, src *file.Store, dst *remote.Reposit
 }
 
 // copyToRegistry handles progress tracking, per-layer retries, and the
-// final manifest push via oras.Copy. It is shared by Push and PushMeta.
+// final manifest push via oras.Copy. It is shared by Push and PushCategory.
 func copyToRegistry(ctx context.Context, fs *file.Store, repo *remote.Repository, tag string, layers []v1.Descriptor, maxRetries int) error {
 	var totalBytes atomic.Int64
 	for _, desc := range layers {
@@ -547,7 +587,7 @@ func (c *OciClient) Push(folder string, repo string, tag string, overrides map[s
 
 	// Pack meta descriptors.
 	if packMeta {
-		metaDescriptors, err := c.createMetaDescriptors(fs, folder, ".meta")
+		metaDescriptors, err := c.createMetaDescriptors(fs, folder, ".meta", "")
 		if err != nil {
 			return v1.Descriptor{}, err
 		}
@@ -641,7 +681,8 @@ func (c *OciClient) Push(folder string, repo string, tag string, overrides map[s
 	return rootManifestDescriptor, nil
 }
 
-func (c *OciClient) PushMeta(scrollDir string, repo string) (v1.Descriptor, error) {
+func (c *OciClient) PushCategory(dir string, repo string, category string) (v1.Descriptor, error) {
+
 	ctx := context.Background()
 
 	// Authenticate before doing any expensive local work.
@@ -653,13 +694,13 @@ func (c *OciClient) PushMeta(scrollDir string, repo string) (v1.Descriptor, erro
 		return v1.Descriptor{}, err
 	}
 
-	fs, err := file.New(scrollDir)
+	fs, err := file.New(dir)
 	if err != nil {
 		return v1.Descriptor{}, err
 	}
 	defer fs.Close()
 
-	manifestDescriptors, err := c.createMetaDescriptors(fs, scrollDir, ".meta")
+	manifestDescriptors, err := c.createMetaDescriptors(fs, dir, "", DefaultCategoryMarkdownPattern)
 	if err != nil {
 		return v1.Descriptor{}, err
 	}
@@ -675,7 +716,7 @@ func (c *OciClient) PushMeta(scrollDir string, repo string) (v1.Descriptor, erro
 		zap.String("digest", rootManifestDescriptor.Digest.String()),
 	)
 
-	tag := "meta"
+	tag := "druid-category--" + category
 	if err = fs.Tag(ctx, rootManifestDescriptor, tag); err != nil {
 		return v1.Descriptor{}, err
 	}