format code with gofmt
This commit is contained in:
@@ -2,22 +2,22 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"errors"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrNotLoggedIn = errors.New("not logged in")
|
ErrNotLoggedIn = errors.New("not logged in")
|
||||||
ErrNotAdmin = errors.New("not admin")
|
ErrNotAdmin = errors.New("not admin")
|
||||||
ErrEmpty = errors.New("Empty field detected, please fill in all fields")
|
ErrEmpty = errors.New("Empty field detected, please fill in all fields")
|
||||||
ErrAnonymous = errors.New("Anonymous user detected, please login")
|
ErrAnonymous = errors.New("Anonymous user detected, please login")
|
||||||
ErrNotActive = errors.New("User is not active")
|
ErrNotActive = errors.New("User is not active")
|
||||||
ErrWrongPassword = errors.New("Wrong password")
|
ErrWrongPassword = errors.New("Wrong password")
|
||||||
)
|
)
|
||||||
|
|
||||||
type Error struct {
|
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) {
|
func (api *API) HandleError(w http.ResponseWriter, r *http.Request, err error) {
|
||||||
|
|||||||
@@ -105,6 +105,5 @@ func (api *API) HandleDeleteFeedback(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
api.HandleOK(w, r)
|
api.HandleOK(w, r)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package api
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
|
||||||
"log"
|
"log"
|
||||||
|
"net/http"
|
||||||
)
|
)
|
||||||
|
|
||||||
type DeleteFileRequest struct {
|
type DeleteFileRequest struct {
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resp := &InsertTagResponse{Tag: tag}
|
resp := &InsertTagResponse{Tag: tag}
|
||||||
|
|
||||||
err = json.NewEncoder(w).Encode(resp)
|
err = json.NewEncoder(w).Encode(resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
@@ -159,4 +159,3 @@ func (api *API) HandleDeleteTag(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
api.HandleOK(w, r)
|
api.HandleOK(w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ func (api *API) HandleGetTagsOnFile(w http.ResponseWriter, r *http.Request) {
|
|||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Println("[api] Get tags on file request:", req)
|
log.Println("[api] Get tags on file request:", req)
|
||||||
|
|
||||||
tags, err := api.Db.GetTagsOnFile(req.ID)
|
tags, err := api.Db.GetTagsOnFile(req.ID)
|
||||||
|
|||||||
@@ -8,20 +8,20 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Database struct {
|
type Database struct {
|
||||||
sqlConn *sql.DB
|
sqlConn *sql.DB
|
||||||
stmt *Stmt
|
stmt *Stmt
|
||||||
singleThreadLock SingleThreadLock
|
singleThreadLock SingleThreadLock
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSingleThreadLock(enabled bool) SingleThreadLock {
|
func NewSingleThreadLock(enabled bool) SingleThreadLock {
|
||||||
return SingleThreadLock{
|
return SingleThreadLock{
|
||||||
lock: sync.Mutex{},
|
lock: sync.Mutex{},
|
||||||
enabled: enabled,
|
enabled: enabled,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type SingleThreadLock struct {
|
type SingleThreadLock struct {
|
||||||
lock sync.Mutex
|
lock sync.Mutex
|
||||||
enabled bool
|
enabled bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,8 +54,8 @@ func NewDatabase(dbName string, singleThread bool) (*Database, error) {
|
|||||||
|
|
||||||
// new database
|
// new database
|
||||||
database := &Database{
|
database := &Database{
|
||||||
sqlConn: sqlConn,
|
sqlConn: sqlConn,
|
||||||
stmt: stmt,
|
stmt: stmt,
|
||||||
singleThreadLock: NewSingleThreadLock(singleThread),
|
singleThreadLock: NewSingleThreadLock(singleThread),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrNotFound = errors.New("object not found")
|
ErrNotFound = errors.New("object not found")
|
||||||
ErrTagNotFound = errors.New("tag not found")
|
ErrTagNotFound = errors.New("tag not found")
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ func (database *Database) GetTags() ([]*Tag, error) {
|
|||||||
return tags, nil
|
return tags, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) UpdateTag(tag *Tag) (error) {
|
func (database *Database) UpdateTag(tag *Tag) error {
|
||||||
database.singleThreadLock.Lock()
|
database.singleThreadLock.Lock()
|
||||||
defer database.singleThreadLock.Unlock()
|
defer database.singleThreadLock.Unlock()
|
||||||
|
|
||||||
|
|||||||
@@ -759,7 +759,7 @@ func NewPreparedStatement(sqlConn *sql.DB) (*Stmt, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// init updateFilename
|
// init updateFilename
|
||||||
stmt.updateFilename, err = sqlConn.Prepare(updateFilenameQuery)
|
stmt.updateFilename, err = sqlConn.Prepare(updateFilenameQuery)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user