all repos — homestead @ 82424b77fba708e4450c1a0cec5b0c7967b13d7b

Code for my website

move files and update import paths

Alan Pearce
commit

82424b77fba708e4450c1a0cec5b0c7967b13d7b

parent

e24a0eb383ecedef596a5a75ded7414398ecd9d1

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

changed files
M internal/storage/files/writer.go → shared/storage/files/writer.go
@@ -6,10 +6,10 @@ "io"
 	"os"
 	"path/filepath"
 
-	"alin.ovh/homestead/internal/buffer"
-	"alin.ovh/homestead/internal/content"
-	"alin.ovh/homestead/internal/multifile"
-	"alin.ovh/homestead/internal/storage"
+	"alin.ovh/homestead/domain/content"
+	"alin.ovh/homestead/shared/buffer"
+	"alin.ovh/homestead/shared/file"
+	"alin.ovh/homestead/shared/storage"
 	"alin.ovh/x/log"
 
 	"github.com/Southclaws/fault"

@@ -64,7 +64,7 @@ if err := fd.Close(); err != nil {
 		return fault.Wrap(err)
 	}
 
-	if mf, isMultifile := fd.(*multifile.MultiFile); isMultifile {
+	if mf, isMultifile := fd.(*file.MultiFile); isMultifile {
 		err = mf.Chtimes(post.Date)
 	} else {
 		err = fault.Wrap(os.Chtimes(fd.Name(), post.Date, post.Date))

@@ -101,7 +101,7 @@ func (f *Files) WriteFile(file *storage.File, content *buffer.Buffer) error {
 	return f.Write(file.Path, file.Title, content)
 }
 
-func (f *Files) write(pathname string, content *buffer.Buffer) (multifile.FileLike, error) {
+func (f *Files) write(pathname string, content *buffer.Buffer) (file.FileLike, error) {
 	filename := pathNameToFileName(pathname)
 	err := f.Mkdirp(filepath.Dir(filename))
 	if err != nil {

@@ -129,7 +129,7 @@
 	return f, nil
 }
 
-func openFileGz(filename string) (*multifile.CompressWriter, error) {
+func openFileGz(filename string) (*file.CompressWriter, error) {
 	filenameGz := filename + ".gz"
 	f, err := openFileWrite(filenameGz)
 	if err != nil {

@@ -142,20 +142,20 @@ if baseErr != nil {
 		return nil, fault.Wrap(baseErr)
 	}
 
-	return multifile.NewCompressWriter(f, w), err
+	return file.NewCompressWriter(f, w), err
 }
 
-func openFileBrotli(filename string) (*multifile.CompressWriter, error) {
+func openFileBrotli(filename string) (*file.CompressWriter, error) {
 	filenameBrotli := filename + ".br"
 	f, err := openFileWrite(filenameBrotli)
 	if err != nil {
 		return nil, err
 	}
 
-	return multifile.NewCompressWriter(f, brotli.NewWriterLevel(f, brotliLevel)), nil
+	return file.NewCompressWriter(f, brotli.NewWriterLevel(f, brotliLevel)), nil
 }
 
-func openFileZstd(filename string) (*multifile.CompressWriter, error) {
+func openFileZstd(filename string) (*file.CompressWriter, error) {
 	f, err := openFileWrite(filename + ".zstd")
 	if err != nil {
 		return nil, err

@@ -168,10 +168,10 @@ if baseErr != nil {
 		return nil, fault.Wrap(baseErr)
 	}
 
-	return multifile.NewCompressWriter(f, w), nil
+	return file.NewCompressWriter(f, w), nil
 }
 
-func multiOpenFile(filename string) (*multifile.MultiFile, error) {
+func multiOpenFile(filename string) (*file.MultiFile, error) {
 	r, err := openFileWrite(filename)
 	if err != nil {
 		return nil, err

@@ -189,10 +189,10 @@ if err != nil {
 		return nil, err
 	}
 
-	return multifile.NewMultiFile(r, gz, br, zst), nil
+	return file.NewMultiFile(r, gz, br, zst), nil
 }
 
-func (f *Files) OpenFileAndVariants(filename string) (multifile.FileLike, error) {
+func (f *Files) OpenFileAndVariants(filename string) (file.FileLike, error) {
 	if f.options.Compress {
 		return multiOpenFile(f.join(filename))
 	}