From b68c181631c79ee00184334591080f69386571b4 Mon Sep 17 00:00:00 2001
From: Igor Kaldowski <igor.kaldowski@gmail.com>
Date: Sat, 4 Dec 2021 23:57:47 +0000
Subject: [PATCH] Add: Force re-scan library

---
 client/components/modals/libraries/LibraryItem.vue | 4 ++++
 server/Server.js                                   | 4 ++--
 server/scanner/Scanner.js                          | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/components/modals/libraries/LibraryItem.vue b/client/components/modals/libraries/LibraryItem.vue
index a6fa5118..60839c3b 100644
--- a/client/components/modals/libraries/LibraryItem.vue
+++ b/client/components/modals/libraries/LibraryItem.vue
@@ -10,6 +10,7 @@
     <p class="text-xl font-book pl-4 hover:underline cursor-pointer" @click.stop="$emit('click', library)">{{ library.name }}</p>
     <div class="flex-grow" />
     <ui-btn v-show="isHovering && !libraryScan && canScan" small color="bg" @click.stop="scan">Scan</ui-btn>
+    <ui-btn v-show="isHovering && !libraryScan && canScan" small color="bg" class="ml-2" @click.stop="forceScan">Force Re-Scan</ui-btn>
     <span v-show="isHovering && !libraryScan && showEdit && canEdit" class="material-icons text-xl text-gray-300 hover:text-gray-50 ml-4 cursor-pointer" @click.stop="editClick">edit</span>
     <span v-show="!libraryScan && isHovering && showEdit && canDelete && !isDeleting" class="material-icons text-xl text-gray-300 ml-3" :class="isMain ? 'text-opacity-5 cursor-not-allowed' : 'hover:text-gray-50 cursor-pointer'" @click.stop="deleteClick">delete</span>
     <div v-show="isDeleting" class="text-xl text-gray-300 ml-3 animate-spin">
@@ -67,6 +68,9 @@ export default {
     scan() {
       this.$root.socket.emit('scan', this.library.id)
     },
+    forceScan() {
+      this.$root.socket.emit('scan', this.library.id, {forceRescan: true})
+    },
     deleteClick() {
       if (this.isMain) return
       if (confirm(`Are you sure you want to permanently delete library "${this.library.name}"?`)) {
diff --git a/server/Server.js b/server/Server.js
index 5fd1638f..09dd4b63 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -316,9 +316,9 @@ class Server {
     await this.scanner2.scanFilesChanged(fileUpdates)
   }
 
-  async scan(libraryId) {
+  async scan(libraryId, options = {}) {
     Logger.info('[Server] Starting Scan')
-    await this.scanner2.scan(libraryId)
+    await this.scanner2.scan(libraryId, options)
     // await this.scanner.scan(libraryId)
     Logger.info('[Server] Scan complete')
   }
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 40df4eb2..d5bd38d0 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -221,7 +221,7 @@ class Scanner {
         }
       } else {
         var checkRes = audiobook.checkScanData(dataFound, version)
-        if (checkRes.newAudioFileData.length || checkRes.newOtherFileData.length) { // Audiobook has new files
+        if (checkRes.newAudioFileData.length || checkRes.newOtherFileData.length || libraryScan.scanOptions.forceRescan) { // Audiobook has new files
           checkRes.audiobook = audiobook
           checkRes.bookScanData = dataFound
           audiobookDataToRescan.push(checkRes)
@@ -325,13 +325,13 @@ class Scanner {
     libraryScan.addLog(LogLevel.DEBUG, `Library "${libraryScan.libraryName}" Re-scanning "${audiobook.path}"`)
 
     // Sync other files first to use local images as cover before extracting audio file cover
-    if (newOtherFileData.length) {
+    if (newOtherFileData.length || libraryScan.scanOptions.forceRescan) {
       // TODO: Cleanup other file sync
       var allOtherFiles = newOtherFileData.concat(audiobook._otherFiles)
       await audiobook.syncOtherFiles(allOtherFiles, this.MetadataPath, libraryScan.preferOpfMetadata)
     }
 
-    if (newAudioFileData.length) {
+    if (newAudioFileData.length || libraryScan.scanOptions.forceRescan) {
       await AudioFileScanner.scanAudioFiles(newAudioFileData, bookScanData, audiobook, libraryScan.preferAudioMetadata, libraryScan)
 
       // Extract embedded cover art if cover is not already in directory