From 06554811e2060fe66c62724fd52465cf4f48da29 Mon Sep 17 00:00:00 2001
From: Mark Cooper <mcoop320@gmail.com>
Date: Sun, 26 Sep 2021 15:34:08 -0500
Subject: [PATCH] Series order by volume number, show volume number, keyword
 filter, fix overflow bug

---
 client/assets/app.css                      |  2 +-
 client/components/app/BookShelf.vue        | 24 +++++++++++++++-------
 client/components/app/BookShelfToolbar.vue |  4 ++--
 client/components/app/SideRail.vue         |  3 ++-
 client/components/cards/BookCard.vue       |  7 ++++++-
 client/components/cards/GroupCard.vue      | 19 +++++++++++++----
 client/components/cards/GroupCover.vue     |  2 +-
 client/layouts/default.vue                 |  3 +++
 client/package.json                        |  2 +-
 client/store/audiobooks.js                 | 14 +++++++++++--
 package.json                               |  2 +-
 11 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/client/assets/app.css b/client/assets/app.css
index 2a0391f4..7367e374 100644
--- a/client/assets/app.css
+++ b/client/assets/app.css
@@ -108,5 +108,5 @@
 }
 
 .box-shadow-side {
-  box-shadow: 4px 0px 4px #11111166;
+  box-shadow: 5px 0px 5px #11111166;
 }
diff --git a/client/components/app/BookShelf.vue b/client/components/app/BookShelf.vue
index 7c3c71f5..262b7054 100644
--- a/client/components/app/BookShelf.vue
+++ b/client/components/app/BookShelf.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="bookshelf" ref="wrapper" class="w-full h-full overflow-y-auto relative">
+  <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 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>
@@ -23,7 +23,7 @@
             <template v-for="entity in shelf">
               <cards-group-card v-if="showGroups" :key="entity.id" :width="bookCoverWidth" :group="entity" @click="clickGroup" />
               <!-- <cards-book-3d :key="entity.id" v-else :width="100" :src="$store.getters['audiobooks/getBookCoverSrc'](entity.book)" /> -->
-              <cards-book-card v-else :key="entity.id" :width="bookCoverWidth" :user-progress="userAudiobooks[entity.id]" :audiobook="entity" />
+              <cards-book-card v-else :key="entity.id" :show-volume-number="selectedSeries" :width="bookCoverWidth" :user-progress="userAudiobooks[entity.id]" :audiobook="entity" />
             </template>
           </div>
           <div class="bookshelfDivider h-4 w-full absolute bottom-0 left-0 right-0 z-10" />
