move the id type into spec

server/ctrlsubsonic/specid/ids.go

@@ -0,0 +1,59 @@
+package specid
+
+// this package is at such a high level in the hierarchy because
+// it's used by both `server/db` (for now) and `server/ctrlsubsonic`
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+var (
+	ErrBadSeparator = errors.New("bad separator")
+	ErrNotAnInt     = errors.New("not an int")
+	ErrBadPrefix    = errors.New("bad prefix")
+)
+
+type IDT string
+
+const (
+	Artist    IDT = "ar"
+	Album     IDT = "al"
+	Track     IDT = "tr"
+	separator     = "-"
+)
+
+type ID struct {
+	Type  IDT
+	Value int
+}
+
+func New(in string) (ID, error) {
+	parts := strings.Split(in, separator)
+	if len(parts) != 2 {
+		return ID{}, ErrBadSeparator
+	}
+	partType := parts[0]
+	partValue := parts[1]
+	val, err := strconv.Atoi(partValue)
+	if err != nil {
+		return ID{}, fmt.Errorf("%q: %w", partValue, ErrNotAnInt)
+	}
+	for _, acc := range []IDT{Artist, Album, Track} {
+		if partType == string(acc) {
+			return ID{Type: acc, Value: val}, nil
+		}
+	}
+	return ID{}, fmt.Errorf("%q: %w", partType, ErrBadPrefix)
+}
+
+func (i ID) String() string {
+	return fmt.Sprintf("%s%s%d", i.Type, separator, i.Value)
+}
+
+func (i ID) MarshalJSON() ([]byte, error) {
+	return json.Marshal(i.String())
+}

server/ctrlsubsonic/specid/ids_test.go

@@ -0,0 +1,36 @@
+package specid
+
+import (
+	"errors"
+	"testing"
+)
+
+func TestParseID(t *testing.T) {
+	tcases := []struct {
+		param    string
+		expType  IDT
+		expValue int
+		expErr   error
+	}{
+		{param: "al-45", expType: Album, expValue: 45},
+		{param: "ar-2", expType: Artist, expValue: 2},
+		{param: "tr-43", expType: Track, expValue: 43},
+		{param: "xx-1", expErr: ErrBadPrefix},
+		{param: "al-howdy", expErr: ErrNotAnInt},
+	}
+	for _, tcase := range tcases {
+		tcase := tcase // pin
+		t.Run(tcase.param, func(t *testing.T) {
+			act, err := New(tcase.param)
+			if !errors.Is(err, tcase.expErr) {
+				t.Fatalf("expected err %q, got %q", tcase.expErr, err)
+			}
+			if act.Value != tcase.expValue {
+				t.Errorf("expected value %d, got %d", tcase.expValue, act.Value)
+			}
+			if act.Type != tcase.expType {
+				t.Errorf("expected type %v, got %v", tcase.expType, act.Type)
+			}
+		})
+	}
+}