Merge pull request #2283 from mikiher/watcher-single-file-update

Fix handling of single media file updates
advplyr · Nov 6, 2023 · 5ce1cda · 5ce1cda
2 parents ff83167 + 567e1c4
commit 5ce1cda
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/server/scanner/LibraryScanner.js b/server/scanner/LibraryScanner.js
@@ -463,7 +463,7 @@ class LibraryScanner {
     //    Test Case: Moving audio files from library item folder to author folder should trigger a re-scan of the item
     const updateGroup = { ...fileUpdateGroup }
     for (const itemDir in updateGroup) {
-      if (itemDir == fileUpdateGroup[itemDir]) continue // Media in root path
+      if (isSingleMediaFile(fileUpdateGroup, itemDir)) continue // Media in root path
 
       const itemDirNestedFiles = fileUpdateGroup[itemDir].filter(b => b.includes('/'))
       if (!itemDirNestedFiles.length) continue
@@ -559,7 +559,7 @@ class LibraryScanner {
         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)
         continue
-      } else if (library.settings.audiobooksOnly && !fileUpdateGroup[itemDir].some?.(scanUtils.checkFilepathIsAudioFile)) {
+      } else if (library.settings.audiobooksOnly && !hasAudioFiles(fileUpdateGroup, itemDir)) {
         Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" has no audio files`)
         continue
       }
@@ -580,7 +580,7 @@ class LibraryScanner {
       }
 
       Logger.debug(`[LibraryScanner] Folder update group must be a new item "${itemDir}" in library "${library.name}"`)
-      const isSingleMediaItem = itemDir === fileUpdateGroup[itemDir]
+      const isSingleMediaItem = isSingleMediaFile(fileUpdateGroup, itemDir)
       const newLibraryItem = await LibraryItemScanner.scanPotentialNewLibraryItem(fullPath, library, folder, isSingleMediaItem)
       if (newLibraryItem) {
         const oldNewLibraryItem = Database.libraryItemModel.getOldLibraryItem(newLibraryItem)
@@ -592,4 +592,14 @@ class LibraryScanner {
     return itemGroupingResults
   }
 }
-module.exports = new LibraryScanner()
+module.exports = new LibraryScanner()
+
+function hasAudioFiles(fileUpdateGroup, itemDir) {
+  return isSingleMediaFile(fileUpdateGroup, itemDir) ?
+    scanUtils.checkFilepathIsAudioFile(fileUpdateGroup[itemDir]) :
+    fileUpdateGroup[itemDir].some(scanUtils.checkFilepathIsAudioFile)
+}
+
+function isSingleMediaFile(fileUpdateGroup, itemDir) {
+  return itemDir === fileUpdateGroup[itemDir]
+}