Add Makefile targets for go vet and go fix, use named struct fields in tests, apply go fix improvements
This commit is contained in:
parent
a96b765794
commit
30a5786adf
7 changed files with 34 additions and 28 deletions
|
|
@ -6,6 +6,7 @@ import (
|
|||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
|
@ -34,7 +35,7 @@ func (e Entry) getFieldMarshalChan() chan metaRes {
|
|||
ch := make(chan metaRes, size)
|
||||
var wg sync.WaitGroup
|
||||
|
||||
for i := 0; i < size; i++ {
|
||||
for i := range size {
|
||||
wg.Add(1)
|
||||
go func(m Meta) {
|
||||
defer wg.Done()
|
||||
|
|
@ -139,8 +140,8 @@ func scanEntry(data []byte, atEOF bool) (advance int, token []byte, err error) {
|
|||
if atEOF {
|
||||
end := []byte{32, 64, 101, 110, 100}
|
||||
token = data
|
||||
if i := bytes.Index(data, end); i >= 0 {
|
||||
token = data[0:i]
|
||||
if before, _, ok := bytes.Cut(data, end); ok {
|
||||
token = before
|
||||
}
|
||||
return len(data), token, nil
|
||||
}
|
||||
|
|
@ -198,9 +199,7 @@ func (e Entry) MarshalJSON() ([]byte, error) {
|
|||
out := map[string]any{}
|
||||
out["title"] = e.Title
|
||||
out["date"] = e.Date.Format(time.RFC3339)
|
||||
for k, v := range e.Fields.Map() {
|
||||
out[k] = v
|
||||
}
|
||||
maps.Copy(out, e.Fields.Map())
|
||||
return json.Marshal(out)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue