Merge branch 'feature/translations' into develop

internal/common/common.go

@@ -1,13 +1,14 @@
 package common
 
 const (
-	HeaderAcceptLanguage string = "Accept-Language"
-	HeaderContentType    string = "Content-Type"
+	HeaderAcceptLanguage  string = "Accept-Language"
+	HeaderContentLanguage string = "Content-Language"
+	HeaderContentType     string = "Content-Type"
 )
 
 const (
-	MIMETextHTML                           string = "text/html"
-	MIMETextHTMLCharsetUTF8                string = MIMETextHTML + "; " + charsetUTF8
+	MIMETextHTML            string = "text/html"
+	MIMETextHTMLCharsetUTF8 string = MIMETextHTML + "; " + charsetUTF8
 )
 
 const charsetUTF8 string = "charset=UTF-8"

internal/domain/page.go

@@ -3,15 +3,20 @@ package domain
 import "golang.org/x/text/language"
 
 type Page struct {
-	Language    language.Tag
-	Params      map[string]any
-	File        File
-	Description string
-	Title       string
-	Content     []byte
-	Resources   Resources
+	Language     language.Tag
+	Params       map[string]any
+	File         File
+	Description  string
+	Title        string
+	Content      []byte
+	Resources    Resources
+	Translations []*Page
 }
 
 func (p Page) IsHome() bool {
 	return p.File.dir == "./" && p.File.translationBaseName == "index"
 }
+
+func (p Page) IsTranslated() bool {
+	return 1 < len(p.Translations)
+}

internal/domain/resources.go

@@ -6,14 +6,9 @@ import (
 
 type Resources []*Resource
 
-func (r Resources) GetType(targetType string) Resources {
+func (r Resources) GetType(target ResourceType) Resources {
 	out := make(Resources, 0, len(r))
 
-	target, err := ParseResourceType(targetType)
-	if err != nil {
-		return out
-	}
-
 	for i := range r {
 		if r[i].resourceType != target {
 			continue

internal/page/repository/fs/fs_page.go

@@ -60,12 +60,13 @@ func (repo *fileSystemPageRepository) Get(ctx context.Context, lang language.Tag
 	}
 
 	return &domain.Page{
-		File:        domain.NewFile(target),
-		Language:    lang,
-		Title:       data.Title,
-		Content:     data.Content,
-		Description: data.Description,
-		Params:      data.Params,
-		Resources:   make([]*domain.Resource, 0),
+		File:         domain.NewFile(target),
+		Language:     lang,
+		Title:        data.Title,
+		Content:      data.Content,
+		Description:  data.Description,
+		Params:       data.Params,
+		Resources:    make([]*domain.Resource, 0),
+		Translations: make([]*domain.Page, 0),
 	}, nil
 }

internal/page/usecase/page_ucase.go

@@ -3,7 +3,9 @@ package usecase
 import (
 	"context"
 	"fmt"
+	"log"
 	"path"
+	"strings"
 
 	"golang.org/x/text/language"
 
@@ -49,7 +51,38 @@ func (ucase *pageUseCase) Do(ctx context.Context, lang language.Tag, p string) (
 			continue
 		}
 
-		out.Resources, _, _ = ucase.statics.Fetch(ctx, out.File.Dir()+"*")
+		if out.Resources, _, err = ucase.statics.Fetch(ctx, out.File.Dir()+"*"); err != nil {
+			return out, nil
+		}
+
+		for _, res := range out.Resources.GetType(domain.ResourceTypePage) {
+			// TODO(toby3d): simplify this, it's awful
+			resName := path.Base(res.Key())
+			resExt := path.Ext(resName)
+			resParts := strings.Split(resName[:len(resName)-len(resExt)], ".")
+
+			translationBaseName := strings.Join(resParts[:len(resParts)-1], ".")
+			if translationBaseName != out.File.TranslationBaseName() {
+				continue
+			}
+
+			resLang := language.Make(resParts[len(resParts)-1])
+			if resLang == language.Und {
+				continue
+			}
+
+			translation, err := ucase.pages.Get(ctx, resLang, targets[i])
+			if err != nil {
+				continue
+			}
+
+			out.Translations = append(out.Translations, translation)
+		}
+
+		translations := make([]string, 0)
+		for i := range out.Translations {
+			translations = append(translations, out.Translations[i].Language.String())
+		}
 
 		return out, nil
 	}

main.go

@@ -18,6 +18,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"runtime/pprof"
+	"strings"
 	"syscall"
 	"time"
 	_ "time/tzdata"
@@ -38,6 +39,7 @@ import (
 	"source.toby3d.me/toby3d/home/internal/templateutil"
 	themefsrepo "source.toby3d.me/toby3d/home/internal/theme/repository/fs"
 	themeucase "source.toby3d.me/toby3d/home/internal/theme/usecase"
+	"source.toby3d.me/toby3d/home/internal/urlutil"
 )
 
 type (
@@ -81,12 +83,42 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) {
 	server := &http.Server{
 		Addr: config.AddrPort().String(),
 		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			tags, _, err := language.ParseAcceptLanguage(r.Header.Get(common.HeaderAcceptLanguage))
-			if err != nil || len(tags) == 0 {
-				tags = append(tags, language.English)
+			head, tail := urlutil.ShiftPath(r.URL.Path)
+
+			if head == "" {
+				tags, _, err := language.ParseAcceptLanguage(r.Header.Get(common.HeaderAcceptLanguage))
+				if err != nil || len(tags) == 0 {
+					tags = append(tags, language.English)
+				}
+
+				lang, _, _ := matcher.Match(tags...)
+
+				http.Redirect(w, r, "/"+lang.String()+"/", http.StatusSeeOther)
+
+				return
 			}
 
-			lang, _, _ := matcher.Match(tags...)
+			lang, err := language.Parse(head)
+			if err != nil || lang == language.Und {
+				res, err := staticer.Do(r.Context(), r.URL.Path)
+				if err != nil {
+					if errors.Is(err, fs.ErrNotExist) {
+						http.Error(w, err.Error(), http.StatusNotFound)
+
+						return
+					}
+
+					http.Error(w, err.Error(), http.StatusInternalServerError)
+
+					return
+				}
+
+				http.ServeContent(w, r, res.Name(), domain.ResourceModTime(res), res)
+
+				return
+			}
+
+			r.URL.Path = tail
 
 			s, err := siter.Do(r.Context(), lang)
 			if err != nil {
@@ -121,6 +153,14 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) {
 				return
 			}
 
+			contentLanguage := make([]string, len(p.Translations))
+			for i := range p.Translations {
+				base, _ := p.Translations[i].Language.Base()
+				contentLanguage[i] = base.String()
+			}
+
+			w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", "))
+
 			tpl, err := themer.Do(r.Context())
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)