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

backend show foldername

Browse Source
This commit is contained in:
黑墨水鱼
2021-05-24 02:52:44 +08:00
parent 811425f6bb
commit d7501e3857
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pkg/database/database.go
View File

@@ -36,7 +36,7 @@ var dropFilesQuery = `DROP TABLE files;`
var dropFolderQuery = `DROP TABLE folders;` var dropFolderQuery = `DROP TABLE folders;`
var getFileQuery = `SELECT files.id, files.folder_id, files.filename, folders.foldername, files.filesize FROM files JOIN folders ON files.folder_id = folders.id WHERE files.id = ? LIMIT 1;` var getFileQuery = `SELECT files.id, files.folder_id, files.filename, folders.foldername, files.filesize FROM files JOIN folders ON files.folder_id = folders.id WHERE files.id = ? LIMIT 1;`
var searchFoldersQuery = `SELECT id, folder, foldername FROM folders WHERE foldername LIKE ? LIMIT ? OFFSET ?;` var searchFoldersQuery = `SELECT id, folder, foldername FROM folders WHERE foldername LIKE ? LIMIT ? OFFSET ?;`
var getFilesInFolderQuery = `SELECT id, filename, filesize FROM files WHERE folder_id = ? LIMIT ? OFFSET ?;` var getFilesInFolderQuery = `SELECT files.id, files.filename, files.filesize, folders.foldername FROM files JOIN folders ON files.folder_id = folders.id WHERE folder_id = ? LIMIT ? OFFSET ?;`
var getRandomFilesQuery = `SELECT files.id, files.folder_id, files.filename, folders.foldername, files.filesize FROM files JOIN folders on files.folder_id = folders.id ORDER BY RANDOM() LIMIT ?;` var getRandomFilesQuery = `SELECT files.id, files.folder_id, files.filename, folders.foldername, files.filesize FROM files JOIN folders on files.folder_id = folders.id ORDER BY RANDOM() LIMIT ?;`
var insertFeedbackQuery = `INSERT INTO feedbacks (time, feedback, header) VALUES (?, ?, ?);` var insertFeedbackQuery = `INSERT INTO feedbacks (time, feedback, header) VALUES (?, ?, ?);`
@@ -119,7 +119,7 @@ func (database *Database) GetFilesInFolder(folder_id int64, limit int64, offset
Db: database, Db: database,
Folder_id: folder_id, Folder_id: folder_id,
} }
err = rows.Scan(&file.ID, &file.Filename, &file.Filesize) err = rows.Scan(&file.ID, &file.Filename, &file.Filesize, &file.Foldername)
if err != nil { if err != nil {
return nil, err return nil, err
} }

9
web/index.js
View File

@@ -61,7 +61,6 @@ const component_search_folders = {
mounted() { mounted() {
if (this.$route.query.folder_id) { if (this.$route.query.folder_id) {
this.folder.id = parseInt(this.$route.query.folder_id) this.folder.id = parseInt(this.$route.query.folder_id)
this.folder.foldername = this.$route.query.foldername
this.get_files_in_folder() this.get_files_in_folder()
} }
}, },
@@ -88,11 +87,7 @@ const component_search_folders = {
limit: this.folder_limit, limit: this.folder_limit,
offset: this.folder_offset, offset: this.folder_offset,
}).then((response) => { }).then((response) => {
var files = response.data.files this.files_in_folder = response.data.files
for (var key in files) {
files[key].foldername = this.folder.foldername
}
this.files_in_folder = files
}) })
}, },
last_page() { last_page() {
@@ -366,7 +361,6 @@ const component_file = {
path: '/search_folders', path: '/search_folders',
query: { query: {
folder_id: this.file.folder_id, folder_id: this.file.folder_id,
foldername: this.file.foldername,
} }
}) })
}, },
@@ -422,7 +416,6 @@ const component_audio_player = {
path: '/search_folders', path: '/search_folders',
query: { query: {
folder_id: this.file.folder_id, folder_id: this.file.folder_id,
foldername: this.file.foldername,
} }
}) })
}, },