@@ -58,7 +58,8 @@ export default {
       selectedSizeIndex: 3,
       rowPaddingX: 40,
       keywordFilterTimeout: null,
-      scannerParseSubtitle: false
+      scannerParseSubtitle: false,
+      wrapperClientWidth: 0
     }
   },
   watch: {
@@ -159,7 +160,8 @@ export default {
       this.$store.dispatch('user/updateUserSettings', { bookshelfCoverSize: this.bookCoverWidth })
     },
     setBookshelfEntities() {
-      var width = Math.max(0, this.$refs.wrapper.clientWidth - this.rowPaddingX * 2)
+      this.wrapperClientWidth = this.$refs.wrapper.clientWidth
+      var width = Math.max(0, this.wrapperClientWidth - this.rowPaddingX * 2)
       var booksPerRow = Math.floor(width / this.bookWidth)
 
       var entities = this.entities
@@ -182,6 +184,8 @@ export default {
       this.shelves = groups
     },
     async init() {
+      this.wrapperClientWidth = this.$refs.wrapper ? this.$refs.wrapper.clientWidth : 0
+
       var bookshelfCoverSize = this.$store.getters['user/getUserSetting']('bookshelfCoverSize')
       var sizeIndex = this.availableSizes.findIndex((s) => s === bookshelfCoverSize)
       if (!isNaN(sizeIndex)) this.selectedSizeIndex = sizeIndex
@@ -192,9 +196,7 @@ export default {
       }
     },
     resize() {
-      this.$nextTick(() => {
-        this.setBookshelfEntities()
-      })
+      this.$nextTick(this.setBookshelfEntities)
     },
     audiobooksUpdated() {
       console.log('[AudioBookshelf] Audiobooks Updated')
@@ -216,10 +218,18 @@ export default {
       this.$root.socket.emit('scan')
     }
   },
+  updated() {
+    if (this.$refs.wrapper) {
+      if (this.wrapperClientWidth !== this.$refs.wrapper.clientWidth) {
+        this.$nextTick(this.setBookshelfEntities)
+      }
+    }
+  },
   mounted() {
     window.addEventListener('resize', this.resize)
     this.$store.commit('audiobooks/addListener', { id: 'bookshelf', meth: this.audiobooksUpdated })
     this.$store.commit('user/addSettingsListener', { id: 'bookshelf', meth: this.settingsUpdated })
+
     this.init()
   },
   beforeDestroy() {
diff --git a/client/components/app/BookShelfToolbar.vue b/client/components/app/BookShelfToolbar.vue
index 08475a67..33287d64 100644
--- a/client/components/app/BookShelfToolbar.vue
+++ b/client/components/app/BookShelfToolbar.vue
@@ -14,7 +14,7 @@
         </div>
         <div class="flex-grow" />
 
-        <ui-text-input v-show="showSortFilters" v-model="_keywordFilter" placeholder="Keyword Filter" :padding-y="1.5" class="text-xs w-40" />
+        <ui-text-input v-show="!selectedSeries" v-model="_keywordFilter" placeholder="Keyword Filter" :padding-y="1.5" class="text-xs w-40" />
         <controls-filter-select v-show="showSortFilters" v-model="settings.filterBy" class="w-48 h-7.5 ml-4" @change="updateFilter" />
         <controls-order-select v-show="showSortFilters" v-model="settings.orderBy" :descending.sync="settings.orderDesc" class="w-48 h-7.5 ml-4" @change="updateOrder" />
       </template>
@@ -121,6 +121,6 @@ export default {
 
 <style>
 #toolbar {
-  box-shadow: 0px 8px 8px #111111aa;
+  box-shadow: 0px 8px 6px #111111aa;
 }
 </style>
\ No newline at end of file
diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue
index c34e3409..1f69b2ba 100644
--- a/client/components/app/SideRail.vue
+++ b/client/components/app/SideRail.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="w-20 border-r border-primary bg-bg h-full relative box-shadow-side z-40" style="min-width: 80px">
+  <div class="w-20 bg-bg h-full relative box-shadow-side z-20" style="min-width: 80px">
+    <div class="absolute top-0 -right-4 w-4 bg-bg h-10 pointer-events-none" />
     <nuxt-link to="/library" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="paramId === '' ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
       <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
diff --git a/client/components/cards/BookCard.vue b/client/components/cards/BookCard.vue
index 1fd74a02..4202be4f 100644
--- a/client/components/cards/BookCard.vue
+++ b/client/components/cards/BookCard.vue
@@ -29,6 +29,10 @@
             </div>
           </div>
 
+          <div v-if="volumeNumber && showVolumeNumber && !isHovering" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md" :style="{ top: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem` }">
+            <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }">#{{ volumeNumber }}</p>
+          </div>
+
           <div v-show="!isSelectionMode" class="absolute bottom-0 left-0 h-1 shadow-sm max-w-full" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: width * userProgressPercent + 'px' }"></div>
 
           <ui-tooltip v-if="showError" :text="errorText" class="absolute bottom-4 left-0">
@@ -56,7 +60,8 @@ export default {
     width: {
       type: Number,
       default: 120
-    }
+    },
+    showVolumeNumber: Boolean
   },
   data() {
     return {
diff --git a/client/components/cards/GroupCard.vue b/client/components/cards/GroupCard.vue
index 418c23d0..94ca97ce 100644
--- a/client/components/cards/GroupCard.vue
+++ b/client/components/cards/GroupCard.vue
@@ -5,13 +5,16 @@
         <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" />
 
-          <div v-if="hasValidCovers" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'">
-            <p class="truncate font-book" :style="{ fontSize: sizeMultiplier + 'rem' }">{{ groupName }}</p>
+          <div v-if="hasValidCovers" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'" :style="{ padding: `${sizeMultiplier}rem` }">
+            <p class="font-book" :style="{ fontSize: sizeMultiplier + 'rem' }">{{ groupName }}</p>
           </div>
 
           <div class="absolute top-2 right-2 w-7 h-7 rounded-lg bg-black bg-opacity-90 text-gray-300 box-shadow-book flex items-center justify-center border border-white border-opacity-25 pointer-events-none">
             <p class="font-book text-xl">{{ bookItems.length }}</p>
           </div>
+          <div class="absolute bottom-0 left-0 w-full h-1 flex flex-nowrap">
+            <div v-for="userProgress in userProgressItems" :key="userProgress.audiobookId" class="h-full w-full" :class="userProgress.isRead ? 'bg-success' : userProgress.progress > 0 ? 'bg-yellow-400' : ''" />
+          </div>
         </div>
       </nuxt-link>
     </div>
@@ -60,6 +63,15 @@ export default {
     bookItems() {
       return this._group.books || []
     },
+    userAudiobooks() {
+      return Object.values(this.$store.state.user.user ? this.$store.state.user.user.audiobooks || {} : {})
+    },
+    userProgressItems() {
+      return this.bookItems.map((item) => {
+        var userAudiobook = this.userAudiobooks.find((ab) => ab.audiobookId === item.id)
+        return userAudiobook || {}
+      })
+    },
     groupName() {
       return this._group.name || 'No Name'
     },
@@ -81,7 +93,6 @@ export default {
     clickCard() {
       this.$emit('click', this.group)
     }
-  },
-  mounted() {}
+  }
 }
 </script>
\ No newline at end of file
diff --git a/client/components/cards/GroupCover.vue b/client/components/cards/GroupCover.vue
index a4ba17b6..c33f9dca 100644
--- a/client/components/cards/GroupCover.vue
+++ b/client/components/cards/GroupCover.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="wrapper" :style="{ height: height + 'px', width: width + 'px' }" class="relative">
-    <div v-if="noValidCovers" class="absolute top-0 left-0 w-full h-full flex items-center justify-center box-shadow-book">
+    <div v-if="noValidCovers" class="absolute top-0 left-0 w-full h-full flex items-center justify-center box-shadow-book" :style="{ padding: `${sizeMultiplier}rem` }">
       <p :style="{ fontSize: sizeMultiplier + 'rem' }">{{ name }}</p>
     </div>
   </div>
diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 33c29778..b02037cf 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -26,6 +26,9 @@ export default {
       if (this.$store.state.selectedAudiobooks) {
         this.$store.commit('setSelectedAudiobooks', [])
       }
+      if (this.$store.state.audiobooks.keywordFilter) {
+        this.$store.commit('audiobooks/setKeywordFilter', '')
+      }
     }
   },
   computed: {
diff --git a/client/package.json b/client/package.json
index eb896743..53844014 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/client/store/audiobooks.js b/client/store/audiobooks.js
index b2f59714..6be8710f 100644
--- a/client/store/audiobooks.js
+++ b/client/store/audiobooks.js
@@ -73,13 +73,23 @@ export const getters = {
         } else {
           series[audiobook.book.series] = {
             type: 'series',
-            name: audiobook.book.series,
+            name: audiobook.book.series || '',
             books: [audiobook]
           }
         }
       }
     })
-    return Object.values(series)
+    var seriesArray = Object.values(series).map((_series) => {
+      _series.books = sort(_series.books)['asc']((ab) => {
+        return ab.book && ab.book.volumeNumber && !isNaN(ab.book.volumeNumber) ? Number(ab.book.volumeNumber) : null
+      })
+      return _series
+    })
+    if (state.keywordFilter) {
+      const keywordFilter = state.keywordFilter.toLowerCase()
+      return seriesArray.filter((_series) => _series.name.toLowerCase().includes(keywordFilter))
+    }
+    return seriesArray
   },
   getUniqueAuthors: (state) => {
     var _authors = state.audiobooks.filter(ab => !!(ab.book && ab.book.author)).map(ab => ab.book.author)
diff --git a/package.json b/package.json
index f2303c9b..2d226aca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {