From ad765f5798892b343b8756a48bd94bb728e78aaa Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 19 Nov 2015 20:03:51 -0800
Subject: [PATCH] gofmt

---
 main.go           | 17 +++++++++--------
 news/news.go      | 12 +++++-------
 route_handlers.go | 16 ++++++++--------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/main.go b/main.go
index 1b8213f..661028b 100644
--- a/main.go
+++ b/main.go
@@ -83,12 +83,13 @@ func csrfSecret() string {
 	}
 	return string(bytes)
 }
-type CSRFErrorHandler struct {}
+
+type CSRFErrorHandler struct{}
 
 func (self CSRFErrorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-    fmt.Println("csrf Failure: ")
-    fmt.Println(csrf.FailureReason(r))
-    fmt.Println("-----") 
+	fmt.Println("csrf Failure: ")
+	fmt.Println(csrf.FailureReason(r))
+	fmt.Println("-----")
 }
 
 func main() {
@@ -104,13 +105,13 @@ func main() {
 	initTemplates()
 	muxRouter := init_route_handlers()
 	//errHandler := csrf.ErrorHandler( CSRFErrorHandler{} )
-	
+
 	// Terrible. TODO: Get SSL for prod, and then wrap in if(dev) { {
 	csrfSecurityOption := csrf.Secure(false)
-	 
+
 	fmt.Println("Listening on", config.Port, "...")
-	
-	err := http.ListenAndServe(":"+config.Port, csrf.Protect([]byte(csrfSecret()), /*errHandler,*/ csrfSecurityOption)(muxRouter))
+
+	err := http.ListenAndServe(":"+config.Port, csrf.Protect([]byte(csrfSecret()) /*errHandler,*/, csrfSecurityOption)(muxRouter))
 	if err != nil {
 		fmt.Println("Fatal Error: ", err)
 	}
diff --git a/news/news.go b/news/news.go
index c861c85..094930d 100644
--- a/news/news.go
+++ b/news/news.go
@@ -2,12 +2,12 @@ package news
 
 import (
 	"database/sql"
+	"errors"
 	"fmt"
 	"github.com/dballard/transmet/categories"
 	_ "github.com/lib/pq"
-	"time"
-	"errors"
 	"strconv"
+	"time"
 )
 
 type News struct {
@@ -72,7 +72,7 @@ func Delete(db *sql.DB, id int) error {
 }
 
 func Get(db *sql.DB, id int) (*News, error) {
-	rows, err := db.Query("SELECT " + SQL_NEWS_FIELDS + " FROM news WHERE id=$1", id)
+	rows, err := db.Query("SELECT "+SQL_NEWS_FIELDS+" FROM news WHERE id=$1", id)
 
 	if err != nil {
 		fmt.Println("Error getting news (", id, "): ", err)
@@ -94,7 +94,7 @@ func Get(db *sql.DB, id int) (*News, error) {
 func LoadPage(db *sql.DB, offset, amount int) ([]*News, int, error) {
 	categories.LoadCategories(db) // required by addContainer
 
-	rows, err := db.Query("SELECT "+SQL_NEWS_FIELDS+" FROM news order by timestamp DESC")
+	rows, err := db.Query("SELECT " + SQL_NEWS_FIELDS + " FROM news order by timestamp DESC")
 	if err != nil {
 		fmt.Println("DB errpr reading LoadPage news: ", err)
 		return nil, 0, err
@@ -108,7 +108,7 @@ func LoadPage(db *sql.DB, offset, amount int) ([]*News, int, error) {
 func Unexported(db *sql.DB) (map[int]*NewsContainer, int, error) {
 	categories.LoadCategories(db) // required by addContainer
 
-	rows, err := db.Query("SELECT "+SQL_NEWS_FIELDS+" FROM news WHERE exported is null order by category_id ASC")
+	rows, err := db.Query("SELECT " + SQL_NEWS_FIELDS + " FROM news WHERE exported is null order by category_id ASC")
 	if err != nil {
 		fmt.Println("DB errpr reading unexported news: ", err)
 		return nil, 0, err
@@ -230,5 +230,3 @@ func convertSqlToNewsContainer(rows *sql.Rows) (map[int]*NewsContainer, int, err
 
 	return newsTree, count, nil
 }
-
-
diff --git a/route_handlers.go b/route_handlers.go
index 885fdfb..d4ab1e7 100644
--- a/route_handlers.go
+++ b/route_handlers.go
@@ -210,7 +210,7 @@ func editFormHandler(w http.ResponseWriter, r *http.Request, user *user.User, se
 }
 
 func editPostHandler(w http.ResponseWriter, r *http.Request, user *user.User, session *sessions.Session) {
-    id, idErr := strconv.Atoi(mux.Vars(r)["id"])
+	id, idErr := strconv.Atoi(mux.Vars(r)["id"])
 	if idErr != nil {
 		session.AddFlash("Error trying to save news item", flash_err)
 		session.Save(r, w)
@@ -430,30 +430,30 @@ func init_route_handlers() *mux.Router {
 
 	rGet := r.Methods("GET").Subrouter()
 	rPost := r.Methods("POST").Subrouter()
-	
+
 	rGet.HandleFunc("/login", LoginFormHandler)
 	rPost.HandleFunc("/login", LoginPostHandler)
-	
+
 	rPost.HandleFunc("/logout", userHandler(LogoutHandler))
 
 	rGet.HandleFunc("/news/add", userHandler(addFormHandler))
 	rPost.HandleFunc("/news/add", userHandler(addPostHandler))
-	
+
 	rGet.HandleFunc("/", userHandler(newsFormHandler))
 	rGet.HandleFunc("/news", userHandler(newsFormHandler))
-	
+
 	rGet.HandleFunc("/news/export", userHandler(templateFormHandler))
 	rPost.HandleFunc("/news/export", userHandler(exportHandler))
-	
+
 	rGet.HandleFunc("/news/added", userHandler(addedHandler))
-	
+
 	rPost.HandleFunc("/news/{id:[0-9]+}/delete", userHandler(deleteHandler))
 	rGet.HandleFunc("/news/{id:[0-9]+}/edit", userHandler(editFormHandler))
 	rPost.HandleFunc("/news/{id:[0-9]+}/edit", userHandler(editPostHandler))
 
 	rGet.HandleFunc("/categories", userHandler(categoriesFormHandler))
 	rPost.HandleFunc("/caegories", userHandler(categoriesPostHandler))
-	
+
 	rPost.HandleFunc("/categories/{id:[0-9]+}/change-parent", userHandler(categoryChangeParentHandler))
 	rPost.HandleFunc("/categories/add", userHandler(categoryAddHandler))
 	rPost.HandleFunc("/categories/{id:[0-9]+}/delete", userHandler(categoryDeleteHandler))