From 48f0e039e58039f5ca0fbab222bbb81b2760c5ac Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 17 Oct 2021 11:29:52 -0500
Subject: [PATCH] New search page, updated search menu includes tags #112

---
 client/components/app/BookShelf.vue           |  64 ++++++++++++++++--
 .../components/app/BookShelfCategorized.vue   |   3 -
 client/components/app/BookShelfRow.vue        |  17 +++--
 client/components/app/BookShelfToolbar.vue    |   7 +-
 .../components/cards/AudiobookSearchCard.vue  |  48 +++++++++++--
 client/components/cards/AuthorSearchCard.vue  |   4 +-
 client/components/cards/GroupCard.vue         |  12 +++-
 client/components/cards/TagSearchCard.vue     |  34 ++++++++++
 client/components/controls/GlobalSearch.vue   |  45 ++++++++----
 client/components/modals/edit-tabs/Cover.vue  |   2 -
 client/package.json                           |   4 +-
 .../pages/library/_library/bookshelf/_id.vue  |  22 ++++--
 client/static/icons/NoUserPhoto.png           | Bin 0 -> 9138 bytes
 client/store/audiobooks.js                    |   6 +-
 package.json                                  |   2 +-
 server/ApiController.js                       |  22 +++++-
 server/objects/Audiobook.js                   |  15 +++-
 server/objects/Book.js                        |   9 ++-
 18 files changed, 259 insertions(+), 57 deletions(-)
 create mode 100644 client/components/cards/TagSearchCard.vue
 create mode 100644 client/static/icons/NoUserPhoto.png

diff --git a/client/components/app/BookShelf.vue b/client/components/app/BookShelf.vue
index 9a70a2aa..6b0d2039 100644
--- a/client/components/app/BookShelf.vue
+++ b/client/components/app/BookShelf.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="bookshelf" ref="wrapper" class="w-full h-full overflow-y-scroll relative">
     <!-- Cover size widget -->
-    <div v-show="!isSelectionMode" class="fixed bottom-2 right-4 z-20">
+    <div v-show="!isSelectionMode" class="fixed bottom-2 right-4 z-30">
       <div class="rounded-full py-1 bg-primary px-2 border border-black-100 text-center flex items-center box-shadow-md" @mousedown.prevent @mouseup.prevent>
         <span class="material-icons" :class="selectedSizeIndex === 0 ? 'text-gray-400' : 'hover:text-yellow-300 cursor-pointer'" style="font-size: 0.9rem" @mousedown.prevent @click="decreaseSize">remove</span>
         <p class="px-2 font-mono">{{ bookCoverWidth }}</p>
@@ -16,6 +16,14 @@
         <ui-btn color="success" class="w-52" @click="scan">Scan Audiobooks</ui-btn>
       </div>
     </div>
+    <div v-else-if="page === 'search'" id="bookshelf-categorized" class="w-full flex flex-col items-center">
+      <template v-for="(shelf, index) in categorizedShelves">
+        <app-book-shelf-row :key="index" :index="index" :shelf="shelf" :size-multiplier="sizeMultiplier" :book-cover-width="bookCoverWidth" />
+      </template>
+      <div v-show="!categorizedShelves.length" class="w-full py-16 text-center text-xl">
+        <div class="py-4 mb-6"><p class="text-2xl">No Results</p></div>
+      </div>
+    </div>
     <div v-else id="bookshelf" class="w-full flex flex-col items-center">
       <template v-for="(shelf, index) in shelves">
         <div :key="index" class="w-full bookshelfRow relative">
@@ -45,8 +53,8 @@ export default {
     page: String,
     selectedSeries: String,
     searchResults: {
-      type: Array,
-      default: () => []
+      type: Object,
+      default: () => {}
     },
     searchQuery: String
   },
@@ -74,7 +82,7 @@ export default {
     },
     searchResults() {
       this.$nextTick(() => {
-        this.$store.commit('audiobooks/setSearchResults', this.searchResults)
+        // this.$store.commit('audiobooks/setSearchResults', this.searchResults)
         this.setBookshelfEntities()
       })
     },
