all repos — homestead @ 82424b77fba708e4450c1a0cec5b0c7967b13d7b

Code for my website

move files and update import paths

Alan Pearce
commit

82424b77fba708e4450c1a0cec5b0c7967b13d7b

parent

e24a0eb383ecedef596a5a75ded7414398ecd9d1

69 files changed, 108 insertions(+), 108 deletions(-)

changed files
M .ko.yaml.ko.yaml
@@ -5,5 +5,5 @@ flags:
- -tags - timetzdata ldflags: - - -X alin.ovh/homestead/internal/server.CommitSHA={{ .Git.FullCommit }} - - -X alin.ovh/homestead/internal/server.ShortSHA={{ .Git.ShortCommit }} + - -X alin.ovh/homestead/domain/web/server.CommitSHA={{ .Git.FullCommit }} + - -X alin.ovh/homestead/domain/web/server.ShortSHA={{ .Git.ShortCommit }}
M cmd/barkeep/main.gocmd/barkeep/main.go
@@ -7,9 +7,9 @@ "os"
"github.com/ardanlabs/conf/v3" - "alin.ovh/homestead/internal/publisher" - "alin.ovh/homestead/internal/server" - "alin.ovh/homestead/internal/tssrv" + "alin.ovh/homestead/domain/content/publisher" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/domain/web/tssrv" "alin.ovh/x/log" )
M cmd/build/main.gocmd/build/main.go
@@ -7,13 +7,13 @@ "fmt"
"os" "path/filepath" - "alin.ovh/homestead/internal/builder" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/file" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/files" - "alin.ovh/homestead/internal/storage/sqlite" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content/builder" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/file" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/files" + "alin.ovh/homestead/shared/storage/sqlite" + "alin.ovh/homestead/shared/vcs" "alin.ovh/x/log" "github.com/ardanlabs/conf/v3"
M internal/atom/atom.godomain/indieweb/atom/atom.go
@@ -6,8 +6,8 @@ "encoding/xml"
"net/url" "time" + "alin.ovh/homestead/shared/config" "github.com/Southclaws/fault" - "alin.ovh/homestead/internal/config" ) func MakeTagURI(config *config.Config, specific string) string {
M internal/builder/builder.godomain/content/builder/builder.go
@@ -9,13 +9,13 @@ "path/filepath"
"slices" "time" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/builder/template" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" - "alin.ovh/homestead/internal/sitemap" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/domain/content/builder/template" + "alin.ovh/homestead/domain/indieweb/sitemap" + "alin.ovh/homestead/shared/buffer" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/vcs" "alin.ovh/homestead/templates" "alin.ovh/x/log"
M internal/builder/template/template.godomain/content/builder/template/template.go
@@ -6,9 +6,9 @@ "encoding/xml"
"io" "text/template" - "alin.ovh/homestead/internal/atom" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/domain/indieweb/atom" + "alin.ovh/homestead/shared/config" "alin.ovh/homestead/templates" "github.com/PuerkitoBio/goquery"
M internal/cache/cache.goshared/cache/cache.go
@@ -4,7 +4,7 @@ import (
"os" "path/filepath" - "alin.ovh/homestead/internal/file" + "alin.ovh/homestead/shared/file" ) var home string
M internal/calendar/calendar.godomain/calendar/calendar.go
@@ -11,13 +11,13 @@ "os"
"slices" "time" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" - "alin.ovh/x/log" ical "vimagination.zapto.org/ics" - "alin.ovh/homestead/internal/cache" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/cache" + "alin.ovh/homestead/shared/config" ) const Filename = "calendar.ics"
M internal/content/posts.godomain/content/posts.go
@@ -12,8 +12,8 @@ "slices"
"strings" "time" - "alin.ovh/homestead/internal/markdown" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content/markdown" + "alin.ovh/homestead/shared/vcs" "alin.ovh/x/log" "github.com/Southclaws/fault"
M internal/events/redis.goshared/events/redis.go
@@ -7,10 +7,10 @@ "fmt"
"strconv" "time" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" "github.com/redis/go-redis/v9" - "alin.ovh/x/log" "go.uber.org/zap" )
M internal/fetcher/fetcher.godomain/content/fetcher/fetcher.go
@@ -15,12 +15,12 @@ "strconv"
"strings" "time" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/events" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" "github.com/google/renameio/v2" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/events" - "alin.ovh/x/log" ) var files = []string{"config.toml", "site.db"}
M internal/multibuf/writecloser.goshared/buffer/writecloser.go
@@ -1,4 +1,4 @@
-package multibuf +package buffer import ( "io"
M internal/multifile/compress.goshared/file/compress.go
@@ -1,4 +1,4 @@
-package multifile +package file import ( "errors"
M internal/multifile/multifile.goshared/file/multifile.go
@@ -1,4 +1,4 @@
-package multifile +package file import ( "errors"
M internal/publisher/app.godomain/content/publisher/app.go
@@ -7,9 +7,9 @@ "github.com/Southclaws/fault"
"github.com/Southclaws/fault/fmsg" "go.hacdias.com/indielib/indieauth" - "alin.ovh/homestead/internal/config" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/shared/config" "alin.ovh/homestead/templates" "alin.ovh/x/log" )
M internal/publisher/mux.godomain/content/publisher/mux.go
@@ -3,8 +3,8 @@
import ( "net/http" - ihttp "alin.ovh/homestead/internal/http" - pubtpl "alin.ovh/homestead/internal/publisher/templates" + pubtpl "alin.ovh/homestead/domain/content/publisher/templates" + ihttp "alin.ovh/homestead/domain/web/middleware" "alin.ovh/homestead/templates" )
M internal/server/server.godomain/web/server/server.go
@@ -7,8 +7,8 @@ "fmt"
"net/http" "time" - "github.com/osdevisnot/sorvor/pkg/livereload" "alin.ovh/x/log" + "github.com/osdevisnot/sorvor/pkg/livereload" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg"
M internal/server/tcp.godomain/web/server/tcp.go
@@ -4,8 +4,8 @@ import (
"net" "strconv" - "github.com/Southclaws/fault" "alin.ovh/x/listenfd" + "github.com/Southclaws/fault" ) func (s *Server) serveTCP() error {
M internal/sitemap/sitemap.godomain/indieweb/sitemap/sitemap.go
@@ -4,7 +4,7 @@ import (
"io" "time" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" "github.com/snabb/sitemap" )
M internal/stats/goatcounter/count.godomain/analytics/goatcounter/count.go
@@ -8,10 +8,10 @@ "io"
"net/http" "time" + "alin.ovh/homestead/shared/config" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" - "alin.ovh/homestead/internal/config" - "alin.ovh/x/log" ) const timeout = 5 * time.Second
M internal/storage/file.goshared/storage/file.go
@@ -5,8 +5,8 @@ "io"
"strings" "time" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/builder/template" + "alin.ovh/homestead/domain/content/builder/template" + "alin.ovh/homestead/shared/buffer" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" )
M internal/storage/files/file.goshared/storage/files/file.go
@@ -10,8 +10,8 @@ "os"
"path/filepath" "strings" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/storage" + "alin.ovh/homestead/shared/buffer" + "alin.ovh/homestead/shared/storage" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" )
M internal/storage/files/reader.goshared/storage/files/reader.go
@@ -6,7 +6,7 @@ "io/fs"
"path/filepath" "strings" - "alin.ovh/homestead/internal/storage" + "alin.ovh/homestead/shared/storage" "alin.ovh/x/log" "github.com/Southclaws/fault"
M internal/storage/files/writer.goshared/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)) }
M internal/storage/interface.goshared/storage/interface.go
@@ -1,8 +1,8 @@
package storage import ( - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/buffer" ) type Reader interface {
M internal/storage/sqlite/reader.goshared/storage/sqlite/reader.go
@@ -7,9 +7,9 @@ "encoding/json"
"strings" "time" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/sqlite/db" + "alin.ovh/homestead/shared/buffer" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/sqlite/db" "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg"
M internal/storage/sqlite/writer.goshared/storage/sqlite/writer.go
@@ -13,10 +13,10 @@ "os"
"path/filepath" "time" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/content" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/sqlite/db" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/buffer" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/sqlite/db" "alin.ovh/x/log" "github.com/andybalholm/brotli" "github.com/klauspost/compress/gzip"
M internal/vcs/repository.goshared/vcs/repository.go
@@ -4,8 +4,8 @@ import (
"errors" "os" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/file" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/file" "alin.ovh/x/log" "github.com/Southclaws/fault"
M internal/website/mux.godomain/web/mux.go
@@ -8,8 +8,8 @@ "regexp"
"slices" "strings" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" "alin.ovh/homestead/templates" "github.com/kevinpollet/nego"
M internal/website/website.godomain/web/website.go
@@ -9,18 +9,18 @@ "slices"
"sync" "time" - "alin.ovh/homestead/internal/calendar" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/events" - "alin.ovh/homestead/internal/fetcher" - "alin.ovh/homestead/internal/file" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" - "alin.ovh/homestead/internal/stats" - "alin.ovh/homestead/internal/stats/goatcounter" - "alin.ovh/homestead/internal/stats/nullcounter" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/sqlite" + stats "alin.ovh/homestead/domain/analytics" + "alin.ovh/homestead/domain/analytics/goatcounter" + "alin.ovh/homestead/domain/analytics/nullcounter" + "alin.ovh/homestead/domain/calendar" + "alin.ovh/homestead/domain/content/fetcher" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/events" + "alin.ovh/homestead/shared/file" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/sqlite" "alin.ovh/homestead/templates" "alin.ovh/x/log" "github.com/Southclaws/fault"
M main.gomain.go
@@ -8,8 +8,8 @@ "os"
"os/signal" "time" - "alin.ovh/homestead/internal/server" - "alin.ovh/homestead/internal/website" + website "alin.ovh/homestead/domain/web" + "alin.ovh/homestead/domain/web/server" "alin.ovh/x/log" "github.com/ardanlabs/conf/v3"
M sqlc.yamlsqlc.yaml
@@ -1,11 +1,11 @@
version: "2" sql: - engine: "sqlite" - queries: "query.sql" - schema: "schema.sql" + queries: "shared/storage/sqlite/query.sql" + schema: "shared/storage/sqlite/schema.sql" database: uri: "file:db.sqlite3?mode=rwc" gen: go: - out: "internal/storage/sqlite/db" + out: "shared/storage/sqlite/db" emit_prepared_queries: true
M templates/calendar.gotemplates/calendar.go
@@ -9,7 +9,7 @@ c "alin.ovh/gomponents/components"
. "alin.ovh/gomponents/html" "vimagination.zapto.org/ics" - "alin.ovh/homestead/internal/calendar" + "alin.ovh/homestead/domain/calendar" ) func CalendarPage(
M templates/error.gotemplates/error.go
@@ -3,10 +3,9 @@
import ( "strconv" - "alin.ovh/homestead/internal/http" - g "alin.ovh/gomponents" . "alin.ovh/gomponents/html" + http "alin.ovh/homestead/domain/web/middleware" ) func Error(site SiteSettings, err *http.Error) g.Node {
M templates/files.gotemplates/files.go
@@ -4,7 +4,7 @@ import (
"io/fs" "os" - "alin.ovh/homestead/internal/env" + "alin.ovh/homestead/shared/env" ) var (
M templates/gopkg.gotemplates/gopkg.go
@@ -6,7 +6,7 @@ "net/url"
g "alin.ovh/gomponents" . "alin.ovh/gomponents/html" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" ) type GoPackageVars struct {
@@ -77,6 +77,7 @@ func must[T any](t T, err error) T {
if err != nil { panic(err) } + return t }
M templates/homepage.gotemplates/homepage.go
@@ -1,8 +1,8 @@
package templates import ( - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/config" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/layout.gotemplates/layout.go
@@ -3,7 +3,7 @@
import ( "io" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" "github.com/Southclaws/fault" "github.com/alanpearce/htmlformat"
M templates/list.gotemplates/list.go
@@ -1,7 +1,7 @@
package templates import ( - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/page.gotemplates/page.go
@@ -1,7 +1,7 @@
package templates import ( - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/post.gotemplates/post.go
@@ -3,8 +3,8 @@
import ( "time" - "alin.ovh/homestead/internal/content" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/vcs" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"