Merge pull request #2400 from mikiher/bookfinder-improvements

A few BookFinder improvements (including a fix for #2238)

server/controllers/SearchController.js

@@ -3,15 +3,18 @@ const BookFinder = require('../finders/BookFinder')
 const PodcastFinder = require('../finders/PodcastFinder')
 const AuthorFinder = require('../finders/AuthorFinder')
 const MusicFinder = require('../finders/MusicFinder')
+const Database = require("../Database")
 
 class SearchController {
   constructor() { }
 
   async findBooks(req, res) {
+    const id = req.query.id
+    const libraryItem = await Database.libraryItemModel.getOldById(id)
     const provider = req.query.provider || 'google'
     const title = req.query.title || ''
     const author = req.query.author || ''
-    const results = await BookFinder.search(provider, title, author)
+    const results = await BookFinder.search(libraryItem, provider, title, author)
     res.json(results)
   }
 

server/finders/BookFinder.js

@@ -167,6 +167,7 @@ class BookFinder {
         [/ (2nd|3rd|\d+th)\s+ed(\.|ition)?/g, ''], // Remove edition
         [/(^| |\.)(m4b|m4a|mp3)( |$)/g, ''],       // Remove file-type
         [/ a novel.*$/g, ''],                      // Remove "a novel"
+        [/(^| )(un)?abridged( |$)/g, ' '],         // Remove "unabridged/abridged"
         [/^\d+ | \d+$/g, ''],                      // Remove preceding/trailing numbers
       ]
 
@@ -298,6 +299,7 @@ class BookFinder {
   /**
    * Search for books including fuzzy searches
    * 
+   * @param {Object} libraryItem
    * @param {string} provider 
    * @param {string} title 
    * @param {string} author 
@@ -306,7 +308,7 @@ class BookFinder {
    * @param {{titleDistance:number, authorDistance:number, maxFuzzySearches:number}} options 
    * @returns {Promise<Object[]>}
    */
-  async search(provider, title, author, isbn, asin, options = {}) {
+  async search(libraryItem, provider, title, author, isbn, asin, options = {}) {
     let books = []
     const maxTitleDistance = !isNaN(options.titleDistance) ? Number(options.titleDistance) : 4
     const maxAuthorDistance = !isNaN(options.authorDistance) ? Number(options.authorDistance) : 4
@@ -335,6 +337,7 @@ class BookFinder {
       for (const titlePart of titleParts)
         authorCandidates.add(titlePart)
       authorCandidates = await authorCandidates.getCandidates()
+      loop_author:
       for (const authorCandidate of authorCandidates) {
         let titleCandidates = new BookFinder.TitleCandidates(authorCandidate)
         for (const titlePart of titleParts)
@@ -342,13 +345,27 @@ class BookFinder {
         titleCandidates = titleCandidates.getCandidates()
         for (const titleCandidate of titleCandidates) {
           if (titleCandidate == title && authorCandidate == author) continue // We already tried this
-          if (++numFuzzySearches > maxFuzzySearches) return books
+          if (++numFuzzySearches > maxFuzzySearches) break loop_author
           books = await this.runSearch(titleCandidate, authorCandidate, provider, asin, maxTitleDistance, maxAuthorDistance)
-          if (books.length) return books
+          if (books.length) break loop_author
         }
       }
     }
 
+    if (books.length) {
+      const resultsHaveDuration = provider.startsWith('audible')
+      if (resultsHaveDuration && libraryItem?.media?.duration) {
+        const libraryItemDurationMinutes = libraryItem.media.duration / 60
+        // If provider results have duration, sort by ascendinge duration difference from libraryItem
+        books.sort((a, b) => {
+          const aDuration = a.duration || Number.POSITIVE_INFINITY
+          const bDuration = b.duration || Number.POSITIVE_INFINITY
+          const aDurationDiff = Math.abs(aDuration - libraryItemDurationMinutes)
+          const bDurationDiff = Math.abs(bDuration - libraryItemDurationMinutes)
+          return aDurationDiff - bDurationDiff
+        })
+      }
+    }
     return books
   }
 
@@ -392,12 +409,12 @@ class BookFinder {
 
     if (provider === 'all') {
       for (const providerString of this.providers) {
-        const providerResults = await this.search(providerString, title, author, options)
+        const providerResults = await this.search(null, providerString, title, author, options)
         Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
         searchResults.push(...providerResults)
       }
     } else {
-      searchResults = await this.search(provider, title, author, options)
+      searchResults = await this.search(null, provider, title, author, options)
     }
     Logger.debug(`[BookFinder] FindCovers search results: ${searchResults.length}`)
 
@@ -455,12 +472,14 @@ function cleanTitleForCompares(title) {
 function cleanAuthorForCompares(author) {
   if (!author) return ''
   author = stripRedundantSpaces(author)
-  
+
   let cleanAuthor = replaceAccentedChars(author).toLowerCase()
   // separate initials
   cleanAuthor = cleanAuthor.replace(/([a-z])\.([a-z])/g, '$1. $2')
   // remove middle initials
   cleanAuthor = cleanAuthor.replace(/(?<=\w\w)(\s+[a-z]\.?)+(?=\s+\w\w)/g, '')
+  // remove et al.
+  cleanAuthor = cleanAuthor.replace(/ et al\.?(?= |$)/g, '')
   return cleanAuthor
 }
 

server/scanner/Scanner.js

@@ -37,7 +37,7 @@ class Scanner {
       var searchISBN = options.isbn || libraryItem.media.metadata.isbn
       var searchASIN = options.asin || libraryItem.media.metadata.asin
 
-      var results = await BookFinder.search(provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
+      var results = await BookFinder.search(libraryItem, provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
       if (!results.length) {
         return {
           warning: `No ${provider} match found`