heimoshuiyu/msw-open-music
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix backend output format

Browse Source
This commit is contained in:
黑墨水鱼
2022-06-12 18:01:30 +08:00
parent d7b6b3849c
commit edc42248ee
8 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/handle_database_manage.go
View File

@@ -2,6 +2,7 @@ package api
import (
"encoding/json"
"log"
"net/http"
)
@@ -20,6 +21,8 @@ func (api *API) HandleReset(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Reset database")
// reset
err = api.Db.ResetFiles()
if err != nil {
@@ -69,6 +72,8 @@ func (api *API) HandleWalk(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Walk", walkRequest.Root, walkRequest.Pattern, walkRequest.TagIDs)
// walk
err = api.Db.Walk(walkRequest.Root, walkRequest.Pattern, walkRequest.TagIDs, userID)
if err != nil {

35
pkg/api/handle_folder.go
View File

@@ -1,35 +0,0 @@
package api
import (
"encoding/json"
"net/http"
)
type UpdateFoldernameRequest struct {
ID int64 `json:"id"`
Foldername string `json:"foldername"`
}
func (api *API) HandleUpdateFoldername(w http.ResponseWriter, r *http.Request) {
req := &UpdateFoldernameRequest{}
err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// check is admin
err = api.CheckAdmin(w, r)
if err != nil {
api.HandleError(w, r, err)
return
}
err = api.Db.UpdateFoldername(req.ID, req.Foldername)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
api.HandleOK(w, r)
}

2
pkg/api/handle_get_file_info.go
View File

@@ -31,6 +31,8 @@ func (api *API) HandleGetFileInfo(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Get file info", getFileRequest.ID)
file, err := api.Db.GetFile(getFileRequest.ID)
if err != nil {
api.HandleError(w, r, err)

34
pkg/api/handle_manage_folder.go
View File

@@ -2,6 +2,7 @@ package api
import (
"encoding/json"
"log"
"net/http"
)
@@ -24,6 +25,8 @@ func (api *API) HandleResetFoldername(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Reset foldername folderID", req.ID)
err = api.Db.ResetFoldername(req.ID)
if err != nil {
api.HandleError(w, r, err)
@@ -32,3 +35,34 @@ func (api *API) HandleResetFoldername(w http.ResponseWriter, r *http.Request) {
api.HandleOK(w, r)
}
type UpdateFoldernameRequest struct {
ID int64 `json:"id"`
Foldername string `json:"foldername"`
}
func (api *API) HandleUpdateFoldername(w http.ResponseWriter, r *http.Request) {
req := &UpdateFoldernameRequest{}
err := json.NewDecoder(r.Body).Decode(req)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// check is admin
err = api.CheckAdmin(w, r)
if err != nil {
api.HandleError(w, r, err)
return
}
log.Println("[api] Update foldername folderID", req.ID, req.Foldername)
err = api.Db.UpdateFoldername(req.ID, req.Foldername)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
api.HandleOK(w, r)
}

11
pkg/api/handle_review.go
View File

@@ -3,6 +3,7 @@ package api
import (
"encoding/json"
"errors"
"log"
"msw-open-music/pkg/database"
"net/http"
"time"
@@ -24,6 +25,8 @@ func (api *API) HandleInsertReview(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Insert review by", review.UserId, review.Content)
review.CreatedAt = time.Now().Unix()
err = api.Db.InsertReview(review)
@@ -58,6 +61,8 @@ func (api *API) HandleGetReviewsOnFile(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Get reviews on fileID", req.ID)
resp := &GetReviewsOnFileResponse{
Reviews: reviews,
}
@@ -92,6 +97,8 @@ func (api *API) HandleGetReview(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Get review ID", req.ID)
ret := &GetReviewResponse{
Review: review,
}
@@ -144,6 +151,8 @@ func (api *API) HandleUpdateReview(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Update review", req.ID, req.Content)
req.UpdatedAt = time.Now().Unix()
err = api.Db.UpdateReview(req)
@@ -174,6 +183,8 @@ func (api *API) HandleDeleteReview(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("[api] Delete review ID", req.ID)
err = api.Db.DeleteReview(req.ID)
if err != nil {
api.HandleError(w, r, err)

4
pkg/api/handle_tag.go
View File

@@ -18,7 +18,7 @@ func (api *API) HandleGetTags(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Successfully got tags")
log.Println("[api] Successfully got tags")
resp := &getTagsResponse{Tags: tags}
@@ -155,7 +155,7 @@ func (api *API) HandleDeleteTag(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Successfully deleted tag and its references", req.ID)
log.Println("[api] Successfully deleted tag and its references", req.ID)
api.HandleOK(w, r)
}

6
pkg/api/handle_tag_and_file.go
View File

@@ -39,7 +39,7 @@ func (api *API) HandlePutTagOnFile(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Put tag on file request:", req, "userID:", userID)
log.Println("[api] Put tag on file request:", req, "userID:", userID)
api.Db.PutTagOnFile(req.TagID, req.FileID, userID)
@@ -62,7 +62,7 @@ func (api *API) HandleGetTagsOnFile(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Get tags on file request:", req)
log.Println("[api] Get tags on file request:", req)
tags, err := api.Db.GetTagsOnFile(req.ID)
if err != nil {
@@ -107,7 +107,7 @@ func (api *API) HandleDeleteTagOnFile(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Delete tag on file request:", req)
log.Println("[api] Delete tag on file request:", req)
err = api.Db.DeleteTagOnFile(req.TagID, req.FileID)
if err != nil {

9
pkg/api/handle_user.go
View File

@@ -49,7 +49,6 @@ func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
var user *database.User
var err error
session, _ := api.store.Get(r, api.defaultSessionName)
log.Println("Session:", session.Values)
// Get method will login current or anonymous user
if r.Method == "GET" {
@@ -62,16 +61,16 @@ func (api *API) HandleLogin(w http.ResponseWriter, r *http.Request) {
api.HandleError(w, r, err)
return
}
log.Println("User not found")
log.Println("[api] Warning: User not found")
// login as anonymous user
api.LoginAsAnonymous(w, r)
return
}
log.Println("User already logged in:", user)
log.Println("[api] User already logged in:", user)
} else {
// login as anonymous user
log.Println("Login as anonymous user")
log.Println("[api] Login as anonymous user")
api.LoginAsAnonymous(w, r)
return
}
@@ -132,7 +131,7 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) {
return
}
log.Println("Register user", request.Username)
log.Println("[api] Register user", request.Username)
err = api.Db.Register(request.Username, request.Password, request.Role)
if err != nil {