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

support /v1/get_files_in_folder return folder path

Browse Source
This commit is contained in:
黑墨水鱼
2022-11-03 01:21:25 +08:00
parent 2b4bbdf25e
commit 857a5e9dd9
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/handle_get_files_in_folder.go
View File

@@ -15,6 +15,7 @@ type GetFilesInFolderRequest struct {
type GetFilesInFolderResponse struct {
Files *[]database.File `json:"files"`
Folder string `json:"folder"`
}
func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
@@ -34,7 +35,7 @@ func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
return
}
files, err := api.Db.GetFilesInFolder(getFilesInFolderRequest.Folder_id, getFilesInFolderRequest.Limit, getFilesInFolderRequest.Offset)
files, folder, err := api.Db.GetFilesInFolder(getFilesInFolderRequest.Folder_id, getFilesInFolderRequest.Limit, getFilesInFolderRequest.Offset)
if err != nil {
api.HandleError(w, r, err)
return
@@ -42,6 +43,7 @@ func (api *API) HandleGetFilesInFolder(w http.ResponseWriter, r *http.Request) {
getFilesInFolderResponse := &GetFilesInFolderResponse{
Files: &files,
Folder: folder,
}
log.Println("[api] Get files in folder", getFilesInFolderRequest.Folder_id)

11
pkg/database/method.go
View File

@@ -53,28 +53,29 @@ func (database *Database) GetRandomFilesWithTag(tagID, limit int64) ([]File, err
return files, nil
}
func (database *Database) GetFilesInFolder(folder_id int64, limit int64, offset int64) ([]File, error) {
func (database *Database) GetFilesInFolder(folder_id int64, limit int64, offset int64) ([]File, string, error) {
database.singleThreadLock.Lock()
defer database.singleThreadLock.Unlock()
rows, err := database.stmt.getFilesInFolder.Query(folder_id, limit, offset)
if err != nil {
return nil, err
return nil, "", err
}
defer rows.Close()
files := make([]File, 0)
folder := ""
for rows.Next() {
file := File{
Db: database,
Folder_id: folder_id,
}
err = rows.Scan(&file.ID, &file.Filename, &file.Filesize, &file.Foldername)
err = rows.Scan(&file.ID, &file.Filename, &file.Filesize, &file.Foldername, &folder)
if err != nil {
return nil, err
return nil, "", err
}
files = append(files, file)
}
return files, nil
return files, folder, nil
}
func (database *Database) SearchFolders(foldername string, limit int64, offset int64) ([]Folder, error) {

2
pkg/database/sql_stmt.go
View File

@@ -150,7 +150,7 @@ ORDER BY foldername
LIMIT ? OFFSET ?;`
var getFilesInFolderQuery = `SELECT
files.id, files.filename, files.filesize, folders.foldername
files.id, files.filename, files.filesize, folders.foldername, folders.folder
FROM files
JOIN folders ON files.folder_id = folders.id
WHERE folder_id = ?

2
pkg/database/struct.go
View File

@@ -17,7 +17,7 @@ type File struct {
type Folder struct {
Db *Database `json:"-"`
ID int64 `json:"id"`
Folder string `json:"-"`
Folder string `json:"folder"`
Foldername string `json:"foldername"`
}