@@ -94,6 +102,9 @@ export default {
     audiobooks() {
       return this.$store.state.audiobooks.audiobooks
     },
+    sizeMultiplier() {
+      return this.bookCoverWidth / 120
+    },
     bookCoverWidth() {
       return this.availableSizes[this.selectedSizeIndex]
     },
@@ -122,11 +133,54 @@ export default {
     showGroups() {
       return this.page !== '' && this.page !== 'search' && !this.selectedSeries
     },
+    categorizedShelves() {
+      if (this.page !== 'search') return []
+      var audiobookSearchResults = this.searchResults ? this.searchResults.audiobooks || [] : []
+      const shelves = []
+
+      if (audiobookSearchResults.length) {
+        shelves.push({
+          label: 'Books',
+          books: audiobookSearchResults.map((absr) => absr.audiobook)
+        })
+      }
+
+      if (this.searchResults.series && this.searchResults.series.length) {
+        var seriesGroups = this.searchResults.series.map((seriesResult) => {
+          return {
+            type: 'series',
+            name: seriesResult.series || '',
+            books: seriesResult.audiobooks || []
+          }
+        })
+        shelves.push({
+          label: 'Series',
+          series: seriesGroups
+        })
+      }
+
+      if (this.searchResults.tags && this.searchResults.tags.length) {
+        var tagGroups = this.searchResults.tags.map((tagResult) => {
+          return {
+            type: 'tags',
+            name: tagResult.tag || '',
+            books: tagResult.audiobooks || []
+          }
+        })
+        shelves.push({
+          label: 'Tags',
+          series: tagGroups
+        })
+      }
+
+      return shelves
+    },
     entities() {
       if (this.page === '') {
         return this.$store.getters['audiobooks/getFilteredAndSorted']()
       } else if (this.page === 'search') {
-        return this.searchResults || []
+        var audiobookSearchResults = this.searchResults ? this.searchResults.audiobooks || [] : []
+        return audiobookSearchResults.map((absr) => absr.audiobook)
       } else {
         var seriesGroups = this.$store.getters['audiobooks/getSeriesGroups']()
         if (this.selectedSeries) {
diff --git a/client/components/app/BookShelfCategorized.vue b/client/components/app/BookShelfCategorized.vue
index 7a279a3e..ab46c7d6 100644
--- a/client/components/app/BookShelfCategorized.vue
+++ b/client/components/app/BookShelfCategorized.vue
@@ -51,9 +51,6 @@ export default {
     sizeMultiplier() {
       return this.bookCoverWidth / 120
     },
-    signSizeMultiplier() {
-      return (1 - this.sizeMultiplier) / 2 + this.sizeMultiplier
-    },
     paddingX() {
       return 16 * this.sizeMultiplier
     },
diff --git a/client/components/app/BookShelfRow.vue b/client/components/app/BookShelfRow.vue
index cd36a852..b73441c2 100644
--- a/client/components/app/BookShelfRow.vue
+++ b/client/components/app/BookShelfRow.vue
@@ -2,11 +2,23 @@
   <div class="relative">
     <div ref="shelf" class="w-full max-w-full bookshelfRowCategorized relative overflow-x-scroll overflow-y-hidden z-10" :style="{ paddingLeft: 2.5 * sizeMultiplier + 'rem' }" @scroll="scrolled">
       <div class="w-full h-full" :style="{ marginTop: sizeMultiplier + 'rem' }">
-        <div class="flex items-center -mb-2">
+        <div v-if="shelf.books" class="flex items-center -mb-2">
           <template v-for="entity in shelf.books">
             <cards-book-card :key="entity.id" :width="bookCoverWidth" :user-progress="userAudiobooks[entity.id]" :audiobook="entity" @hook:updated="updatedBookCard" @edit="editBook" />
           </template>
         </div>
+        <div v-else-if="shelf.series" class="flex items-center -mb-2">
+          <template v-for="entity in shelf.series">
+            <cards-group-card :key="entity.name" :width="bookCoverWidth" :group="entity" @click="$emit('clickSeries', entity)" />
+          </template>
+        </div>
+        <div v-else-if="shelf.tags" class="flex items-center -mb-2">
+          <template v-for="entity in shelf.tags">
+            <nuxt-link :key="entity.name" :to="`/library/${currentLibraryId}/bookshelf?filter=tags.${$encode(entity.name)}`">
+              <cards-group-card :width="bookCoverWidth" :group="entity" />
+            </nuxt-link>
+          </template>
+        </div>
       </div>
     </div>
 
@@ -67,7 +79,6 @@ export default {
     },
     scrollLeft() {
       if (!this.$refs.shelf) {
-        console.error('No Shelf', this.index)
         return
       }
       this.isScrolling = true
@@ -75,7 +86,6 @@ export default {
     },
     scrollRight() {
       if (!this.$refs.shelf) {
-        console.error('No Shelf', this.index)
         return
       }
       this.isScrolling = true
@@ -89,7 +99,6 @@ export default {
     },
     checkCanScroll() {
       if (!this.$refs.shelf) {
-        console.error('No Shelf', this.index)
         return
       }
       var clientWidth = this.$refs.shelf.clientWidth
diff --git a/client/components/app/BookShelfToolbar.vue b/client/components/app/BookShelfToolbar.vue
index 66b2a5af..0f7c60e2 100644
--- a/client/components/app/BookShelfToolbar.vue
+++ b/client/components/app/BookShelfToolbar.vue
@@ -41,8 +41,8 @@ export default {
     isHome: Boolean,
     selectedSeries: String,
     searchResults: {
-      type: Array,
-      default: () => []
+      type: Object,
+      default: () => {}
     },
     searchQuery: String
   },
@@ -60,7 +60,8 @@ export default {
       if (this.page === '') {
         return this.$store.getters['audiobooks/getFiltered']().length
       } else if (this.page === 'search') {
-        return (this.searchResults || []).length
+        var audiobookSearchResults = this.searchResults ? this.searchResults.audiobooks || [] : []
+        return audiobookSearchResults.length
       } else {
         var groups = this.$store.getters['audiobooks/getSeriesGroups']()
         if (this.selectedSeries) {
diff --git a/client/components/cards/AudiobookSearchCard.vue b/client/components/cards/AudiobookSearchCard.vue
index 19c0c359..f6d463f6 100644
--- a/client/components/cards/AudiobookSearchCard.vue
+++ b/client/components/cards/AudiobookSearchCard.vue
@@ -1,9 +1,16 @@
 <template>
   <div class="flex h-full px-1 overflow-hidden">
     <cards-book-cover :audiobook="audiobook" :width="50" />
-    <div class="flex-grow px-2 searchCardContent h-full">
-      <p class="truncate text-sm">{{ title }}</p>
-      <p class="text-xs text-gray-200 truncate">by {{ author }}</p>
+    <div class="flex-grow px-2 audiobookSearchCardContent">
+      <p v-if="matchKey !== 'title'" class="truncate text-sm">{{ title }}</p>
+      <p v-else class="truncate text-sm" v-html="matchHtml" />
+
+      <p v-if="matchKey === 'subtitle'" class="truncate text-xs text-gray-300">{{ matchHtml }}</p>
+
+      <p v-if="matchKey !== 'author'" class="text-xs text-gray-200 truncate">by {{ author }}</p>
+      <p v-else class="truncate text-xs text-gray-200" v-html="matchHtml" />
+
+      <div v-if="matchKey === 'series' || matchKey === 'tags'" class="m-0 p-0 truncate" v-html="matchHtml" />
     </div>
   </div>
 </template>
@@ -14,7 +21,10 @@ export default {
     audiobook: {
       type: Object,
       default: () => {}
-    }
+    },
+    search: String,
+    matchKey: String,
+    matchText: String
   },
   data() {
     return {}
@@ -26,8 +36,34 @@ export default {
     title() {
       return this.book ? this.book.title : 'No Title'
     },
+    subtitle() {
+      return this.book ? this.book.subtitle : ''
+    },
     author() {
       return this.book ? this.book.author : 'Unknown'
+    },
+    matchHtml() {
+      if (!this.matchText || !this.search) return ''
+      if (this.matchKey === 'subtitle') return ''
+      var matchSplit = this.matchText.toLowerCase().split(this.search.toLowerCase().trim())
+      if (matchSplit.length < 2) return ''
+
+      var html = ''
+      var totalLenSoFar = 0
+      for (let i = 0; i < matchSplit.length - 1; i++) {
+        var indexOf = matchSplit[i].length
+        var firstPart = this.matchText.substr(totalLenSoFar, indexOf)
+        var actualWasThere = this.matchText.substr(totalLenSoFar + indexOf, this.search.length)
+        totalLenSoFar += indexOf + this.search.length
+
+        html += `${firstPart}<strong class="text-warning">${actualWasThere}</strong>`
+      }
+      var lastPart = this.matchText.substr(totalLenSoFar)
+      html += lastPart
+
+      if (this.matchKey === 'tags') return `<p class="truncate">Tags: ${html}</p>`
+      if (this.matchKey === 'author') return `by ${html}`
+      return `${html}`
     }
   },
   methods: {},
@@ -36,9 +72,9 @@ export default {
 </script>
 
 <style>
-.searchCardContent {
+.audiobookSearchCardContent {
   width: calc(100% - 80px);
-  height: calc(50px * 1.5);
+  height: 75px;
   display: flex;
   flex-direction: column;
   justify-content: center;
diff --git a/client/components/cards/AuthorSearchCard.vue b/client/components/cards/AuthorSearchCard.vue
index 7a77e60a..a14653d2 100644
--- a/client/components/cards/AuthorSearchCard.vue
+++ b/client/components/cards/AuthorSearchCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex h-full px-1 overflow-hidden">
-    <img src="https://rpgplanner.com/wp-content/uploads/2020/06/no-photo-available.png" class="w-40 h-40 max-h-40 object-contain" style="max-height: 40px; max-width: 40px" />
+    <img src="/icons/NoUserPhoto.png" class="w-40 h-40 max-h-40 object-contain" style="max-height: 40px; max-width: 40px" />
     <div class="flex-grow px-2 authorSearchCardContent h-full">
       <p class="truncate text-sm">{{ author }}</p>
     </div>
@@ -22,7 +22,7 @@ export default {
 </script>
 
 <style>
-.searchCardContent {
+.authorSearchCardContent {
   width: calc(100% - 80px);
   height: 40px;
   display: flex;
diff --git a/client/components/cards/GroupCard.vue b/client/components/cards/GroupCard.vue
index 55573fb5..1b16dc70 100644
--- a/client/components/cards/GroupCard.vue
+++ b/client/components/cards/GroupCard.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative">
     <div class="rounded-sm h-full overflow-hidden relative" :style="{ padding: `16px ${paddingX}px` }" @mouseover="isHovering = true" @mouseleave="isHovering = false" @click="clickCard">
-      <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series?${groupType}=${groupEncode}`" class="cursor-pointer">
+      <nuxt-link :to="groupTo" class="cursor-pointer">
         <div class="w-full relative" :class="isHovering ? 'bg-black-400' : 'bg-primary'" :style="{ height: height + 'px', width: height + 'px' }">
           <cards-group-cover ref="groupcover" :name="groupName" :book-items="bookItems" :width="height" :height="height" />
 
@@ -54,6 +54,16 @@ export default {
     _group() {
       return this.group || {}
     },
+    groupType() {
+      return this._group.type
+    },
+    groupTo() {
+      if (this.groupType === 'series') {
+        return `/library/${this.currentLibraryId}/bookshelf/series?series=${this.groupEncode}`
+      } else {
+        return `/library/${this.currentLibraryId}/bookshelf?filter=tags.${this.groupEncode}`
+      }
+    },
     height() {
       return this.width * 1.6
     },
diff --git a/client/components/cards/TagSearchCard.vue b/client/components/cards/TagSearchCard.vue
new file mode 100644
index 00000000..c4068a28
--- /dev/null
+++ b/client/components/cards/TagSearchCard.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="flex h-full px-1 overflow-hidden">
+    <div class="w-10 h-10 flex items-center justify-center">
+      <span class="material-icons text-2xl text-gray-200">local_offer</span>
+    </div>
+    <div class="flex-grow px-2 tagSearchCardContent h-full">
+      <p class="truncate text-sm">{{ tag }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tag: String
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.tagSearchCardContent {
+  width: calc(100% - 40px);
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/client/components/controls/GlobalSearch.vue b/client/components/controls/GlobalSearch.vue
index 33ce1081..ca79be2b 100644
--- a/client/components/controls/GlobalSearch.vue
+++ b/client/components/controls/GlobalSearch.vue
@@ -23,7 +23,7 @@
           <template v-for="item in audiobookResults">
             <li :key="item.audiobook.id" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
               <nuxt-link :to="`/audiobook/${item.audiobook.id}`">
-                <cards-audiobook-search-card :audiobook="item.audiobook" />
+                <cards-audiobook-search-card :audiobook="item.audiobook" :match-key="item.matchKey" :match-text="item.matchText" :search="lastSearch" />
               </nuxt-link>
             </li>
           </template>
@@ -39,12 +39,21 @@
 
           <p v-if="seriesResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Series</p>
           <template v-for="item in seriesResults">
-            <li :key="item.series" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickedOption(item.series)">
+            <li :key="item.series" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
               <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series?series=${$encode(item.series)}`">
                 <cards-series-search-card :series="item.series" :book-items="item.audiobooks" />
               </nuxt-link>
             </li>
           </template>
+
+          <p v-if="tagResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Tags</p>
+          <template v-for="item in tagResults">
+            <li :key="item.tag" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf?filter=tags.${$encode(item.tag)}`">
+                <cards-tag-search-card :tag="item.tag" />
+              </nuxt-link>
+            </li>
+          </template>
         </template>
       </ul>
     </div>
@@ -64,6 +73,7 @@ export default {
       audiobookResults: [],
       authorResults: [],
       seriesResults: [],
+      tagResults: [],
       searchTimeout: null,
       lastSearch: null
     }
@@ -76,19 +86,27 @@ export default {
       return this.$store.state.libraries.currentLibraryId
     },
     totalResults() {
-      return this.audiobookResults.length + this.seriesResults.length + this.authorResults.length
+      return this.audiobookResults.length + this.seriesResults.length + this.authorResults.length + this.tagResults.length
     }
   },
   methods: {
     submitSearch() {
       if (!this.search) return
-      this.$router.push(`/library/${this.currentLibraryId}/bookshelf/search?query=${this.search}`)
-
+      var search = this.search
+      this.clearResults()
+      this.$router.push(`/library/${this.currentLibraryId}/bookshelf/search?query=${search}`)
+    },
+    clearResults() {
       this.search = null
+      this.lastSearch = null
       this.audiobookResults = []
       this.authorResults = []
       this.seriesResults = []
+      this.tagResults = []
       this.showMenu = false
+      this.isFetching = false
+      this.isTyping = false
+      clearTimeout(this.searchTimeout)
       this.$nextTick(() => {
         if (this.$refs.input) {
           this.$refs.input.blur()
@@ -117,9 +135,14 @@ export default {
         console.error('Search error', error)
         return []
       })
+
+      // Search was canceled
+      if (!this.isFetching) return
+
       this.audiobookResults = searchResults.audiobooks || []
       this.authorResults = searchResults.authors || []
       this.seriesResults = searchResults.series || []
+      this.tagResults = searchResults.tags || []
 
       this.isFetching = false
       if (!this.showMenu) {
@@ -135,19 +158,15 @@ export default {
       }
       this.isTyping = true
       this.searchTimeout = setTimeout(() => {
+        // Canceled search
+        if (!this.isTyping) return
+
         this.isTyping = false
         this.runSearch(val)
       }, 750)
     },
     clickClear() {
-      if (this.search) {
-        this.search = null
-        this.lastSearch = null
-        this.audiobookResults = []
-        this.authorResults = []
-        this.seriesResults = []
-        this.showMenu = false
-      }
+      this.clearResults()
     }
   },
   mounted() {}
diff --git a/client/components/modals/edit-tabs/Cover.vue b/client/components/modals/edit-tabs/Cover.vue
index 446e5270..4241ea19 100644
--- a/client/components/modals/edit-tabs/Cover.vue
+++ b/client/components/modals/edit-tabs/Cover.vue
@@ -79,8 +79,6 @@
 </template>
 
 <script>
-import Path from 'path'
-
 export default {
   props: {
     processing: Boolean,
diff --git a/client/package.json b/client/package.json
index afe8bc58..b9307743 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
@@ -30,4 +30,4 @@
     "@nuxtjs/tailwindcss": "^4.2.1",
     "postcss": "^8.3.6"
   }
-}
+}
\ No newline at end of file
diff --git a/client/pages/library/_library/bookshelf/_id.vue b/client/pages/library/_library/bookshelf/_id.vue
index 0e4cffd1..bc05386f 100644
--- a/client/pages/library/_library/bookshelf/_id.vue
+++ b/client/pages/library/_library/bookshelf/_id.vue
@@ -19,27 +19,37 @@ export default {
       return redirect('/oops?message=Library not found')
     }
 
+    // Set filter by
     if (query.filter) {
       store.dispatch('user/updateUserSettings', { filterBy: query.filter })
     }
-    var searchResults = []
+
+    // Search page
+    var searchResults = {}
+    var audiobookSearchResults = []
     var searchQuery = null
     if (params.id === 'search' && query.query) {
       searchQuery = query.query
-      searchResults = await app.$axios.$get(`/api/library/${libraryId}/audiobooks?q=${query.query}`).catch((error) => {
+
+      searchResults = await app.$axios.$get(`/api/library/${libraryId}/search?q=${searchQuery}`).catch((error) => {
         console.error('Search error', error)
-        return []
+        return {}
       })
+      audiobookSearchResults = searchResults.audiobooks || []
       store.commit('audiobooks/setSearchResults', searchResults)
-      if (searchResults.length) searchResults.forEach((ab) => store.commit('audiobooks/addUpdate', ab))
+      if (audiobookSearchResults.length) audiobookSearchResults.forEach((ab) => store.commit('audiobooks/addUpdate', ab.audiobook))
     }
+
+    // Series page
     var selectedSeries = query.series ? app.$decode(query.series) : null
     store.commit('audiobooks/setSelectedSeries', selectedSeries)
+
     var libraryPage = params.id || ''
     store.commit('audiobooks/setLibraryPage', libraryPage)
 
     return {
       id: libraryPage,
+      libraryId,
       searchQuery,
       searchResults,
       selectedSeries
@@ -65,9 +75,9 @@ export default {
   methods: {
     async newQuery() {
       var query = this.$route.query.query
-      this.searchResults = await this.$axios.$get(`/api/audiobooks?q=${query}`).catch((error) => {
+      this.searchResults = await this.$axios.$get(`/api/library/${this.libraryId}/search?q=${query}`).catch((error) => {
         console.error('Search error', error)
-        return []
+        return {}
       })
       this.searchQuery = query
     }
diff --git a/client/static/icons/NoUserPhoto.png b/client/static/icons/NoUserPhoto.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d864927ab707674f71288487b58ecfee212e68e
GIT binary patch
literal 9138
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

literal 0
HcmV?d00001

diff --git a/client/store/audiobooks.js b/client/store/audiobooks.js
index c95af913..94b9f43b 100644
--- a/client/store/audiobooks.js
+++ b/client/store/audiobooks.js
@@ -14,7 +14,8 @@ export const state = () => ({
   keywordFilter: null,
   selectedSeries: null,
   libraryPage: null,
-  searchResults: []
+  searchResults: {},
+  searchResultAudiobooks: []
 })
 
 export const getters = {
@@ -25,7 +26,7 @@ export const getters = {
     if (!state.libraryPage) {
       return getters.getFiltered()
     } else if (state.libraryPage === 'search') {
-      return state.searchResults
+      return state.searchResultAudiobooks
     } else if (state.libraryPage === 'series') {
       var series = getters.getSeriesGroups()
       if (state.selectedSeries) {
@@ -222,6 +223,7 @@ export const mutations = {
   },
   setSearchResults(state, val) {
     state.searchResults = val
+    state.searchResultAudiobooks = val && val.audiobooks ? val.audiobooks.map(ab => ab.audiobook) : []
   },
   set(state, audiobooks) {
     // GENRES
diff --git a/package.json b/package.json
index 9a20a06e..6ebb9b8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.4.10",
+  "version": "1.4.11",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {
diff --git a/server/ApiController.js b/server/ApiController.js
index 367f8570..b9a58d93 100644
--- a/server/ApiController.js
+++ b/server/ApiController.js
@@ -148,15 +148,18 @@ class ApiController {
     var bookMatches = []
     var authorMatches = {}
     var seriesMatches = {}
+    var tagMatches = {}
 
     var audiobooksInLibrary = this.db.audiobooks.filter(ab => ab.libraryId === library.id)
     audiobooksInLibrary.forEach((ab) => {
       var queryResult = ab.searchQuery(req.query.q)
       if (queryResult.book) {
-        bookMatches.push({
+        var bookMatchObj = {
           audiobook: ab,
-          matchKey: queryResult.book
-        })
+          matchKey: queryResult.book,
+          matchText: queryResult.bookMatchText
+        }
+        bookMatches.push(bookMatchObj)
       }
       if (queryResult.author && !authorMatches[queryResult.author]) {
         authorMatches[queryResult.author] = {
@@ -173,10 +176,23 @@ class ApiController {
           seriesMatches[queryResult.series].audiobooks.push(ab)
         }
       }
+      if (queryResult.tags && queryResult.tags.length) {
+        queryResult.tags.forEach((tag) => {
+          if (!tagMatches[tag]) {
+            tagMatches[tag] = {
+              tag,
+              audiobooks: [ab]
+            }
+          } else {
+            tagMatches[tag].audiobooks.push(ab)
+          }
+        })
+      }
     })
 
     res.json({
       audiobooks: bookMatches.slice(0, maxResults),
+      tags: Object.values(tagMatches).slice(0, maxResults),
       authors: Object.values(authorMatches).slice(0, maxResults),
       series: Object.values(seriesMatches).slice(0, maxResults)
     })
diff --git a/server/objects/Audiobook.js b/server/objects/Audiobook.js
index 64e7c438..f1948a64 100644
--- a/server/objects/Audiobook.js
+++ b/server/objects/Audiobook.js
@@ -654,11 +654,22 @@ class Audiobook {
   }
 
   isSearchMatch(search) {
-    return this.book.isSearchMatch(search.toLowerCase().trim())
+    var tagMatch = this.tags.filter(tag => {
+      return tag.toLowerCase().includes(search.toLowerCase().trim())
+    })
+    return this.book.isSearchMatch(search.toLowerCase().trim()) || tagMatch.length
   }
 
   searchQuery(search) {
-    return this.book.getQueryMatches(search.toLowerCase().trim())
+    var matches = this.book.getQueryMatches(search.toLowerCase().trim())
+    matches.tags = this.tags.filter(tag => {
+      return tag.toLowerCase().includes(search.toLowerCase().trim())
+    })
+    if (!matches.book && matches.tags.length) {
+      matches.book = 'tags'
+      matches.bookMatchText = matches.tags.join(', ')
+    }
+    return matches
   }
 
   getAudioFileByIno(ino) {
diff --git a/server/objects/Book.js b/server/objects/Book.js
index daa9b692..b144f9e7 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -220,11 +220,16 @@ class Book {
   }
 
   getQueryMatches(search) {
-    var titleMatch = this._title.toLowerCase().includes(search) || this._subtitle.toLowerCase().includes(search)
+    var titleMatch = this._title.toLowerCase().includes(search)
+    var subtitleMatch = this._subtitle.toLowerCase().includes(search)
     var authorMatch = this._author.toLowerCase().includes(search)
     var seriesMatch = this._series.toLowerCase().includes(search)
+
+    var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorMatch ? 'author' : seriesMatch ? 'series' : false
+    var bookMatchText = bookMatchKey ? this[bookMatchKey] : ''
     return {
-      book: titleMatch ? 'title' : authorMatch ? 'author' : seriesMatch ? 'series' : false,
+      book: bookMatchKey,
+      bookMatchText,
       author: authorMatch ? this._author : false,
       series: seriesMatch ? this._series : false
     }