Missing audiobooks flagged not deleted, fix close progress loop on stream errors, clickable download toast, consolidate duplicate track error log, improved scanner to ignore non-audio files

server/utils/audioFileScanner.js

@@ -89,6 +89,8 @@ async function scanAudioFiles(audiobook, newAudioFiles) {
     return
   }
   var tracks = []
+  var numDuplicateTracks = 0
+  var numInvalidTracks = 0
   for (let i = 0; i < newAudioFiles.length; i++) {
     var audioFile = newAudioFiles[i]
     var scanData = await scan(audioFile.fullPath)
@@ -118,17 +120,19 @@ async function scanAudioFiles(audiobook, newAudioFiles) {
     if (newAudioFiles.length > 1) {
       trackNumber = isNumber(trackNumFromMeta) ? trackNumFromMeta : trackNumFromFilename
       if (trackNumber === null) {
-        Logger.error('[AudioFileScanner] Invalid track number for', audioFile.filename)
+        Logger.debug('[AudioFileScanner] Invalid track number for', audioFile.filename)
         audioFile.invalid = true
         audioFile.error = 'Failed to get track number'
+        numInvalidTracks++
         continue;
       }
     }
 
     if (tracks.find(t => t.index === trackNumber)) {
-      Logger.error('[AudioFileScanner] Duplicate track number for', audioFile.filename)
+      Logger.debug('[AudioFileScanner] Duplicate track number for', audioFile.filename)
       audioFile.invalid = true
       audioFile.error = 'Duplicate track number'
+      numDuplicateTracks++
       continue;
     }
 
@@ -141,6 +145,13 @@ async function scanAudioFiles(audiobook, newAudioFiles) {
     return
   }
 
+  if (numDuplicateTracks > 0) {
+    Logger.warn(`[AudioFileScanner] ${numDuplicateTracks} Duplicate tracks for "${audiobook.title}"`)
+  }
+  if (numInvalidTracks > 0) {
+    Logger.error(`[AudioFileScanner] ${numDuplicateTracks} Invalid tracks for "${audiobook.title}"`)
+  }
+
   tracks.sort((a, b) => a.index - b.index)
   audiobook.audioFiles.sort((a, b) => {
     var aNum = isNumber(a.trackNumFromMeta) ? a.trackNumFromMeta : isNumber(a.trackNumFromFilename) ? a.trackNumFromFilename : 0

server/utils/scandir.js

@@ -19,11 +19,17 @@ function getPaths(path) {
   })
 }
 
+function isAudioFile(path) {
+  if (!path) return false
+  var ext = Path.extname(path)
+  if (!ext) return false
+  return AUDIO_FORMATS.includes(ext.slice(1).toLowerCase())
+}
+
 function groupFilesIntoAudiobookPaths(paths) {
   // Step 1: Normalize path, Remove leading "/", Filter out files in root dir
   var pathsFiltered = paths.map(path => Path.normalize(path.slice(1))).filter(path => Path.parse(path).dir)
 
-
   // Step 2: Sort by least number of directories
   pathsFiltered.sort((a, b) => {
     var pathsA = Path.dirname(a).split(Path.sep).length
@@ -31,25 +37,55 @@ function groupFilesIntoAudiobookPaths(paths) {
     return pathsA - pathsB
   })
 
-  // Step 3: Group into audiobooks
+  // Step 2.5: Seperate audio files and other files
+  var audioFilePaths = []
+  var otherFilePaths = []
+  pathsFiltered.forEach(path => {
+    if (isAudioFile(path)) audioFilePaths.push(path)
+    else otherFilePaths.push(path)
+  })
+
+  // Step 3: Group audio files in audiobooks
   var audiobookGroup = {}
-  pathsFiltered.forEach((path) => {
+  audioFilePaths.forEach((path) => {
     var dirparts = Path.dirname(path).split(Path.sep)
     var numparts = dirparts.length
     var _path = ''
+
+    // Iterate over directories in path
     for (let i = 0; i < numparts; i++) {
       var dirpart = dirparts.shift()
       _path = Path.join(_path, dirpart)
-      if (audiobookGroup[_path]) {
+
+
+      if (audiobookGroup[_path]) { // Directory already has files, add file
         var relpath = Path.join(dirparts.join(Path.sep), Path.basename(path))
         audiobookGroup[_path].push(relpath)
         return
-      } else if (!dirparts.length) {
+      } else if (!dirparts.length) { // This is the last directory, create group
         audiobookGroup[_path] = [Path.basename(path)]
         return
       }
     }
   })
+
+  // Step 4: Add other files into audiobook groups
+  otherFilePaths.forEach((path) => {
+    var dirparts = Path.dirname(path).split(Path.sep)
+    var numparts = dirparts.length
+    var _path = ''
+
+    // Iterate over directories in path
+    for (let i = 0; i < numparts; i++) {
+      var dirpart = dirparts.shift()
+      _path = Path.join(_path, dirpart)
+      if (audiobookGroup[_path]) { // Directory is audiobook group
+        var relpath = Path.join(dirparts.join(Path.sep), Path.basename(path))
+        audiobookGroup[_path].push(relpath)
+        return
+      }
+    }
+  })
   return audiobookGroup
 }
 module.exports.groupFilesIntoAudiobookPaths = groupFilesIntoAudiobookPaths