all repos — homestead @ fad67bb33d68e1ab0a03868c089ddd697bce012a

Code for my website

fix linter complaints

Alan Pearce
commit

fad67bb33d68e1ab0a03868c089ddd697bce012a

parent

b6e41746f7db00110e6dd3299dc616f9026338ca

M internal/buffer/buffer_test.gointernal/buffer/buffer_test.go
@@ -6,6 +6,7 @@ "testing"
) func TestWrite(t *testing.T) { + t.Parallel() b := Buffer{} data := []byte("test")
@@ -24,21 +25,27 @@ }
} func TestRead(t *testing.T) { + t.Parallel() b := NewBuffer([]byte("testdata")) p := make([]byte, 3) n, err := b.Read(p) - if n != 3 || string(p[:n]) != "tes" { - t.Errorf("Read returned incorrect data: expected 'tes', got '%s'", p[:n]) + if n != 3 || string(p[:n]) != "tes" || err != nil { + t.Errorf("Read returned incorrect data: expected 'tes', got '%s', error: %v", p[:n], err) } b.Reset() - b.Write([]byte("abc")) + data := []byte("abc") + n, err = b.Write(data) + if n != 3 || err != nil { + t.Errorf("Write failed: expected %d bytes, got %d, error: %v", len(data), n, err) + } + p = make([]byte, 2) n, err = b.Read(p) - if n != 2 || string(p) != "ab" { - t.Errorf("Read after reset failed: expected 'ab', got '%s'", p) + if n != 2 || string(p) != "ab" || err != nil { + t.Errorf("Read after reset failed: expected 'ab', got '%s', error: %v", p, err) } b.pos = b.len
@@ -49,8 +56,13 @@ }
} func TestReset(t *testing.T) { + t.Parallel() b := NewBuffer([]byte("test")) - b.Write([]byte("data")) + data := []byte("data") + n, err := b.Write(data) + if n != 4 || err != nil { + t.Errorf("Write failed: expected %d bytes, got %d, error: %v", len(data), n, err) + } if b.Len() != 8 || b.pos != 0 { t.Errorf("Initial buffer state incorrect: len=%d, pos=%d", b.Len(), b.pos)
@@ -63,6 +75,7 @@ }
} func TestSeek(t *testing.T) { + t.Parallel() b := NewBuffer([]byte("test")) tests := []struct { offset int64
M internal/builder/builder.gointernal/builder/builder.go
@@ -44,6 +44,7 @@ }
func copyRecursive(storage storage.Writer, src string) error { buf := new(buffer.Buffer) + return filepath.WalkDir(src, func(path string, d fs.DirEntry, err error) error { if err != nil { return err
@@ -238,7 +239,9 @@ r.Hashes = append(r.Hashes, h)
log.Debug("rendering sitemap") buf.Reset() - sitemap.WriteTo(buf) + if _, err := sitemap.WriteTo(buf); err != nil { + return nil, err + } if err := storage.Write("/sitemap.xml", buf); err != nil { return nil, err }
M internal/storage/files/file.gointernal/storage/files/file.go
@@ -14,8 +14,6 @@ "go.alanpearce.eu/website/internal/buffer"
"go.alanpearce.eu/website/internal/storage" ) -type Content io.ReadSeekCloser - var encodings = map[string]string{ "br": ".br", "gzip": ".gz",
@@ -83,7 +81,7 @@ }
func pathNameToFileName(pathname string) string { if strings.HasSuffix(pathname, "/") { - pathname = pathname + "index.html" + pathname += "index.html" } return strings.TrimPrefix(pathname, "/")
M internal/vcs/repository.gointernal/vcs/repository.go
@@ -80,6 +80,7 @@ var hash plumbing.Hash
for _, ref := range refs { if ref.Name() == plumbing.Main { hash = ref.Hash() + break } }
M internal/watcher/watcher.gointernal/watcher/watcher.go
@@ -62,6 +62,7 @@ }
if entry.IsDir() { if entry.Name() == ".git" { l.Debug("skipping directory", "entry", entry.Name()) + return fs.SkipDir } l.Debug("adding directory to watcher", "path", path)