Apply go fmt *.go

This auto-applies the recommended Go codestyle.

8 files changed, 57 insertions, 65 deletions

diff --git a/config.go b/config.go
index 645e347..e48016a 100644
--- a/config.go
+++ b/config.go
@@ -1,33 +1,32 @@
-
 package main
 
 import (
-	"log"
+	"encoding/json"
 	"flag"
-	"os"
 	"io/ioutil"
-	"encoding/json"
+	"log"
+	"os"
 	"path/filepath"
 )
 
 type RuntimeConfig struct {
-	Path string
-	Http HttpConfig `json:"http"`
+	Path     string
+	Http     HttpConfig     `json:"http"`
 	Database DatabaseConfig `json:"database"`
 }
 
 type HttpConfig struct {
-	Host string `json:"bind_host"`
-	Port string `json:"bind_port"`
-	Static string `json:"static"`
+	Host      string `json:"bind_host"`
+	Port      string `json:"bind_port"`
+	Static    string `json:"static"`
 	Templates string `json:"templates"`
-	Storage string `json:"storage"`
+	Storage   string `json:"storage"`
 }
 
 type DatabaseConfig struct {
-	Socket string `json:"socket"`
-	User string `json:"user"`
-	Database string `json:"database"`
+	Socket     string `json:"socket"`
+	User       string `json:"user"`
+	Database   string `json:"database"`
 	Migrations string `json:"migrations"`
 }
 
@@ -59,7 +58,7 @@ func GetRuntimeConfig() RuntimeConfig {
 		log.Fatalf("Could not parse configuration file %s", config.Path)
 	}
 
-	abs,err := filepath.Abs(config.Path)
+	abs, err := filepath.Abs(config.Path)
 	if err != nil {
 		log.Fatalf("Could not translate %s to absolute path.", config.Path)
 	}
diff --git a/database.go b/database.go
index 5d9181c..6451599 100644
--- a/database.go
+++ b/database.go
@@ -1,33 +1,32 @@
-
 package main
 
 import (
-	"log"
+	"database/sql"
 	"fmt"
-	"path/filepath"
 	"io"
+	"log"
 	"os"
-	"os/user"
 	"os/exec"
+	"os/user"
+	"path/filepath"
 	"strconv"
-	"database/sql"
 
 	_ "github.com/go-sql-driver/mysql"
 )
 
-const databaseSchemaVersion int = 2  // this defines the needed version for the
-                                     // executable
+const databaseSchemaVersion int = 2 // this defines the needed version for the
+// executable
 
 func setupDatabase() *sql.DB {
 
-	u,err := user.Current()
+	u, err := user.Current()
 	if err != nil {
 		log.Fatal(err)
 	}
 	target := fmt.Sprintf("%s@unix(%s)/%s", u.Username, config.Database.Socket,
-	                      config.Database.Database)
+		config.Database.Database)
 
