From 59ab7953e53d075786f5015fa69b03f23048f20d Mon Sep 17 00:00:00 2001 From: thewhitetulip Date: Fri, 13 Nov 2015 18:41:30 +0530 Subject: [PATCH] formatted using gofmt --- db/db.go | 70 ++++++++++++++++++++-------------------- main.go | 8 ++--- viewmodels/viewmodels.go | 14 ++++---- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/db/db.go b/db/db.go index faaac5a..aa61dea 100644 --- a/db/db.go +++ b/db/db.go @@ -25,36 +25,36 @@ func Close() { database.Close() } -func GetTasks(deleted bool) []types.Task{ +func GetTasks(deleted bool) []types.Task { var task []types.Task var TaskId int var TaskTitle string var TaskContent string var getTasksql string - if deleted == true{ + if deleted == true { getTasksql = "select id, title, content from task where is_deleted!='Y' order by created_date asc" } else { getTasksql = "select id, title, content from task where is_deleted='Y' order by created_date asc" } rows, err := database.Query(getTasksql) - if err!=nil{ + if err != nil { fmt.Println(err) } defer rows.Close() - for rows.Next(){ + for rows.Next() { err := rows.Scan(&TaskId, &TaskTitle, &TaskContent) - if err!=nil{ + if err != nil { fmt.Println(err) } - a := types.Task{Id:TaskId, Title:TaskTitle, Content:TaskContent} + a := types.Task{Id: TaskId, Title: TaskTitle, Content: TaskContent} task = append(task, a) } return task } -func GetTaskById(id int) types.Task{ +func GetTaskById(id int) types.Task { var task types.Task var TaskId int var TaskTitle string @@ -62,31 +62,31 @@ func GetTaskById(id int) types.Task{ getTasksql := "select id, title, content from task where id=?" rows, err := database.Query(getTasksql, id) - if err!=nil{ + if err != nil { fmt.Println(err) } defer rows.Close() - if rows.Next(){ + if rows.Next() { err := rows.Scan(&TaskId, &TaskTitle, &TaskContent) - if err!=nil{ + if err != nil { fmt.Println(err) } - task = types.Task{Id:TaskId, Title:TaskTitle, Content:TaskContent} + task = types.Task{Id: TaskId, Title: TaskTitle, Content: TaskContent} } return task } func ArchiveTask(id int) error { stmt, err := database.Prepare("update task set is_deleted='Y', finish_date=datetime(),last_modified_at=datetime() where id=?") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() - if err!=nil{ + if err != nil { fmt.Println(err) } _, err = tx.Stmt(stmt).Exec(id) - if err!=nil{ + if err != nil { fmt.Println(err) tx.Rollback() } else { @@ -97,15 +97,15 @@ func ArchiveTask(id int) error { func DeleteAll() error { stmt, err := database.Prepare("delete from task where is_deleted='Y'") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() - if err!=nil{ + if err != nil { fmt.Println(err) } _, err = tx.Stmt(stmt).Exec() - if err!=nil{ + if err != nil { fmt.Println("doing rollback") tx.Rollback() } else { @@ -116,15 +116,15 @@ func DeleteAll() error { func RestoreTask(id int) error { restoreSql, err := database.Prepare("update task set is_deleted='N',last_modified_at=datetime() where id=?") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() - if err!=nil{ + if err != nil { fmt.Println(err) } _, err = tx.Stmt(restoreSql).Exec(id) - if err!=nil{ + if err != nil { fmt.Println("doing rollback") tx.Rollback() } else { @@ -135,15 +135,15 @@ func RestoreTask(id int) error { func DeleteTask(id int) error { deleteSQL, err := database.Prepare("delete from task where id = ?") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() - if err!=nil{ + if err != nil { fmt.Println(err) } _, err = tx.Stmt(deleteSQL).Exec(id) - if err!=nil{ + if err != nil { fmt.Println(err) tx.Rollback() } else { @@ -154,12 +154,12 @@ func DeleteTask(id int) error { func AddTask(title, content string) error { restoreSql, err := database.Prepare("insert into task(title, content, created_date, last_modified_at) values(?,?,datetime(), datetime())") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() _, err = tx.Stmt(restoreSql).Exec(title, content) - if err!=nil{ + if err != nil { fmt.Println(err) tx.Rollback() } else { @@ -168,18 +168,18 @@ func AddTask(title, content string) error { return err } -func UpdateTask(id int, title string, content string) error{ +func UpdateTask(id int, title string, content string) error { Sql, err := database.Prepare("update task set title=?, content=? where id=?") - if err!=nil{ + if err != nil { fmt.Println(err) } tx, err := database.Begin() - if err!=nil{ + if err != nil { fmt.Println(err) } _, err = tx.Stmt(Sql).Exec(title, content, id) - if err!=nil{ + if err != nil { fmt.Println(err) tx.Rollback() } else { @@ -188,25 +188,25 @@ func UpdateTask(id int, title string, content string) error{ return err } -func SearchTask(query string) []types.Task{ - stmt := "select id, title, content from task where title like '%"+query+"%' or content like '%"+query+"%'" +func SearchTask(query string) []types.Task { + stmt := "select id, title, content from task where title like '%" + query + "%' or content like '%" + query + "%'" var task []types.Task var TaskId int var TaskTitle string var TaskContent string rows, err := database.Query(stmt, query, query) - if err!=nil{ + if err != nil { fmt.Println(err) } - for rows.Next(){ + for rows.Next() { err := rows.Scan(&TaskId, &TaskTitle, &TaskContent) - if err!=nil{ + if err != nil { fmt.Println(err) } TaskTitle = strings.Replace(TaskTitle, query, ""+query+"", -1) TaskContent = strings.Replace(TaskContent, query, ""+query+"", -1) - a := types.Task{Id:TaskId, Title:TaskTitle, Content:TaskContent} + a := types.Task{Id: TaskId, Title: TaskTitle, Content: TaskContent} task = append(task, a) } return task diff --git a/main.go b/main.go index 19c84db..6d7701e 100644 --- a/main.go +++ b/main.go @@ -59,7 +59,7 @@ func ShowAllTasks(w http.ResponseWriter, r *http.Request, parm httprouter.Params homeTemplate.Execute(w, context) } -func SearchTask(w http.ResponseWriter, r *http.Request, _ httprouter.Params){ +func SearchTask(w http.ResponseWriter, r *http.Request, _ httprouter.Params) { r.ParseForm() query := r.Form.Get("query") context := viewmodels.SearchTask(query) @@ -83,7 +83,7 @@ func ShowTrashTask(w http.ResponseWriter, r *http.Request, parm httprouter.Param func EditTask(w http.ResponseWriter, r *http.Request, param httprouter.Params) { id, err := strconv.Atoi(param.ByName("id")) - if err!=nil{ + if err != nil { fmt.Println(err) } else { task := viewmodels.GetTaskById(id) @@ -103,7 +103,7 @@ func ArchiveTask(w http.ResponseWriter, r *http.Request, param httprouter.Params func DeleteTask(w http.ResponseWriter, r *http.Request, param httprouter.Params) { id := param.ByName("id") - if id == "all"{ + if id == "all" { viewmodels.DeleteAll() http.Redirect(w, r, "/", http.StatusFound) } else { @@ -130,7 +130,7 @@ func RestoreTask(w http.ResponseWriter, r *http.Request, param httprouter.Params func UpdateTask(w http.ResponseWriter, r *http.Request, param httprouter.Params) { r.ParseForm() id, err := strconv.Atoi(r.Form.Get("id")) - if err!=nil{ + if err != nil { fmt.Println(err) } title := r.Form.Get("title") diff --git a/viewmodels/viewmodels.go b/viewmodels/viewmodels.go index 4f38ecf..c83b17f 100644 --- a/viewmodels/viewmodels.go +++ b/viewmodels/viewmodels.go @@ -9,13 +9,13 @@ func GetTasks(deleted bool) []types.Task { return db.GetTasks(deleted) } -func SearchTask(query string) []types.Task{ +func SearchTask(query string) []types.Task { return db.SearchTask(query) } func AddTask(title, content string) bool { err := db.AddTask(title, content) - if err!=nil{ + if err != nil { return false } return true @@ -37,9 +37,9 @@ func DeleteTask(id int) bool { return true } -func DeleteAll() bool{ +func DeleteAll() bool { err := db.DeleteAll() - if err!=nil{ + if err != nil { return false } return true @@ -53,11 +53,11 @@ func ArchiveTask(id int) bool { return true } -func GetTaskById(id int) types.Task{ +func GetTaskById(id int) types.Task { return db.GetTaskById(id) } -func UpdateTask(id int, title string, content string) bool{ +func UpdateTask(id int, title string, content string) bool { err := db.UpdateTask(id, title, content) if err != nil { return false @@ -65,6 +65,6 @@ func UpdateTask(id int, title string, content string) bool{ return true } -func Close(){ +func Close() { db.Close() }