From 684b4426ebee0d4173c273d3c8032dc56563274e Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 17 Aug 2024 11:01:52 +0100
Subject: [PATCH] more error cleanup

---
 internal/executor/create.go |  1 +
 internal/executor/edit.go   | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/internal/executor/create.go b/internal/executor/create.go
index 9f40d9b..10d8367 100644
--- a/internal/executor/create.go
+++ b/internal/executor/create.go
@@ -234,6 +234,7 @@ func (c *CreateExecutor) createStatus(gtsClient *client.Client) error {
 
 func (c *CreateExecutor) createMediaAttachment(gtsClient *client.Client) error {
 	expectedNumValues := 1
+
 	if !c.mediaFiles.ExpectedLength(expectedNumValues) {
 		return UnexpectedNumValuesError{
 			name:     "media files",
diff --git a/internal/executor/edit.go b/internal/executor/edit.go
index b6097de..f2247bf 100644
--- a/internal/executor/edit.go
+++ b/internal/executor/edit.go
@@ -69,10 +69,11 @@ func (e *EditExecutor) editMediaAttachment(gtsClient *client.Client) error {
 	expectedNumValues := 1
 
 	if !e.attachmentIDs.ExpectedLength(expectedNumValues) {
-		return fmt.Errorf(
-			"received an unexpected number of media attachment IDs: want %d",
-			expectedNumValues,
-		)
+		return UnexpectedNumValuesError{
+			name:     "media attachment IDs",
+			expected: expectedNumValues,
+			actual:   len(e.attachmentIDs),
+		}
 	}
 
 	attachment, err := gtsClient.GetMediaAttachment(e.attachmentIDs[0])
@@ -83,18 +84,21 @@ func (e *EditExecutor) editMediaAttachment(gtsClient *client.Client) error {
 	description := attachment.Description
 	if !e.mediaDescriptions.Empty() {
 		if !e.mediaDescriptions.ExpectedLength(expectedNumValues) {
-			return fmt.Errorf(
-				"received an unexpected number of media descriptions: want %d",
-				expectedNumValues,
-			)
+			return UnexpectedNumValuesError{
+				name:     "media description",
+				expected: expectedNumValues,
+				actual:   len(e.mediaDescriptions),
+			}
 		}
 
 		var err error
+
 		description, err = utilities.ReadContents(e.mediaDescriptions[0])
 		if err != nil {
 			return fmt.Errorf(
 				"unable to read the contents from %s: %w",
 				e.mediaDescriptions[0],
+				err,
 			)
 		}
 	}
@@ -102,11 +106,13 @@ func (e *EditExecutor) editMediaAttachment(gtsClient *client.Client) error {
 	focus := fmt.Sprintf("%f,%f", attachment.Meta.Focus.X, attachment.Meta.Focus.Y)
 	if !e.mediaFocusValues.Empty() {
 		if !e.mediaFocusValues.ExpectedLength(expectedNumValues) {
-			return fmt.Errorf(
-				"received an unexpected number of media focus values: want %d",
-				expectedNumValues,
-			)
+			return UnexpectedNumValuesError{
+				name:     "media focus values",
+				expected: expectedNumValues,
+				actual:   len(e.mediaFocusValues),
+			}
 		}
+
 		focus = e.mediaFocusValues[0]
 	}