From 2b91bff1afca58f1f37a0f33ce37d51b4b288a7d Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 12 Jul 2022 15:02:08 -0500
Subject: [PATCH] Fix:Ordering newly scanned in audio tracks properly #823

---
 server/objects/files/AudioFile.js  |  4 ++++
 server/scanner/MediaFileScanner.js | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/objects/files/AudioFile.js b/server/objects/files/AudioFile.js
index c2a15fb5..27c62e8e 100644
--- a/server/objects/files/AudioFile.js
+++ b/server/objects/files/AudioFile.js
@@ -111,6 +111,10 @@ class AudioFile {
     }
   }
 
+  get isValidTrack() {
+    return !this.invalid && !this.exclude
+  }
+
   // New scanner creates AudioFile from MediaFileScanner
   setDataFromProbe(libraryFile, probeData) {
     this.ino = libraryFile.ino || null
diff --git a/server/scanner/MediaFileScanner.js b/server/scanner/MediaFileScanner.js
index 3ed96895..e010d1b1 100644
--- a/server/scanner/MediaFileScanner.js
+++ b/server/scanner/MediaFileScanner.js
@@ -211,22 +211,26 @@ class MediaFileScanner {
         Logger.debug(`Library Item "${scanData.path}" Audio file scan took ${mediaScanResult.elapsed}ms for ${mediaScanResult.audioFiles.length} with average time of ${mediaScanResult.averageScanDuration}ms`)
       }
 
-      var totalAudioFilesToInclude = mediaScanResult.audioFiles.length
       var newAudioFiles = mediaScanResult.audioFiles.filter(af => {
         return !libraryItem.media.findFileWithInode(af.ino)
       })
 
       // Book: Adding audio files to book media
       if (libraryItem.mediaType === 'book') {
+        var mediaScanFileInodes = mediaScanResult.audioFiles.map(af => af.ino)
+        // Filter for existing valid track audio files not included in the audio files scanned
+        var existingAudioFiles = libraryItem.media.audioFiles.filter(af => af.isValidTrack && !mediaScanFileInodes.includes(af.ino))
+
         if (newAudioFiles.length) {
           // Single Track Audiobooks
-          if (totalAudioFilesToInclude === 1) {
+          if (mediaScanFileInodes.length + existingAudioFiles.length === 1) {
             var af = mediaScanResult.audioFiles[0]
             af.index = 1
             libraryItem.media.addAudioFile(af)
             hasUpdated = true
           } else {
-            this.runSmartTrackOrder(libraryItem, mediaScanResult.audioFiles)
+            var allAudioFiles = existingAudioFiles.concat(mediaScanResult.audioFiles)
+            this.runSmartTrackOrder(libraryItem, allAudioFiles)
             hasUpdated = true
           }
         } else {