Update new library scanner to handle metadata file changes

advplyr · Sep 3, 2023 · e63aab9 · e63aab9
1 parent 9123dcb
commit e63aab9
Show file tree

Hide file tree

Showing 6 changed files with 264 additions and 68 deletions.
diff --git a/server/Database.js b/server/Database.js
@@ -325,9 +325,9 @@ class Database {
     return Promise.all(oldUsers.map(u => this.updateUser(u)))
   }
 
-  async removeUser(userId) {
+  removeUser(userId) {
     if (!this.sequelize) return false
-    await this.models.user.removeById(userId)
+    return this.models.user.removeById(userId)
   }
 
   upsertMediaProgress(oldMediaProgress) {
@@ -345,19 +345,19 @@ class Database {
     return Promise.all(oldBooks.map(oldBook => this.models.book.saveFromOld(oldBook)))
   }
 
-  async createLibrary(oldLibrary) {
+  createLibrary(oldLibrary) {
     if (!this.sequelize) return false
-    await this.models.library.createFromOld(oldLibrary)
+    return this.models.library.createFromOld(oldLibrary)
   }
 
   updateLibrary(oldLibrary) {
     if (!this.sequelize) return false
     return this.models.library.updateFromOld(oldLibrary)
   }
 
-  async removeLibrary(libraryId) {
+  removeLibrary(libraryId) {
     if (!this.sequelize) return false
-    await this.models.library.removeById(libraryId)
+    return this.models.library.removeById(libraryId)
   }
 
   createBulkCollectionBooks(collectionBooks) {

diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
@@ -10,7 +10,7 @@ const Podcast = require('./mediaTypes/Podcast')
 const Video = require('./mediaTypes/Video')
 const Music = require('./mediaTypes/Music')
 const { areEquivalent, copyValue, cleanStringForSearch } = require('../utils/index')
-const { filePathToPOSIX } = require('../utils/fileUtils')
+const { filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
 
 class LibraryItem {
   constructor(libraryItem = null) {
@@ -40,6 +40,7 @@ class LibraryItem {
     this.mediaType = null
     this.media = null
 
+    /** @type {LibraryFile[]} */
     this.libraryFiles = []
 
     if (libraryItem) {
@@ -525,19 +526,20 @@ class LibraryItem {
 
   /**
    * Save metadata.json/metadata.abs file
-   * @returns {boolean} true if saved
+   * @returns {Promise<LibraryFile>} null if not saved
    */
   async saveMetadata() {
-    if (this.mediaType === 'video' || this.mediaType === 'music') return
+    if (this.isSavingMetadata) return null
 
-    if (this.isSavingMetadata) return
     this.isSavingMetadata = true
 
     let metadataPath = Path.join(global.MetadataPath, 'items', this.id)
-    if (global.ServerSettings.storeMetadataWithItem && !this.isFile) {
+    let storeMetadataWithItem = global.ServerSettings.storeMetadataWithItem
+    if (storeMetadataWithItem && !this.isFile) {
       metadataPath = this.path
     } else {
       // Make sure metadata book dir exists
+      storeMetadataWithItem = false
       await fs.ensureDir(metadataPath)
     }
 
@@ -552,20 +554,29 @@ class LibraryItem {
       }
 
       return fs.writeFile(metadataFilePath, JSON.stringify(this.media.toJSONForMetadataFile(), null, 2)).then(async () => {
-        this.isSavingMetadata = false
         // Add metadata.json to libraryFiles array if it is new
-        if (global.ServerSettings.storeMetadataWithItem && !this.libraryFiles.some(lf => lf.metadata.path === filePathToPOSIX(metadataFilePath))) {
-          const newLibraryFile = new LibraryFile()
-          await newLibraryFile.setDataFromPath(metadataFilePath, `metadata.json`)
-          this.libraryFiles.push(newLibraryFile)
+        let metadataLibraryFile = this.libraryFiles.find(lf => lf.metadata.path === filePathToPOSIX(metadataFilePath))
+        if (storeMetadataWithItem && !metadataLibraryFile) {
+          metadataLibraryFile = new LibraryFile()
+          await metadataLibraryFile.setDataFromPath(metadataFilePath, `metadata.json`)
+          this.libraryFiles.push(metadataLibraryFile)
+        } else if (storeMetadataWithItem) {
+          const fileTimestamps = await getFileTimestampsWithIno(metadataFilePath)
+          if (fileTimestamps) {
+            metadataLibraryFile.metadata.mtimeMs = fileTimestamps.mtimeMs
+            metadataLibraryFile.metadata.ctimeMs = fileTimestamps.ctimeMs
+            metadataLibraryFile.metadata.size = fileTimestamps.size
+            metadataLibraryFile.ino = fileTimestamps.ino
+          }
         }
         Logger.debug(`[LibraryItem] Success saving abmetadata to "${metadataFilePath}"`)
 
-        return true
+        return metadataLibraryFile
       }).catch((error) => {
-        this.isSavingMetadata = false
         Logger.error(`[LibraryItem] Failed to save json file at "${metadataFilePath}"`, error)
-        return false
+        return null
+      }).finally(() => {
+        this.isSavingMetadata = false
       })
     } else {
       // Remove metadata.json if it exists
@@ -576,19 +587,30 @@ class LibraryItem {
       }
 
       return abmetadataGenerator.generate(this, metadataFilePath).then(async (success) => {
-        this.isSavingMetadata = false
-        if (!success) Logger.error(`[LibraryItem] Failed saving abmetadata to "${metadataFilePath}"`)
-        else {
-          // Add metadata.abs to libraryFiles array if it is new
-          if (global.ServerSettings.storeMetadataWithItem && !this.libraryFiles.some(lf => lf.metadata.path === filePathToPOSIX(metadataFilePath))) {
-            const newLibraryFile = new LibraryFile()
-            await newLibraryFile.setDataFromPath(metadataFilePath, `metadata.abs`)
-            this.libraryFiles.push(newLibraryFile)
+        if (!success) {
+          Logger.error(`[LibraryItem] Failed saving abmetadata to "${metadataFilePath}"`)
+          return null
+        }
+        // Add metadata.abs to libraryFiles array if it is new
+        let metadataLibraryFile = this.libraryFiles.find(lf => lf.metadata.path === filePathToPOSIX(metadataFilePath))
+        if (storeMetadataWithItem && !metadataLibraryFile) {
+          metadataLibraryFile = new LibraryFile()
+          await metadataLibraryFile.setDataFromPath(metadataFilePath, `metadata.abs`)
+          this.libraryFiles.push(metadataLibraryFile)
+        } else if (storeMetadataWithItem) {
+          const fileTimestamps = await getFileTimestampsWithIno(metadataFilePath)
+          if (fileTimestamps) {
+            metadataLibraryFile.metadata.mtimeMs = fileTimestamps.mtimeMs
+            metadataLibraryFile.metadata.ctimeMs = fileTimestamps.ctimeMs
+            metadataLibraryFile.metadata.size = fileTimestamps.size
+            metadataLibraryFile.ino = fileTimestamps.ino
           }
-
-          Logger.debug(`[LibraryItem] Success saving abmetadata to "${metadataFilePath}"`)
         }
-        return success
+
+        Logger.debug(`[LibraryItem] Success saving abmetadata to "${metadataFilePath}"`)
+        return metadataLibraryFile
+      }).finally(() => {
+        this.isSavingMetadata = false
       })
     }
   }