feat: extract bins

cmd/chisel/cmd_cut.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"slices"
 	"time"
@@ -11,6 +12,7 @@ import (
 	"github.com/canonical/chisel/internal/cache"
 	"github.com/canonical/chisel/internal/setup"
 	"github.com/canonical/chisel/internal/slicer"
+	"github.com/canonical/chisel/internal/store"
 )
 
 var shortCutHelp = "Cut a tree with selected slices"
@@ -121,9 +123,29 @@ func (cmd *cmdCut) Execute(args []string) error {
 		}
 	}
 
+	stores := make(map[string]store.Store)
+	for storeName, storeInfo := range release.Stores {
+		openStore, err := store.Open(&store.Options{
+			Arch:     cmd.Arch,
+			CacheDir: cache.DefaultDir("chisel"),
+			Kind:     storeInfo.Kind,
+			Version:  storeInfo.Version,
+		})
+		if err != nil {
+			var unknownStoreKindError *store.UnknownStoreKindError
+			if errors.As(err, &unknownStoreKindError) {
+				logf("Store %q ignored: %v", storeName, err)
+				continue
+			}
+			return err
+		}
+		stores[storeName] = openStore
+	}
+
 	err = slicer.Run(&slicer.RunOptions{
 		Selection: selection,
 		Archives:  archives,
+		Stores:    stores,
 		TargetDir: cmd.RootDir,
 	})
 	return err

cmd/chisel/cmd_info.go

@@ -123,9 +123,12 @@ func selectPackageSlices(release *setup.Release, queries []string) (packages []*
 		} else {
 			releasePkg := release.Packages[pkgName]
 			pkg = &setup.Package{
-				Name:    releasePkg.Name,
-				Archive: releasePkg.Archive,
-				Slices:  make(map[string]*setup.Slice),
+				Name:         releasePkg.Name,
+				RealName:     releasePkg.RealName,
+				Archive:      releasePkg.Archive,
+				Store:        releasePkg.Store,
+				DefaultTrack: releasePkg.DefaultTrack,
+				Slices:       make(map[string]*setup.Slice),
 			}
 			for _, sliceName := range pkgSlices[pkgName] {
 				pkg.Slices[sliceName] = releasePkg.Slices[sliceName]

cmd/chisel/main.go

@@ -16,6 +16,8 @@ import (
 	"github.com/canonical/chisel/internal/deb"
 	"github.com/canonical/chisel/internal/setup"
 	"github.com/canonical/chisel/internal/slicer"
+	"github.com/canonical/chisel/internal/store"
+	"github.com/canonical/chisel/internal/tarball"
 	//"github.com/canonical/chisel/internal/logger"
 )
 
@@ -327,6 +329,8 @@ func run() error {
 	deb.SetLogger(log.Default())
 	setup.SetLogger(log.Default())
 	slicer.SetLogger(log.Default())
+	store.SetLogger(log.Default())
+	tarball.SetLogger(log.Default())
 	SetLogger(log.Default())
 
 	parser := Parser()

internal/archive/archive_test.go

@@ -17,8 +17,9 @@ import (
 	"strings"
 
 	"github.com/canonical/chisel/internal/archive"
-	"github.com/canonical/chisel/internal/archive/testarchive"
 	"github.com/canonical/chisel/internal/deb"
+	"github.com/canonical/chisel/internal/archive/testarchive"
+	"github.com/canonical/chisel/internal/tarball"
 	"github.com/canonical/chisel/internal/testutil"
 )
 
@@ -856,10 +857,11 @@ func (s *S) testOpenArchiveArch(c *C, test realArchiveTest, arch string) {
 	c.Assert(info.Name, DeepEquals, test.pkg)
 	c.Assert(info.Arch, DeepEquals, arch)
 
-	err = deb.Extract(pkg, &deb.ExtractOptions{
+	err = tarball.Extract(pkg, &tarball.ExtractOptions{
 		Package:   test.pkg,
 		TargetDir: extractDir,
-		Extract: map[string][]deb.ExtractInfo{
+		OpenData:  deb.DataReader,
+		Extract: map[string][]tarball.ExtractInfo{
 			fmt.Sprintf("/usr/share/doc/%s/copyright", test.pkg): {
 				{Path: "/copyright"},
 			},