diff --git a/dict/main.go b/dict/main.go
index 5234d26..8b4328b 100644
--- a/dict/main.go
+++ b/dict/main.go
@@ -69,11 +69,10 @@ func ParseEntry(entry jmdict.JmdictEntry) Entry {
}
}
-func Search(query string) queryResult {
+func Search(query string) (exactResults []Entry, otherResults []Entry, truncated bool) {
query = strings.TrimSpace(query)
- exactResults := make([]Entry, 0)
- otherResults := make([]Entry, 0)
- truncated := false
+ exactResults = make([]Entry, 0)
+ otherResults = make([]Entry, 0)
count := 0
for _, jmdictEntry := range dict.Entries {
exactMatch := false
@@ -106,8 +105,18 @@ func Search(query string) queryResult {
break
}
}
- return queryResult{
- Query: query,
+ return
+}
+
+type searchTemplateData struct {
+ ExactResults []Entry
+ OtherResults []Entry
+ Truncated bool
+ Count int
+}
+
+func initSearchTemplateData(exactResults []Entry, otherResults []Entry, truncated bool) searchTemplateData {
+ return searchTemplateData{
ExactResults: exactResults,
OtherResults: otherResults,
Truncated: truncated,
@@ -115,26 +124,6 @@ func Search(query string) queryResult {
}
}
-func Lookup(word string) *Entry {
- for _, jmdictEntry := range dict.Entries {
- entry := ParseEntry(jmdictEntry)
- if entry.Kanji == word {
- return &entry
- }
- }
- return nil
-}
-
-type queryResult struct {
- // Fields must be capitalized
- // to be accessible in templates
- Query string
- ExactResults []Entry
- OtherResults []Entry
- Truncated bool
- Count int
-}
-
func main() {
err := LoadDict()
if err != nil {
@@ -144,80 +133,51 @@ func main() {
fmt.Println("JMdict loaded!")
r := mux.NewRouter()
r.HandleFunc("/", httputils.GenerateHandler(
+ "index.html",
func(w http.ResponseWriter, r *http.Request) bool { return true },
- httputils.NewTemplateSet("index.html"),
- func(w http.ResponseWriter, r *http.Request) (string, any) { return "index.html", nil },
+ func(w http.ResponseWriter, r *http.Request) any { return nil },
[]string{http.MethodGet},
))
- rawSearchHandler := func(w http.ResponseWriter, r *http.Request) {
- r.ParseMultipartForm(0)
- q := r.FormValue("q")
- var redirect string
- if q == "" {
- redirect = "/"
- } else {
- redirect = "/search/" + q
- }
- http.Redirect(w, r, redirect, http.StatusMovedPermanently)
+ redirectToHome := func(w http.ResponseWriter, r *http.Request) {
+ http.Redirect(w, r, "/", http.StatusPermanentRedirect)
}
- r.HandleFunc("/search", rawSearchHandler)
- r.HandleFunc("/search/", rawSearchHandler)
+ r.HandleFunc("/search", redirectToHome)
+ r.HandleFunc("/search/", redirectToHome)
r.HandleFunc("/search/{query}", httputils.GenerateHandler(
- // handler whether or not to use template
+ "index.html",
+ func(w http.ResponseWriter, r *http.Request) bool {
+ return true
+ },
+ func(w http.ResponseWriter, r *http.Request) any {
+ query := mux.Vars(r)["query"]
+ return struct {
+ Query string
+ Results searchTemplateData
+ }{
+ Query: query,
+ Results: initSearchTemplateData(Search(query)),
+ }
+ },
+ []string{http.MethodGet},
+ ))
+ r.HandleFunc("/api/search", httputils.GenerateHandler(
+ "search.html",
func(w http.ResponseWriter, r *http.Request) bool {
- // If Accept: applicaiton/json we'll use the template
if r.Header.Get("Accept") != "application/json" {
return true
}
-
- // Otherwise, let's send JSON
- query := mux.Vars(r)["query"]
- result := Search(query)
- jsonBytes, _ := json.Marshal(append(result.ExactResults, result.OtherResults...))
-
w.Header().Set("Content-Type", "application/json; charset=utf-8")
+ r.ParseMultipartForm(0)
+ query := r.FormValue("q")
+ exactResults, otherResults, _ := Search(query)
+ jsonBytes, _ := json.Marshal(append(exactResults, otherResults...))
fmt.Fprint(w, string(jsonBytes))
-
return false
},
- httputils.NewTemplateSet("index.html", "search.html"),
- // template data
- func(w http.ResponseWriter, r *http.Request) (template string, data any) {
- if r.Header.Get("HX-Request") == "" {
- template = "search.html"
- } else {
- template = "search"
- }
- // Only runs if handler returns true
- query := mux.Vars(r)["query"]
- data = Search(query)
- return
- },
- []string{http.MethodGet},
- ))
- rawWordHandler := func(w http.ResponseWriter, r *http.Request) {
- fmt.Println("Redirecting raw word handler")
- http.Redirect(w, r, "/", http.StatusMovedPermanently)
- }
- r.HandleFunc("/word", rawWordHandler)
- r.HandleFunc("/word/", rawWordHandler)
- r.HandleFunc("/word/{word}", httputils.GenerateHandler(
- func(w http.ResponseWriter, r *http.Request) bool { return true },
- // Order matters
- // word.html overrided the results block in index.html
- // so should be loaded second
- httputils.NewTemplateSet("index.html", "word.html"),
- func(w http.ResponseWriter, r *http.Request) (template string, data any) {
- template = "word.html"
- query := mux.Vars(r)["word"]
- data = struct {
- Query any
- Entry *Entry
- }{
- Query: nil,
- Entry: Lookup(query),
- }
- return
+ func(w http.ResponseWriter, r *http.Request) any {
+ r.ParseMultipartForm(0)
+ query := r.FormValue("q")
+ return initSearchTemplateData(Search(query))
},
[]string{http.MethodGet},
))
diff --git a/dict/templates/partials/definition.html b/dict/templates/definition.html
similarity index 100%
rename from dict/templates/partials/definition.html
rename to dict/templates/definition.html
diff --git a/dict/templates/index.html b/dict/templates/index.html
index ea33ea8..ca01362 100644
--- a/dict/templates/index.html
+++ b/dict/templates/index.html
@@ -1,42 +1,33 @@
-{{- define "index" -}}
{{ block "title" . }}{{ template "sitetitle" . }}{{ end }}
+ jidict
- {{ block "results" . }}{{ if .Query }}{{ template "search" . }}{{ end }}{{ end }}
+ {{ with .Results }}{{ template "search" . }}{{ end }}
-
-{{- end -}}
-{{- template "index" . -}}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/dict/templates/partials/entry.html b/dict/templates/partials/entry.html
deleted file mode 100644
index 9d74569..0000000
--- a/dict/templates/partials/entry.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{ define "entry" }}
-
-
- {{- if .Kanji -}}
- {{- .Kanji -}}( {{- .Reading -}} )
- {{- $count := len .Definitions -}}
- {{ if eq $count 1 -}}
-
{{- template "definition" (index .Definitions 0) -}}
- {{- else if ne $count 0 -}}
-
- {{- range .Definitions }}
-
- {{ template "definition" . }}
-
- {{- end }}
-
- {{- end }}
-
-
- {{- if .Kanji -}}
- {{- .Kanji -}}( {{- .Reading -}} )
- {{- else -}}
- {{- .Reading -}}
- {{- end -}}
-
- {{- $count := len .Definitions -}}
- {{ if eq $count 1 -}}
-
{{- template "definition" (index .Definitions 0) -}}
- {{- else if ne $count 0 -}}
-
- {{- range .Definitions }}
-
- {{ template "definition" . }}
-
- {{- end }}
-
- {{- end }}
-
{{ if .Truncated }}Truncated results, showing first {{ .Count }}{{ else }}{{ if eq .Count 0 }}No results{{ else }}{{ .Count }} result{{ if ne .Count 1}}s{{ end }}{{ end }}{{ end }}.
-{{ range .ExactResults -}}
-{{- template "entry" . -}}
-{{- end }}
-{{ if and (ne (len .ExactResults) 0) (ne (len .OtherResults) 0) }}{{ if .Truncated }}Truncated results, showing first {{ .Count }}{{ else }}{{ if eq .Count 0 }}No results{{ else }}{{ .Count }} result{{ if ne .Count 1}}s{{ end }}{{ end }}{{ end }}.
+{{- range .ExactResults -}}
+{{- template "word" . -}}
+{{- end }}
+
+
+ {{- if .Kanji -}}
+ {{- .Kanji -}}( {{- .Reading -}} )
+ {{- else -}}
+ {{- .Reading -}}
+ {{- end -}}
+
+ {{ if le (len .Definitions) 2 -}}
+
{{- template "definition" (index .Definitions 0) -}}
+ {{- else -}}
+
+ {{- range .Definitions }}
+
+ {{ template "definition" . }}
+
+ {{- end }}
+
+ {{- end }}
+
