all repos — homestead @ 20dd619b8605660dac67fa435d711e5f22da3174

Code for my website

ensure reasonable ordering of declarations in source

Alan Pearce
commit

20dd619b8605660dac67fa435d711e5f22da3174

parent

6f41d182abaf1af16fd0cc697abf0f2e9ce54c5c

1 file changed, 22 insertions(+), 22 deletions(-)

changed files
M shared/storage/files/writer.goshared/storage/files/writer.go
@@ -18,11 +18,6 @@ "github.com/andybalholm/brotli"
"github.com/klauspost/compress/zstd" ) -const ( - gzipLevel = 6 - brotliLevel = 9 -) - type Files struct { outputDirectory string options *Options
@@ -32,6 +27,11 @@
type Options struct { Compress bool } + +const ( + gzipLevel = 6 + brotliLevel = 9 +) func NewWriter(outputDirectory string, logger *log.Logger, opts *Options) (*Files, error) { return &Files{
@@ -101,6 +101,23 @@ func (f *Files) WriteFile(file *storage.File, content *buffer.Buffer) error {
return f.Write(file.Path, file.Title, content) } +func (f *Files) OpenFileAndVariants(filename string) (file.FileLike, error) { + if f.options.Compress { + return multiOpenFile(f.join(filename)) + } + + return openFileWrite(f.join(filename)) +} + +func (f *Files) Mkdirp(dir string) error { + err := os.MkdirAll(f.join(dir), 0o750) + if err != nil { + return fault.Wrap(err, fmsg.With("could not create directory")) + } + + return nil +} + func (f *Files) write(pathname string, content *buffer.Buffer) (file.FileLike, error) { filename := pathNameToFileName(pathname) err := f.Mkdirp(filepath.Dir(filename))
@@ -190,23 +207,6 @@ return nil, err
} return file.NewMultiFile(r, gz, br, zst), nil -} - -func (f *Files) OpenFileAndVariants(filename string) (file.FileLike, error) { - if f.options.Compress { - return multiOpenFile(f.join(filename)) - } - - return openFileWrite(f.join(filename)) -} - -func (f *Files) Mkdirp(dir string) error { - err := os.MkdirAll(f.join(dir), 0o750) - if err != nil { - return fault.Wrap(err, fmsg.With("could not create directory")) - } - - return nil } func (f *Files) join(filename string) string {