feat(ods): normalize all unicode characters to their ascii equivalents

This commit is contained in:
Julien Dessaux 2024-03-27 10:08:09 +01:00
parent e389a0e925
commit a6fd4a153d
Signed by: adyxax
GPG key ID: F92E51B86E07177E
2 changed files with 12 additions and 5 deletions

2
go.mod
View file

@ -1,3 +1,5 @@
module git.adyxax.org/adyxax/ods/v2 module git.adyxax.org/adyxax/ods/v2
go 1.22.1 go 1.22.1
require golang.org/x/text v0.14.0 // indirect

View file

@ -2,10 +2,14 @@ package main
import ( import (
"embed" "embed"
"golang.org/x/text/runes"
"golang.org/x/text/transform"
"golang.org/x/text/unicode/norm"
"html/template" "html/template"
"log/slog" "log/slog"
"net/http" "net/http"
"strings" "strings"
"unicode"
) )
// Variables to customise the search behaviour // Variables to customise the search behaviour
@ -44,14 +48,15 @@ func getIndex() http.Handler {
} }
func postIndex() http.Handler { func postIndex() http.Handler {
words := strings.Split(ods,"\n") normalizer := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
words := strings.Split(ods, "\n")
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
data := IndexData{ data := IndexData{
HasQuery: true, HasQuery: true,
Query: r.FormValue("query"), Query: r.FormValue("query"),
Invalid: true, Invalid: true,
} }
query := strings.TrimSpace(strings.ToUpper(data.Query)) query, _, _ := transform.String(normalizer, strings.TrimSpace(strings.ToUpper(data.Query)))
for _, w := range words { for _, w := range words {
if w == query { if w == query {
data.Invalid = false data.Invalid = false