From 077d76462ceca4b316c07f32ab77a54a3e20caea Mon Sep 17 00:00:00 2001 From: Peter Stuifzand Date: Wed, 5 Aug 2020 10:11:00 +0200 Subject: [PATCH] Resolve today to page for current date --- main.go | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/main.go b/main.go index c5dd45e..ee9e069 100644 --- a/main.go +++ b/main.go @@ -301,9 +301,7 @@ func (h *historyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { r.ParseForm() page := r.URL.Path[9:] - if page == "" { - page = "Home" - } + page = resolvePageName(page) history, err := mp.PageHistory(page) if err != nil { @@ -411,9 +409,7 @@ func (h *editHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } page := r.URL.Path[6:] - if page == "" { - page = "Home" - } + page = resolvePageName(page) mpPage := mp.Get(page) pageText := mpPage.Content @@ -462,7 +458,7 @@ func (h *editHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { Editor: editor, Name: page, Backrefs: mpPage.Refs, - TodayPage: todayPage(), + TodayPage: "Today", ShowGraph: page != "Daily_Notes", } templates := baseTemplate @@ -595,9 +591,7 @@ func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } page := r.URL.Path[1:] - if page == "" { - page = "Home" - } + page = resolvePageName(page) mpPage := mp.Get(page) pageText := mpPage.Content @@ -676,7 +670,7 @@ func (h *indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { Name: page, Backrefs: mpPage.Refs, ShowGraph: page != "Daily_Notes", - TodayPage: todayPage(), + TodayPage: "Today", } templates := baseTemplate templates = append(templates, "templates/view.html") @@ -924,3 +918,13 @@ func createSearchIndex(dataDir, indexName string) (bleve.Index, error) { return searchIndex, nil } } + +func resolvePageName(name string) string { + if name == "" { + return "Home" + } + if name == "Today" { + return todayPage() + } + return name +}