Skip to content

Commit 6a12d46

Browse files
committed
Fixes to edit and remove
1 parent dbb35d3 commit 6a12d46

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

internal/app/edit/edit.go

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,26 @@ package edit
33
import (
44
"bufio"
55
"bytes"
6+
"errors"
67
"fmt"
78
"path/filepath"
8-
"slices"
99

1010
"github.com/DanWlker/remind/internal/data"
11-
r_error "github.com/DanWlker/remind/internal/error"
11+
i_error "github.com/DanWlker/remind/internal/error"
1212
"github.com/DanWlker/remind/internal/record"
1313
"github.com/DanWlker/remind/internal/shared"
1414
)
1515

1616
func editTodoAssociatedWith(directory string) error {
17-
recordItems, err := record.GetFileContents()
18-
if err != nil {
19-
return fmt.Errorf("record.GetFileContents: %w", err)
20-
}
21-
22-
idx := slices.IndexFunc(recordItems, func(item record.RecordEntity) bool {
23-
return item.Path == directory
24-
})
25-
if idx == -1 {
26-
return r_error.RecordDoesNotExistError{ID: directory}
17+
current, err := record.GetRecordEntityWithIdentifier(directory)
18+
var errRecordDoesNotExist i_error.RecordDoesNotExistError
19+
if errors.As(err, &errRecordDoesNotExist) {
20+
recordIdentifier := errRecordDoesNotExist.ID
21+
fmt.Println("No record linked to this folder found: " + recordIdentifier)
22+
return nil
23+
} else if err != nil {
24+
return fmt.Errorf("record.GetRecordEntityWithIdentifier: %w", err)
2725
}
28-
current := &recordItems[idx]
2926

3027
dataFolder, err := data.GetFolder()
3128
if err != nil {

internal/app/remove/remove.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
package remove
22

33
import (
4+
"errors"
45
"fmt"
56
"path/filepath"
67
"strconv"
78

89
"github.com/DanWlker/remind/internal/data"
10+
i_error "github.com/DanWlker/remind/internal/error"
911
"github.com/DanWlker/remind/internal/record"
1012
"github.com/DanWlker/remind/internal/shared"
1113
)
1214

1315
func removeTodoAssociatedWith(directory string, indexesToRemove map[int]bool) error {
1416
projectRecordEntity, err := record.GetRecordEntityWithIdentifier(directory)
15-
if err != nil {
17+
var errRecordDoesNotExist i_error.RecordDoesNotExistError
18+
if errors.As(err, &errRecordDoesNotExist) {
19+
recordIdentifier := errRecordDoesNotExist.ID
20+
fmt.Println("No record linked to this folder found: " + recordIdentifier)
21+
return nil
22+
} else if err != nil {
1623
return fmt.Errorf("record.GetRecordEntityWithIdentifier: %w", err)
1724
}
1825

@@ -44,7 +51,12 @@ func removeTodoAssociatedWith(directory string, indexesToRemove map[int]bool) er
4451

4552
func removeAllTodosAssociatedWith(directory string) error {
4653
projectRecordEntity, err := record.GetRecordEntityWithIdentifier(directory)
47-
if err != nil {
54+
var errRecordDoesNotExist i_error.RecordDoesNotExistError
55+
if errors.As(err, &errRecordDoesNotExist) {
56+
recordIdentifier := errRecordDoesNotExist.ID
57+
fmt.Println("No record linked to this folder found: " + recordIdentifier)
58+
return nil
59+
} else if err != nil {
4860
return fmt.Errorf("record.GetRecordEntityWithIdentifier: %w", err)
4961
}
5062

0 commit comments

Comments
 (0)