From 33f20d54cccc5e5e919715d144e50633b7da2a48 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 23 Apr 2023 17:08:36 -0500
Subject: [PATCH 01/13] Updated docker template xml

---
 docker-template.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/docker-template.xml b/docker-template.xml
index 229f2774..cdd72b10 100644
--- a/docker-template.xml
+++ b/docker-template.xml
@@ -48,21 +48,9 @@
       <Mode>rw</Mode>
     </Volume>
   </Data>
-  <Environment>
-    <Variable>
-      <Value>99</Value>
-      <Name>AUDIOBOOKSHELF_UID</Name>
-      <Mode/>
-    </Variable>
-    <Variable>
-      <Value>100</Value>
-      <Name>AUDIOBOOKSHELF_GID</Name>
-      <Mode/>
-    </Variable>
-  </Environment>
   <Labels/>
   <Config Name="Audiobooks" Target="/audiobooks" Default="" Mode="rw" Description="Container Path: /audiobooks" Type="Path" Display="always" Required="true" Mask="false" />
   <Config Name="Config" Target="/config" Default="/mnt/user/appdata/audiobookshelf/config/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/audiobookshelf/config/</Config>
   <Config Name="Metadata" Target="/metadata" Default="/mnt/user/appdata/audiobookshelf/metadata/" Mode="rw" Description="Container Path: /metadata" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/audiobookshelf/metadata/</Config>
   <Config Name="Web UI Port" Target="80" Default="13378" Mode="tcp" Description="Container Port: 80" Type="Port" Display="always" Required="false" Mask="false">13378</Config>
-</Container>
+</Container>
\ No newline at end of file

From a5627a1b52b942d15444dfd0bd53c40a441f87c4 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 24 Apr 2023 18:25:30 -0500
Subject: [PATCH 02/13] Add:Search for narrators #1495

---
 .../components/app/BookShelfCategorized.vue   |  29 +++--
 client/components/app/BookShelfRow.vue        |   6 ++
 client/components/cards/ItemSearchCard.vue    |   9 +-
 client/components/cards/NarratorCard.vue      |  50 +++++++++
 .../components/cards/NarratorSearchCard.vue   |  34 ++++++
 client/components/controls/GlobalSearch.vue   |  14 ++-
 client/components/widgets/NarratorsSlider.vue | 100 ++++++++++++++++++
 client/pages/library/_library/search.vue      |  33 +++---
 server/controllers/LibraryController.js       |  19 +++-
 server/objects/mediaTypes/Book.js             |   7 +-
 server/objects/metadata/BookMetadata.js       |   3 +
 11 files changed, 271 insertions(+), 33 deletions(-)
 create mode 100644 client/components/cards/NarratorCard.vue
 create mode 100644 client/components/cards/NarratorSearchCard.vue
 create mode 100644 client/components/widgets/NarratorsSlider.vue

diff --git a/client/components/app/BookShelfCategorized.vue b/client/components/app/BookShelfCategorized.vue
index fe1d5df5..ca070e18 100644
--- a/client/components/app/BookShelfCategorized.vue
+++ b/client/components/app/BookShelfCategorized.vue
@@ -28,6 +28,9 @@
         <widgets-authors-slider v-else-if="shelf.type === 'authors'" :key="index + '.'" :items="shelf.entities" :height="192 * sizeMultiplier" class="bookshelf-row pl-8 my-6">
           <p class="font-semibold text-gray-100" :style="{ fontSize: sizeMultiplier + 'rem' }">{{ $strings[shelf.labelStringKey] }}</p>
         </widgets-authors-slider>
+        <widgets-narrators-slider v-else-if="shelf.type === 'narrators'" :key="index + '.'" :items="shelf.entities" :height="100 * sizeMultiplier" class="bookshelf-row pl-8 my-6">
+          <p class="font-semibold text-gray-100" :style="{ fontSize: sizeMultiplier + 'rem' }">{{ $strings[shelf.labelStringKey] }}</p>
+        </widgets-narrators-slider>
       </template>
     </div>
     <!-- Regular bookshelf view -->
