initial server

server/server.go

@@ -21,7 +21,7 @@ var files embed.FS
 
 var templates map[string]*template.Template
 
-var App *model.App
+type App struct{ *model.App }
 
 func LoadTemplates() error {
 	if templates == nil {
@@ -77,21 +77,20 @@ func openBrowser(url string) {
 
 }
 
-func Index(w http.ResponseWriter, r *http.Request) {
+func (app *App) ListDiaryEntries(w http.ResponseWriter, r *http.Request) {
-	log.Print(templates)
 	var tmpl, ok = templates["index.html"]
 	if !ok {
 		http.Error(w, "could not find template index", http.StatusInternalServerError)
 		return
 	}
 
-	data := App.GetDiaryEntries(model.GetDiaryEntriesQuery{})
+	data := app.GetDiaryEntries(model.GetDiaryEntriesQuery{})
 	if err := tmpl.Execute(w, data); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
 
-func setup() {
+func setup() *App {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		panic(err)
@@ -105,13 +104,13 @@ func setup() {
 	if err != nil {
 		panic(err)
 	}
-	App = app
+	return &App{app}
 }
 
 func Run(openBrowserAtUrl bool, defaultPort int) {
-	setup()
+	app := setup()
 
-	http.HandleFunc("/", Index)
+	http.HandleFunc("/", app.ListDiaryEntries)
 
 	var port int
 	if defaultPort <= 0 {
@@ -124,10 +123,10 @@ func Run(openBrowserAtUrl bool, defaultPort int) {
 		port = defaultPort
 	}
 
-	log.Print("opening browser")
 	var url = fmt.Sprintf("http://localhost:%d", port)
 	log.Print(url)
 	if openBrowserAtUrl {
+		log.Print("opening browser")
 		openBrowser(url)
 	}
 	if err := http.ListenAndServe(fmt.Sprintf(":%d", port), nil); err != nil {