Merge branch 'main' into multi-arch

cmd/oras/internal/display/metadata/interface.go

@@ -104,4 +104,7 @@ type ManifestIndexUpdateHandler ManifestIndexCreateHandler
 // CopyHandler handles metadata output for cp events.
 type CopyHandler interface {
 	TaggedHandler
+	Renderer
+
+	OnCopied(target *option.BinaryTarget, desc ocispec.Descriptor) error
 }

cmd/oras/internal/display/metadata/text/copy.go

@@ -18,12 +18,14 @@ package text
 import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras/cmd/oras/internal/display/metadata"
+	"oras.land/oras/cmd/oras/internal/option"
 	"oras.land/oras/cmd/oras/internal/output"
 )
 
 // CopyHandler handles text metadata output for cp events.
 type CopyHandler struct {
 	printer *output.Printer
+	desc    ocispec.Descriptor
 }
 
 // NewCopyHandler returns a new handler for cp events.
@@ -37,3 +39,14 @@ func NewCopyHandler(printer *output.Printer) metadata.CopyHandler {
 func (h *CopyHandler) OnTagged(_ ocispec.Descriptor, tag string) error {
 	return h.printer.Println("Tagged", tag)
 }
+
+// Render implements metadata.Renderer.
+func (h *CopyHandler) Render() error {
+	return h.printer.Println("Digest:", h.desc.Digest)
+}
+
+// OnCopied implements metadata.CopyHandler.
+func (h *CopyHandler) OnCopied(target *option.BinaryTarget, desc ocispec.Descriptor) error {
+	h.desc = desc
+	return h.printer.Println("Copied", target.From.AnnotatedReference(), "=>", target.To.AnnotatedReference())
+}

cmd/oras/internal/display/status/progress/humanize/bytes.go

@@ -22,7 +22,7 @@ import (
 
 const base = 1024.0
 
-var units = []string{"B", "kB", "MB", "GB", "TB"}
+var units = []string{"B", "KB", "MB", "GB", "TB"}
 
 type Bytes struct {
 	Size float64
@@ -46,7 +46,7 @@ func ToBytes(sizeInBytes int64) Bytes {
 
 // String returns the string representation of Bytes.
 func (b Bytes) String() string {
-	return fmt.Sprintf("%v %2s", b.Size, b.Unit)
+	return fmt.Sprintf("%g %2s", b.Size, b.Unit)
 }
 
 // RoundTo makes length of the size string to less than or equal to 4.

cmd/oras/internal/display/status/progress/humanize/bytes_test.go

@@ -54,10 +54,10 @@ func TestToBytes(t *testing.T) {
 	}{
 		{"0 bytes", args{0}, Bytes{0, "B"}},
 		{"1023 bytes", args{1023}, Bytes{1023, "B"}},
-		{"1 kB", args{1024}, Bytes{1, "kB"}},
-		{"1.5 kB", args{1024 + 512}, Bytes{1.5, "kB"}},
-		{"12.5 kB", args{1024 * 12.5}, Bytes{12.5, "kB"}},
-		{"512.5 kB", args{1024 * 512.5}, Bytes{513, "kB"}},
+		{"1 KB", args{1024}, Bytes{1, "KB"}},
+		{"1.5 KB", args{1024 + 512}, Bytes{1.5, "KB"}},
+		{"12.5 KB", args{1024 * 12.5}, Bytes{12.5, "KB"}},
+		{"512.5 KB", args{1024 * 512.5}, Bytes{513, "KB"}},
 		{"1 MB", args{1024 * 1024}, Bytes{1, "MB"}},
 		{"1 GB", args{1024 * 1024 * 1024}, Bytes{1, "GB"}},
 		{"1 TB", args{1024 * 1024 * 1024 * 1024}, Bytes{1, "TB"}},

cmd/oras/internal/display/status/progress/manager.go

@@ -23,46 +23,46 @@ import (
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras/cmd/oras/internal/display/status/console"
+	"oras.land/oras/internal/progress"
 )
 
 const (
-	// BufferSize is the size of the status channel buffer.
-	BufferSize       = 1
+	// bufferSize is the size of the status channel buffer.
+	bufferSize       = 1
 	framePerSecond   = 5
 	bufFlushDuration = time.Second / framePerSecond
 )
 
 var errManagerStopped = errors.New("progress output manager has already been stopped")
 
-// Manager is progress view master
-type Manager interface {
-	Add() (*Messenger, error)
-	SendAndStop(desc ocispec.Descriptor, prompt string) error
-	Close() error
-}
-
 type manager struct {
 	status       []*status
 	statusLock   sync.RWMutex
 	console      console.Console
 	updating     sync.WaitGroup
 	renderDone   chan struct{}
 	renderClosed chan struct{}
+	prompts      map[progress.State]string
 }
 
 // NewManager initialized a new progress manager.
-func NewManager(tty *os.File) (Manager, error) {
+func NewManager(tty *os.File, prompts map[progress.State]string) (progress.Manager, error) {
 	c, err := console.NewConsole(tty)
 	if err != nil {
 		return nil, err
 	}
+	return newManager(c, prompts), nil
+}
+
+func newManager(c console.Console, prompts map[progress.State]string) progress.Manager {
 	m := &manager{
 		console:      c,
 		renderDone:   make(chan struct{}),
 		renderClosed: make(chan struct{}),
+		prompts:      prompts,
 	}
 	m.start()
-	return m, nil
+	return m
 }
 
 func (m *manager) start() {
@@ -87,59 +87,54 @@ func (m *manager) start() {
 func (m *manager) render() {
 	m.statusLock.RLock()
 	defer m.statusLock.RUnlock()
-	// todo: update size in another routine
+
+	// render with culling: only the latter statuses are rendered.
+	models := m.status
 	height, width := m.console.GetHeightWidth()
-	lineCount := len(m.status) * 2
-	offset := 0
-	if lineCount > height {
-		// skip statuses that cannot be rendered
-		offset = lineCount - height
+	if n := len(m.status) - height/2; n > 0 {
+		models = models[n:]
+		if height%2 == 1 {
+			view := m.status[n-1].Render(width)
+			m.console.OutputTo(uint(len(models)*2+1), view[1])
+		}
 	}
-
-	for ; offset < lineCount; offset += 2 {
-		status, progress := m.status[offset/2].String(width)
-		m.console.OutputTo(uint(lineCount-offset), status)
-		m.console.OutputTo(uint(lineCount-offset-1), progress)
+	viewHeight := len(models) * 2
+	for i, model := range models {
+		view := model.Render(width)
+		m.console.OutputTo(uint(viewHeight-i*2), view[0])
+		m.console.OutputTo(uint(viewHeight-i*2-1), view[1])
 	}
 }
 
-// Add appends a new status with 2-line space for rendering.
-func (m *manager) Add() (*Messenger, error) {
+// Track appends a new status with 2-line space for rendering.
+func (m *manager) Track(desc ocispec.Descriptor) (progress.Tracker, error) {
 	if m.closed() {
 		return nil, errManagerStopped
 	}
 
-	s := newStatus()
+	s := newStatus(desc)
 	m.statusLock.Lock()
 	m.status = append(m.status, s)
 	m.statusLock.Unlock()
 
 	defer m.console.NewRow()
 	defer m.console.NewRow()
-	return m.statusChan(s), nil
+	return m.newTracker(s), nil
 }
 
-// SendAndStop send message for descriptor and stop timing.
-func (m *manager) SendAndStop(desc ocispec.Descriptor, prompt string) error {
-	messenger, err := m.Add()
-	if err != nil {
-		return err
-	}
-	messenger.Send(prompt, desc, desc.Size)
-	messenger.Stop()
-	return nil
-}
-
-func (m *manager) statusChan(s *status) *Messenger {
-	ch := make(chan *status, BufferSize)
+func (m *manager) newTracker(s *status) progress.Tracker {
+	ch := make(chan statusUpdate, bufferSize)
 	m.updating.Add(1)
 	go func() {
 		defer m.updating.Done()
-		for newStatus := range ch {
-			s.update(newStatus)
+		for update := range ch {
+			update(s)
 		}
 	}()
-	return &Messenger{ch: ch}
+	return &messenger{
+		update:  ch,
+		prompts: m.prompts,
+	}
 }
 
 // Close stops all status and waits for updating and rendering.

cmd/oras/internal/display/status/progress/manager_test.go

@@ -1,5 +1,3 @@
-//go:build freebsd || linux || netbsd || openbsd || solaris
-
 /*
 Copyright The ORAS Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,40 +16,92 @@ limitations under the License.
 package progress
 
 import (
-	"fmt"
+	"regexp"
 	"testing"
 
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras/cmd/oras/internal/display/status/console"
-	"oras.land/oras/internal/testutils"
+	"oras.land/oras/internal/progress"
 )
 
-func Test_manager_render(t *testing.T) {
-	pty, device, err := testutils.NewPty()
-	if err != nil {
-		t.Fatal(err)
+type mockConsole struct {
+	console.Console
+
+	view   []string
+	height int
+	width  int
+}
+
+func newMockConsole(width, height int) *mockConsole {
+	return &mockConsole{
+		height: height,
+		width:  width,
+	}
+}
+
+func (c *mockConsole) GetHeightWidth() (int, int) {
+	return c.height, c.width
+}
+
+func (c *mockConsole) NewRow() {
+	c.view = append(c.view, "")
+}
+
+func (c *mockConsole) OutputTo(upCnt uint, str string) {
+	c.view[len(c.view)-int(upCnt)] = str
+}
+
+func (c *mockConsole) Restore() {}
+
+func (c *mockConsole) Save() {}
+
+func Test_manager(t *testing.T) {
+	desc := ocispec.Descriptor{
+		MediaType: "application/vnd.docker.image.rootfs.diff.tar.gzip",
+		Size:      1234567890,
+		Digest:    "sha256:c775e7b757ede630cd0aa1113bd102661ab38829ca52a6422ab782862f268646",
+		Annotations: map[string]string{
+			"org.opencontainers.image.title": "hello.bin",
+		},
 	}
-	defer device.Close()
-	sole, err := console.NewConsole(device)
+
+	// simulate a console run
+	c := newMockConsole(80, 24)
+	m := newManager(c, map[progress.State]string{
+		progress.StateExists: "Exists",
+	})
+	tracker, err := m.Track(desc)
 	if err != nil {
-		t.Fatal(err)
+		t.Fatalf("manager.Track() error = %v, wantErr nil", err)
+	}
+	if err = tracker.Update(progress.Status{
+		State:  progress.StateExists,
+		Offset: -1,
+	}); err != nil {
+		t.Errorf("tracker.Update() error = %v, wantErr nil", err)
+	}
+	if err := tracker.Close(); err != nil {
+		t.Errorf("tracker.Close() error = %v, wantErr nil", err)
+	}
+	if err := m.Close(); err != nil {
+		t.Errorf("manager.Close() error = %v, wantErr nil", err)
 	}
 
-	m := &manager{
-		console: sole,
+	// verify the console output
+	want := []string{
+		"✓ Exists hello.bin                                   1.15/1.15 GB 100.00%     0s",
+		"  └─ sha256:c775e7b757ede630cd0aa1113bd102661ab38829ca52a6422ab782862f268646    ",
 	}
-	height, _ := m.console.GetHeightWidth()
-	for i := 0; i < height; i++ {
-		if _, err := m.Add(); err != nil {
-			t.Fatal(err)
-		}
+	if len(c.view) != len(want) {
+		t.Errorf("console view length = %d, want %d", len(c.view), len(want))
 	}
-	m.render()
-	// validate
-	var want []string
-	for i := height; i > 0; i -= 2 {
-		want = append(want, fmt.Sprintf("%dF%s", i, zeroStatus))
+	escRegexp := regexp.MustCompile("\x1b\\[[0-9]+m")
+	equal := func(got, want string) bool {
+		return escRegexp.ReplaceAllString(got, "") == want
 	}
-	if err = testutils.MatchPty(pty, device, want...); err != nil {
-		t.Fatal(err)
+	for i, v := range want {
+		if !equal(c.view[i], v) {
+			t.Errorf("console view[%d] = %q, want %q", i, c.view[i], v)
+		}
 	}
 }