From ad388cf83b9fe0ed58ff16487c0d6d7747dfcb5a Mon Sep 17 00:00:00 2001 From: heimoshuiyu Date: Wed, 20 Jul 2022 18:16:39 +0800 Subject: [PATCH] format code with gofmt --- pkg/api/handle_error.go | 14 +++++++------- pkg/api/handle_feedback.go | 1 - pkg/api/handle_manage_file.go | 2 +- pkg/api/handle_tag.go | 3 +-- pkg/api/handle_tag_and_file.go | 2 +- pkg/database/database.go | 12 ++++++------ pkg/database/error.go | 2 +- pkg/database/method_tag.go | 2 +- pkg/database/sql_stmt.go | 2 +- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pkg/api/handle_error.go b/pkg/api/handle_error.go index e0fe2d0..6cdfa7d 100644 --- a/pkg/api/handle_error.go +++ b/pkg/api/handle_error.go @@ -2,22 +2,22 @@ package api import ( "encoding/json" + "errors" "log" "net/http" - "errors" ) var ( - ErrNotLoggedIn = errors.New("not logged in") - ErrNotAdmin = errors.New("not admin") - ErrEmpty = errors.New("Empty field detected, please fill in all fields") - ErrAnonymous = errors.New("Anonymous user detected, please login") - ErrNotActive = errors.New("User is not active") + ErrNotLoggedIn = errors.New("not logged in") + ErrNotAdmin = errors.New("not admin") + ErrEmpty = errors.New("Empty field detected, please fill in all fields") + ErrAnonymous = errors.New("Anonymous user detected, please login") + ErrNotActive = errors.New("User is not active") ErrWrongPassword = errors.New("Wrong password") ) type Error struct { - Error string `json:"error,omitempty"` + Error string `json:"error,omitempty"` } func (api *API) HandleError(w http.ResponseWriter, r *http.Request, err error) { diff --git a/pkg/api/handle_feedback.go b/pkg/api/handle_feedback.go index eceaf7f..3f2eb89 100644 --- a/pkg/api/handle_feedback.go +++ b/pkg/api/handle_feedback.go @@ -105,6 +105,5 @@ func (api *API) HandleDeleteFeedback(w http.ResponseWriter, r *http.Request) { return } - api.HandleOK(w, r) } diff --git a/pkg/api/handle_manage_file.go b/pkg/api/handle_manage_file.go index 0b6b011..1aba693 100644 --- a/pkg/api/handle_manage_file.go +++ b/pkg/api/handle_manage_file.go @@ -2,8 +2,8 @@ package api import ( "encoding/json" - "net/http" "log" + "net/http" ) type DeleteFileRequest struct { diff --git a/pkg/api/handle_tag.go b/pkg/api/handle_tag.go index a3a5126..ba0a8be 100644 --- a/pkg/api/handle_tag.go +++ b/pkg/api/handle_tag.go @@ -67,7 +67,7 @@ func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) { } resp := &InsertTagResponse{Tag: tag} - + err = json.NewEncoder(w).Encode(resp) if err != nil { api.HandleError(w, r, err) @@ -159,4 +159,3 @@ func (api *API) HandleDeleteTag(w http.ResponseWriter, r *http.Request) { api.HandleOK(w, r) } - diff --git a/pkg/api/handle_tag_and_file.go b/pkg/api/handle_tag_and_file.go index 7595ce1..e9df22e 100644 --- a/pkg/api/handle_tag_and_file.go +++ b/pkg/api/handle_tag_and_file.go @@ -61,7 +61,7 @@ func (api *API) HandleGetTagsOnFile(w http.ResponseWriter, r *http.Request) { api.HandleError(w, r, err) return } - + log.Println("[api] Get tags on file request:", req) tags, err := api.Db.GetTagsOnFile(req.ID) diff --git a/pkg/database/database.go b/pkg/database/database.go index 4199be8..176278c 100644 --- a/pkg/database/database.go +++ b/pkg/database/database.go @@ -8,20 +8,20 @@ import ( ) type Database struct { - sqlConn *sql.DB - stmt *Stmt + sqlConn *sql.DB + stmt *Stmt singleThreadLock SingleThreadLock } func NewSingleThreadLock(enabled bool) SingleThreadLock { return SingleThreadLock{ - lock: sync.Mutex{}, + lock: sync.Mutex{}, enabled: enabled, } } type SingleThreadLock struct { - lock sync.Mutex + lock sync.Mutex enabled bool } @@ -54,8 +54,8 @@ func NewDatabase(dbName string, singleThread bool) (*Database, error) { // new database database := &Database{ - sqlConn: sqlConn, - stmt: stmt, + sqlConn: sqlConn, + stmt: stmt, singleThreadLock: NewSingleThreadLock(singleThread), } diff --git a/pkg/database/error.go b/pkg/database/error.go index f298618..70e266c 100644 --- a/pkg/database/error.go +++ b/pkg/database/error.go @@ -5,6 +5,6 @@ import ( ) var ( - ErrNotFound = errors.New("object not found") + ErrNotFound = errors.New("object not found") ErrTagNotFound = errors.New("tag not found") ) diff --git a/pkg/database/method_tag.go b/pkg/database/method_tag.go index d6929e8..3e6e630 100644 --- a/pkg/database/method_tag.go +++ b/pkg/database/method_tag.go @@ -57,7 +57,7 @@ func (database *Database) GetTags() ([]*Tag, error) { return tags, nil } -func (database *Database) UpdateTag(tag *Tag) (error) { +func (database *Database) UpdateTag(tag *Tag) error { database.singleThreadLock.Lock() defer database.singleThreadLock.Unlock() diff --git a/pkg/database/sql_stmt.go b/pkg/database/sql_stmt.go index bd9bb80..f01e5a3 100644 --- a/pkg/database/sql_stmt.go +++ b/pkg/database/sql_stmt.go @@ -759,7 +759,7 @@ func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) { if err != nil { return nil, err } - + // init updateFilename stmt.updateFilename, err = sqlConn.Prepare(updateFilenameQuery) if err != nil {