groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-03-01 05:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge 397613795f into 1d0b7e383a

Browse source
This commit is contained in:
Scott A Miller-Tatasciore 2026-02-25 02:55:11 +01:00 • committed by GitHub
commit f37944b761
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
client/pages/upload/index.vue
View file

@ -377,26 +377,33 @@ export default {
const itemsToUpload = []
// Check if path already exists before starting upload
// uploading fails if path already exists
// Check if path already exists for each file before starting upload
// uploading fails if all paths already exist
for (const item of items) {
const exists = await this.$axios
.$post(`/api/filesystem/pathexists`, { directory: item.directory, folderPath: this.selectedFolder.fullPath })
.then((data) => {
if (data.exists) {
if (data.libraryItemTitle) {
this.$toast.error(this.$getString('ToastUploaderItemExistsInSubdirectoryError', [data.libraryItemTitle]))
} else {
this.$toast.error(this.$getString('ToastUploaderFilepathExistsError', [Path.join(this.selectedFolder.fullPath, item.directory)]))
let filesToUpload = []
for (const file of item.files) {
const exists = await this.$axios
.$post(`/api/filesystem/pathexists`, { folderPath: this.selectedFolder.fullPath, directory: item.directory, fileName: file.filepath })
.then((data) => {
if (data.exists) {
if (data.libraryItemTitle) {
this.$toast.error(this.$getString('ToastUploaderItemExistsInSubdirectoryError', [data.libraryItemTitle]))
} else {
this.$toast.error(this.$getString('ToastUploaderFilepathExistsError', [Path.join(this.selectedFolder.fullPath, item.directory)]))
}
}
}
return data.exists
})
.catch((error) => {
console.error('Failed to check if filepath exists', error)
return false
})
if (!exists) {
return data.exists
})
.catch((error) => {
console.error('Failed to check if filepath exists', error)
return false
})
if (!exists) {
filesToUpload.push(file)
}
}
if (filesToUpload?.length) {
item.files = filesToUpload
itemsToUpload.push(item)
}
}

4
server/controllers/FileSystemController.js
View file

@ -88,7 +88,7 @@ class FileSystemController {
return res.sendStatus(403)
}
const { directory, folderPath } = req.body
const { folderPath, directory, fileName } = req.body
if (!directory?.length || typeof directory !== 'string' || !folderPath?.length || typeof folderPath !== 'string') {
Logger.error(`[FileSystemController] Invalid request body: ${JSON.stringify(req.body)}`)
return res.status(400).json({
@ -113,7 +113,7 @@ class FileSystemController {
return res.sendStatus(403)
}
let filepath = Path.join(libraryFolder.path, directory)
let filepath = Path.join(libraryFolder.path, directory, fileName)
filepath = fileUtils.filePathToPOSIX(filepath)
// Ensure filepath is inside library folder (prevents directory traversal)