@@ -185,8 +188,8 @@ export default {
       this.shelves = categories
     },
     async setShelvesFromSearch() {
-      var shelves = []
-      if (this.results.books && this.results.books.length) {
+      const shelves = []
+      if (this.results.books?.length) {
         shelves.push({
           id: 'books',
           label: 'Books',
@@ -196,7 +199,7 @@ export default {
         })
       }
 
-      if (this.results.podcasts && this.results.podcasts.length) {
+      if (this.results.podcasts?.length) {
         shelves.push({
           id: 'podcasts',
           label: 'Podcasts',
@@ -206,7 +209,7 @@ export default {
         })
       }
 
-      if (this.results.series && this.results.series.length) {
+      if (this.results.series?.length) {
         shelves.push({
           id: 'series',
           label: 'Series',
@@ -221,7 +224,7 @@ export default {
           })
         })
       }
-      if (this.results.tags && this.results.tags.length) {
+      if (this.results.tags?.length) {
         shelves.push({
           id: 'tags',
           label: 'Tags',
@@ -236,7 +239,7 @@ export default {
           })
         })
       }
-      if (this.results.authors && this.results.authors.length) {
+      if (this.results.authors?.length) {
         shelves.push({
           id: 'authors',
           label: 'Authors',
@@ -250,6 +253,20 @@ export default {
           })
         })
       }
+      if (this.results.narrators?.length) {
+        shelves.push({
+          id: 'narrators',
+          label: 'Narrators',
+          labelStringKey: 'LabelNarrators',
+          type: 'narrators',
+          entities: this.results.narrators.map((n) => {
+            return {
+              ...n,
+              type: 'narrator'
+            }
+          })
+        })
+      }
       this.shelves = shelves
     },
     scan() {
diff --git a/client/components/app/BookShelfRow.vue b/client/components/app/BookShelfRow.vue
index bd97d56a..60632db7 100644
--- a/client/components/app/BookShelfRow.vue
+++ b/client/components/app/BookShelfRow.vue
@@ -41,6 +41,11 @@
             <cards-author-card :key="entity.id" :width="bookCoverWidth / 1.25" :height="bookCoverWidth" :author="entity" :size-multiplier="sizeMultiplier" @hook:updated="updatedBookCard" class="pb-6 mx-2" @edit="editAuthor" />
           </template>
         </div>
+        <div v-if="shelf.type === 'narrators'" class="flex items-center">
+          <template v-for="entity in shelf.entities">
+            <cards-narrator-card :key="entity.name" :width="150" :height="100" :narrator="entity" :size-multiplier="sizeMultiplier" @hook:updated="updatedBookCard" class="pb-6 mx-2" />
+          </template>
+        </div>
       </div>
     </div>
 
@@ -88,6 +93,7 @@ export default {
       return this.bookCoverWidth * this.bookCoverAspectRatio
     },
     shelfHeight() {
+      if (this.shelf.type === 'narrators') return 148
       return this.bookCoverHeight + 48
     },
     paddingLeft() {
diff --git a/client/components/cards/ItemSearchCard.vue b/client/components/cards/ItemSearchCard.vue
index f29888e5..1784db0f 100644
--- a/client/components/cards/ItemSearchCard.vue
+++ b/client/components/cards/ItemSearchCard.vue
@@ -10,7 +10,7 @@
       <p v-if="matchKey !== 'authors'" class="text-xs text-gray-200 truncate">by {{ authorName }}</p>
       <p v-else class="truncate text-xs text-gray-200" v-html="matchHtml" />
 
-      <div v-if="matchKey === 'series' || matchKey === 'tags' || matchKey === 'isbn' || matchKey === 'asin' || matchKey === 'episode'" class="m-0 p-0 truncate text-xs" v-html="matchHtml" />
+      <div v-if="matchKey === 'series' || matchKey === 'tags' || matchKey === 'isbn' || matchKey === 'asin' || matchKey === 'episode' || matchKey === 'narrators'" class="m-0 p-0 truncate text-xs" v-html="matchHtml" />
     </div>
   </div>
 </template>
@@ -67,12 +67,13 @@ export default {
       //        but with removing commas periods etc this is no longer plausible
       const html = this.matchText
 
-      if (this.matchKey === 'episode') return `<p class="truncate">Episode: ${html}</p>`
-      if (this.matchKey === 'tags') return `<p class="truncate">Tags: ${html}</p>`
+      if (this.matchKey === 'episode') return `<p class="truncate">${this.$strings.LabelEpisode}: ${html}</p>`
+      if (this.matchKey === 'tags') return `<p class="truncate">${this.$strings.LabelTags}: ${html}</p>`
       if (this.matchKey === 'authors') return `by ${html}`
       if (this.matchKey === 'isbn') return `<p class="truncate">ISBN: ${html}</p>`
       if (this.matchKey === 'asin') return `<p class="truncate">ASIN: ${html}</p>`
-      if (this.matchKey === 'series') return `<p class="truncate">Series: ${html}</p>`
+      if (this.matchKey === 'series') return `<p class="truncate">${this.$strings.LabelSeries}: ${html}</p>`
+      if (this.matchKey === 'narrators') return `<p class="truncate">${this.$strings.LabelNarrator}: ${html}</p>`
       return `${html}`
     }
   },
diff --git a/client/components/cards/NarratorCard.vue b/client/components/cards/NarratorCard.vue
new file mode 100644
index 00000000..9d3e5a30
--- /dev/null
+++ b/client/components/cards/NarratorCard.vue
@@ -0,0 +1,50 @@
+<template>
+  <nuxt-link :to="`/library/${currentLibraryId}/bookshelf?filter=narrators.${$encode(narrator.name)}`">
+    <div :style="{ width: width + 'px', height: height + 'px' }" class="bg-primary box-shadow-book rounded-md relative overflow-hidden">
+      <div class="absolute inset-0 w-full h-full flex items-center justify-center pointer-events-none opacity-20">
+        <span class="material-icons-outlined text-8xl">record_voice_over</span>
+      </div>
+
+      <!-- Narrator name & num books overlay -->
+      <div class="absolute bottom-0 left-0 w-full py-1 bg-black bg-opacity-60 px-2">
+        <p class="text-center font-semibold truncate" :style="{ fontSize: sizeMultiplier * 0.75 + 'rem' }">{{ name }}</p>
+        <p class="text-center text-gray-200" :style="{ fontSize: sizeMultiplier * 0.65 + 'rem' }">{{ numBooks }} Book{{ numBooks === 1 ? '' : 's' }}</p>
+      </div>
+    </div>
+  </nuxt-link>
+</template>
+
+<script>
+export default {
+  props: {
+    narrator: {
+      type: Object,
+      default: () => {}
+    },
+    width: Number,
+    height: Number,
+    sizeMultiplier: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    name() {
+      return this.narrator?.name || ''
+    },
+    numBooks() {
+      return this.narrator?.books?.length || 0
+    },
+    userCanUpdate() {
+      return this.$store.getters['user/getUserCanUpdate']
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    }
+  },
+  methods: {}
+}
+</script>
\ No newline at end of file
diff --git a/client/components/cards/NarratorSearchCard.vue b/client/components/cards/NarratorSearchCard.vue
new file mode 100644
index 00000000..e147e079
--- /dev/null
+++ b/client/components/cards/NarratorSearchCard.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">record_voice_over</span>
+    </div>
+    <div class="flex-grow px-2 narratorSearchCardContent h-full">
+      <p class="truncate text-sm">{{ narrator }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    narrator: String
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style scoped>
+.narratorSearchCardContent {
+  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 670eb6e7..3dbebf1c 100644
--- a/client/components/controls/GlobalSearch.vue
+++ b/client/components/controls/GlobalSearch.vue
@@ -63,6 +63,15 @@
               </nuxt-link>
             </li>
           </template>
+
+          <p v-if="narratorResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">{{ $strings.LabelNarrators }}</p>
+          <template v-for="narrator in narratorResults">
+            <li :key="narrator.name" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickOption">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf?filter=narrators.${$encode(narrator.name)}`">
+                <cards-narrator-search-card :narrator="narrator.name" />
+              </nuxt-link>
+            </li>
+          </template>
         </template>
       </ul>
     </div>
@@ -84,6 +93,7 @@ export default {
       authorResults: [],
       seriesResults: [],
       tagResults: [],
+      narratorResults: [],
       searchTimeout: null,
       lastSearch: null
     }
@@ -114,6 +124,7 @@ export default {
       this.authorResults = []
       this.seriesResults = []
       this.tagResults = []
+      this.narratorResults = []
       this.showMenu = false
       this.isFetching = false
       this.isTyping = false
@@ -142,7 +153,7 @@ export default {
       }
       this.isFetching = true
 
-      var searchResults = await this.$axios.$get(`/api/libraries/${this.currentLibraryId}/search?q=${value}&limit=3`).catch((error) => {
+      const searchResults = await this.$axios.$get(`/api/libraries/${this.currentLibraryId}/search?q=${value}&limit=3`).catch((error) => {
         console.error('Search error', error)
         return []
       })
@@ -155,6 +166,7 @@ export default {
       this.authorResults = searchResults.authors || []
       this.seriesResults = searchResults.series || []
       this.tagResults = searchResults.tags || []
+      this.narratorResults = searchResults.narrators || []
 
       this.isFetching = false
       if (!this.showMenu) {
diff --git a/client/components/widgets/NarratorsSlider.vue b/client/components/widgets/NarratorsSlider.vue
new file mode 100644
index 00000000..77302f6f
--- /dev/null
+++ b/client/components/widgets/NarratorsSlider.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="w-full">
+    <div class="flex items-center py-3">
+      <slot />
+      <div class="flex-grow" />
+      <button v-if="isScrollable" class="w-8 h-8 mx-1 flex items-center justify-center rounded-full" :class="canScrollLeft ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollLeft">
+        <span class="material-icons text-2xl">chevron_left</span>
+      </button>
+      <button v-if="isScrollable" class="w-8 h-8 mx-1 flex items-center justify-center rounded-full" :class="canScrollRight ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollRight">
+        <span class="material-icons text-2xl">chevron_right</span>
+      </button>
+    </div>
+    <div ref="slider" class="w-full overflow-y-hidden overflow-x-auto no-scroll -mx-2" style="scroll-behavior: smooth" @scroll="scrolled">
+      <div class="flex" :style="{ height: height + 'px' }">
+        <template v-for="item in items">
+          <cards-narrator-card :key="item.name" :ref="`slider-item-${item.name}`" :narrator="item" :height="cardHeight" :width="cardWidth" class="relative mx-2" @hook:updated="setScrollVars" />
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    items: {
+      type: Array,
+      default: () => []
+    },
+    height: {
+      type: Number,
+      default: 192
+    },
+    bookshelfView: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      isScrollable: false,
+      canScrollLeft: false,
+      canScrollRight: false,
+      clientWidth: 0
+    }
+  },
+  computed: {
+    cardHeight() {
+      return this.height
+    },
+    cardWidth() {
+      return this.cardHeight * 1.5
+    },
+    booksPerPage() {
+      return Math.floor(this.clientWidth / (this.cardWidth + 16))
+    }
+  },
+  methods: {
+    scrolled() {
+      this.setScrollVars()
+    },
+    scrollRight() {
+      if (!this.canScrollRight) return
+      const slider = this.$refs.slider
+      if (!slider) return
+      const scrollAmount = this.booksPerPage * this.cardWidth
+      const maxScrollLeft = slider.scrollWidth - slider.clientWidth
+
+      const newScrollLeft = Math.min(maxScrollLeft, slider.scrollLeft + scrollAmount)
+      slider.scrollLeft = newScrollLeft
+    },
+    scrollLeft() {
+      if (!this.canScrollLeft) return
+      const slider = this.$refs.slider
+      if (!slider) return
+
+      const scrollAmount = this.booksPerPage * this.cardWidth
+
+      const newScrollLeft = Math.max(0, slider.scrollLeft - scrollAmount)
+      slider.scrollLeft = newScrollLeft
+    },
+    setScrollVars() {
+      const slider = this.$refs.slider
+      if (!slider) return
+      const { scrollLeft, scrollWidth, clientWidth } = slider
+      const scrollPercent = (scrollLeft + clientWidth) / scrollWidth
+
+      this.clientWidth = clientWidth
+      this.isScrollable = scrollWidth > clientWidth
+      this.canScrollRight = scrollPercent < 1
+      this.canScrollLeft = scrollLeft > 0
+    }
+  },
+  updated() {
+    this.setScrollVars()
+  },
+  mounted() {},
+  beforeDestroy() {}
+}
+</script>
\ No newline at end of file
diff --git a/client/pages/library/_library/search.vue b/client/pages/library/_library/search.vue
index b338323f..2f43d202 100644
--- a/client/pages/library/_library/search.vue
+++ b/client/pages/library/_library/search.vue
@@ -11,27 +11,27 @@
 <script>
 export default {
   async asyncData({ store, params, redirect, query, app }) {
-    var libraryId = params.library
-    var library = await store.dispatch('libraries/fetch', libraryId)
+    const libraryId = params.library
+    const library = await store.dispatch('libraries/fetch', libraryId)
     if (!library) {
       return redirect('/oops?message=Library not found')
     }
-    var query = query.q
-    var results = await app.$axios.$get(`/api/libraries/${libraryId}/search?q=${query}`).catch((error) => {
+    let results = await app.$axios.$get(`/api/libraries/${libraryId}/search?q=${query.q}`).catch((error) => {
       console.error('Failed to search library', error)
       return null
     })
     results = {
-      podcasts: results && results.podcast ? results.podcast : null,
-      books: results && results.book ? results.book : null,
-      authors: results && results.authors.length ? results.authors : null,
-      series: results && results.series.length ? results.series : null,
-      tags: results && results.tags.length ? results.tags : null
+      podcasts: results?.podcast || [],
+      books: results?.book || [],
+      authors: results?.authors || [],
+      series: results?.series || [],
+      tags: results?.tags || [],
+      narrators: results?.narrators || []
     }
     return {
       libraryId,
       results,
-      query
+      query: query.q
     }
   },
   data() {
@@ -55,16 +55,17 @@ export default {
   },
   methods: {
     async search() {
-      var results = await this.$axios.$get(`/api/libraries/${this.libraryId}/search?q=${this.query}`).catch((error) => {
+      const results = await this.$axios.$get(`/api/libraries/${this.libraryId}/search?q=${this.query}`).catch((error) => {
         console.error('Failed to search library', error)
         return null
       })
       this.results = {
-        podcasts: results && results.podcast ? results.podcast : null,
-        books: results && results.book ? results.book : null,
-        authors: results && results.authors.length ? results.authors : null,
-        series: results && results.series.length ? results.series : null,
-        tags: results && results.tags.length ? results.tags : null
+        podcasts: results?.podcast || [],
+        books: results?.book || [],
+        authors: results?.authors || [],
+        series: results?.series || [],
+        tags: results?.tags || [],
+        narrators: results?.narrators || []
       }
       this.$nextTick(() => {
         if (this.$refs.bookshelf) {
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 154f6f17..abceabca 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -596,6 +596,7 @@ class LibraryController {
 
     const itemMatches = []
     const authorMatches = {}
+    const narratorMatches = {}
     const seriesMatches = {}
     const tagMatches = {}
 
@@ -608,7 +609,7 @@ class LibraryController {
           matchText: queryResult.matchText
         })
       }
-      if (queryResult.series && queryResult.series.length) {
+      if (queryResult.series?.length) {
         queryResult.series.forEach((se) => {
           if (!seriesMatches[se.id]) {
             const _series = this.db.series.find(_se => _se.id === se.id)
@@ -618,7 +619,7 @@ class LibraryController {
           }
         })
       }
-      if (queryResult.authors && queryResult.authors.length) {
+      if (queryResult.authors?.length) {
         queryResult.authors.forEach((au) => {
           if (!authorMatches[au.id]) {
             const _author = this.db.authors.find(_au => _au.id === au.id)
@@ -631,7 +632,7 @@ class LibraryController {
           }
         })
       }
-      if (queryResult.tags && queryResult.tags.length) {
+      if (queryResult.tags?.length) {
         queryResult.tags.forEach((tag) => {
           if (!tagMatches[tag]) {
             tagMatches[tag] = { name: tag, books: [li.toJSON()] }
@@ -640,13 +641,23 @@ class LibraryController {
           }
         })
       }
+      if (queryResult.narrators?.length) {
+        queryResult.narrators.forEach((narrator) => {
+          if (!narratorMatches[narrator]) {
+            narratorMatches[narrator] = { name: narrator, books: [li.toJSON()] }
+          } else {
+            narratorMatches[narrator].books.push(li.toJSON())
+          }
+        })
+      }
     })
     const itemKey = req.library.mediaType
     const results = {
       [itemKey]: itemMatches.slice(0, maxResults),
       tags: Object.values(tagMatches).slice(0, maxResults),
       authors: Object.values(authorMatches).slice(0, maxResults),
-      series: Object.values(seriesMatches).slice(0, maxResults)
+      series: Object.values(seriesMatches).slice(0, maxResults),
+      narrators: Object.values(narratorMatches).slice(0, maxResults)
     }
     res.json(results)
   }
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
index 2983faf7..18c6ea52 100644
--- a/server/objects/mediaTypes/Book.js
+++ b/server/objects/mediaTypes/Book.js
@@ -322,6 +322,7 @@ class Book {
       tags: this.tags.filter(t => cleanStringForSearch(t).includes(query)),
       series: this.metadata.searchSeries(query),
       authors: this.metadata.searchAuthors(query),
+      narrators: this.metadata.searchNarrators(query),
       matchKey: null,
       matchText: null
     }
@@ -336,10 +337,12 @@ class Book {
       } else if (payload.series.length) {
         payload.matchKey = 'series'
         payload.matchText = this.metadata.seriesName
-      }
-      else if (payload.tags.length) {
+      } else if (payload.tags.length) {
         payload.matchKey = 'tags'
         payload.matchText = this.tags.join(', ')
+      } else if (payload.narrators.length) {
+        payload.matchKey = 'narrators'
+        payload.matchText = this.metadata.narratorName
       }
     }
     return payload
diff --git a/server/objects/metadata/BookMetadata.js b/server/objects/metadata/BookMetadata.js
index 68fb6084..e6294f5f 100644
--- a/server/objects/metadata/BookMetadata.js
+++ b/server/objects/metadata/BookMetadata.js
@@ -381,6 +381,9 @@ class BookMetadata {
   searchAuthors(query) {
     return this.authors.filter(au => cleanStringForSearch(au.name).includes(query))
   }
+  searchNarrators(query) {
+    return this.narrators.filter(n => cleanStringForSearch(n).includes(query))
+  }
   searchQuery(query) { // Returns key if match is found
     const keysToCheck = ['title', 'asin', 'isbn']
     for (const key of keysToCheck) {

From f5572892746019bdfa54bfd521dc5acd8e4d6647 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 25 Apr 2023 19:00:57 -0500
Subject: [PATCH 03/13] Update:Set lang in HTML tag #1399

---
 client/layouts/default.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 8c9316fa..b201fc4a 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -569,6 +569,7 @@ export default {
     changeLanguage(code) {
       console.log('Changed lang', code)
       this.currentLang = code
+      document.documentElement.lang = code
     }
   },
   beforeMount() {
@@ -593,6 +594,11 @@ export default {
       this.$toast.error(this.$route.query.error)
       this.$router.replace(this.$route.path)
     }
+
+    // Set lang on HTML tag
+    if (this.$languageCodes?.current) {
+      document.documentElement.lang = this.$languageCodes.current
+    }
   },
   beforeDestroy() {
     this.$eventBus.$off('change-lang', this.changeLanguage)

From bdb154a6e5a21480ec2adbeb0668f4b6e37516e9 Mon Sep 17 00:00:00 2001
From: Tomazed <toma.zed@gmail.com>
Date: Wed, 26 Apr 2023 17:39:15 +0200
Subject: [PATCH 04/13] update on pending translation

---
 client/strings/fr.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/strings/fr.json b/client/strings/fr.json
index 61649d15..3affb7e0 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -93,7 +93,7 @@
   "HeaderCollection": "Collection",
   "HeaderCollectionItems": "Entrées de la Collection",
   "HeaderCover": "Couverture",
-  "HeaderCurrentDownloads": "Current Downloads",
+  "HeaderCurrentDownloads": "File d’attente de téléchargement",
   "HeaderDetails": "Détails",
   "HeaderDownloadQueue": "Queue de téléchargement",
   "HeaderEpisodes": "Épisodes",
@@ -161,7 +161,7 @@
   "LabelAccountTypeGuest": "Invité",
   "LabelAccountTypeUser": "Utilisateur",
   "LabelActivity": "Activité",
-  "LabelAdded": "Added",
+  "LabelAdded": "Ajouté",
   "LabelAddedAt": "Date d’ajout",
   "LabelAddToCollection": "Ajouter à la collection",
   "LabelAddToCollectionBatch": "Ajout de {0} livres à la lollection",
@@ -186,8 +186,8 @@
   "LabelBitrate": "Bitrate",
   "LabelBooks": "Livres",
   "LabelChangePassword": "Modifier le mot de passe",
-  "LabelChannels": "Channels",
-  "LabelChapters": "Chapters",
+  "LabelChannels": "Canaux",
+  "LabelChapters": "Chapitres",
   "LabelChaptersFound": "Chapitres trouvés",
   "LabelChapterTitle": "Titres du chapitre",
   "LabelClosePlayer": "Fermer le lecteur",
@@ -257,8 +257,8 @@
   "LabelItem": "Article",
   "LabelLanguage": "Langue",
   "LabelLanguageDefaultServer": "Langue par défaut",
-  "LabelLastBookAdded": "Last Book Added",
-  "LabelLastBookUpdated": "Last Book Updated",
+  "LabelLastBookAdded": "Dernier livre ajouté",
+  "LabelLastBookUpdated": "Dernier livre mis à jour",
   "LabelLastSeen": "Vu dernièrement",
   "LabelLastTime": "Progression",
   "LabelLastUpdate": "Dernière mise à jour",
@@ -277,12 +277,12 @@
   "LabelMediaType": "Type de média",
   "LabelMetadataProvider": "Fournisseur de métadonnées",
   "LabelMetaTag": "Etiquette de métadonnée",
-  "LabelMetaTags": "Meta Tags",
+  "LabelMetaTags": "Etiquettes de métadonnée",
   "LabelMinute": "Minute",
   "LabelMissing": "Manquant",
   "LabelMissingParts": "Parties manquantes",
   "LabelMore": "Plus",
-  "LabelMoreInfo": "More Info",
+  "LabelMoreInfo": "Plus d’info",
   "LabelName": "Nom",
   "LabelNarrator": "Narrateur",
   "LabelNarrators": "Narrateurs",
@@ -324,7 +324,7 @@
   "LabelPodcasts": "Podcasts",
   "LabelPodcastType": "Type de Podcast",
   "LabelPrefixesToIgnore": "Préfixes à Ignorer (Insensible à la Casse)",
-  "LabelPreventIndexing": "Prevent your feed from being indexed by iTunes and Google podcast directories",
+  "LabelPreventIndexing": "Empêcher l’indexation de votre flux par les bases de donénes iTunes et Google podcast",
   "LabelProgress": "Progression",
   "LabelProvider": "Fournisseur",
   "LabelPubDate": "Date de publication",
@@ -384,7 +384,7 @@
   "LabelSettingsStoreCoversWithItemHelp": "Par défaut, les couvertures sont enregistrées dans /metadata/items. Activer ce paramètre enregistrera les couvertures dans le dossier avec les fichiers de l’article. Seul un fichier nommé « cover » sera conservé.",
   "LabelSettingsStoreMetadataWithItem": "Enregistrer les Métadonnées avec les articles",
   "LabelSettingsStoreMetadataWithItemHelp": "Par défaut, les métadonnées sont enregistrées dans /metadata/items. Activer ce paramètre enregistrera les métadonnées dans le dossier de l’article avec une extension « .abs ».",
-  "LabelSettingsTimeFormat": "Time Format",
+  "LabelSettingsTimeFormat": "Format d’heure",
   "LabelShowAll": "Afficher Tout",
   "LabelSize": "Taille",
   "LabelSleepTimer": "Minuterie",
@@ -412,8 +412,8 @@
   "LabelTag": "Étiquette",
   "LabelTags": "Étiquettes",
   "LabelTagsAccessibleToUser": "Étiquettes accessibles à l’utilisateur",
-  "LabelTasks": "Tasks Running",
-  "LabelTimeBase": "Time Base",
+  "LabelTasks": "Tâches en cours",
+  "LabelTimeBase": "Base de temps",
   "LabelTimeListened": "Temps d’écoute",
   "LabelTimeListenedToday": "Nombres d’écoutes Aujourd’hui",
   "LabelTimeRemaining": "{0} restantes",
@@ -535,7 +535,7 @@
   "MessageNoSearchResultsFor": "Aucun résultat pour la recherche « {0} »",
   "MessageNoSeries": "Aucune série",
   "MessageNoTags": "Aucune d’étiquettes",
-  "MessageNoTasksRunning": "No Tasks Running",
+  "MessageNoTasksRunning": "Aucune tâche en cours",
   "MessageNotYetImplemented": "Non implémenté",
   "MessageNoUpdateNecessary": "Aucune mise à jour nécessaire",
   "MessageNoUpdatesWereNecessary": "Aucune mise à jour n’était nécessaire",
@@ -567,7 +567,7 @@
   "MessageWatcherIsDisabledGlobally": "La surveillance est désactivée par un paramètre global du serveur",
   "MessageXLibraryIsEmpty": "La bibliothèque {0} est vide !",
   "MessageYourAudiobookDurationIsLonger": "La durée de votre Livre Audio est plus longue que la durée trouvée",
-  "MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée",
+  "MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée",d’épisode
   "NoteChangeRootPassword": "seul l’utilisateur « root » peut utiliser un mot de passe vide",
   "NoteChapterEditorTimes": "Information : l’horodatage du premier chapitre doit être à 0:00 et celui du dernier chapitre ne peut se situer au-delà de la durée du Livre Audio.",
   "NoteFolderPicker": "Information : Les dossiers déjà surveillés ne sont pas affichés",
@@ -581,7 +581,7 @@
   "PlaceholderNewFolderPath": "Nouveau chemin de dossier",
   "PlaceholderNewPlaylist": "Nouveau nom de liste de lecture",
   "PlaceholderSearch": "Recherche...",
-  "PlaceholderSearchEpisode": "Search episode...",
+  "PlaceholderSearchEpisode": "Recherche d’épisode...",
   "ToastAccountUpdateFailed": "Échec de la mise à jour du compte",
   "ToastAccountUpdateSuccess": "Compte mis à jour",
   "ToastAuthorImageRemoveFailed": "Échec de la suppression de l’image",
@@ -651,4 +651,4 @@
   "ToastSocketFailedToConnect": "Échec de la connexion WebSocket",
   "ToastUserDeleteFailed": "Échec de la suppression de l’utilisateur",
   "ToastUserDeleteSuccess": "Utilisateur supprimé"
-}
+}
\ No newline at end of file

From 065675697d017d1cd63b4ce42f4c2fcbc151460a Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 26 Apr 2023 18:15:50 -0500
Subject: [PATCH 05/13] Fix:Catch exception when failing to download podcast
 episodes

---
 server/utils/fileUtils.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js
index d9fa13c2..5751372f 100644
--- a/server/utils/fileUtils.js
+++ b/server/utils/fileUtils.js
@@ -174,20 +174,24 @@ async function recurseFiles(path, relPathToReplace = null) {
 }
 module.exports.recurseFiles = recurseFiles
 
-module.exports.downloadFile = async (url, filepath) => {
-  Logger.debug(`[fileUtils] Downloading file to ${filepath}`)
+module.exports.downloadFile = (url, filepath) => {
+  return new Promise(async (resolve, reject) => {
+    Logger.debug(`[fileUtils] Downloading file to ${filepath}`)
+    axios({
+      url,
+      method: 'GET',
+      responseType: 'stream',
+      timeout: 30000
+    }).then((response) => {
+      const writer = fs.createWriteStream(filepath)
+      response.data.pipe(writer)
 
-  const writer = fs.createWriteStream(filepath)
-  const response = await axios({
-    url,
-    method: 'GET',
-    responseType: 'stream',
-    timeout: 30000
-  })
-  response.data.pipe(writer)
-  return new Promise((resolve, reject) => {
-    writer.on('finish', resolve)
-    writer.on('error', reject)
+      writer.on('finish', resolve)
+      writer.on('error', reject)
+    }).catch((err) => {
+      Logger.error(`[fileUtils] Failed to download file "${filepath}"`, err)
+      reject(err)
+    })
   })
 }
 

From 813e553dbbae0b8d83d06c6fba0e5668eb0fc6ec Mon Sep 17 00:00:00 2001
From: Arturo Pineiro <apineirom97@gmail.com>
Date: Wed, 26 Apr 2023 18:20:46 -0700
Subject: [PATCH 06/13] update es translation

---
 client/strings/es.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/strings/es.json b/client/strings/es.json
index 99d25e6f..242a25e4 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -186,8 +186,8 @@
   "LabelBitrate": "Bitrate",
   "LabelBooks": "Libros",
   "LabelChangePassword": "Cambiar Contraseña",
-  "LabelChannels": "Channels",
-  "LabelChapters": "Chapters",
+  "LabelChannels": "Canales",
+  "LabelChapters": "Capitulos",
   "LabelChaptersFound": "Capitulo Encontrado",
   "LabelChapterTitle": "Titulo del Capitulo",
   "LabelClosePlayer": "Close player",
@@ -217,7 +217,7 @@
   "LabelDuration": "Duración",
   "LabelDurationFound": "Duración Comprobada:",
   "LabelEdit": "Editar",
-  "LabelEmbeddedCover": "Embedded Cover",
+  "LabelEmbeddedCover": "Portada Integrada",
   "LabelEnable": "Habilitar",
   "LabelEnd": "Fin",
   "LabelEpisode": "Episodio",
@@ -235,7 +235,7 @@
   "LabelFinished": "Terminado",
   "LabelFolder": "Carpeta",
   "LabelFolders": "Carpetas",
-  "LabelFormat": "Format",
+  "LabelFormat": "Formato",
   "LabelGenre": "Genero",
   "LabelGenres": "Géneros",
   "LabelHardDeleteFile": "Eliminar Definitivamente",
@@ -282,7 +282,7 @@
   "LabelMissing": "Ausente",
   "LabelMissingParts": "Partes Ausentes",
   "LabelMore": "Mas",
-  "LabelMoreInfo": "More Info",
+  "LabelMoreInfo": "Mas Información",
   "LabelName": "Nombre",
   "LabelNarrator": "Narrador",
   "LabelNarrators": "Narradores",
@@ -477,7 +477,7 @@
   "MessageConfirmForceReScan": "Esta seguro que desea forzar re-escanear?",
   "MessageConfirmMarkSeriesFinished": "Esta seguro que desea marcar todos los libros en esta serie como terminados?",
   "MessageConfirmMarkSeriesNotFinished": "Esta seguro que desea marcar todos los libros en esta serie como no terminados?",
-  "MessageConfirmRemoveAllChapters": "Are you sure you want to remove all chapters?",
+  "MessageConfirmRemoveAllChapters": "Esta seguro que desea remover todos los capitulos?",
   "MessageConfirmRemoveCollection": "Esta seguro que desea remover la colección \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Esta seguro que desea remover el episodio \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Esta seguro que desea remover {0} episodios?",
@@ -549,7 +549,7 @@
   "MessageRemoveAllItemsWarning": "ADVERTENCIA! Esta acción eliminará todos los elementos de la biblioteca de la base de datos incluyendo cualquier actualización o match. Esto no hace nada a sus archivos reales. Esta seguro que desea continuar?",
   "MessageRemoveChapter": "Remover capítulos",
   "MessageRemoveEpisodes": "Remover {0} episodio(s)",
-  "MessageRemoveFromPlayerQueue": "Remover de player queue",
+  "MessageRemoveFromPlayerQueue": "Romover la cola de reporduccion",
   "MessageRemoveUserWarning": "Esta seguro que desea eliminar el usuario \"{0}\"?",
   "MessageReportBugsAndContribute": "Reporte erres, solicite funciones y contribuye en",
   "MessageResetChaptersConfirm": "Esta seguro que desea reiniciar el capitulo y deshacer los cambios que hiciste?",

From 9a808602c43f987075b828e104eff89cfc312f93 Mon Sep 17 00:00:00 2001
From: Hallo951 <40667862+Hallo951@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:41:06 +0200
Subject: [PATCH 07/13] Update german strings

---
 client/strings/de.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index 4b9188e5..fcd09dfd 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -142,8 +142,8 @@
   "HeaderSettingsGeneral": "Allgemein",
   "HeaderSettingsScanner": "Scanner",
   "HeaderSleepTimer": "Einschlaf-Timer",
-  "HeaderStatsLargestItems": "Largest Items",
-  "HeaderStatsLongestItems": "Längste Einträge (h)",
+  "HeaderStatsLargestItems": "Größte Medien",
+  "HeaderStatsLongestItems": "Längste Medien (h)",
   "HeaderStatsMinutesListeningChart": "Hörminuten (letzte 7 Tage)",
   "HeaderStatsRecentSessions": "Neueste Ereignisse",
   "HeaderStatsTop10Authors": "Top 10 Autoren",
@@ -161,7 +161,7 @@
   "LabelAccountTypeGuest": "Gast",
   "LabelAccountTypeUser": "Benutzer",
   "LabelActivity": "Aktivitäten",
-  "LabelAdded": "Added",
+  "LabelAdded": "Hinzugefügt",
   "LabelAddedAt": "Hinzugefügt am",
   "LabelAddToCollection": "Zur Sammlung hinzufügen",
   "LabelAddToCollectionBatch": "Füge {0} Hörbüch(er)/Podcast(s) der Sammlung hinzu",
@@ -169,7 +169,7 @@
   "LabelAddToPlaylistBatch": "Füge {0} Hörbüch(er)/Podcast(s) der Wiedergabeliste hinzu",
   "LabelAll": "Alle",
   "LabelAllUsers": "Alle Benutzer",
-  "LabelAlreadyInYourLibrary": "Already in your library",
+  "LabelAlreadyInYourLibrary": "In der Bibliothek vorhanden",
   "LabelAppend": "Anhängen",
   "LabelAuthor": "Autor",
   "LabelAuthorFirstLast": "Autor (Vorname Nachname)",
@@ -201,7 +201,7 @@
   "LabelCover": "Titelbild",
   "LabelCoverImageURL": "URL des Titelbildes",
   "LabelCreatedAt": "Erstellt am",
-  "LabelCronExpression": "Cron Ausdruck",
+  "LabelCronExpression": "Cron-Ausdruck",
   "LabelCurrent": "Aktuell",
   "LabelCurrently": "Aktuell:",
   "LabelCustomCronExpression": "Benutzerdefinierter Cron-Ausdruck",
@@ -223,7 +223,7 @@
   "LabelEpisode": "Episode",
   "LabelEpisodeTitle": "Episodentitel",
   "LabelEpisodeType": "Episodentyp",
-  "LabelExample": "Example",
+  "LabelExample": "Beispiel",
   "LabelExplicit": "Explizit (Altersbeschränkung)",
   "LabelFeedURL": "Feed URL",
   "LabelFile": "Datei",
@@ -257,8 +257,8 @@
   "LabelItem": "Medium",
   "LabelLanguage": "Sprache",
   "LabelLanguageDefaultServer": "Standard-Server-Sprache",
-  "LabelLastBookAdded": "Last Book Added",
-  "LabelLastBookUpdated": "Last Book Updated",
+  "LabelLastBookAdded": "Zuletzt hinzugefügtes Medium",
+  "LabelLastBookUpdated": "Zuletzt aktualisiertes Medium",
   "LabelLastSeen": "Zuletzt angesehen",
   "LabelLastTime": "Letztes Mal",
   "LabelLastUpdate": "Letzte Aktualisierung",
@@ -384,7 +384,7 @@
   "LabelSettingsStoreCoversWithItemHelp": "Standardmäßig werden die Titelbilder in /metadata/items gespeichert. Wenn diese Option aktiviert ist, werden die Titelbilder als jpg Datei in dem gleichen Ordner gespeichert in welchem sich auch das Medium befindet. Es wird immer nur eine Datei mit dem Namen \"cover.jpg\" gespeichert.",
   "LabelSettingsStoreMetadataWithItem": "Metadaten als OPF-Datei im Medienordner speichern",
   "LabelSettingsStoreMetadataWithItemHelp": "Standardmäßig werden die Metadaten in /metadata/items gespeichert. Wenn diese Option aktiviert ist, werden die Metadaten als OPF-Datei (Textdatei) in dem gleichen Ordner gespeichert in welchem sich auch das Medium befindet. Es wird immer nur eine Datei mit dem Namen \"matadata.abs\" gespeichert.",
-  "LabelSettingsTimeFormat": "Time Format",
+  "LabelSettingsTimeFormat": "Zeitformat",
   "LabelShowAll": "Alles anzeigen",
   "LabelSize": "Größe",
   "LabelSleepTimer": "Einschlaf-Timer",
@@ -412,8 +412,8 @@
   "LabelTag": "Schlagwort",
   "LabelTags": "Schlagwörter",
   "LabelTagsAccessibleToUser": "Für Benutzer zugängliche Schlagwörter",
-  "LabelTasks": "Tasks Running",
-  "LabelTimeBase": "Time Base",
+  "LabelTasks": "Laufende Aufgaben",
+  "LabelTimeBase": "Basiszeit",
   "LabelTimeListened": "Gehörte Zeit",
   "LabelTimeListenedToday": "Heute gehörte Zeit",
   "LabelTimeRemaining": "{0} verbleibend",
@@ -470,7 +470,7 @@
   "MessageChapterErrorStartGteDuration": "Ungültige Kapitelstartzeit: Kapitelanfang > Mediumlänge (Kapitelanfang liegt zeitlich nach dem Ende des Mediums -> Lösung: Kapitelanfang < Mediumlänge)",
   "MessageChapterErrorStartLtPrev": "Ungültige Kapitelstartzeit: Kapitelanfang < Kapitelanfang vorheriges Kapitel (Kapitelanfang liegt zeitlich vor dem Beginn des vorherigen Kapitels -> Lösung: Kapitelanfang >= Startzeit des vorherigen Kapitels)",
   "MessageChapterStartIsAfter": "Ungültige Kapitelstartzeit: Kapitelanfang > Mediumende (Kapitelanfang liegt nach dem Ende des Mediums)",
-  "MessageCheckingCron": "Überprüfe cron...",
+  "MessageCheckingCron": "Überprüfe Cron...",
   "MessageConfirmDeleteBackup": "Sind Sie sicher, dass Sie die Sicherung für {0} löschen wollen?",
   "MessageConfirmDeleteLibrary": "Sind Sie sicher, dass Sie die Bibliothek \"{0}\" dauerhaft löschen wollen?",
   "MessageConfirmDeleteSession": "Sind Sie sicher, dass Sie diese Sitzung löschen möchten?",
@@ -563,7 +563,7 @@
   "MessageUploaderItemFailed": "Hochladen fehlgeschlagen",
   "MessageUploaderItemSuccess": "Erfolgreich hochgeladen!",
   "MessageUploading": "Hochladen...",
-  "MessageValidCronExpression": "Gültiger cron-ausdruck",
+  "MessageValidCronExpression": "Gültiger Cron-Ausdruck",
   "MessageWatcherIsDisabledGlobally": "Überwachung ist in den Servereinstellungen global deaktiviert",
   "MessageXLibraryIsEmpty": "{0} Bibliothek ist leer!",
   "MessageYourAudiobookDurationIsLonger": "Die Dauer Ihres Mediums ist länger als die gefundene Dauer",
@@ -651,4 +651,4 @@
   "ToastSocketFailedToConnect": "Verbindung zum WebSocket fehlgeschlagen",
   "ToastUserDeleteFailed": "Benutzer konnte nicht gelöscht werden",
   "ToastUserDeleteSuccess": "Benutzer gelöscht"
-}
\ No newline at end of file
+}

From 0387436111680f8eef2c7e4b51811bbf3462126c Mon Sep 17 00:00:00 2001
From: Divyang Joshi <divyangbw@gmail.com>
Date: Thu, 27 Apr 2023 17:02:15 -0400
Subject: [PATCH 08/13] feat: add support for inverting the selection on
 libraries and tags

---
 client/components/modals/AccountModal.vue | 33 ++++++++++++++------
 client/strings/de.json                    |  2 ++
 client/strings/en-us.json                 |  2 ++
 client/strings/es.json                    |  2 ++
 client/strings/fr.json                    |  2 ++
 client/strings/gu.json                    |  2 ++
 client/strings/hi.json                    |  2 ++
 client/strings/hr.json                    |  2 ++
 client/strings/it.json                    |  2 ++
 client/strings/pl.json                    |  2 ++
 client/strings/ru.json                    |  2 ++
 client/strings/zh-cn.json                 |  2 ++
 server/objects/user/User.js               | 38 +++++++++++++++--------
 13 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/client/components/modals/AccountModal.vue b/client/components/modals/AccountModal.vue
index b1cdabf0..070baab4 100644
--- a/client/components/modals/AccountModal.vue
+++ b/client/components/modals/AccountModal.vue
@@ -6,7 +6,7 @@
       </div>
     </template>
     <form @submit.prevent="submitForm">
-      <div class="px-4 w-full text-sm py-6 rounded-lg bg-bg shadow-lg border border-black-300">
+      <div class="px-4 w-full text-sm py-6 rounded-lg bg-bg shadow-lg border border-black-300 overflow-y-auto overflow-x-hidden"  style="min-height: 400px; max-height: 80vh">
         <div class="w-full p-8">
           <div class="flex py-2">
             <div class="w-1/2 px-2">
@@ -96,7 +96,14 @@
               </div>
             </div>
             <div v-if="!newUser.permissions.accessAllTags" class="my-4">
-              <ui-multi-select-dropdown v-model="newUser.itemTagsAccessible" :items="itemTags" :label="$strings.LabelTagsAccessibleToUser" />
+              <div class="flex items-center">
+                <ui-multi-select-dropdown v-model="newUser.itemTagsSelected" :items="itemTags" :label="tagsSelectionText" />
+                <div class="flex items-center pt-4 px-2">
+                  <p class="px-3 font-semibold" id="selected-tags-not-accessible--permissions-toggle">{{ $strings.LabelInvert }}</p>
+                  <ui-toggle-switch labeledBy="selected-tags-not-accessible--permissions-toggle" v-model="newUser.permissions.selectedTagsNotAccessible" />
+                </div>
+              </div>
+              
             </div>
           </div>
 
@@ -185,6 +192,9 @@ export default {
           value: t
         }
       })
+    },
+    tagsSelectionText() {
+      return this.newUser.permissions.selectedTagsNotAccessible ? this.$strings.LabelTagsNotAccessibleToUser : this.$strings.LabelTagsAccessibleToUser
     }
   },
   methods: {
@@ -193,8 +203,11 @@ export default {
       if (this.$refs.modal) this.$refs.modal.setHide()
     },
     accessAllTagsToggled(val) {
-      if (val && this.newUser.itemTagsAccessible.length) {
-        this.newUser.itemTagsAccessible = []
+      if (val) {
+        if (this.newUser.itemTagsSelected?.length) {
+          this.newUser.itemTagsSelected = []
+        }
+        this.newUser.permissions.selectedTagsNotAccessible = false
       }
     },
     fetchAllTags() {
@@ -226,7 +239,7 @@ export default {
         this.$toast.error('Must select at least one library')
         return
       }
-      if (!this.newUser.permissions.accessAllTags && !this.newUser.itemTagsAccessible.length) {
+      if (!this.newUser.permissions.accessAllTags && !this.newUser.itemTagsSelected.length) {
         this.$toast.error('Must select at least one tag')
         return
       }
@@ -307,12 +320,12 @@ export default {
         delete: type === 'admin',
         upload: type === 'admin',
         accessAllLibraries: true,
-        accessAllTags: true
+        accessAllTags: true,
+        selectedTagsNotAccessible: false
       }
     },
     init() {
       this.fetchAllTags()
-
       this.isNew = !this.account
       if (this.account) {
         this.newUser = {
@@ -322,9 +335,10 @@ export default {
           isActive: this.account.isActive,
           permissions: { ...this.account.permissions },
           librariesAccessible: [...(this.account.librariesAccessible || [])],
-          itemTagsAccessible: [...(this.account.itemTagsAccessible || [])]
+          itemTagsSelected: [...(this.account.itemTagsSelected || [])]
         }
       } else {
+        this.fetchAllTags()
         this.newUser = {
           username: null,
           password: null,
@@ -336,7 +350,8 @@ export default {
             delete: false,
             upload: false,
             accessAllLibraries: true,
-            accessAllTags: true
+            accessAllTags: true,
+            selectedTagsNotAccessible: false
           },
           librariesAccessible: []
         }
diff --git a/client/strings/de.json b/client/strings/de.json
index fcd09dfd..fb5b570a 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Jeden Tag",
   "LabelIntervalEveryHour": "Jede Stunde",
   "LabelInvalidParts": "Ungültige Teile",
+  "LabelInvert": "Invert",
   "LabelItem": "Medium",
   "LabelLanguage": "Sprache",
   "LabelLanguageDefaultServer": "Standard-Server-Sprache",
@@ -412,6 +413,7 @@
   "LabelTag": "Schlagwort",
   "LabelTags": "Schlagwörter",
   "LabelTagsAccessibleToUser": "Für Benutzer zugängliche Schlagwörter",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Laufende Aufgaben",
   "LabelTimeBase": "Basiszeit",
   "LabelTimeListened": "Gehörte Zeit",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 07d8bbe9..31b7145b 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Every day",
   "LabelIntervalEveryHour": "Every hour",
   "LabelInvalidParts": "Invalid Parts",
+  "LabelInvert": "Invert",
   "LabelItem": "Item",
   "LabelLanguage": "Language",
   "LabelLanguageDefaultServer": "Default Server Language",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTagsAccessibleToUser": "Tags Accessible to User",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tasks Running",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Time Listened",
diff --git a/client/strings/es.json b/client/strings/es.json
index 242a25e4..05fcc220 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Cada Dia",
   "LabelIntervalEveryHour": "Cada Hora",
   "LabelInvalidParts": "Partes Invalidas",
+  "LabelInvert": "Invert",
   "LabelItem": "Elemento",
   "LabelLanguage": "Lenguaje",
   "LabelLanguageDefaultServer": "Lenguaje Predeterminado del Servidor",
@@ -412,6 +413,7 @@
   "LabelTag": "Etiqueta",
   "LabelTags": "Etiquetas",
   "LabelTagsAccessibleToUser": "Etiquetas Accessible para el Usuario",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tareas Corriendo",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Tiempo Escuchando",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index 3affb7e0..3e6512a6 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Tous les jours",
   "LabelIntervalEveryHour": "Toutes les heures",
   "LabelInvalidParts": "Parties invalides",
+  "LabelInvert": "Invert",
   "LabelItem": "Article",
   "LabelLanguage": "Langue",
   "LabelLanguageDefaultServer": "Langue par défaut",
@@ -412,6 +413,7 @@
   "LabelTag": "Étiquette",
   "LabelTags": "Étiquettes",
   "LabelTagsAccessibleToUser": "Étiquettes accessibles à l’utilisateur",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tâches en cours",
   "LabelTimeBase": "Base de temps",
   "LabelTimeListened": "Temps d’écoute",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index c1d80158..7825882e 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Every day",
   "LabelIntervalEveryHour": "Every hour",
   "LabelInvalidParts": "Invalid Parts",
+  "LabelInvert": "Invert",
   "LabelItem": "Item",
   "LabelLanguage": "Language",
   "LabelLanguageDefaultServer": "Default Server Language",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTagsAccessibleToUser": "Tags Accessible to User",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tasks Running",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Time Listened",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index 928d9cf2..fa4de440 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Every day",
   "LabelIntervalEveryHour": "Every hour",
   "LabelInvalidParts": "Invalid Parts",
+  "LabelInvert": "Invert",
   "LabelItem": "Item",
   "LabelLanguage": "Language",
   "LabelLanguageDefaultServer": "Default Server Language",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTagsAccessibleToUser": "Tags Accessible to User",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tasks Running",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Time Listened",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 45fffdf4..777aef15 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Every day",
   "LabelIntervalEveryHour": "Every hour",
   "LabelInvalidParts": "Nevaljajuči dijelovi",
+  "LabelInvert": "Invert",
   "LabelItem": "Stavka",
   "LabelLanguage": "Jezik",
   "LabelLanguageDefaultServer": "Default jezik servera",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTagsAccessibleToUser": "Tags dostupni korisniku",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tasks Running",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Vremena odslušano",
diff --git a/client/strings/it.json b/client/strings/it.json
index 6ca8ae99..9606aaf4 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Ogni Giorno",
   "LabelIntervalEveryHour": "Ogni ora",
   "LabelInvalidParts": "Parti Invalide",
+  "LabelInvert": "Invert",
   "LabelItem": "Oggetti",
   "LabelLanguage": "Lingua",
   "LabelLanguageDefaultServer": "Lingua di Default",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTagsAccessibleToUser": "Tags permessi agli Utenti",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Processi in esecuzione",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Tempo di Ascolto",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 5b52c210..7babe3f4 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Każdego dnia",
   "LabelIntervalEveryHour": "Każdej godziny",
   "LabelInvalidParts": "Nieprawidłowe części",
+  "LabelInvert": "Invert",
   "LabelItem": "Pozycja",
   "LabelLanguage": "Język",
   "LabelLanguageDefaultServer": "Domyślny język serwera",
@@ -412,6 +413,7 @@
   "LabelTag": "Tag",
   "LabelTags": "Tagi",
   "LabelTagsAccessibleToUser": "Tagi dostępne dla użytkownika",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Tasks Running",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Czas odtwarzania",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index 1a04e611..8ac05e05 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "Каждый день",
   "LabelIntervalEveryHour": "Каждый час",
   "LabelInvalidParts": "Неверные части",
+  "LabelInvert": "Invert",
   "LabelItem": "Элемент",
   "LabelLanguage": "Язык",
   "LabelLanguageDefaultServer": "Язык сервера по умолчанию",
@@ -412,6 +413,7 @@
   "LabelTag": "Тег",
   "LabelTags": "Теги",
   "LabelTagsAccessibleToUser": "Теги доступные для пользователя",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "Запущенные задачи",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "Время прослушивания",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 87293a35..1ad22d69 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -254,6 +254,7 @@
   "LabelIntervalEveryDay": "每天",
   "LabelIntervalEveryHour": "每小时",
   "LabelInvalidParts": "无效部件",
+  "LabelInvert": "Invert",
   "LabelItem": "项目",
   "LabelLanguage": "语言",
   "LabelLanguageDefaultServer": "默认服务器语言",
@@ -412,6 +413,7 @@
   "LabelTag": "标签",
   "LabelTags": "标签",
   "LabelTagsAccessibleToUser": "用户可访问的标签",
+  "LabelTagsNotAccessibleToUser": "Tags not Accessible to User",
   "LabelTasks": "正在运行的任务",
   "LabelTimeBase": "Time Base",
   "LabelTimeListened": "收听时间",
diff --git a/server/objects/user/User.js b/server/objects/user/User.js
index ed59aca1..c46bd9a7 100644
--- a/server/objects/user/User.js
+++ b/server/objects/user/User.js
@@ -20,7 +20,7 @@ class User {
 
     this.permissions = {}
     this.librariesAccessible = [] // Library IDs (Empty if ALL libraries)
-    this.itemTagsAccessible = [] // Empty if ALL item tags accessible
+    this.itemTagsSelected = [] // Empty if ALL item tags accessible
 
     if (user) {
       this.construct(user)
@@ -86,7 +86,7 @@ class User {
       createdAt: this.createdAt,
       permissions: this.permissions,
       librariesAccessible: [...this.librariesAccessible],
-      itemTagsAccessible: [...this.itemTagsAccessible]
+      itemTagsSelected: [...this.itemTagsSelected]
     }
   }
 
@@ -105,7 +105,7 @@ class User {
       createdAt: this.createdAt,
       permissions: this.permissions,
       librariesAccessible: [...this.librariesAccessible],
-      itemTagsAccessible: [...this.itemTagsAccessible]
+      itemTagsSelected: [...this.itemTagsSelected]
     }
     if (minimal) {
       delete json.mediaProgress
@@ -169,9 +169,15 @@ class User {
     if (this.permissions.accessAllTags === undefined) this.permissions.accessAllTags = true
     // Explicit content restriction permission added v2.0.18
     if (this.permissions.accessExplicitContent === undefined) this.permissions.accessExplicitContent = true
+    // itemTagsAccessible was renamed to itemTagsSelected in version v2.x
+    if (this.itemTagsAccessible) {
+      this.permissions.selectedTagsNotAccessible = false
+      this.itemTagsSelected = this.itemTagsAccessible
+      this.itemTagsAccessible = undefined
+    }
 
     this.librariesAccessible = [...(user.librariesAccessible || [])]
-    this.itemTagsAccessible = [...(user.itemTagsAccessible || [])]
+    this.itemTagsSelected = [...(user.itemTagsSelected || [])]
   }
 
   update(payload) {
@@ -228,19 +234,21 @@ class User {
     // Update accessible tags
     if (this.permissions.accessAllTags) {
       // Access all tags
-      if (this.itemTagsAccessible.length) {
-        this.itemTagsAccessible = []
+      if (this.itemTagsSelected.length) {
+        this.itemTagsSelected = []
+        this.permissions.selectedTagsNotAccessible = false
         hasUpdates = true
       }
-    } else if (payload.itemTagsAccessible !== undefined) {
-      if (payload.itemTagsAccessible.length) {
-        if (payload.itemTagsAccessible.join(',') !== this.itemTagsAccessible.join(',')) {
+    } else if (payload.itemTagsSelected !== undefined) {
+      if (payload.itemTagsSelected.length) {
+        if (payload.itemTagsSelected.join(',') !== this.itemTagsSelected.join(',')) {
           hasUpdates = true
-          this.itemTagsAccessible = [...payload.itemTagsAccessible]
+          this.itemTagsSelected = [...payload.itemTagsSelected]
         }
-      } else if (this.itemTagsAccessible.length > 0) {
+      } else if (this.itemTagsSelected.length > 0) {
         hasUpdates = true
-        this.itemTagsAccessible = []
+        this.itemTagsSelected = []
+        this.permissions.selectedTagsNotAccessible = false
       }
     }
     return hasUpdates
@@ -343,8 +351,12 @@ class User {
 
   checkCanAccessLibraryItemWithTags(tags) {
     if (this.permissions.accessAllTags) return true
+    if (this.permissions.selectedTagsNotAccessible) {
+      if (!tags || !tags.length) return true
+      return tags.every(tag => !this.itemTagsSelected.includes(tag))
+    }
     if (!tags || !tags.length) return false
-    return this.itemTagsAccessible.some(tag => tags.includes(tag))
+    return this.itemTagsSelected.some(tag => tags.includes(tag))
   }
 
   checkCanAccessLibraryItem(libraryItem) {

From 4a13712b1c1b90e94408d3c64a4d9b705862634f Mon Sep 17 00:00:00 2001
From: Divyang Joshi <divyangbw@gmail.com>
Date: Thu, 27 Apr 2023 17:07:09 -0400
Subject: [PATCH 09/13] fix: Remove what seems to be a paste error in the
 french translations

---
 client/strings/fr.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/strings/fr.json b/client/strings/fr.json
index 3affb7e0..8ceb71db 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -567,7 +567,7 @@
   "MessageWatcherIsDisabledGlobally": "La surveillance est désactivée par un paramètre global du serveur",
   "MessageXLibraryIsEmpty": "La bibliothèque {0} est vide !",
   "MessageYourAudiobookDurationIsLonger": "La durée de votre Livre Audio est plus longue que la durée trouvée",
-  "MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée",d’épisode
+  "MessageYourAudiobookDurationIsShorter": "La durée de votre Livre Audio est plus courte que la durée trouvée",
   "NoteChangeRootPassword": "seul l’utilisateur « root » peut utiliser un mot de passe vide",
   "NoteChapterEditorTimes": "Information : l’horodatage du premier chapitre doit être à 0:00 et celui du dernier chapitre ne peut se situer au-delà de la durée du Livre Audio.",
   "NoteFolderPicker": "Information : Les dossiers déjà surveillés ne sont pas affichés",

From 56e213d654eeece365aa82c92b321ac6fe189842 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 27 Apr 2023 17:18:54 -0500
Subject: [PATCH 10/13] Update itemTagsSelected migration

---
 server/objects/user/User.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/objects/user/User.js b/server/objects/user/User.js
index c46bd9a7..b6ee71bc 100644
--- a/server/objects/user/User.js
+++ b/server/objects/user/User.js
@@ -169,11 +169,10 @@ class User {
     if (this.permissions.accessAllTags === undefined) this.permissions.accessAllTags = true
     // Explicit content restriction permission added v2.0.18
     if (this.permissions.accessExplicitContent === undefined) this.permissions.accessExplicitContent = true
-    // itemTagsAccessible was renamed to itemTagsSelected in version v2.x
-    if (this.itemTagsAccessible) {
+    // itemTagsAccessible was renamed to itemTagsSelected in version v2.2.20
+    if (user.itemTagsAccessible?.length) {
       this.permissions.selectedTagsNotAccessible = false
-      this.itemTagsSelected = this.itemTagsAccessible
-      this.itemTagsAccessible = undefined
+      user.itemTagsSelected = user.itemTagsAccessible
     }
 
     this.librariesAccessible = [...(user.librariesAccessible || [])]
@@ -352,10 +351,10 @@ class User {
   checkCanAccessLibraryItemWithTags(tags) {
     if (this.permissions.accessAllTags) return true
     if (this.permissions.selectedTagsNotAccessible) {
-      if (!tags || !tags.length) return true
+      if (!tags?.length) return true
       return tags.every(tag => !this.itemTagsSelected.includes(tag))
     }
-    if (!tags || !tags.length) return false
+    if (!tags?.length) return false
     return this.itemTagsSelected.some(tag => tags.includes(tag))
   }
 

From ff8a58c7bc83278c9c6c785efbd30cb93c25e30f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 28 Apr 2023 16:08:57 -0500
Subject: [PATCH 11/13] Remove log about not modifying permissions

---
 server/utils/filePerms.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/utils/filePerms.js b/server/utils/filePerms.js
index 85fa7e84..b32f3040 100644
--- a/server/utils/filePerms.js
+++ b/server/utils/filePerms.js
@@ -92,7 +92,6 @@ module.exports.setDefault = (path, silent = false) => {
   const gid = global.Gid
   return new Promise((resolve) => {
     if (isNaN(uid) || isNaN(gid)) {
-      if (!silent) Logger.debug('Not modifying permissions since no uid/gid is specified')
       return resolve()
     }
     if (!silent) Logger.debug(`Setting permission "${mode}" for uid ${uid} and gid ${gid} | "${path}"`)

From 4db26f9f79fb22d8355341c42bb3970676b198d2 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 28 Apr 2023 16:16:47 -0500
Subject: [PATCH 12/13] Add:Log user and ip on successful login #1740

---
 server/Auth.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/Auth.js b/server/Auth.js
index 2bca48d2..7fc8ccc6 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -126,12 +126,12 @@ class Auth {
 
   async login(req, res) {
     const ipAddress = requestIp.getClientIp(req)
-    var username = (req.body.username || '').toLowerCase()
-    var password = req.body.password || ''
+    const username = (req.body.username || '').toLowerCase()
+    const password = req.body.password || ''
 
-    var user = this.users.find(u => u.username.toLowerCase() === username)
+    const user = this.users.find(u => u.username.toLowerCase() === username)
 
-    if (!user || !user.isActive) {
+    if (!user?.isActive) {
       Logger.warn(`[Auth] Failed login attempt ${req.rateLimit.current} of ${req.rateLimit.limit} from ${ipAddress}`)
       if (req.rateLimit.remaining <= 2) {
         Logger.error(`[Auth] Failed login attempt for username ${username} from ip ${ipAddress}. Attempts: ${req.rateLimit.current}`)
@@ -145,13 +145,15 @@ class Auth {
       if (password) {
         return res.status(401).send('Invalid root password (hint: there is none)')
       } else {
+        Logger.info(`[Auth] ${user.username} logged in from ${ipAddress}`)
         return res.json(this.getUserLoginResponsePayload(user))
       }
     }
 
     // Check password match
-    var compare = await bcrypt.compare(password, user.pash)
+    const compare = await bcrypt.compare(password, user.pash)
     if (compare) {
+      Logger.info(`[Auth] ${user.username} logged in from ${ipAddress}`)
       res.json(this.getUserLoginResponsePayload(user))
     } else {
       Logger.warn(`[Auth] Failed login attempt ${req.rateLimit.current} of ${req.rateLimit.limit} from ${ipAddress}`)

From 5286b533347477ae47d4e56f086285019e8095c1 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 29 Apr 2023 16:26:56 -0500
Subject: [PATCH 13/13] Add:Progress bar on series covers #1734

---
 client/components/cards/LazySeriesCard.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 313530b6..1175acf1 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -7,7 +7,7 @@
 
     <div class="absolute z-10 top-1.5 right-1.5 rounded-md leading-3 text-sm p-1 font-semibold text-white flex items-center justify-center" style="background-color: #cd9d49dd">{{ books.length }}</div>
 
-    <div v-if="isSeriesFinished" class="absolute bottom-0 left-0 h-1 shadow-sm max-w-full z-10 rounded-b bg-success w-full" />
+    <div v-if="seriesPercentInProgress > 0" class="absolute bottom-0 left-0 h-1 shadow-sm max-w-full z-10 rounded-b w-full" :class="isSeriesFinished ? 'bg-success' : 'bg-yellow-400'" :style="{ width: seriesPercentInProgress * 100 + '%' }" />
 
     <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 :style="{ fontSize: 1.2 * sizeMultiplier + 'rem' }">{{ displayTitle }}</p>
@@ -85,13 +85,13 @@ export default {
         case 'addedAt':
           return `${this.$strings.LabelAdded} ${this.$formatDate(this.addedAt, this.dateFormat)}`
         case 'totalDuration':
-          return `${this.$strings.LabelDuration} ${this.$elapsedPrettyExtended(this.totalDuration, false)}` 
+          return `${this.$strings.LabelDuration} ${this.$elapsedPrettyExtended(this.totalDuration, false)}`
         case 'lastBookUpdated':
-          const lastUpdated = Math.max(...(this.books).map(x => x.updatedAt), 0)
+          const lastUpdated = Math.max(...this.books.map((x) => x.updatedAt), 0)
           return `${this.$strings.LabelLastBookUpdated} ${this.$formatDate(lastUpdated, this.dateFormat)}`
         case 'lastBookAdded':
-          const lastBookAdded = Math.max(...(this.books).map(x => x.addedAt), 0)
-          return `${this.$strings.LabelLastBookAdded} ${this.$formatDate(lastBookAdded, this.dateFormat)}` 
+          const lastBookAdded = Math.max(...this.books.map((x) => x.addedAt), 0)
+          return `${this.$strings.LabelLastBookAdded} ${this.$formatDate(lastBookAdded, this.dateFormat)}`
         default:
           return null
       }
@@ -115,6 +115,14 @@ export default {
     seriesBooksFinished() {
       return this.seriesBookProgress.filter((p) => p.isFinished)
     },
+    hasSeriesBookInProgress() {
+      return this.seriesBookProgress.some((p) => !p.isFinished && p.progress > 0)
+    },
+    seriesPercentInProgress() {
+      let totalFinishedAndInProgress = this.seriesBooksFinished.length
+      if (this.hasSeriesBookInProgress) totalFinishedAndInProgress += 1
+      return Math.min(1, Math.max(0, totalFinishedAndInProgress / this.books.length))
+    },
     isSeriesFinished() {
       return this.books.length === this.seriesBooksFinished.length
     },