Move cover path func to LibraryItem model

mikiher · Nov 2, 2024 · 7a1623e · 7a1623e
1 parent c25acb4
commit 7a1623e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 25 deletions.
diff --git a/server/Auth.js b/server/Auth.js
@@ -23,7 +23,7 @@ class Auth {
 
   /**
    * Checks if the request should not be authenticated.
-   * @param {import('express').Request} req
+   * @param {Request} req
    * @returns {boolean}
    * @private
    */

diff --git a/server/Database.js b/server/Database.js
@@ -808,28 +808,6 @@ class Database {
       return `${normalizedColumn} LIKE ${pattern}`
     }
   }
-
-  async getLibraryItemCoverPath(libraryItemId) {
-    const libraryItem = await this.libraryItemModel.findByPk(libraryItemId, {
-      attributes: ['id', 'mediaType', 'mediaId', 'libraryId'],
-      include: [
-        {
-          model: this.bookModel,
-          attributes: ['id', 'coverPath']
-        },
-        {
-          model: this.podcastModel,
-          attributes: ['id', 'coverPath']
-        }
-      ]
-    })
-    if (!libraryItem) {
-      Logger.warn(`[Database] getCover: Library item "${libraryItemId}" does not exist`)
-      return null
-    }
-
-    return libraryItem.media.coverPath
-  }
 }
 
 module.exports = new Database()
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
@@ -350,7 +350,7 @@ class LibraryItemController {
     }
 
     if (raw) {
-      const coverPath = await Database.getLibraryItemCoverPath(libraryItemId)
+      const coverPath = await Database.libraryItemModel.getCoverPath(libraryItemId)
       if (!coverPath || !(await fs.pathExists(coverPath))) {
         return res.sendStatus(404)
       }

diff --git a/server/managers/CacheManager.js b/server/managers/CacheManager.js
@@ -59,7 +59,7 @@ class CacheManager {
     }
 
     // Cached cover does not exist, generate it
-    const coverPath = await Database.getLibraryItemCoverPath(libraryItemId)
+    const coverPath = await Database.libraryItemModel.getCoverPath(libraryItemId)
     if (!coverPath || !(await fs.pathExists(coverPath))) {
       return res.sendStatus(404)
     }

diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
@@ -863,6 +863,33 @@ class LibraryItem extends Model {
     return this.getOldLibraryItem(libraryItem)
   }
 
+  /**
+   *
+   * @param {string} libraryItemId
+   * @returns {Promise<string>}
+   */
+  static async getCoverPath(libraryItemId) {
+    const libraryItem = await this.findByPk(libraryItemId, {
+      attributes: ['id', 'mediaType', 'mediaId', 'libraryId'],
+      include: [
+        {
+          model: this.bookModel,
+          attributes: ['id', 'coverPath']
+        },
+        {
+          model: this.podcastModel,
+          attributes: ['id', 'coverPath']
+        }
+      ]
+    })
+    if (!libraryItem) {
+      Logger.warn(`[LibraryItem] getCoverPath: Library item "${libraryItemId}" does not exist`)
+      return null
+    }
+
+    return libraryItem.media.coverPath
+  }
+
   /**
    *
    * @param {import('sequelize').FindOptions} options