all repos — website @ becede4bfead952239b9cf7c8eb9fb96d01534ec

My website

refactor/format

Alan Pearce
commit

becede4bfead952239b9cf7c8eb9fb96d01534ec

parent

4f5ca39f582d83ded08a6e1cbf1a195141623b1c

1 file changed, 24 insertions(+), 16 deletions(-)

changed files
M internal/builder/files.gointernal/builder/files.go
@@ -32,6 +32,7 @@ if err != nil {
lastErr = err } } + return lastErr }
@@ -45,6 +46,7 @@ f, err := openFileWrite(filenameGz)
if err != nil { return nil, err } + return gzip.NewWriterLevel(f, gzipLevel) }
@@ -54,6 +56,7 @@ f, err := openFileWrite(filenameBrotli)
if err != nil { return nil, err } + return brotli.NewWriterLevel(f, brotliLevel), nil }
@@ -70,6 +73,7 @@ br, err := openFileBrotli(filename)
if err != nil { return nil, err } + return &MultiWriteCloser{ writers: []io.WriteCloser{r, gz, br}, multiWriter: io.MultiWriter(r, gz, br),
@@ -79,34 +83,38 @@
func openFileAndVariants(filename string) (io.WriteCloser, error) { if compressFiles { return multiOpenFile(filename) - } else { - return openFileWrite(filename) } + + return openFileWrite(filename) } func copyRecursive(src, dst string) error { return filepath.WalkDir(src, func(path string, d fs.DirEntry, err error) error { + if err != nil { + return err + } rel, err := filepath.Rel(src, path) if err != nil { return err } if d.IsDir() { return mkdirp(dst, rel) - } else { - sf, err := os.Open(path) - if err != nil { - return err - } - defer sf.Close() - df, err := openFileAndVariants(filepath.Join(dst, rel)) - if err != nil { - return err - } - defer df.Close() - if _, err := io.Copy(df, sf); err != nil { - return err - } + } + + sf, err := os.Open(path) + if err != nil { + return err } + defer sf.Close() + df, err := openFileAndVariants(filepath.Join(dst, rel)) + if err != nil { + return err + } + defer df.Close() + if _, err := io.Copy(df, sf); err != nil { + return err + } + return nil }) }