Merge remote-tracking branch 'origin/pkgserver' into pkgserver

This exposes the new OpenStatus cache method.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/mbf/main.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"os/signal"
@@ -260,6 +261,30 @@ func main() {
 			)
 	}
 
+	c.NewCommand(
+		"status",
+		"Display the status file of an artifact",
+		func(args []string) error {
+			if len(args) != 1 {
+				return errors.New("status requires 1 argument")
+			}
+			if p, ok := rosa.ResolveName(args[0]); !ok {
+				return fmt.Errorf("unknown artifact %q", args[0])
+			} else {
+				r, err := cache.OpenStatus(rosa.Std.Load(p))
+				if err != nil {
+					if errors.Is(err, os.ErrNotExist) {
+						return errors.New(args[0] + " was never cured")
+					}
+					return err
+				}
+
+				_, err = io.Copy(os.Stdout, r)
+				return errors.Join(err, r.Close())
+			}
+		},
+	)
+
 	{
 		var (
 			flagNet     bool

internal/pkg/pkg.go

@@ -1790,6 +1790,18 @@ func (pending *pendingArtifactDep) cure(c *Cache) {
 	pending.errsMu.Unlock()
 }
 
+// OpenStatus attempts to open the status file associated to an [Artifact]. If
+// err is nil, the caller must close the resulting reader.
+func (c *Cache) OpenStatus(a Artifact) (r io.ReadSeekCloser, err error) {
+	c.identMu.RLock()
+	r, err = os.Open(c.base.Append(
+		dirStatus,
+		Encode(c.Ident(a).Value())).String(),
+	)
+	c.identMu.RUnlock()
+	return
+}
+
 // Close cancels all pending cures and waits for them to clean up.
 func (c *Cache) Close() {
 	c.closeOnce.Do(func() {

internal/rosa/all.go

@@ -120,8 +120,8 @@ const (
 	Zlib
 	Zstd
 
-	// _presetUnexportedStart is the first unexported preset.
+	// PresetUnexportedStart is the first unexported preset.
-	_presetUnexportedStart
+	PresetUnexportedStart
 
 	buildcatrust = iota - 1
 	utilMacros
@@ -137,8 +137,8 @@ const (
 	// part of the [Std] toolchain.
 	Stage0
 
-	// _presetEnd is the total number of presets and does not denote a preset.
+	// PresetEnd is the total number of presets and does not denote a preset.
-	_presetEnd
+	PresetEnd
 )
 
 // Metadata is stage-agnostic information of a [PArtifact] not directly
@@ -159,7 +159,7 @@ const Unversioned = "\x00"
 
 var (
 	// artifactsM is an array of [PArtifact] metadata.
-	artifactsM [_presetEnd]Metadata
+	artifactsM [PresetEnd]Metadata
 
 	// artifacts stores the result of Metadata.f.
 	artifacts [_toolchainEnd][len(artifactsM)]pkg.Artifact
@@ -190,7 +190,7 @@ func (t Toolchain) Version(p PArtifact) string {
 
 // ResolveName returns a [PArtifact] by name.
 func ResolveName(name string) (p PArtifact, ok bool) {
-	for i := range _presetUnexportedStart {
+	for i := range PresetUnexportedStart {
 		if name == artifactsM[i].Name {
 			return i, true
 		}

internal/rosa/all_test.go

@@ -1,19 +1,20 @@
-package rosa
+package rosa_test
 
-import "testing"
+import (
+	"testing"
 
-// PresetEnd is the total PArtifact count exported for testing.
+	"hakurei.app/internal/rosa"
-const PresetEnd = _presetEnd
+)
 
 func TestLoad(t *testing.T) {
 	t.Parallel()
 
-	for i := range _presetEnd {
+	for i := range rosa.PresetEnd {
-		p := PArtifact(i)
+		p := rosa.PArtifact(i)
-		t.Run(GetMetadata(p).Name, func(t *testing.T) {
+		t.Run(rosa.GetMetadata(p).Name, func(t *testing.T) {
 			t.Parallel()
 
-			Std.Load(p)
+			rosa.Std.Load(p)
 		})
 	}
 }
@@ -21,13 +22,13 @@ func TestLoad(t *testing.T) {
 func TestResolveName(t *testing.T) {
 	t.Parallel()
 
-	for i := range _presetUnexportedStart {
+	for i := range rosa.PresetUnexportedStart {
 		p := i
-		name := GetMetadata(p).Name
+		name := rosa.GetMetadata(p).Name
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			if got, ok := ResolveName(name); !ok {
+			if got, ok := rosa.ResolveName(name); !ok {
 				t.Fatal("ResolveName: ok = false")
 			} else if got != p {
 				t.Fatalf("ResolveName: %d, want %d", got, p)
@@ -38,13 +39,13 @@ func TestResolveName(t *testing.T) {
 func TestResolveNameUnexported(t *testing.T) {
 	t.Parallel()
 
-	for i := _presetUnexportedStart; i < _presetEnd; i++ {
+	for i := rosa.PresetUnexportedStart; i < rosa.PresetEnd; i++ {
 		p := i
-		name := GetMetadata(p).Name
+		name := rosa.GetMetadata(p).Name
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			if got, ok := ResolveName(name); ok {
+			if got, ok := rosa.ResolveName(name); ok {
 				t.Fatalf("ResolveName: resolved unexported preset %d", got)
 			}
 		})

internal/rosa/zlib.go

@@ -4,11 +4,11 @@ import "hakurei.app/internal/pkg"
 
 func (t Toolchain) newZlib() (pkg.Artifact, string) {
 	const (
-		version  = "1.3.1"
+		version  = "1.3.2"
-		checksum = "E-eIpNzE8oJ5DsqH4UuA_0GDKuQF5csqI8ooDx2w7Vx-woJ2mb-YtSbEyIMN44mH"
+		checksum = "KHZrePe42vL2XvOUE3KlJkp1UgWhWkl0jjT_BOvFhuM4GzieEH9S7CioepOFVGYB"
 	)
 	return t.NewPackage("zlib", version, pkg.NewHTTPGetTar(
-		nil, "https://zlib.net/zlib-"+version+".tar.gz",
+		nil, "https://www.zlib.net/fossils/zlib-"+version+".tar.gz",
 		mustDecode(checksum),
 		pkg.TarGzip,
 	), &PackageAttr{