Add cover finder to new book scanner

server/controllers/AuthorController.js

@@ -5,6 +5,8 @@ const { createNewSortInstance } = require('../libs/fastSort')
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
+const CacheManager = require('../managers/CacheManager')
+const CoverManager = require('../managers/CoverManager')
 const AuthorFinder = require('../finders/AuthorFinder')
 
 const { reqSupportsWebp } = require('../utils/index')
@@ -68,13 +70,13 @@ class AuthorController {
     // Updating/removing cover image
     if (payload.imagePath !== undefined && payload.imagePath !== req.author.imagePath) {
       if (!payload.imagePath && req.author.imagePath) { // If removing image then remove file
-        await this.cacheManager.purgeImageCache(req.author.id) // Purge cache
-        await this.coverManager.removeFile(req.author.imagePath)
+        await CacheManager.purgeImageCache(req.author.id) // Purge cache
+        await CoverManager.removeFile(req.author.imagePath)
       } else if (payload.imagePath.startsWith('http')) { // Check if image path is a url
         const imageData = await AuthorFinder.saveAuthorImage(req.author.id, payload.imagePath)
         if (imageData) {
           if (req.author.imagePath) {
-            await this.cacheManager.purgeImageCache(req.author.id) // Purge cache
+            await CacheManager.purgeImageCache(req.author.id) // Purge cache
           }
           payload.imagePath = imageData.path
           hasUpdated = true
@@ -86,7 +88,7 @@ class AuthorController {
         }
 
         if (req.author.imagePath) {
-          await this.cacheManager.purgeImageCache(req.author.id) // Purge cache
+          await CacheManager.purgeImageCache(req.author.id) // Purge cache
         }
       }
     }
@@ -186,7 +188,7 @@ class AuthorController {
 
     // Only updates image if there was no image before or the author ASIN was updated
     if (authorData.image && (!req.author.imagePath || hasUpdates)) {
-      this.cacheManager.purgeImageCache(req.author.id)
+      await CacheManager.purgeImageCache(req.author.id)
 
       const imageData = await AuthorFinder.saveAuthorImage(req.author.id, authorData.image)
       if (imageData) {
@@ -232,7 +234,7 @@ class AuthorController {
       height: height ? parseInt(height) : null,
       width: width ? parseInt(width) : null
     }
-    return this.cacheManager.handleAuthorCache(res, author, options)
+    return CacheManager.handleAuthorCache(res, author, options)
   }
 
   async middleware(req, res, next) {

server/controllers/CacheController.js

@@ -1,4 +1,4 @@
-const Logger = require('../Logger')
+const CacheManager = require('../managers/CacheManager')
 
 class CacheController {
   constructor() { }
@@ -8,7 +8,7 @@ class CacheController {
     if (!req.user.isAdminOrUp) {
       return res.sendStatus(403)
     }
-    await this.cacheManager.purgeAll()
+    await CacheManager.purgeAll()
     res.sendStatus(200)
   }
 
@@ -17,7 +17,7 @@ class CacheController {
     if (!req.user.isAdminOrUp) {
       return res.sendStatus(403)
     }
-    await this.cacheManager.purgeItems()
+    await CacheManager.purgeItems()
     res.sendStatus(200)
   }
 }

server/controllers/LibraryController.js

@@ -15,6 +15,7 @@ const naturalSort = createNewSortInstance({
 })
 
 const LibraryScanner = require('../scanner/LibraryScanner')
+const Scanner = require('../scanner/Scanner')
 const Database = require('../Database')
 const libraryFilters = require('../utils/queries/libraryFilters')
 const libraryItemsPodcastFilters = require('../utils/queries/libraryItemsPodcastFilters')
@@ -772,7 +773,7 @@ class LibraryController {
       Logger.error(`[LibraryController] Non-root user attempted to match library items`, req.user)
       return res.sendStatus(403)
     }
-    this.scanner.matchLibraryItems(req.library)
+    Scanner.matchLibraryItems(req.library)
     res.sendStatus(200)
   }
 

server/controllers/LibraryItemController.js

@@ -10,6 +10,9 @@ const { ScanResult } = require('../utils/constants')
 const { getAudioMimeTypeFromExtname } = require('../utils/fileUtils')
 const LibraryItemScanner = require('../scanner/LibraryItemScanner')
 const AudioFileScanner = require('../scanner/AudioFileScanner')
+const Scanner = require('../scanner/Scanner')
+const CacheManager = require('../managers/CacheManager')
+const CoverManager = require('../managers/CoverManager')
 
 class LibraryItemController {
   constructor() { }
@@ -56,7 +59,7 @@ class LibraryItemController {
     var libraryItem = req.libraryItem
     // Item has cover and update is removing cover so purge it from cache
     if (libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
-      await this.cacheManager.purgeCoverCache(libraryItem.id)
+      await CacheManager.purgeCoverCache(libraryItem.id)
     }
 
     const hasUpdates = libraryItem.update(req.body)
@@ -104,7 +107,7 @@ class LibraryItemController {
 
     // Item has cover and update is removing cover so purge it from cache
     if (libraryItem.media.coverPath && (mediaPayload.coverPath === '' || mediaPayload.coverPath === null)) {
-      await this.cacheManager.purgeCoverCache(libraryItem.id)
+      await CacheManager.purgeCoverCache(libraryItem.id)
     }
 
     // Book specific
@@ -165,10 +168,10 @@ class LibraryItemController {
     var result = null
     if (req.body && req.body.url) {
       Logger.debug(`[LibraryItemController] Requesting download cover from url "${req.body.url}"`)
-      result = await this.coverManager.downloadCoverFromUrl(libraryItem, req.body.url)
+      result = await CoverManager.downloadCoverFromUrl(libraryItem, req.body.url)
     } else if (req.files && req.files.cover) {
       Logger.debug(`[LibraryItemController] Handling uploaded cover`)
-      result = await this.coverManager.uploadCover(libraryItem, req.files.cover)
+      result = await CoverManager.uploadCover(libraryItem, req.files.cover)
     } else {
       return res.status(400).send('Invalid request no file or url')
     }
@@ -194,7 +197,7 @@ class LibraryItemController {
       return res.status(400).send('Invalid request no cover path')
     }
 
-    const validationResult = await this.coverManager.validateCoverPath(req.body.cover, libraryItem)
+    const validationResult = await CoverManager.validateCoverPath(req.body.cover, libraryItem)
     if (validationResult.error) {
       return res.status(500).send(validationResult.error)
     }
@@ -214,7 +217,7 @@ class LibraryItemController {
 
     if (libraryItem.media.coverPath) {
       libraryItem.updateMediaCover('')
-      await this.cacheManager.purgeCoverCache(libraryItem.id)
+      await CacheManager.purgeCoverCache(libraryItem.id)
       await Database.updateLibraryItem(libraryItem)
       SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
     }
@@ -243,7 +246,7 @@ class LibraryItemController {
       height: height ? parseInt(height) : null,
       width: width ? parseInt(width) : null
     }
-    return this.cacheManager.handleCoverCache(res, libraryItem, options)
+    return CacheManager.handleCoverCache(res, libraryItem, options)
   }
 
   // GET: api/items/:id/stream
@@ -297,7 +300,7 @@ class LibraryItemController {
     var libraryItem = req.libraryItem
 
     var options = req.body || {}
-    var matchResult = await this.scanner.quickMatchLibraryItem(libraryItem, options)
+    var matchResult = await Scanner.quickMatchLibraryItem(libraryItem, options)
     res.json(matchResult)
   }
 
@@ -421,7 +424,7 @@ class LibraryItemController {
     res.sendStatus(200)
 
     for (const libraryItem of libraryItems) {
-      const matchResult = await this.scanner.quickMatchLibraryItem(libraryItem, options)
+      const matchResult = await Scanner.quickMatchLibraryItem(libraryItem, options)
       if (matchResult.updated) {
         itemsUpdated++
       } else if (matchResult.warning) {

server/controllers/PodcastController.js

@@ -7,6 +7,9 @@ const fs = require('../libs/fsExtra')
 const { getPodcastFeed, findMatchingEpisodes } = require('../utils/podcastUtils')
 const { getFileTimestampsWithIno, filePathToPOSIX } = require('../utils/fileUtils')
 
+const Scanner = require('../scanner/Scanner')
+const CoverManager = require('../managers/CoverManager')
+
 const LibraryItem = require('../objects/LibraryItem')
 
 class PodcastController {
@@ -73,7 +76,7 @@ class PodcastController {
     if (payload.media.metadata.imageUrl) {
       // TODO: Scan cover image to library files
       // Podcast cover will always go into library item folder
-      const coverResponse = await this.coverManager.downloadCoverFromUrl(libraryItem, payload.media.metadata.imageUrl, true)
+      const coverResponse = await CoverManager.downloadCoverFromUrl(libraryItem, payload.media.metadata.imageUrl, true)
       if (coverResponse) {
         if (coverResponse.error) {
           Logger.error(`[PodcastController] Download cover error from "${payload.media.metadata.imageUrl}": ${coverResponse.error}`)
@@ -200,7 +203,7 @@ class PodcastController {
     }
 
     const overrideDetails = req.query.override === '1'
-    const episodesUpdated = await this.scanner.quickMatchPodcastEpisodes(req.libraryItem, { overrideDetails })
+    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(req.libraryItem, { overrideDetails })
     if (episodesUpdated) {
       await Database.updateLibraryItem(req.libraryItem)
       SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())