apollo/enbas
1
0
Fork 0
Code Issues 4 Pull requests Projects Activity Actions

more error cleanup

Browse source
This commit is contained in:
Dan Anglin 2024-08-17 11:01:52 +01:00
parent 87d8f0ad04
commit 684b4426eb
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/executor/create.go
View file

@ -234,6 +234,7 @@ func (c *CreateExecutor) createStatus(gtsClient *client.Client) error {
func (c *CreateExecutor) createMediaAttachment(gtsClient *client.Client) error { func (c *CreateExecutor) createMediaAttachment(gtsClient *client.Client) error {
expectedNumValues := 1 expectedNumValues := 1
if !c.mediaFiles.ExpectedLength(expectedNumValues) { if !c.mediaFiles.ExpectedLength(expectedNumValues) {
return UnexpectedNumValuesError{ return UnexpectedNumValuesError{
name: "media files", name: "media files",

30
internal/executor/edit.go
View file

@ -69,10 +69,11 @@ func (e *EditExecutor) editMediaAttachment(gtsClient *client.Client) error {
expectedNumValues := 1 expectedNumValues := 1
if !e.attachmentIDs.ExpectedLength(expectedNumValues) { if !e.attachmentIDs.ExpectedLength(expectedNumValues) {
return fmt.Errorf( return UnexpectedNumValuesError{
"received an unexpected number of media attachment IDs: want %d", name: "media attachment IDs",
expectedNumValues, expected: expectedNumValues,
) actual: len(e.attachmentIDs),
}
} }
attachment, err := gtsClient.GetMediaAttachment(e.attachmentIDs[0]) attachment, err := gtsClient.GetMediaAttachment(e.attachmentIDs[0])
@ -83,18 +84,21 @@ func (e *EditExecutor) editMediaAttachment(gtsClient *client.Client) error {
description := attachment.Description description := attachment.Description
if !e.mediaDescriptions.Empty() { if !e.mediaDescriptions.Empty() {
if !e.mediaDescriptions.ExpectedLength(expectedNumValues) { if !e.mediaDescriptions.ExpectedLength(expectedNumValues) {
return fmt.Errorf( return UnexpectedNumValuesError{
"received an unexpected number of media descriptions: want %d", name: "media description",
expectedNumValues, expected: expectedNumValues,
) actual: len(e.mediaDescriptions),
}
} }
var err error var err error
description, err = utilities.ReadContents(e.mediaDescriptions[0]) description, err = utilities.ReadContents(e.mediaDescriptions[0])
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf(
"unable to read the contents from %s: %w", "unable to read the contents from %s: %w",
e.mediaDescriptions[0], 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) focus := fmt.Sprintf("%f,%f", attachment.Meta.Focus.X, attachment.Meta.Focus.Y)
if !e.mediaFocusValues.Empty() { if !e.mediaFocusValues.Empty() {
if !e.mediaFocusValues.ExpectedLength(expectedNumValues) { if !e.mediaFocusValues.ExpectedLength(expectedNumValues) {
return fmt.Errorf( return UnexpectedNumValuesError{
"received an unexpected number of media focus values: want %d", name: "media focus values",
expectedNumValues, expected: expectedNumValues,
) actual: len(e.mediaFocusValues),
}
} }
focus = e.mediaFocusValues[0] focus = e.mediaFocusValues[0]
} }