-	db,err := sql.Open("mysql", target)
+	db, err := sql.Open("mysql", target)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -46,15 +45,15 @@ func setupDatabase() *sql.DB {
 
 func migrate(db *sql.DB) {
 
-	const t = databaseSchemaVersion  // targeted database schema version
+	const t = databaseSchemaVersion // targeted database schema version
 
 	for {
-		v := schemaVersion(db)  // read schema version from DB table
+		v := schemaVersion(db) // read schema version from DB table
 
 		// handle current database schema which is newer than targeted one
 		if v > t {
 			log.Fatalf(
-			    "Current database schema version is %d but newest is %d!", v, t)
+				"Current database schema version is %d but newest is %d!", v, t)
 		}
 
 		// break if targeted version is already reached
@@ -65,7 +64,7 @@ func migrate(db *sql.DB) {
 		// execute migration
 		log.Printf("Starting database schema migration to version %d.\n", v+1)
 		path := filepath.Join(config.Database.Migrations,
-		                      fmt.Sprintf("%04d_migration.sql", v+1))
+			fmt.Sprintf("%04d_migration.sql", v+1))
 		RunSqlScript(path)
 		log.Printf("Finished database schema migration to version %d.\n", v+1)
 	}
@@ -123,7 +122,7 @@ func schemaVersion(db *sql.DB) int {
 	v, err := strconv.Atoi(version)
 	if err != nil {
 		log.Fatalf("Could not convert database schema version '%s' to int.\n",
-		           version)
+			version)
 	}
 
 	return v
diff --git a/handler.go b/handler.go
index 5a3883d..0c51bf6 100644
--- a/handler.go
+++ b/handler.go
@@ -1,13 +1,12 @@
-
 package main
 
 import (
 	"bytes"
 	"fmt"
-	"regexp"
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
+	"regexp"
 
 	"github.com/yuin/goldmark"
 )
@@ -29,7 +28,7 @@ func indexGet(w http.ResponseWriter, r *http.Request) {
 
 	// prepare data store
 	type Element struct {
-		Id string
+		Id    string
 		Title string
 	}
 	elements := make([]Element, 0)
@@ -73,17 +72,17 @@ func recipeGet(w http.ResponseWriter, r *http.Request) {
 	cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr)
 	rows, err := db.Query(cmd)
 	if err != nil {
-		http.Error(w, "Database returned error: " + err.Error(), 500)
+		http.Error(w, "Database returned error: "+err.Error(), 500)
 		return
 	}
 	defer rows.Close()
 
 	// prepare data store
 	type Element struct {
-		Id string
-		Title string
-		UpstreamUrl string
-		DescriptionMarkdown string
+		Id                          string
+		Title                       string
+		UpstreamUrl                 string
+		DescriptionMarkdown         string
 		RenderedDescriptionMarkdown string
 	}
 	elements := make([]Element, 0)
@@ -136,7 +135,7 @@ func recipePost(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// read request body
-	buffer,_ := ioutil.ReadAll(r.Body)  // FIXME error handling
+	buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling
 	body := string(buffer)
 	updateRecipe(body, idStr)
 }
@@ -162,17 +161,17 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) {
 	cmd := fmt.Sprintf("SELECT title,upstream_url,description_markdown FROM recipes WHERE (id='%s');", idStr)
 	rows, err := db.Query(cmd)
 	if err != nil {
-		http.Error(w, "Got error from database: " + err.Error(), 500)
+		http.Error(w, "Got error from database: "+err.Error(), 500)
 		return
 	}
 	defer rows.Close()
 
 	// prepare data store
 	type Element struct {
-		Id string
-		Title string
-		UpstreamUrl string
-		DescriptionMarkdown string
+		Id                          string
+		Title                       string
+		UpstreamUrl                 string
+		DescriptionMarkdown         string
 		RenderedDescriptionMarkdown string
 	}
 	elements := make([]Element, 0)
@@ -219,7 +218,7 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// read request body
-	buffer,_ := ioutil.ReadAll(r.Body)  // FIXME error handling
+	buffer, _ := ioutil.ReadAll(r.Body) // FIXME error handling
 	body := string(buffer)
 	updateRecipe(body, idStr)
 }
@@ -227,7 +226,7 @@ func recipeEditPost(w http.ResponseWriter, r *http.Request) {
 func updateRecipe(body string, idStr string) {
 
 	// execute SQL UPDATE
-	_,_ = db.Exec(`
+	_, _ = db.Exec(`
 		UPDATE
 			recipes
 		SET
@@ -236,7 +235,7 @@ func updateRecipe(body string, idStr string) {
 			(id=?);
 		`,
 		body, idStr,
-	)  // FIXME error handling
+	) // FIXME error handling
 
 	return
 }
@@ -276,12 +275,12 @@ func addRecipesPost(w http.ResponseWriter, r *http.Request) {
 	title := r.FormValue("title")
 
 	cmd := fmt.Sprintf("INSERT INTO recipes (title,upstream_url) VALUES ('%s', '%s')", title, url)
-	res,err := db.Exec(cmd)
+	res, err := db.Exec(cmd)
 	if err != nil {
 		http.Error(w, "Could not add recipe.", 500)
 		return
 	}
-	id,err := res.LastInsertId()
+	id, err := res.LastInsertId()
 	if err != nil {
 		http.Error(w, "Expected exactly one recipe URL.", 400)
 		return
diff --git a/main.go b/main.go
index c1e0571..bdea383 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,10 @@
-
 package main
 
 import (
+	"database/sql"
 	"log"
 	"os"
 	"os/signal"
-	"database/sql"
 	"syscall"
 )
 
diff --git a/mux.go b/mux.go
index ddb1d0f..4c84570 100644
--- a/mux.go
+++ b/mux.go
@@ -1,4 +1,3 @@
-
 package main
 
 import (
diff --git a/server.go b/server.go
index ff581e3..67e6e37 100644
--- a/server.go
+++ b/server.go
@@ -1,4 +1,3 @@
-
 package main
 
 import (
diff --git a/storage.go b/storage.go
index 10ec915..e063d6b 100644
--- a/storage.go
+++ b/storage.go
@@ -1,10 +1,9 @@
-
 package main
 
 import (
+	"io/ioutil"
 	"log"
 	"net/http"
-	"io/ioutil"
 	"path/filepath"
 )
 
@@ -12,7 +11,7 @@ func ServeStorage(w http.ResponseWriter, r *http.Request, path string) {
 
 	// generate absolute, cleaned path of ressource
 	path = filepath.Join(config.Http.Storage, path)
-	path,err := filepath.Abs(path)
+	path, err := filepath.Abs(path)
 	if err != nil {
 		log.Print(err)
 		http.Error(w, http.StatusText(400), 400)
diff --git a/templates.go b/templates.go
index 84e449a..d18017f 100644
--- a/templates.go
+++ b/templates.go
@@ -1,32 +1,31 @@
-
 package main
 
 import (
+	"io/ioutil"
 	"log"
 	"net/http"
-	"io/ioutil"
-	"text/template"  // FIXME switch to html/template for security reasons
-					 // and make a workaround for rendered Markdown insertion
+	"text/template" // FIXME switch to html/template for security reasons
+	// and make a workaround for rendered Markdown insertion
 )
 
 func ServeTemplate(w http.ResponseWriter, name string, path string, data interface{}) {
 
-	templateFile,err := ioutil.ReadFile(path)
+	templateFile, err := ioutil.ReadFile(path)
 	if err != nil {
 		log.Print(err)
 		http.Error(w, http.StatusText(404), 404)
 		return
 	}
-	tmpl,err := template.New(name).Parse(string(templateFile))
+	tmpl, err := template.New(name).Parse(string(templateFile))
 	if err != nil {
 		log.Print(err)
-        http.Error(w, http.StatusText(404), 404)
-        return
+		http.Error(w, http.StatusText(404), 404)
+		return
 	}
 	err = tmpl.Execute(w, data)
 	if err != nil {
 		log.Print(err)
-        http.Error(w, http.StatusText(404), 404)
-        return
+		http.Error(w, http.StatusText(404), 404)
+		return
 	}
 }