all repos — homestead @ 27e64d5478221580c710287be37b60d275161cc8

Code for my website

refactor outputs->storage for generalisation

Alan Pearce
commit

27e64d5478221580c710287be37b60d275161cc8

parent

43d9ad9e254113916ffbc45c92596511fc94c7fd

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

changed files
M internal/outputs/files.gointernal/storage/files/writer.go
@@ -1,4 +1,4 @@
-package outputs +package files import ( "compress/gzip"
@@ -21,25 +21,25 @@ gzipLevel = 6
brotliLevel = 9 ) -type FilesOutput struct { +type Files struct { outputDirectory string options *Options log *log.Logger } type Options struct { - CompressFiles bool + Compress bool } -func NewFilesOutput(outputDirectory string, logger *log.Logger, opts *Options) *FilesOutput { - return &FilesOutput{ +func NewWriter(outputDirectory string, logger *log.Logger, opts *Options) *Files { + return &Files{ outputDirectory: outputDirectory, options: opts, log: logger, } } -func (f *FilesOutput) CopyRecursive(src string) error { +func (f *Files) CopyRecursive(src string) error { return filepath.WalkDir(src, func(path string, d fs.DirEntry, err error) error { if err != nil { return err
@@ -70,11 +70,11 @@ return nil
}) } -func (f *FilesOutput) Open(filename string) (io.ReadCloser, error) { +func (f *Files) Open(filename string) (io.ReadCloser, error) { return os.Open(filepath.Join(f.outputDirectory, filename)) } -func (f *FilesOutput) OutputToFile(output io.Reader, filename string) error { +func (f *Files) OutputToFile(output io.Reader, filename string) error { fn := path.Join(f.outputDirectory, filename) if err := f.mkdirp(filepath.Dir(filename)); err != nil { return err
@@ -93,7 +93,7 @@
return nil } -func (f *FilesOutput) RenderToFile(component templ.Component, filename string) error { +func (f *Files) RenderToFile(component templ.Component, filename string) error { fn := path.Join(f.outputDirectory, filename) if err := f.mkdirp(filepath.Dir(filename)); err != nil { return err
@@ -112,7 +112,7 @@
return nil } -func (f *FilesOutput) WriterToFile(writer io.WriterTo, filename string) error { +func (f *Files) WriterToFile(writer io.WriterTo, filename string) error { fn := path.Join(f.outputDirectory, filename) if err := f.mkdirp(filepath.Dir(filename)); err != nil { return err
@@ -196,15 +196,15 @@ multiWriter: io.MultiWriter(r, gz, br),
}, nil } -func (f *FilesOutput) openFileAndVariants(filename string) (io.WriteCloser, error) { - if f.options.CompressFiles { +func (f *Files) openFileAndVariants(filename string) (io.WriteCloser, error) { + if f.options.Compress { return multiOpenFile(filename) } return openFileWrite(filename) } -func (f *FilesOutput) mkdirp(dir string) error { +func (f *Files) mkdirp(dir string) error { f.log.Debug("creating directory", "dir", dir) err := os.MkdirAll(path.Join(f.outputDirectory, dir), 0755)