Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-04-02 01:16:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update libraryFolderID correctly in scanFolderUpdates

Browse Source
This commit is contained in:
mikiher 2024-03-20 11:40:50 +02:00
parent 9511122bae
commit 1bee082720
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/scanner/LibraryItemScanner.js
View File

@ -21,10 +21,10 @@ class LibraryItemScanner {
* Scan single library item * Scan single library item
* *
* @param {string} libraryItemId * @param {string} libraryItemId
* @param {{relPath:string, path:string}} [renamedPaths] used by watcher when item folder was renamed * @param {{relPath:string, path:string}} [updateLibraryItemDetails] used by watcher when item folder was renamed
* @returns {number} ScanResult * @returns {number} ScanResult
*/ */
async scanLibraryItem(libraryItemId, renamedPaths = null) { async scanLibraryItem(libraryItemId, updateLibraryItemDetails = null) {
// TODO: Add task manager // TODO: Add task manager
const libraryItem = await Database.libraryItemModel.findByPk(libraryItemId) const libraryItem = await Database.libraryItemModel.findByPk(libraryItemId)
if (!libraryItem) { if (!libraryItem) {
@ -32,11 +32,12 @@ class LibraryItemScanner {
return ScanResult.NOTHING return ScanResult.NOTHING
} }
const libraryFolderId = updateLibraryItemDetails?.libraryFolderId || libraryItem.libraryFolderId
const library = await Database.libraryModel.findByPk(libraryItem.libraryId, { const library = await Database.libraryModel.findByPk(libraryItem.libraryId, {
include: { include: {
model: Database.libraryFolderModel, model: Database.libraryFolderModel,
where: { where: {
id: libraryItem.libraryFolderId id: libraryFolderId
} }
} }
}) })
@ -51,9 +52,9 @@ class LibraryItemScanner {
const scanLogger = new ScanLogger() const scanLogger = new ScanLogger()
scanLogger.verbose = true scanLogger.verbose = true
scanLogger.setData('libraryItem', renamedPaths?.relPath || libraryItem.relPath) scanLogger.setData('libraryItem', updateLibraryItemDetails?.relPath || libraryItem.relPath)
const libraryItemPath = renamedPaths?.path || fileUtils.filePathToPOSIX(libraryItem.path) const libraryItemPath = updateLibraryItemDetails?.path || fileUtils.filePathToPOSIX(libraryItem.path)
const folder = library.libraryFolders[0] const folder = library.libraryFolders[0]
const libraryItemScanData = await this.getLibraryItemScanData(libraryItemPath, library, folder, false) const libraryItemScanData = await this.getLibraryItemScanData(libraryItemPath, library, folder, false)

9
server/scanner/LibraryScanner.js
View File

@ -525,7 +525,7 @@ class LibraryScanner {
path: potentialChildDirs path: potentialChildDirs
}) })
let renamedPaths = {} let updatedLibraryItemDetails = {}
if (!existingLibraryItem) { if (!existingLibraryItem) {
const dirIno = await fileUtils.getIno(fullPath) const dirIno = await fileUtils.getIno(fullPath)
existingLibraryItem = await Database.libraryItemModel.findOneOld({ existingLibraryItem = await Database.libraryItemModel.findOneOld({
@ -536,8 +536,9 @@ class LibraryScanner {
// Update library item paths for scan // Update library item paths for scan
existingLibraryItem.path = fullPath existingLibraryItem.path = fullPath
existingLibraryItem.relPath = itemDir existingLibraryItem.relPath = itemDir
renamedPaths.path = fullPath updatedLibraryItemDetails.path = fullPath
renamedPaths.relPath = itemDir updatedLibraryItemDetails.relPath = itemDir
updatedLibraryItemDetails.libraryFolderId = folder.id
} }
} }
if (existingLibraryItem) { if (existingLibraryItem) {
@ -557,7 +558,7 @@ class LibraryScanner {
// Scan library item for updates // Scan library item for updates
Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" is in library item "${existingLibraryItem.media.metadata.title}" - scan for updates`) Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" is in library item "${existingLibraryItem.media.metadata.title}" - scan for updates`)
itemGroupingResults[itemDir] = await LibraryItemScanner.scanLibraryItem(existingLibraryItem.id, renamedPaths) itemGroupingResults[itemDir] = await LibraryItemScanner.scanLibraryItem(existingLibraryItem.id, updatedLibraryItemDetails)
continue continue
} else if (library.settings.audiobooksOnly && !hasAudioFiles(fileUpdateGroup, itemDir)) { } else if (library.settings.audiobooksOnly && !hasAudioFiles(fileUpdateGroup, itemDir)) {
Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" has no audio files`) Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" has no audio files`)