From 090a6a36966e0fdc8b4ed045d03e907a34f73107 Mon Sep 17 00:00:00 2001
From: mx03 <mx03@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:43:07 +0100
Subject: [PATCH 01/52] Sort filters

---
 server/utils/libraryHelpers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 2d012587..753169ba 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -74,6 +74,11 @@ module.exports = {
         })
       }
     })
+    data.authors = naturalSort(data.authors).asc()
+    data.genres = naturalSort(data.genres).asc()
+    data.tags = naturalSort(data.tags).asc()
+    data.series = naturalSort(data.series).asc()
+    data.narrators = naturalSort(data.narrators).asc()
     return data
   },
 

From ace37cc54f74e4c04932607dd4733d849edc846d Mon Sep 17 00:00:00 2001
From: mx03 <mx03@users.noreply.github.com>
Date: Mon, 27 Dec 2021 17:51:19 +0100
Subject: [PATCH 02/52] Missing Path variable

---
 server/controllers/FileSystemController.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/controllers/FileSystemController.js b/server/controllers/FileSystemController.js
index 28d63571..3a592b74 100644
--- a/server/controllers/FileSystemController.js
+++ b/server/controllers/FileSystemController.js
@@ -1,4 +1,5 @@
 const Logger = require('../Logger')
+const Path = require('path')
 
 class FileSystemController {
   constructor() { }

From e56196a137a523433e8643b6718257552e89e28b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 28 Dec 2021 15:50:17 -0600
Subject: [PATCH 03/52] Add:Alternative bookshelf view with titles #232

---
 client/assets/app.css                    |  9 +++++----
 client/components/app/LazyBookshelf.vue  | 16 ++++++++++++++--
 client/components/cards/LazyBookCard.vue | 10 ++++++++++
 client/mixins/bookshelfCardsHelpers.js   |  3 ++-
 client/pages/config/index.vue            | 18 ++++++++++++++++++
 client/plugins/constants.js              |  8 +++++++-
 server/objects/ServerSettings.js         |  5 ++++-
 server/utils/constants.js                |  5 +++++
 8 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/client/assets/app.css b/client/assets/app.css
index 867a9d86..6ec19ed5 100644
--- a/client/assets/app.css
+++ b/client/assets/app.css
@@ -18,6 +18,7 @@
 }
 #bookshelf {
   height: calc(100% - 40px);
+  background-image: linear-gradient(to right bottom, #2e2e2e, #303030, #313131, #333333, #353535, #343434, #323232, #313131, #2c2c2c, #282828, #232323, #1f1f1f);
 }
 @media (max-width: 768px) {
   #bookshelf {
@@ -25,6 +26,10 @@
   }
 }
 
+#page-wrapper {
+  background-image: linear-gradient(to right bottom, #2e2e2e, #303030, #313131, #333333, #353535, #343434, #323232, #313131, #2c2c2c, #282828, #232323, #1f1f1f);
+}
+
 /* width */
 ::-webkit-scrollbar {
   width: 8px;
@@ -121,10 +126,6 @@ input[type=number] {
   font-size: 1.1rem;
 }
 
-#page-wrapper {
-  background-image: linear-gradient(to right bottom, #2e2e2e, #303030, #313131, #333333, #353535, #343434, #323232, #313131, #2c2c2c, #282828, #232323, #1f1f1f);
-}
-
 .box-shadow-md {
   box-shadow: 2px 8px 6px #111111aa;
 }
diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 13979e2c..3c036ece 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -1,11 +1,11 @@
 <template>
   <div id="bookshelf" class="w-full overflow-y-auto">
     <template v-for="shelf in totalShelves">
-      <div :key="shelf" class="w-full px-4 sm:px-8 bookshelfRow relative" :id="`shelf-${shelf - 1}`" :style="{ height: shelfHeight + 'px' }">
+      <div :key="shelf" :id="`shelf-${shelf - 1}`" class="w-full px-4 sm:px-8 relative" :class="{ bookshelfRow: !isAlternativeBookshelfView }" :style="{ height: shelfHeight + 'px' }">
         <!-- <div class="absolute top-0 left-0 bottom-0 p-4 z-10">
           <p class="text-white text-2xl">{{ shelf }}</p>
         </div> -->
-        <div class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20" :class="`h-${shelfDividerHeightIndex}`" />
+        <div v-if="!isAlternativeBookshelfView" class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20" :class="`h-${shelfDividerHeightIndex}`" />
       </div>
     </template>
 
@@ -104,9 +104,16 @@ export default {
     coverAspectRatio() {
       return this.$store.getters['getServerSetting']('coverAspectRatio')
     },
+    bookshelfView() {
+      return this.$store.getters['getServerSetting']('bookshelfView')
+    },
     isCoverSquareAspectRatio() {
       return this.coverAspectRatio === this.$constants.BookCoverAspectRatio.SQUARE
     },
+    isAlternativeBookshelfView() {
+      if (!this.isEntityBook) return false // Only used for bookshelf showing books
+      return this.bookshelfView === this.$constants.BookshelfView.TITLES
+    },
     bookCoverAspectRatio() {
       return this.isCoverSquareAspectRatio ? 1 : 1.6
     },
@@ -149,6 +156,7 @@ export default {
       return 6
     },
     shelfHeight() {
+      if (this.isAlternativeBookshelfView) return this.entityHeight + 80 * this.sizeMultiplier
       return this.entityHeight + 40
     },
     totalEntityCardWidth() {
@@ -157,6 +165,10 @@ export default {
     },
     selectedAudiobooks() {
       return this.$store.state.selectedAudiobooks || []
+    },
+    sizeMultiplier() {
+      var baseSize = this.isCoverSquareAspectRatio ? 192 : 120
+      return this.entityWidth / baseSize
     }
   },
   methods: {
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 7a9e7246..cfe0f1e9 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -5,6 +5,11 @@
       <div class="absolute cover-bg" ref="coverBg" />
     </div>
 
+    <div v-if="isAlternativeBookshelfView" class="absolute left-0 z-50 w-full" :style="{ bottom: `-${sizeMultiplier * 3}rem` }">
+      <p class="truncate" :style="{ fontSize: 0.9 * sizeMultiplier + 'rem' }">{{ title }}</p>
+      <p class="truncate text-gray-400" :style="{ fontSize: 0.8 * sizeMultiplier + 'rem' }">{{ authorFL }}</p>
+    </div>
+
     <div class="w-full h-full absolute top-0 left-0 rounded overflow-hidden z-10">
       <div v-show="audiobook && !imageReady" class="absolute top-0 left-0 w-full h-full flex items-center justify-center" :style="{ padding: sizeMultiplier * 0.5 + 'rem' }">
         <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }" class="font-book text-gray-300 text-center">{{ title }}</p>
@@ -79,6 +84,7 @@ export default {
     },
     bookCoverAspectRatio: Number,
     showVolumeNumber: Boolean,
+    bookshelfView: Number,
     bookMount: {
       // Book can be passed as prop or set with setEntity()
       type: Object,
@@ -292,6 +298,10 @@ export default {
         return this.authorFL.slice(0, 27) + '...'
       }
       return this.authorFL
+    },
+    isAlternativeBookshelfView() {
+      var constants = this.$constants || this.$nuxt.$constants
+      return this.bookshelfView === constants.BookshelfView.TITLES
     }
   },
   methods: {
diff --git a/client/mixins/bookshelfCardsHelpers.js b/client/mixins/bookshelfCardsHelpers.js
index 8c2fa349..a25f4d65 100644
--- a/client/mixins/bookshelfCardsHelpers.js
+++ b/client/mixins/bookshelfCardsHelpers.js
@@ -51,7 +51,8 @@ export default {
         index,
         width: this.entityWidth,
         height: this.entityHeight,
-        bookCoverAspectRatio: this.bookCoverAspectRatio
+        bookCoverAspectRatio: this.bookCoverAspectRatio,
+        bookshelfView: this.bookshelfView
       }
       if (this.entityName === 'series-books') props.showVolumeNumber = true
 
diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index f00255ad..79e69c81 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -48,6 +48,13 @@
           <p class="pl-4 text-lg">Use square book covers <span class="material-icons icon-text">info_outlined</span></p>
         </ui-tooltip>
       </div>
+
+      <div class="flex items-center py-2">
+        <ui-toggle-switch v-model="useAlternativeBookshelfView" :disabled="updatingServerSettings" @input="updateAlternativeBookshelfView" />
+        <ui-tooltip :text="bookshelfViewTooltip">
+          <p class="pl-4 text-lg">Use alternative library bookshelf view <span class="material-icons icon-text">info_outlined</span></p>
+        </ui-tooltip>
+      </div>
     </div>
 
     <div class="h-0.5 bg-primary bg-opacity-30 w-full" />
@@ -94,6 +101,7 @@ export default {
       storeCoversInAudiobookDir: false,
       updatingServerSettings: false,
       useSquareBookCovers: false,
+      useAlternativeBookshelfView: false,
       isPurgingCache: false,
       newServerSettings: {}
     }
@@ -134,6 +142,9 @@ export default {
     coverAspectRatioTooltip() {
       return 'Prefer to use square covers over standard 1.6:1 book covers'
     },
+    bookshelfViewTooltip() {
+      return 'Alternative bookshelf view that shows title & author under book covers'
+    },
     showExperimentalFeatures: {
       get() {
         return this.$store.state.showExperimentalFeatures
@@ -175,6 +186,11 @@ export default {
         coverAspectRatio: val ? this.$constants.BookCoverAspectRatio.SQUARE : this.$constants.BookCoverAspectRatio.STANDARD
       })
     },
+    updateAlternativeBookshelfView(val) {
+      this.updateServerSettings({
+        bookshelfView: val ? this.$constants.BookshelfView.TITLES : this.$constants.BookshelfView.STANDARD
+      })
+    },
     updateServerSettings(payload) {
       this.updatingServerSettings = true
       this.$store
@@ -194,6 +210,8 @@ export default {
       this.storeCoversInAudiobookDir = this.newServerSettings.coverDestination === this.$constants.CoverDestination.AUDIOBOOK
 
       this.useSquareBookCovers = this.newServerSettings.coverAspectRatio === this.$constants.BookCoverAspectRatio.SQUARE
+
+      this.useAlternativeBookshelfView = this.newServerSettings.bookshelfView === this.$constants.BookshelfView.TITLES
     },
     resetAudiobooks() {
       if (confirm('WARNING! This action will remove all audiobooks from the database including any updates or matches you have made. This does not do anything to your actual files. Shall we continue?')) {
diff --git a/client/plugins/constants.js b/client/plugins/constants.js
index 7a237fec..3c5e191a 100644
--- a/client/plugins/constants.js
+++ b/client/plugins/constants.js
@@ -15,10 +15,16 @@ const BookCoverAspectRatio = {
   SQUARE: 1
 }
 
+const BookshelfView = {
+  STANDARD: 0,
+  TITLES: 1
+}
+
 const Constants = {
   DownloadStatus,
   CoverDestination,
-  BookCoverAspectRatio
+  BookCoverAspectRatio,
+  BookshelfView
 }
 
 const KeyNames = {
diff --git a/server/objects/ServerSettings.js b/server/objects/ServerSettings.js
index b3695303..df172d9b 100644
--- a/server/objects/ServerSettings.js
+++ b/server/objects/ServerSettings.js
@@ -1,4 +1,4 @@
-const { CoverDestination, BookCoverAspectRatio } = require('../utils/constants')
+const { CoverDestination, BookCoverAspectRatio, BookshelfView } = require('../utils/constants')
 const Logger = require('../Logger')
 
 class ServerSettings {
@@ -35,6 +35,7 @@ class ServerSettings {
 
     // Cover
     this.coverAspectRatio = BookCoverAspectRatio.STANDARD
+    this.bookshelfView = BookshelfView.STANDARD
 
     this.logLevel = Logger.logLevel
     this.version = null
@@ -65,6 +66,7 @@ class ServerSettings {
     this.loggerScannerLogsToKeep = settings.loggerScannerLogsToKeep || 2
 
     this.coverAspectRatio = settings.coverAspectRatio || BookCoverAspectRatio.STANDARD
+    this.bookshelfView = settings.bookshelfView || BookshelfView.STANDARD
 
     this.logLevel = settings.logLevel || Logger.logLevel
     this.version = settings.version || null
@@ -93,6 +95,7 @@ class ServerSettings {
       loggerDailyLogsToKeep: this.loggerDailyLogsToKeep,
       loggerScannerLogsToKeep: this.loggerScannerLogsToKeep,
       coverAspectRatio: this.coverAspectRatio,
+      bookshelfView: this.bookshelfView,
       logLevel: this.logLevel,
       version: this.version
     }
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 868d223d..7d0e094d 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -16,6 +16,11 @@ module.exports.BookCoverAspectRatio = {
   SQUARE: 1
 }
 
+module.exports.BookshelfView = {
+  STANDARD: 0,
+  TITLES: 1
+}
+
 module.exports.LogLevel = {
   TRACE: 0,
   DEBUG: 1,

From 7845e06a248d50e9941bded946ea09f25f09dd27 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 28 Dec 2021 15:50:42 -0600
Subject: [PATCH 04/52] Version bump 1.6.49

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5e36bd52..77c07066 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.48",
+  "version": "1.6.49",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 8e461453..eb2f4692 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.48",
+  "version": "1.6.49",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From b80d735750c3c6bd613e64d6ebcf7faa1e8f5852 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 29 Dec 2021 15:53:19 -0600
Subject: [PATCH 05/52] Add:User listening stats page and new library stats

---
 client/components/app/Appbar.vue              |   2 +-
 client/components/app/ConfigSideNav.vue       |  78 +++++++----
 .../components/stats/DailyListeningChart.vue  |   2 +-
 client/components/stats/PreviewIcons.vue      |  59 ++++----
 client/components/tables/UsersTable.vue       |   2 +-
 client/pages/config.vue                       |  11 +-
 client/pages/config/library-stats.vue         | 127 ++++++++++++++++++
 client/pages/config/stats.vue                 | 121 ++++++++++-------
 client/store/libraries.js                     |   5 +
 server/ApiController.js                       |  18 ++-
 server/controllers/LibraryController.js       |   5 +-
 server/objects/UserListeningSession.js        |   4 +
 server/utils/libraryHelpers.js                |  12 +-
 13 files changed, 326 insertions(+), 120 deletions(-)
 create mode 100644 client/pages/config/library-stats.vue

diff --git a/client/components/app/Appbar.vue b/client/components/app/Appbar.vue
index 711ea2ae..8b64fa5d 100644
--- a/client/components/app/Appbar.vue
+++ b/client/components/app/Appbar.vue
@@ -15,7 +15,7 @@
 
         <span v-if="showExperimentalFeatures" class="material-icons text-4xl text-warning pr-0 sm:pr-2 md:pr-4">logo_dev</span>
 
-        <nuxt-link v-if="isRootUser" to="/config/stats" class="outline-none hover:text-gray-200 cursor-pointer w-8 h-8 flex items-center justify-center mx-1">
+        <nuxt-link to="/config/stats" class="outline-none hover:text-gray-200 cursor-pointer w-8 h-8 flex items-center justify-center mx-1">
           <span class="material-icons">equalizer</span>
         </nuxt-link>
 
diff --git a/client/components/app/ConfigSideNav.vue b/client/components/app/ConfigSideNav.vue
index b0370bc9..f84906c1 100644
--- a/client/components/app/ConfigSideNav.vue
+++ b/client/components/app/ConfigSideNav.vue
@@ -3,29 +3,10 @@
     <div class="md:hidden flex items-center justify-end pb-2 px-4 mb-1" @click="closeDrawer">
       <span class="material-icons text-2xl">arrow_back</span>
     </div>
-    <nuxt-link to="/config" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Settings</p>
-      <div v-show="routeName === 'config'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
-    </nuxt-link>
-    <nuxt-link to="/config/libraries" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config-libraries' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Libraries</p>
-      <div v-show="routeName === 'config-libraries'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
-    </nuxt-link>
-    <nuxt-link to="/config/users" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config-users' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Users</p>
-      <div v-show="routeName === 'config-users'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
-    </nuxt-link>
-    <nuxt-link to="/config/backups" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config-backups' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Backups</p>
-      <div v-show="routeName === 'config-backups'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
-    </nuxt-link>
-    <nuxt-link to="/config/log" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config-log' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Log</p>
-      <div v-show="routeName === 'config-log'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
-    </nuxt-link>
-    <nuxt-link to="/config/stats" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === 'config-stats' ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
-      <p>Stats</p>
-      <div v-show="routeName === 'config-stats'" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
+
+    <nuxt-link v-for="route in configRoutes" :key="route.id" :to="route.path" class="w-full px-4 h-12 border-b border-opacity-0 flex items-center cursor-pointer relative" :class="routeName === route.id ? 'bg-primary bg-opacity-70' : 'hover:bg-primary hover:bg-opacity-30'">
+      <p>{{ route.title }}</p>
+      <div v-show="routeName === route.iod" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
     </nuxt-link>
 
     <div class="w-full h-10 px-4 border-t border-black border-opacity-20 absolute left-0 flex flex-col justify-center" :style="{ bottom: streamAudiobook && windowHeight > 700 && !isMobile ? '300px' : '65px' }">
@@ -47,6 +28,57 @@ export default {
     }
   },
   computed: {
+    userIsRoot() {
+      return this.$store.getters['user/getIsRoot']
+    },
+    configRoutes() {
+      if (!this.userIsRoot) {
+        return [
+          {
+            id: 'config-stats',
+            title: 'Your Stats',
+            path: '/config/stats'
+          }
+        ]
+      }
+      return [
+        {
+          id: 'config',
+          title: 'Settings',
+          path: '/config'
+        },
+        {
+          id: 'config-libraries',
+          title: 'Libraries',
+          path: '/config/libraries'
+        },
+        {
+          id: 'config-users',
+          title: 'Users',
+          path: '/config/users'
+        },
+        {
+          id: 'config-backups',
+          title: 'Backups',
+          path: '/config/backups'
+        },
+        {
+          id: 'config-log',
+          title: 'Log',
+          path: '/config/log'
+        },
+        {
+          id: 'config-library-stats',
+          title: 'Library Stats',
+          path: '/config/library-stats'
+        },
+        {
+          id: 'config-stats',
+          title: 'Your Stats',
+          path: '/config/stats'
+        }
+      ]
+    },
     wrapperClass() {
       var classes = []
       if (this.drawerOpen) classes.push('translate-x-0')
diff --git a/client/components/stats/DailyListeningChart.vue b/client/components/stats/DailyListeningChart.vue
index 43d15fd0..6fe62308 100644
--- a/client/components/stats/DailyListeningChart.vue
+++ b/client/components/stats/DailyListeningChart.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="w-96 my-6 mx-auto">
-    <h1 class="text-2xl mb-4 font-book">Minutes Listening</h1>
+    <h1 class="text-2xl mb-4 font-book">Minutes Listening <span class="text-white text-opacity-60 text-lg">(Last 7 days)</span></h1>
     <div class="relative w-96 h-72">
       <div class="absolute top-0 left-0">
         <template v-for="lbl in yAxisLabels">
diff --git a/client/components/stats/PreviewIcons.vue b/client/components/stats/PreviewIcons.vue
index c8af9845..918c1294 100644
--- a/client/components/stats/PreviewIcons.vue
+++ b/client/components/stats/PreviewIcons.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="flex flex-wrap justify-between mt-6">
-    <div class="flex p-2">
+  <div class="flex flex-wrap justify-center mt-6">
+    <div class="flex px-2">
       <svg class="h-14 w-14 md:h-18 md:w-18" viewBox="0 0 24 24">
         <path fill="currentColor" d="M9 3V18H12V3H9M12 5L16 18L19 17L15 4L12 5M5 5V18H8V5H5M3 19V21H21V19H3Z" />
       </svg>
@@ -9,20 +9,8 @@
         <p class="font-book text-xs md:text-sm text-white text-opacity-80">Books in Library</p>
       </div>
     </div>
-    <div class="flex p-2">
-      <svg class="h-14 w-14 md:h-18 md:w-18" viewBox="0 0 24 24">
-        <path
-          fill="currentColor"
-          d="M19 1L14 6V17L19 12.5V1M21 5V18.5C19.9 18.15 18.7 18 17.5 18C15.8 18 13.35 18.65 12 19.5V6C10.55 4.9 8.45 4.5 6.5 4.5C4.55 4.5 2.45 4.9 1 6V20.65C1 20.9 1.25 21.15 1.5 21.15C1.6 21.15 1.65 21.1 1.75 21.1C3.1 20.45 5.05 20 6.5 20C8.45 20 10.55 20.4 12 21.5C13.35 20.65 15.8 20 17.5 20C19.15 20 20.85 20.3 22.25 21.05C22.35 21.1 22.4 21.1 22.5 21.1C22.75 21.1 23 20.85 23 20.6V6C22.4 5.55 21.75 5.25 21 5M10 18.41C8.75 18.09 7.5 18 6.5 18C5.44 18 4.18 18.19 3 18.5V7.13C3.91 6.73 5.14 6.5 6.5 6.5C7.86 6.5 9.09 6.73 10 7.13V18.41Z"
-        />
-      </svg>
-      <div class="px-3">
-        <p class="text-4xl md:text-5xl font-bold">{{ userAudiobooksRead.length }}</p>
-        <p class="font-book text-xs md:text-sm text-white text-opacity-80">Books Read</p>
-      </div>
-    </div>
 
-    <div class="flex p-2">
+    <div class="flex px-4">
       <span class="material-icons text-7xl">show_chart</span>
       <div class="px-1">
         <p class="text-4xl md:text-5xl font-bold">{{ totalAudiobookHours }}</p>
@@ -30,7 +18,7 @@
       </div>
     </div>
 
-    <div class="flex p-2">
+    <div class="flex px-4">
       <svg class="h-14 w-14 md:h-18 md:w-18" viewBox="0 0 24 24">
         <path fill="currentColor" d="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,6A2,2 0 0,0 10,8A2,2 0 0,0 12,10A2,2 0 0,0 14,8A2,2 0 0,0 12,6M12,13C14.67,13 20,14.33 20,17V20H4V17C4,14.33 9.33,13 12,13M12,14.9C9.03,14.9 5.9,16.36 5.9,17V18.1H18.1V17C18.1,16.36 14.97,14.9 12,14.9Z" />
       </svg>
@@ -40,11 +28,19 @@
       </div>
     </div>
 
-    <div class="flex p-2">
-      <span class="material-icons-outlined" style="font-size: 4.1rem">watch_later</span>
+    <div class="flex px-4">
+      <span class="material-icons-outlined text-6xl pt-1">insert_drive_file</span>
       <div class="px-1">
-        <p class="text-4xl md:text-5xl font-bold">{{ totalMinutesListening }}</p>
-        <p class="font-book text-xs md:text-sm text-white text-opacity-80">Minutes Listening</p>
+        <p class="text-4xl md:text-5xl font-bold">{{ totalSizeNum }}</p>
+        <p class="font-book text-xs md:text-sm text-white text-opacity-80">Size ({{ totalSizeMod }})</p>
+      </div>
+    </div>
+
+    <div class="flex px-4">
+      <span class="material-icons-outlined text-6xl pt-1">audio_file</span>
+      <div class="px-1">
+        <p class="text-4xl md:text-5xl font-bold">{{ numAudioTracks }}</p>
+        <p class="font-book text-xs md:text-sm text-white text-opacity-80">Audio Tracks</p>
       </div>
     </div>
   </div>
@@ -53,10 +49,6 @@
 <script>
 export default {
   props: {
-    listeningStats: {
-      type: Object,
-      default: () => {}
-    },
     libraryStats: {
       type: Object,
       default: () => {}
@@ -75,11 +67,8 @@ export default {
     totalAuthors() {
       return this.libraryStats ? this.libraryStats.totalAuthors : 0
     },
-    userAudiobooks() {
-      return Object.values(this.user.audiobooks || {})
-    },
-    userAudiobooksRead() {
-      return this.userAudiobooks.filter((ab) => !!ab.isRead)
+    numAudioTracks() {
+      return this.libraryStats ? this.libraryStats.numAudioTracks : 0
     },
     totalAudiobookDuration() {
       return this.libraryStats ? this.libraryStats.totalDuration : 0
@@ -88,9 +77,15 @@ export default {
       var totalHours = Math.round(this.totalAudiobookDuration / (60 * 60))
       return totalHours
     },
-    totalMinutesListening() {
-      if (!this.listeningStats) return 0
-      return Math.round(this.listeningStats.totalTime / 60)
+    totalSizePretty() {
+      var totalSize = this.libraryStats ? this.libraryStats.totalSize : 0
+      return this.$bytesPretty(totalSize, 1)
+    },
+    totalSizeNum() {
+      return this.totalSizePretty.split(' ')[0]
+    },
+    totalSizeMod() {
+      return this.totalSizePretty.split(' ')[1]
     }
   },
   methods: {},
diff --git a/client/components/tables/UsersTable.vue b/client/components/tables/UsersTable.vue
index 91ab3c23..86a7c3a0 100644
--- a/client/components/tables/UsersTable.vue
+++ b/client/components/tables/UsersTable.vue
@@ -21,7 +21,7 @@
           <td>
             <div class="flex items-center">
               <widgets-online-indicator :value="!!usersOnline[user.id]" />
-              <span class="pl-2">{{ user.username }}</span> <span v-show="$isDev" class="text-xs text-gray-400 italic pl-4">({{ user.id }})</span>
+              <p class="pl-2 truncate">{{ user.username }}</p>
             </div>
           </td>
           <td class="text-sm">{{ user.type }}</td>
diff --git a/client/pages/config.vue b/client/pages/config.vue
index e4811f6d..2ebc3c24 100644
--- a/client/pages/config.vue
+++ b/client/pages/config.vue
@@ -14,9 +14,12 @@
 
 <script>
 export default {
-  asyncData({ store, redirect }) {
+  asyncData({ store, redirect, route }) {
     if (!store.getters['user/getIsRoot']) {
-      redirect('/?error=unauthorized')
+      // Non-Root user only has access to the listening stats page
+      if (route.name !== 'config-stats') {
+        redirect('/config/stats')
+      }
     }
   },
   data() {
@@ -38,7 +41,7 @@ export default {
     currentPage() {
       if (!this.$route.name) return 'Settings'
       var routeName = this.$route.name.split('-')
-      if (routeName.length > 0) return routeName[1]
+      if (routeName.length > 0) return routeName.slice(1).join('-')
       return 'Settings'
     }
   },
@@ -72,7 +75,7 @@ export default {
   width: 900px;
   max-width: calc(100% - 176px);
 }
-.configContent.page-stats {
+.configContent.page-library-stats {
   width: 1200px;
 }
 @media (max-width: 1024px) {
diff --git a/client/pages/config/library-stats.vue b/client/pages/config/library-stats.vue
new file mode 100644
index 00000000..3f809c67
--- /dev/null
+++ b/client/pages/config/library-stats.vue
@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <p class="text-xl">Stats for library {{ currentLibraryName }}</p>
+
+    <stats-preview-icons :library-stats="libraryStats" />
+
+    <div class="flex md:flex-row flex-wrap justify-between flex-col mt-12">
+      <div class="w-80 my-6 mx-auto">
+        <h1 class="text-2xl mb-4 font-book">Top 5 Genres</h1>
+        <p v-if="!top5Genres.length">No Genres</p>
+        <template v-for="genre in top5Genres">
+          <div :key="genre.genre" class="w-full py-2">
+            <div class="flex items-end mb-1">
+              <p class="text-2xl font-bold">{{ Math.round((100 * genre.count) / totalBooks) }}&nbsp;%</p>
+              <div class="flex-grow" />
+              <p class="text-base font-book text-white text-opacity-70">{{ genre.genre }}</p>
+            </div>
+            <div class="w-full rounded-full h-3 bg-primary bg-opacity-50 overflow-hidden">
+              <div class="bg-yellow-400 h-full rounded-full" :style="{ width: Math.round((100 * genre.count) / totalBooks) + '%' }" />
+            </div>
+          </div>
+        </template>
+      </div>
+      <div class="w-80 my-6 mx-auto">
+        <h1 class="text-2xl mb-4 font-book">Top 10 Authors</h1>
+        <p v-if="!top10Authors.length">No Authors</p>
+        <template v-for="(author, index) in top10Authors">
+          <div :key="author.author" class="w-full py-2">
+            <div class="flex items-center mb-1">
+              <p class="text-sm font-book text-white text-opacity-70 w-36 pr-2 truncate">{{ index + 1 }}.&nbsp;&nbsp;&nbsp;&nbsp;{{ author.author }}</p>
+              <div class="flex-grow rounded-full h-2.5 bg-primary bg-opacity-0 overflow-hidden">
+                <div class="bg-yellow-400 h-full rounded-full" :style="{ width: Math.round((100 * author.count) / mostUsedAuthorCount) + '%' }" />
+              </div>
+              <div class="w-4 ml-3">
+                <p class="text-sm font-bold">{{ author.count }}</p>
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div class="w-80 my-6 mx-auto">
+        <h1 class="text-2xl mb-4 font-book">Longest Audiobooks (hrs)</h1>
+        <p v-if="!top10LongestAudiobooks.length">No Audiobooks</p>
+        <template v-for="(ab, index) in top10LongestAudiobooks">
+          <div :key="index" class="w-full py-2">
+            <div class="flex items-center mb-1">
+              <p class="text-sm font-book text-white text-opacity-70 w-44 pr-2 truncate">{{ index + 1 }}.&nbsp;&nbsp;&nbsp;&nbsp;{{ ab.title }}</p>
+              <div class="flex-grow rounded-full h-2.5 bg-primary bg-opacity-0 overflow-hidden">
+                <div class="bg-yellow-400 h-full rounded-full" :style="{ width: Math.round((100 * ab.duration) / longestAudiobookDuration) + '%' }" />
+              </div>
+              <div class="w-4 ml-3">
+                <p class="text-sm font-bold">{{ (ab.duration / 3600).toFixed(1) }}</p>
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      libraryStats: null
+    }
+  },
+  watch: {
+    currentLibraryId(newVal, oldVal) {
+      if (newVal) {
+        this.init()
+      }
+    }
+  },
+  computed: {
+    user() {
+      return this.$store.state.user.user
+    },
+    totalBooks() {
+      return this.libraryStats ? this.libraryStats.totalBooks : 0
+    },
+    genresWithCount() {
+      return this.libraryStats ? this.libraryStats.genresWithCount : []
+    },
+    top5Genres() {
+      return this.genresWithCount.slice(0, 5)
+    },
+    top10LongestAudiobooks() {
+      return this.libraryStats ? this.libraryStats.longestAudiobooks || [] : []
+    },
+    longestAudiobookDuration() {
+      if (!this.top10LongestAudiobooks.length) return 0
+      return this.top10LongestAudiobooks[0].duration
+    },
+    authorsWithCount() {
+      return this.libraryStats ? this.libraryStats.authorsWithCount : []
+    },
+    mostUsedAuthorCount() {
+      if (!this.authorsWithCount.length) return 0
+      return this.authorsWithCount[0].count
+    },
+    top10Authors() {
+      return this.authorsWithCount.slice(0, 10)
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
+    currentLibraryName() {
+      return this.$store.getters['libraries/getCurrentLibraryName']
+    }
+  },
+  methods: {
+    async init() {
+      this.libraryStats = await this.$axios.$get(`/api/libraries/${this.currentLibraryId}/stats`).catch((err) => {
+        console.error('Failed to get library stats', err)
+        var errorMsg = err.response ? err.response.data || 'Unknown Error' : 'Unknown Error'
+        this.$toast.error(`Failed to get library stats: ${errorMsg}`)
+      })
+      console.log('lib stats', this.libraryStats)
+    }
+  },
+  mounted() {
+    this.init()
+  }
+}
+</script>
\ No newline at end of file
diff --git a/client/pages/config/stats.vue b/client/pages/config/stats.vue
index 64836bfe..6509e4ce 100644
--- a/client/pages/config/stats.vue
+++ b/client/pages/config/stats.vue
@@ -1,40 +1,56 @@
 <template>
   <div>
-    <stats-preview-icons :listening-stats="listeningStats" :library-stats="libraryStats" />
+    <div class="flex justify-center">
+      <div class="flex p-2">
+        <svg class="h-14 w-14 md:h-18 md:w-18" viewBox="0 0 24 24">
+          <path
+            fill="currentColor"
+            d="M19 1L14 6V17L19 12.5V1M21 5V18.5C19.9 18.15 18.7 18 17.5 18C15.8 18 13.35 18.65 12 19.5V6C10.55 4.9 8.45 4.5 6.5 4.5C4.55 4.5 2.45 4.9 1 6V20.65C1 20.9 1.25 21.15 1.5 21.15C1.6 21.15 1.65 21.1 1.75 21.1C3.1 20.45 5.05 20 6.5 20C8.45 20 10.55 20.4 12 21.5C13.35 20.65 15.8 20 17.5 20C19.15 20 20.85 20.3 22.25 21.05C22.35 21.1 22.4 21.1 22.5 21.1C22.75 21.1 23 20.85 23 20.6V6C22.4 5.55 21.75 5.25 21 5M10 18.41C8.75 18.09 7.5 18 6.5 18C5.44 18 4.18 18.19 3 18.5V7.13C3.91 6.73 5.14 6.5 6.5 6.5C7.86 6.5 9.09 6.73 10 7.13V18.41Z"
+          />
+        </svg>
+        <div class="px-3">
+          <p class="text-4xl md:text-5xl font-bold">{{ userAudiobooksRead.length }}</p>
+          <p class="font-book text-xs md:text-sm text-white text-opacity-80">Books Read</p>
+        </div>
+      </div>
 
-    <div class="flex md:flex-row flex-wrap justify-between flex-col mt-12">
-      <div class="w-80 my-6 mx-auto">
-        <h1 class="text-2xl mb-4 font-book">Top 5 Genres</h1>
-        <template v-for="genre in top5Genres">
-          <div :key="genre.genre" class="w-full py-2">
-            <div class="flex items-end mb-1">
-              <p class="text-2xl font-bold">{{ Math.round((100 * genre.count) / totalBooks) }}&nbsp;%</p>
-              <div class="flex-grow" />
-              <p class="text-base font-book text-white text-opacity-70">{{ genre.genre }}</p>
-            </div>
-            <div class="w-full rounded-full h-3 bg-primary bg-opacity-50 overflow-hidden">
-              <div class="bg-yellow-400 h-full rounded-full" :style="{ width: Math.round((100 * genre.count) / totalBooks) + '%' }" />
-            </div>
-          </div>
-        </template>
+      <div class="flex p-2">
+        <span class="material-icons-outlined" style="font-size: 4.1rem">event</span>
+        <div class="px-1">
+          <p class="text-4xl md:text-5xl font-bold">{{ totalDaysListened }}</p>
+          <p class="font-book text-xs md:text-sm text-white text-opacity-80">Days Listened</p>
+        </div>
       </div>
-      <div class="w-80 my-6 mx-auto">
-        <h1 class="text-2xl mb-4 font-book">Top 10 Authors</h1>
-        <template v-for="(author, index) in top10Authors">
-          <div :key="author.author" class="w-full py-2">
-            <div class="flex items-center mb-1">
-              <p class="text-sm font-book text-white text-opacity-70 w-36 pr-2 truncate">{{ index + 1 }}.&nbsp;&nbsp;&nbsp;&nbsp;{{ author.author }}</p>
-              <div class="flex-grow rounded-full h-2.5 bg-primary bg-opacity-0 overflow-hidden">
-                <div class="bg-yellow-400 h-full rounded-full" :style="{ width: Math.round((100 * author.count) / mostUsedAuthorCount) + '%' }" />
-              </div>
-              <div class="w-4 ml-3">
-                <p class="text-sm font-bold">{{ author.count }}</p>
-              </div>
-            </div>
-          </div>
-        </template>
+
+      <div class="flex p-2">
+        <span class="material-icons-outlined" style="font-size: 4.1rem">watch_later</span>
+        <div class="px-1">
+          <p class="text-4xl md:text-5xl font-bold">{{ totalMinutesListening }}</p>
+          <p class="font-book text-xs md:text-sm text-white text-opacity-80">Minutes Listening</p>
+        </div>
       </div>
+    </div>
+    <div class="flex">
       <stats-daily-listening-chart :listening-stats="listeningStats" />
+      <div class="w-80 my-6 mx-auto">
+        <h1 class="text-2xl mb-4 font-book">Recent Listening Sessions</h1>
+        <p v-if="!mostRecentListeningSessions.length">No Listening Sessions</p>
+        <template v-for="(book, index) in mostRecentListeningSessions">
+          <div :key="book.id" class="w-full py-0.5">
+            <div class="flex items-center mb-1">
+              <p class="text-sm font-book text-white text-opacity-70 w-6 truncate">{{ index + 1 }}.</p>
+              <div>
+                <p class="text-sm font-book text-white text-opacity-80 truncate">{{ book.audiobookTitle }}</p>
+                <p class="text-xs text-white text-opacity-50">{{ $dateDistanceFromNow(book.lastUpdate) }}</p>
+              </div>
+              <div class="flex-grow" />
+              <div class="w-18 text-right ml-3">
+                <p class="text-sm font-bold">{{ $elapsedPretty(book.timeListening) }}</p>
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
     </div>
   </div>
 </template>
@@ -58,27 +74,31 @@ export default {
     user() {
       return this.$store.state.user.user
     },
-    totalBooks() {
-      return this.libraryStats ? this.libraryStats.totalBooks : 0
-    },
-    genresWithCount() {
-      return this.libraryStats ? this.libraryStats.genresWithCount : []
-    },
-    top5Genres() {
-      return this.genresWithCount.slice(0, 5)
-    },
-    authorsWithCount() {
-      return this.libraryStats ? this.libraryStats.authorsWithCount : []
-    },
-    mostUsedAuthorCount() {
-      if (!this.authorsWithCount.length) return 0
-      return this.authorsWithCount[0].count
-    },
-    top10Authors() {
-      return this.authorsWithCount.slice(0, 10)
-    },
     currentLibraryId() {
       return this.$store.state.libraries.currentLibraryId
+    },
+    userAudiobooks() {
+      return Object.values(this.user.audiobooks || {})
+    },
+    userAudiobooksRead() {
+      return this.userAudiobooks.filter((ab) => !!ab.isRead)
+    },
+    mostRecentBooksListened() {
+      if (!this.listeningStats) return []
+      var sorted = Object.values(this.listeningStats.books || {}).sort((a, b) => b.lastUpdate - a.lastUpdate)
+      return sorted.slice(0, 10)
+    },
+    mostRecentListeningSessions() {
+      if (!this.listeningStats) return []
+      return this.listeningStats.recentSessions || []
+    },
+    totalMinutesListening() {
+      if (!this.listeningStats) return 0
+      return Math.round(this.listeningStats.totalTime / 60)
+    },
+    totalDaysListened() {
+      if (!this.listeningStats) return 0
+      return Object.values(this.listeningStats.days).length
     }
   },
   methods: {
@@ -88,7 +108,6 @@ export default {
         var errorMsg = err.response ? err.response.data || 'Unknown Error' : 'Unknown Error'
         this.$toast.error(`Failed to get library stats: ${errorMsg}`)
       })
-      console.log('lib stats', this.libraryStats)
       this.listeningStats = await this.$axios.$get(`/api/me/listening-stats`).catch((err) => {
         console.error('Failed to load listening sesions', err)
         return []
diff --git a/client/store/libraries.js b/client/store/libraries.js
index c4a51a2e..3ed19240 100644
--- a/client/store/libraries.js
+++ b/client/store/libraries.js
@@ -13,6 +13,11 @@ export const getters = {
   getCurrentLibrary: state => {
     return state.libraries.find(lib => lib.id === state.currentLibraryId)
   },
+  getCurrentLibraryName: (state, getters) => {
+    var currentLibrary = getters.getCurrentLibrary
+    if (!currentLibrary) return ''
+    return currentLibrary.name
+  },
   getSortedLibraries: state => () => {
     return state.libraries.map(lib => ({ ...lib })).sort((a, b) => a.displayOrder - b.displayOrder)
   }
diff --git a/server/ApiController.js b/server/ApiController.js
index 2fe3315d..6a120cb9 100644
--- a/server/ApiController.js
+++ b/server/ApiController.js
@@ -458,14 +458,15 @@ class ApiController {
       books: {},
       days: {},
       dayOfWeek: {},
-      today: 0
+      today: 0,
+      recentSessions: listeningSessions.slice(0, 10)
     }
     listeningSessions.forEach((s) => {
       if (s.dayOfWeek) {
         if (!listeningStats.dayOfWeek[s.dayOfWeek]) listeningStats.dayOfWeek[s.dayOfWeek] = 0
         listeningStats.dayOfWeek[s.dayOfWeek] += s.timeListening
       }
-      if (s.date) {
+      if (s.date && s.timeListening > 0) {
         if (!listeningStats.days[s.date]) listeningStats.days[s.date] = 0
         listeningStats.days[s.date] += s.timeListening
 
@@ -473,8 +474,17 @@ class ApiController {
           listeningStats.today += s.timeListening
         }
       }
-      if (!listeningStats.books[s.audiobookId]) listeningStats.books[s.audiobookId] = 0
-      listeningStats.books[s.audiobookId] += s.timeListening
+      if (!listeningStats.books[s.audiobookId]) {
+        listeningStats.books[s.audiobookId] = {
+          id: s.audiobookId,
+          timeListening: s.timeListening,
+          title: s.audiobookTitle,
+          author: s.audiobookAuthor,
+          lastUpdate: s.lastUpdate
+        }
+      } else {
+        listeningStats.books[s.audiobookId].timeListening += s.timeListening
+      }
 
       listeningStats.totalTime += s.timeListening
     })
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index ddc89d3a..286704be 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -375,11 +375,14 @@ class LibraryController {
 
     var authorsWithCount = libraryHelpers.getAuthorsWithCount(audiobooksInLibrary)
     var genresWithCount = libraryHelpers.getGenresWithCount(audiobooksInLibrary)
+    var abDurationStats = libraryHelpers.getAudiobookDurationStats(audiobooksInLibrary)
     var stats = {
       totalBooks: audiobooksInLibrary.length,
       totalAuthors: Object.keys(authorsWithCount).length,
       totalGenres: Object.keys(genresWithCount).length,
-      totalDuration: libraryHelpers.getAudiobooksTotalDuration(audiobooksInLibrary),
+      totalDuration: abDurationStats.totalDuration,
+      longestAudiobooks: abDurationStats.longstAudiobooks,
+      numAudioTracks: abDurationStats.numAudioTracks,
       totalSize: libraryHelpers.getAudiobooksTotalSize(audiobooksInLibrary),
       authorsWithCount,
       genresWithCount
diff --git a/server/objects/UserListeningSession.js b/server/objects/UserListeningSession.js
index 35985e67..41e4506f 100644
--- a/server/objects/UserListeningSession.js
+++ b/server/objects/UserListeningSession.js
@@ -10,6 +10,7 @@ class UserListeningSession {
     this.audiobookId = null
     this.audiobookTitle = null
     this.audiobookAuthor = null
+    this.audiobookDuration = 0
     this.audiobookGenres = []
 
     this.date = null
@@ -32,6 +33,7 @@ class UserListeningSession {
       audiobookId: this.audiobookId,
       audiobookTitle: this.audiobookTitle,
       audiobookAuthor: this.audiobookAuthor,
+      audiobookDuration: this.audiobookDuration,
       audiobookGenres: [...this.audiobookGenres],
       date: this.date,
       dayOfWeek: this.dayOfWeek,
@@ -48,6 +50,7 @@ class UserListeningSession {
     this.audiobookId = session.audiobookId
     this.audiobookTitle = session.audiobookTitle
     this.audiobookAuthor = session.audiobookAuthor
+    this.audiobookDuration = session.audiobookDuration || 0
     this.audiobookGenres = session.audiobookGenres
 
     this.date = session.date
@@ -64,6 +67,7 @@ class UserListeningSession {
     this.audiobookId = audiobook.id
     this.audiobookTitle = audiobook.title || ''
     this.audiobookAuthor = audiobook.authorFL || ''
+    this.audiobookDuration = audiobook.duration || 0
     this.audiobookGenres = [...audiobook.genres]
 
     this.timeListening = 0
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 753169ba..978549b6 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -182,12 +182,20 @@ module.exports = {
     return Object.values(authorsMap).sort((a, b) => b.count - a.count)
   },
 
-  getAudiobooksTotalDuration(audiobooks) {
+  getAudiobookDurationStats(audiobooks) {
+    var sorted = sort(audiobooks).desc(a => a.duration)
+    var top10 = sorted.slice(0, 10).map(ab => ({ title: ab.book.title, duration: ab.duration })).filter(ab => ab.duration > 0)
     var totalDuration = 0
+    var numAudioTracks = 0
     audiobooks.forEach((ab) => {
       totalDuration += ab.duration
+      numAudioTracks += ab.tracks.length
     })
-    return totalDuration
+    return {
+      totalDuration,
+      numAudioTracks,
+      longstAudiobooks: top10
+    }
   },
 
   getAudiobooksTotalSize(audiobooks) {

From 72b5579842b4a269cdb48b3e6602e41cb0759234 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 29 Dec 2021 15:54:54 -0600
Subject: [PATCH 06/52] Version bump 1.6.50

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 77c07066..519d1bde 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.49",
+  "version": "1.6.50",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index eb2f4692..fbed7b01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.49",
+  "version": "1.6.50",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 5edff98942c80939d57a97b50be975739ab87ec6 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 29 Dec 2021 16:21:07 -0600
Subject: [PATCH 07/52] Fix:Stat sessions title text overflow

---
 client/pages/config/stats.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/pages/config/stats.vue b/client/pages/config/stats.vue
index 6509e4ce..230a4fc1 100644
--- a/client/pages/config/stats.vue
+++ b/client/pages/config/stats.vue
@@ -38,13 +38,13 @@
         <template v-for="(book, index) in mostRecentListeningSessions">
           <div :key="book.id" class="w-full py-0.5">
             <div class="flex items-center mb-1">
-              <p class="text-sm font-book text-white text-opacity-70 w-6 truncate">{{ index + 1 }}.</p>
-              <div>
+              <p class="text-sm font-book text-white text-opacity-70 w-6 truncate">{{ index + 1 }}.&nbsp;</p>
+              <div class="w-56">
                 <p class="text-sm font-book text-white text-opacity-80 truncate">{{ book.audiobookTitle }}</p>
                 <p class="text-xs text-white text-opacity-50">{{ $dateDistanceFromNow(book.lastUpdate) }}</p>
               </div>
               <div class="flex-grow" />
-              <div class="w-18 text-right ml-3">
+              <div class="w-18 text-right">
                 <p class="text-sm font-bold">{{ $elapsedPretty(book.timeListening) }}</p>
               </div>
             </div>

From 02db145a0c4fbaa81af6e7e83e6a8a6f5d70ee62 Mon Sep 17 00:00:00 2001
From: mx03 <mx03@users.noreply.github.com>
Date: Thu, 30 Dec 2021 10:57:28 +0100
Subject: [PATCH 08/52] Fix: escape special characters in provider urls

---
 server/providers/Audible.js     | 8 ++++++--
 server/providers/Audnexus.js    | 2 ++
 server/providers/GoogleBooks.js | 6 +++++-
 server/providers/LibGen.js      | 1 +
 server/providers/OpenLibrary.js | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/providers/Audible.js b/server/providers/Audible.js
index 4651684c..2f369937 100644
--- a/server/providers/Audible.js
+++ b/server/providers/Audible.js
@@ -39,8 +39,12 @@ class Audible {
     }
 
     asinSearch(asin) {
-        var queryString = `response_groups=rating,series,contributors,product_desc,media,product_extended_attrs` +
-            `&image_sizes=500,1024,2000`;
+        var queryObj = {
+            response_groups: 'rating,series,contributors,product_desc,media,product_extended_attrs',
+            image_sizes: '500,1024,2000'
+        };
+        var queryString = (new URLSearchParams(queryObj)).toString();
+        asin = encodeURIComponent(asin);
         var url = `https://api.audible.com/1.0/catalog/products/${asin}?${queryString}`
         Logger.debug(`[Audible] ASIN url: ${url}`)
         return axios.get(url).then((res) => {
diff --git a/server/providers/Audnexus.js b/server/providers/Audnexus.js
index a7d76f67..4d9c4ce2 100644
--- a/server/providers/Audnexus.js
+++ b/server/providers/Audnexus.js
@@ -8,6 +8,7 @@ class Audnexus {
   }
 
   authorASINsRequest(name) {
+    name = encodeURIComponent(name);
     return axios.get(`${this.baseUrl}/authors?name=${name}`).then((res) => {
       return res.data || []
     }).catch((error) => {
@@ -17,6 +18,7 @@ class Audnexus {
   }
 
   authorRequest(asin) {
+    asin = encodeURIComponent(asin);
     return axios.get(`${this.baseUrl}/authors/${asin}`).then((res) => {
       return res.data
     }).catch((error) => {
diff --git a/server/providers/GoogleBooks.js b/server/providers/GoogleBooks.js
index 43bdf719..0da3c309 100644
--- a/server/providers/GoogleBooks.js
+++ b/server/providers/GoogleBooks.js
@@ -32,8 +32,12 @@ class GoogleBooks {
   }
 
   async search(title, author) {
+    title = encodeURIComponent(title)
     var queryString = `q=intitle:${title}`
-    if (author) queryString += `+inauthor:${author}`
+    if (author) {
+      author = encodeURIComponent(author)
+      queryString += `+inauthor:${author}`
+    }
     var url = `https://www.googleapis.com/books/v1/volumes?${queryString}`
     Logger.debug(`[GoogleBooks] Search url: ${url}`)
     var items = await axios.get(url).then((res) => {
diff --git a/server/providers/LibGen.js b/server/providers/LibGen.js
index 87d119b0..6b01436d 100644
--- a/server/providers/LibGen.js
+++ b/server/providers/LibGen.js
@@ -15,6 +15,7 @@ class LibGen {
       await this.init()
     }
     queryTitle = queryTitle.replace(/'/g, '')
+    queryTitle = encodeURIComponent(queryTitle);
     var options = {
       mirror: this.mirror,
       query: queryTitle,
diff --git a/server/providers/OpenLibrary.js b/server/providers/OpenLibrary.js
index 6694005e..3f4d4682 100644
--- a/server/providers/OpenLibrary.js
+++ b/server/providers/OpenLibrary.js
@@ -85,7 +85,7 @@ class OpenLibrary {
   }
 
   async searchTitle(title) {
-    title = title.replace(/'/g, '')
+    title = encodeURIComponent(title);
     var lookupData = await this.get(`/search.json?title=${title}`)
     if (!lookupData) {
       return {

From 8b587314e9399ffc6606b0aa04d998fd09e372b7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 1 Jan 2022 15:04:29 -0600
Subject: [PATCH 09/52] Add:LICENSE #272

---
 LICENSE      | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |   3 +-
 2 files changed, 676 insertions(+), 1 deletion(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..b98f5fac
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    Audiobookshelf  Self-hosted audiobook server
+    Copyright (C) 2021  advplyr
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    Audiobookshelf  Copyright (C) 2021  advplyr
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/package.json b/package.json
index fbed7b01..d4e57f16 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "prod": "npm run client && npm install && node prod.js",
     "build-win": "pkg -t node12-win-x64 -o ./dist/win/audiobookshelf .",
     "build-linux": "build/linuxpackager",
-    "docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push .  -t advplyr/audiobookshelf"
+    "docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push .  -t advplyr/audiobookshelf",
+    "deploy": "node dist/autodeploy"
   },
   "bin": "prod.js",
   "pkg": {

From 55e253ac60d7d32c4b9d842dfc31f0877b81c49f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 2 Jan 2022 12:20:39 -0600
Subject: [PATCH 10/52] Fix:Audiobook page progress track cover z-index

---
 client/pages/audiobook/_id/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pages/audiobook/_id/index.vue b/client/pages/audiobook/_id/index.vue
index 848b2f63..c004ea47 100644
--- a/client/pages/audiobook/_id/index.vue
+++ b/client/pages/audiobook/_id/index.vue
@@ -5,7 +5,7 @@
         <div class="w-full flex justify-center md:block sm:w-32 md:w-52" style="min-width: 208px">
           <div class="relative" style="height: fit-content">
             <covers-book-cover :audiobook="audiobook" :width="bookCoverWidth" :book-cover-aspect-ratio="bookCoverAspectRatio" />
-            <div class="absolute bottom-0 left-0 h-1.5 bg-yellow-400 shadow-sm" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: 208 * progressPercent + 'px' }"></div>
+            <div class="absolute bottom-0 left-0 h-1.5 bg-yellow-400 shadow-sm z-10" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: 208 * progressPercent + 'px' }"></div>
           </div>
         </div>
         <div class="flex-grow px-2 py-6 md:py-0 md:px-10">

From 5a32fba88e1dcf6ef80fe0d7b0fa875dadf14390 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 3 Jan 2022 07:59:24 -0600
Subject: [PATCH 11/52] Fix:Batch new collection #282

---
 client/components/modals/UserCollectionsModal.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/components/modals/UserCollectionsModal.vue b/client/components/modals/UserCollectionsModal.vue
index 1242e83a..a6832023 100644
--- a/client/components/modals/UserCollectionsModal.vue
+++ b/client/components/modals/UserCollectionsModal.vue
@@ -102,6 +102,9 @@ export default {
     },
     selectedBookIds() {
       return this.$store.state.selectedAudiobooks || []
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
     }
   },
   methods: {
@@ -186,9 +189,10 @@ export default {
       var books = this.showBatchUserCollectionModal ? this.selectedBookIds : [this.selectedAudiobookId]
       var newCollection = {
         books: books,
-        libraryId: this.selectedAudiobook.libraryId,
+        libraryId: this.currentLibraryId,
         name: this.newCollectionName
       }
+
       this.$axios
         .$post('/api/collections', newCollection)
         .then((data) => {

From 511a330aa432eb8ab6b95e3f172ed3c69107f25c Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 3 Jan 2022 07:59:53 -0600
Subject: [PATCH 12/52] Version bump 1.6.51

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 519d1bde..ec415556 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.50",
+  "version": "1.6.51",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index d4e57f16..deb98681 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.50",
+  "version": "1.6.51",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 021d3cfa1a0801aad5c0759542898b35db2d2c6d Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Mon, 3 Jan 2022 21:40:03 +0200
Subject: [PATCH 13/52] Added isbn fetching for metadata

If file metadata has isbn tag it will be fetched and used for book
---
 server/objects/AudioFileMetadata.js | 6 +++++-
 server/objects/Book.js              | 4 ++++
 server/utils/prober.js              | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/objects/AudioFileMetadata.js b/server/objects/AudioFileMetadata.js
index 3a82ceab..c838df9a 100644
--- a/server/objects/AudioFileMetadata.js
+++ b/server/objects/AudioFileMetadata.js
@@ -16,6 +16,7 @@ class AudioFileMetadata {
     this.tagDescription = null
     this.tagEncoder = null
     this.tagEncodedBy = null
+    this.tagIsbn = null
 
     if (metadata) {
       this.construct(metadata)
@@ -50,6 +51,7 @@ class AudioFileMetadata {
     this.tagDescription = metadata.tagDescription || null
     this.tagEncoder = metadata.tagEncoder || null
     this.tagEncodedBy = metadata.tagEncodedBy || null
+    this.tagIsbn = metadata.tagIsbn || null
   }
 
   // Data parsed in prober.js
@@ -70,6 +72,7 @@ class AudioFileMetadata {
     this.tagDescription = payload.file_tag_description || null
     this.tagEncoder = payload.file_tag_encoder || null
     this.tagEncodedBy = payload.file_tag_encodedby || null
+    this.tagIsbn = payload.file_tag_isbn || null
   }
 
   updateData(payload) {
@@ -89,7 +92,8 @@ class AudioFileMetadata {
       tagComment: payload.file_tag_comment || null,
       tagDescription: payload.file_tag_description || null,
       tagEncoder: payload.file_tag_encoder || null,
-      tagEncodedBy: payload.file_tag_encodedby || null
+      tagEncodedBy: payload.file_tag_encodedby || null,
+      tagIsbn: payload.file_tag_isbn || nulll
     }
 
     var hasUpdates = false
diff --git a/server/objects/Book.js b/server/objects/Book.js
index ec250d75..34109475 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -343,6 +343,10 @@ class Book {
       {
         tag: 'tagSeriesPart',
         key: 'volumeNumber'
+      },
+      {
+        tag: 'tagIsbn',
+        key: 'isbn'
       }
     ]
 
diff --git a/server/utils/prober.js b/server/utils/prober.js
index d8b48827..cdcd2606 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -163,6 +163,7 @@ function parseTags(format, verbose) {
     file_tag_genre: tryGrabTags(format, 'genre', 'tcon', 'tco'),
     file_tag_series: tryGrabTag(format, 'series'),
     file_tag_seriespart: tryGrabTag(format, 'series-part'),
+    file_tag_isbn: tryGrabTag(format, 'isbn'),
 
     // Not sure if these are actually used yet or not
     file_tag_creation_time: tryGrabTag(format, 'creation_time'),
@@ -180,7 +181,7 @@ function parseTags(format, verbose) {
     }
   }
 
-  var keysToLookOutFor = ['file_tag_genre1', 'file_tag_genre2', 'file_tag_series', 'file_tag_seriespart', 'file_tag_movement', 'file_tag_movementname', 'file_tag_wwwaudiofile', 'file_tag_contentgroup', 'file_tag_releasetime']
+  var keysToLookOutFor = ['file_tag_genre1', 'file_tag_genre2', 'file_tag_series', 'file_tag_seriespart', 'file_tag_movement', 'file_tag_movementname', 'file_tag_wwwaudiofile', 'file_tag_contentgroup', 'file_tag_releasetime', 'file_tag_isbn']
   keysToLookOutFor.forEach((key) => {
     if (tags[key]) {
       Logger.debug(`Notable! ${key} => ${tags[key]}`)

From 2f8a90c21a4eea257dbdbb85e4cec6a5e76794ab Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Tue, 4 Jan 2022 12:20:28 +0200
Subject: [PATCH 14/52] Added isbn search

Search now also searches books using isbn.
ISBN match has to be exact to prevent isbn matches to flood results.
---
 server/objects/Book.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/objects/Book.js b/server/objects/Book.js
index 34109475..f8661eeb 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -278,8 +278,12 @@ class Book {
 
     // var authorMatch = this._author.toLowerCase().includes(search)
     var seriesMatch = this._series.toLowerCase().includes(search)
+    
+    // ISBN match has to be exact to prevent isbn matches to flood results. Remove dashes since isbn might have those
+    var isbnMatch = this.isbn.toLowerCase().replaceAll('-', '') === search.replaceAll('-', '')
+
+    var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : false
 
-    var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : false
     var bookMatchText = bookMatchKey ? this[bookMatchKey] : ''
     return {
       book: bookMatchKey,

From 01c8013309f2ea849f056dc8335d736cfbb6d57d Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:41:34 +0200
Subject: [PATCH 15/52] Changed replaceAll to replace since node12 doent' have
 it

---
 server/objects/Book.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/objects/Book.js b/server/objects/Book.js
index f8661eeb..caef8a04 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -278,9 +278,9 @@ class Book {
 
     // var authorMatch = this._author.toLowerCase().includes(search)
     var seriesMatch = this._series.toLowerCase().includes(search)
-    
+
     // ISBN match has to be exact to prevent isbn matches to flood results. Remove dashes since isbn might have those
-    var isbnMatch = this.isbn.toLowerCase().replaceAll('-', '') === search.replaceAll('-', '')
+    var isbnMatch = this.isbn.toLowerCase().replace(/-/g, '') === search.replace(/-/g, '')
 
     var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : false
 

From 7607381ea43c2927d47622c21d1d85212d7af9b9 Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Tue, 4 Jan 2022 14:46:40 +0200
Subject: [PATCH 16/52] Added _isbn to Book so it's always string

---
 server/objects/Book.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/objects/Book.js b/server/objects/Book.js
index caef8a04..f60215bc 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -43,6 +43,7 @@ class Book {
   get _authorsList() { return this._author.split(', ') }
   get _narratorsList() { return this._narrator.split(', ') }
   get _genres() { return this.genres || [] }
+  get _isbn() { return this.isbn || '' }
 
   get shouldSearchForCover() {
     if (this.cover) return false
@@ -280,7 +281,7 @@ class Book {
     var seriesMatch = this._series.toLowerCase().includes(search)
 
     // ISBN match has to be exact to prevent isbn matches to flood results. Remove dashes since isbn might have those
-    var isbnMatch = this.isbn.toLowerCase().replace(/-/g, '') === search.replace(/-/g, '')
+    var isbnMatch = this._isbn.toLowerCase().replace(/-/g, '') === search.replace(/-/g, '')
 
     var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : false
 

From 47dbd90971b0470b475bb069e15ed1d0ef4b58f2 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 4 Jan 2022 07:36:52 -0600
Subject: [PATCH 17/52] Add:ISBN highlighting to book search card

---
 client/components/cards/AudiobookSearchCard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/components/cards/AudiobookSearchCard.vue b/client/components/cards/AudiobookSearchCard.vue
index be8420f0..159f02b0 100644
--- a/client/components/cards/AudiobookSearchCard.vue
+++ b/client/components/cards/AudiobookSearchCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full px-1 overflow-hidden">
+  <div class="flex items-center h-full px-1 overflow-hidden">
     <covers-book-cover :audiobook="audiobook" :width="coverWidth" :book-cover-aspect-ratio="bookCoverAspectRatio" />
     <div class="flex-grow px-2 audiobookSearchCardContent">
       <p v-if="matchKey !== 'title'" class="truncate text-sm">{{ title }}</p>
@@ -10,7 +10,7 @@
       <p v-if="matchKey !== 'authorFL'" class="text-xs text-gray-200 truncate">by {{ authorFL }}</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 v-if="matchKey === 'series' || matchKey === 'tags' || matchKey === 'isbn'" class="m-0 p-0 truncate text-xs" v-html="matchHtml" />
     </div>
   </div>
 </template>
@@ -70,6 +70,7 @@ export default {
 
       if (this.matchKey === 'tags') return `<p class="truncate">Tags: ${html}</p>`
       if (this.matchKey === 'authorFL') return `by ${html}`
+      if (this.matchKey === 'isbn') return `<p class="truncate">ISBN: ${html}</p>`
       if (this.matchKey === 'series') return `<p class="truncate">Series: ${html}</p>`
       return `${html}`
     }

From d0d19ed1ad48fa70ffe63a609d31a550607655fb Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 4 Jan 2022 08:16:50 -0600
Subject: [PATCH 18/52] Version bump 1.6.52

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index ec415556..2822d408 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.51",
+  "version": "1.6.52",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index deb98681..51df7df3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.51",
+  "version": "1.6.52",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 4778d09501ec4fa587e3001bb5b13ac74915d3a3 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 5 Jan 2022 18:01:33 -0600
Subject: [PATCH 19/52] Fix:Stream container not opening on mount

---
 client/components/app/StreamContainer.vue  |  2 +-
 client/components/cards/LazySeriesCard.vue |  1 -
 client/layouts/default.vue                 | 14 +++++++++++++-
 server/utils/libraryHelpers.js             |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/components/app/StreamContainer.vue b/client/components/app/StreamContainer.vue
index 0c5afd09..219267b4 100644
--- a/client/components/app/StreamContainer.vue
+++ b/client/components/app/StreamContainer.vue
@@ -145,7 +145,7 @@ export default {
     audioPlayerMounted() {
       this.audioPlayerReady = true
       if (this.stream) {
-        console.log('[STREAM-CONTAINER] audioPlayerMounted w/ Stream', this.stream)
+        console.log('[STREAM-CONTAINER] audioPlayer Mounted w/ Stream', this.stream)
         this.openStream()
       }
     },
diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 9f1e7b8d..4fb1dd9a 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -74,7 +74,6 @@ export default {
   },
   methods: {
     setEntity(_series) {
-      console.log('setting entity', _series)
       this.series = _series
     },
     setSelectionMode(val) {
diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 49cd7c28..67727b84 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -85,12 +85,24 @@ export default {
     reconnectFailed() {
       console.error('[SOCKET] reconnect failed')
     },
-    init(payload) {
+    init(payload, count = 0) {
+      if (!this.$refs.streamContainer) {
+        if (count > 20) {
+          console.error('Stream container never mounted')
+          return
+        }
+        setTimeout(() => {
+          this.init(payload, ++count)
+        }, 100)
+        return
+      }
       console.log('Init Payload', payload)
       if (payload.stream) {
         if (this.$refs.streamContainer) {
           this.$store.commit('setStream', payload.stream)
           this.$refs.streamContainer.streamOpen(payload.stream)
+        } else {
+          console.warn('Stream Container not mounted')
         }
       }
       if (payload.user) {
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 978549b6..4a568757 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -118,7 +118,7 @@ module.exports = {
         userAudiobook: user.getAudiobookJSON(book.id),
         book
       }
-    })
+    }).filter(b => !!b.userAudiobook)
   },
 
   getBooksMostRecentlyRead(booksWithUserAb, limit, minified = false) {

From 8ee4751cacd869f61d0ce33262fb17a2486d1e4d Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 5 Jan 2022 19:07:32 -0600
Subject: [PATCH 20/52] Fix:Sync audiobook progress

---
 server/controllers/MeController.js  |  4 ++--
 server/objects/User.js              | 20 +++++++++++---------
 server/objects/UserAudiobookData.js |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index a57e1d98..b9b2b31f 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -40,7 +40,7 @@ class MeController {
     if (!audiobook) {
       return res.status(404).send('Audiobook not found')
     }
-    var wasUpdated = req.user.updateAudiobookData(audiobook, req.body)
+    var wasUpdated = req.user.updateAudiobookData(audiobook.id, req.body)
     if (wasUpdated) {
       await this.db.updateEntity('user', req.user)
       this.clientEmitter(req.user.id, 'user_updated', req.user.toJSONForBrowser())
@@ -59,7 +59,7 @@ class MeController {
     userAbDataPayloads.forEach((userAbData) => {
       var audiobook = this.db.audiobooks.find(ab => ab.id === userAbData.audiobookId)
       if (audiobook) {
-        var wasUpdated = req.user.updateAudiobookData(audiobook, userAbData)
+        var wasUpdated = req.user.updateAudiobookData(audiobook.id, userAbData)
         if (wasUpdated) shouldUpdate = true
       }
     })
diff --git a/server/objects/User.js b/server/objects/User.js
index 1a6a8d10..48a92c43 100644
--- a/server/objects/User.js
+++ b/server/objects/User.js
@@ -140,7 +140,9 @@ class User {
     if (user.audiobooks) {
       this.audiobooks = {}
       for (const key in user.audiobooks) {
-        if (user.audiobooks[key]) {
+        if (key === '[object Object]') { // TEMP: Bug remove bad data
+          Logger.warn('[User] Construct found invalid UAD')
+        } else if (user.audiobooks[key]) {
           this.audiobooks[key] = new UserAudiobookData(user.audiobooks[key])
         }
       }
@@ -207,16 +209,16 @@ class User {
     return this.audiobooks[stream.audiobookId]
   }
 
-  updateAudiobookData(audiobook, updatePayload) {
+  updateAudiobookData(audiobookId, updatePayload) {
     if (!this.audiobooks) this.audiobooks = {}
-    if (!this.audiobooks[audiobook.id]) {
-      this.audiobooks[audiobook.id] = new UserAudiobookData()
-      this.audiobooks[audiobook.id].audiobookId = audiobook.id
+    if (!this.audiobooks[audiobookId]) {
+      this.audiobooks[audiobookId] = new UserAudiobookData()
+      this.audiobooks[audiobookId].audiobookId = audiobookId
     }
-    var wasUpdated = this.audiobooks[audiobook.id].update(updatePayload)
+    var wasUpdated = this.audiobooks[audiobookId].update(updatePayload)
     if (wasUpdated) {
-      // Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobook.id])}`)
-      return this.audiobooks[audiobook.id]
+      // Logger.debug(`[User] UserAudiobookData was updated ${JSON.stringify(this.audiobooks[audiobookId])}`)
+      return this.audiobooks[audiobookId]
     }
     return false
   }
@@ -251,7 +253,7 @@ class User {
     if (!this.audiobooks || !this.audiobooks[audiobook.id]) {
       return false
     }
-    return this.updateAudiobookData(audiobook, {
+    return this.updateAudiobookData(audiobook.id, {
       progress: 0,
       currentTime: 0,
       isRead: false,
diff --git a/server/objects/UserAudiobookData.js b/server/objects/UserAudiobookData.js
index ca11e742..65da4a84 100644
--- a/server/objects/UserAudiobookData.js
+++ b/server/objects/UserAudiobookData.js
@@ -86,7 +86,7 @@ class UserAudiobookData {
   update(payload) {
     var hasUpdates = false
     for (const key in payload) {
-      if (payload[key] !== this[key]) {
+      if (this[key] !== undefined && payload[key] !== this[key]) {
         if (key === 'isRead') {
           if (!payload[key]) { // Updating to Not Read - Reset progress and current time
             this.finishedAt = null

From 559bb6dec467adfc3f3b523277d497f434be5a1f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 5 Jan 2022 19:10:03 -0600
Subject: [PATCH 21/52] Version bump 1.6.53

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 2822d408..e6db0f97 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.52",
+  "version": "1.6.53",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 51df7df3..ea237e30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.52",
+  "version": "1.6.53",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 7fa2ec278977ddbca11878a92111539e981df05a Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Thu, 6 Jan 2022 12:50:33 +0200
Subject: [PATCH 22/52] Bookview shows description line changes

---
 client/pages/audiobook/_id/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pages/audiobook/_id/index.vue b/client/pages/audiobook/_id/index.vue
index c004ea47..9ca3dc78 100644
--- a/client/pages/audiobook/_id/index.vue
+++ b/client/pages/audiobook/_id/index.vue
@@ -125,7 +125,7 @@
           </div>
 
           <div class="my-4 max-w-2xl">
-            <p class="text-base text-gray-100">{{ description }}</p>
+            <p class="text-base text-gray-100 whitespace-pre-line">{{ description }}</p>
           </div>
 
           <div v-if="missingParts.length" class="bg-error border-red-800 shadow-md p-4">

From 98c678afc7cf5d19978ea8f49c98bda6f095cb2c Mon Sep 17 00:00:00 2001
From: mx03 <mx03@users.noreply.github.com>
Date: Thu, 6 Jan 2022 20:36:10 +0100
Subject: [PATCH 23/52] package.json licence updated

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea237e30..1daad3bb 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     ]
   },
   "author": "advplyr",
-  "license": "ISC",
+  "license": "GPL-3.0",
   "dependencies": {
     "archiver": "^5.3.0",
     "axios": "^0.21.1",

From dc05c384307e4c7f27938f4adec9c636810a443f Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:15:53 +0200
Subject: [PATCH 24/52] Fixes reading multiline data from file tags

Swiched fluent-ffmpeg to node-ffprobe.
Fluent's ffprobe can't handle multiline tag data due to it's parsing process.
node-ffprobe supports getting probe data using json format which keeps line changes.
---
 package.json           |  3 ++-
 server/utils/prober.js | 37 +++++++++++++++++--------------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 1daad3bb..2692c7a9 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "jsonwebtoken": "^8.5.1",
     "libgen": "^2.1.0",
     "njodb": "^0.4.27",
+    "node-ffprobe": "^3.0.0",
     "node-cron": "^3.0.0",
     "node-stream-zip": "^1.15.0",
     "podcast": "^1.3.0",
@@ -52,4 +53,4 @@
     "xml2js": "^0.4.23"
   },
   "devDependencies": {}
-}
\ No newline at end of file
+}
diff --git a/server/utils/prober.js b/server/utils/prober.js
index cdcd2606..55af9f4a 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -1,4 +1,5 @@
 var Ffmpeg = require('fluent-ffmpeg')
+const ffprobe = require('node-ffprobe')
 const Path = require('path')
 
 const AudioProbeData = require('../scanner/AudioProbeData')
@@ -128,7 +129,7 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
 function parseChapters(chapters) {
   if (!chapters) return []
   return chapters.map(chap => {
-    var title = chap['TAG:title'] || chap.title || ''
+    var title = chap['TAG:title'] || chap.title || chap.tags.title || ''
     var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
     return {
       id: chap.id,
@@ -253,27 +254,23 @@ function parseProbeData(data, verbose = false) {
 
 // Updated probe returns AudioProbeData object
 function probe(filepath, verbose = false) {
-  return new Promise((resolve) => {
-    Ffmpeg.ffprobe(filepath, ['-show_chapters'], (err, raw) => {
-      if (err) {
-        console.error(err)
-        var errorMsg = err ? err.message : null
-        resolve({
-          error: errorMsg || 'Probe Error'
-        })
-      } else {
-        var rawProbeData = parseProbeData(raw, verbose)
-        if (!rawProbeData || !rawProbeData.audio_stream) {
-          resolve({
-            error: rawProbeData ? 'Invalid audio file: no audio streams found' : 'Probe Failed'
-          })
-        } else {
-          var probeData = new AudioProbeData()
-          probeData.setData(rawProbeData)
-          resolve(probeData)
+  return ffprobe(filepath)
+    .then(raw => {
+      var rawProbeData = parseProbeData(raw, verbose)
+      if (!rawProbeData || !rawProbeData.audio_stream) {
+        return {
+          error: rawProbeData ? 'Invalid audio file: no audio streams found' : 'Probe Failed'
         }
+      } else {
+        var probeData = new AudioProbeData()
+        probeData.setData(rawProbeData)
+        return probeData
+      }
+    })
+    .catch((err) => {
+      return {
+        error: err
       }
     })
-  })
 }
 module.exports.probe = probe
\ No newline at end of file

From f2e09e524f1ef625f7bf6c386960209e057a34de Mon Sep 17 00:00:00 2001
From: ISO-B <3048685+ISO-B@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:17:35 +0200
Subject: [PATCH 25/52] Cleaned unused require from prober

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

diff --git a/server/utils/prober.js b/server/utils/prober.js
index 55af9f4a..d31c419e 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -1,4 +1,3 @@
-var Ffmpeg = require('fluent-ffmpeg')
 const ffprobe = require('node-ffprobe')
 const Path = require('path')
 

From ab62ec689d4ad9ebe45eaaf825ad645505e0dc64 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 7 Jan 2022 17:26:12 -0600
Subject: [PATCH 26/52] Fix:Sort series before limiting #295

---
 server/controllers/LibraryController.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 286704be..3c3ebf05 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -167,6 +167,7 @@ class LibraryController {
     }
 
     var series = libraryHelpers.getSeriesFromBooks(audiobooks, payload.minified)
+    series = sort(series).asc(s => s.name)
     payload.total = series.length
 
     if (payload.limit) {
@@ -174,7 +175,7 @@ class LibraryController {
       series = series.slice(startIndex, startIndex + payload.limit)
     }
 
-    payload.results = sort(series).asc(s => s.name)
+    payload.results = series
     res.json(payload)
   }
 

From f6a03f866c3e66ce3da52facbda2a67018327888 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 7 Jan 2022 18:07:23 -0600
Subject: [PATCH 27/52] Version bump 1.6.54

---
 client/package.json |   2 +-
 package-lock.json   | 239 ++++++++------------------------------------
 package.json        |   4 +-
 3 files changed, 46 insertions(+), 199 deletions(-)

diff --git a/client/package.json b/client/package.json
index e6db0f97..920dc48e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.53",
+  "version": "1.6.54",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package-lock.json b/package-lock.json
index 68de2efa..b2d73f74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.39",
+  "version": "1.6.53",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -105,12 +105,14 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "optional": true
     },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "optional": true
     },
     "archiver": {
       "version": "5.3.0",
@@ -171,6 +173,7 @@
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
       "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+      "optional": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -180,6 +183,7 @@
           "version": "2.3.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
           "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -342,7 +346,8 @@
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
     },
     "clone-response": {
       "version": "1.0.2",
@@ -355,38 +360,8 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
-    },
-    "color": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-4.1.0.tgz",
-      "integrity": "sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A==",
-      "requires": {
-        "color-convert": "^2.0.1",
-        "color-string": "^1.9.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "color-string": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
-      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "optional": true
     },
     "command-line-args": {
       "version": "5.2.0",
@@ -423,7 +398,8 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "optional": true
     },
     "content-disposition": {
       "version": "0.5.3",
@@ -516,7 +492,8 @@
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "optional": true
     },
     "defer-to-connect": {
       "version": "2.0.1",
@@ -526,7 +503,8 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "optional": true
     },
     "depd": {
       "version": "1.1.2",
@@ -541,7 +519,8 @@
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "optional": true
     },
     "dicer": {
       "version": "0.3.0",
@@ -644,11 +623,6 @@
       "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
     },
-    "expand-template": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-      "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
-    },
     "express": {
       "version": "4.17.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -788,6 +762,7 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "optional": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -807,11 +782,6 @@
         "pump": "^3.0.0"
       }
     },
-    "github-from-package": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-      "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
-    },
     "glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -852,7 +822,8 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "optional": true
     },
     "html-entities": {
       "version": "2.3.2",
@@ -932,7 +903,8 @@
     "ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "optional": true
     },
     "ip": {
       "version": "1.1.5",
@@ -944,15 +916,11 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-    },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "optional": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -1149,21 +1117,6 @@
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
       "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
     },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        }
-      }
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -1213,7 +1166,8 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "optional": true
     },
     "minipass": {
       "version": "2.9.0",
@@ -1243,11 +1197,6 @@
         "minimist": "^1.2.5"
       }
     },
-    "mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
     "moment": {
       "version": "2.29.1",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
@@ -1272,11 +1221,6 @@
       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
       "optional": true
     },
-    "napi-build-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
-    },
     "needle": {
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
@@ -1318,29 +1262,6 @@
         "proper-lockfile": "^4.1.2"
       }
     },
-    "node-abi": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz",
-      "integrity": "sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==",
-      "requires": {
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "node-addon-api": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz",
-      "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q=="
-    },
     "node-cron": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.0.tgz",
@@ -1349,6 +1270,11 @@
         "moment-timezone": "^0.5.31"
       }
     },
+    "node-ffprobe": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/node-ffprobe/-/node-ffprobe-3.0.0.tgz",
+      "integrity": "sha512-2LNTLStz2hw/urwo4xJ00TIOvthgepcl3tF4HB8BWnhJ4nhJ7S08YThapBHkGLYV+GUuY9pML/kX76+dqY2iUg=="
+    },
     "node-pre-gyp": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
@@ -1422,6 +1348,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "optional": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -1432,7 +1359,8 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "optional": true
     },
     "object-assign": {
       "version": "4.1.1",
@@ -1520,26 +1448,6 @@
         "rss": "^1.2.2"
       }
     },
-    "prebuild-install": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.0.tgz",
-      "integrity": "sha512-IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA==",
-      "requires": {
-        "detect-libc": "^1.0.3",
-        "expand-template": "^2.0.3",
-        "github-from-package": "0.0.0",
-        "minimist": "^1.2.3",
-        "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
-        "node-abi": "^3.3.0",
-        "npmlog": "^4.0.1",
-        "pump": "^3.0.0",
-        "rc": "^1.2.7",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0"
-      }
-    },
     "printj": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
@@ -1651,6 +1559,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "optional": true,
       "requires": {
         "deep-extend": "^0.6.0",
         "ini": "~1.3.0",
@@ -1815,66 +1724,19 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "optional": true
     },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
       "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
-    "sharp": {
-      "version": "0.29.3",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.29.3.tgz",
-      "integrity": "sha512-fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA==",
-      "requires": {
-        "color": "^4.0.1",
-        "detect-libc": "^1.0.3",
-        "node-addon-api": "^4.2.0",
-        "prebuild-install": "^7.0.0",
-        "semver": "^7.3.5",
-        "simple-get": "^4.0.0",
-        "tar-fs": "^2.1.1",
-        "tunnel-agent": "^0.6.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
-    "simple-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
-    },
-    "simple-get": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz",
-      "integrity": "sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==",
-      "requires": {
-        "decompress-response": "^6.0.0",
-        "once": "^1.3.1",
-        "simple-concat": "^1.0.0"
-      }
-    },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
     "socket.io": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz",
@@ -1996,6 +1858,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "optional": true,
       "requires": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -2014,6 +1877,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "optional": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -2021,7 +1885,8 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "optional": true
     },
     "tar": {
       "version": "4.4.19",
@@ -2046,17 +1911,6 @@
         }
       }
     },
-    "tar-fs": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-      "requires": {
-        "chownr": "^1.1.1",
-        "mkdirp-classic": "^0.5.2",
-        "pump": "^3.0.0",
-        "tar-stream": "^2.1.4"
-      }
-    },
     "tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
@@ -2082,14 +1936,6 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -2154,6 +2000,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "optional": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
diff --git a/package.json b/package.json
index 2692c7a9..f38679e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.53",
+  "version": "1.6.54",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {
@@ -53,4 +53,4 @@
     "xml2js": "^0.4.23"
   },
   "devDependencies": {}
-}
+}
\ No newline at end of file

From aa287cb5a11e415ea1f2bde19e6a1284c11abd9f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 8 Jan 2022 15:07:52 -0600
Subject: [PATCH 28/52] Change:Readme for iOS

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 11549ecd..69d0aa8d 100644
--- a/readme.md
+++ b/readme.md
@@ -30,6 +30,8 @@ Is there a feature you are looking for? [Suggest it](https://github.com/advplyr/
 
 Android app is in beta, try it out on the [Google Play Store](https://play.google.com/store/apps/details?id=com.audiobookshelf.app)
 
+iOS early beta available using Test Flight: https://testflight.apple.com/join/wiic7QIW - [Join the discussion](https://github.com/advplyr/audiobookshelf-app/discussions/60)
+
 <img alt="Library Screenshot" src="https://github.com/advplyr/audiobookshelf/raw/master/images/LibraryStream.png" />
 
 ## Organizing your audiobooks

From 2c29a273f39610637842d3e802cd67570c13ff51 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 8 Jan 2022 16:42:30 -0600
Subject: [PATCH 29/52] Change:Make square covers the default

---
 server/objects/ServerSettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/objects/ServerSettings.js b/server/objects/ServerSettings.js
index df172d9b..3e13804b 100644
--- a/server/objects/ServerSettings.js
+++ b/server/objects/ServerSettings.js
@@ -34,7 +34,7 @@ class ServerSettings {
     this.loggerScannerLogsToKeep = 2
 
     // Cover
-    this.coverAspectRatio = BookCoverAspectRatio.STANDARD
+    this.coverAspectRatio = BookCoverAspectRatio.SQUARE
     this.bookshelfView = BookshelfView.STANDARD
 
     this.logLevel = Logger.logLevel
@@ -65,7 +65,7 @@ class ServerSettings {
     this.loggerDailyLogsToKeep = settings.loggerDailyLogsToKeep || 7
     this.loggerScannerLogsToKeep = settings.loggerScannerLogsToKeep || 2
 
-    this.coverAspectRatio = settings.coverAspectRatio || BookCoverAspectRatio.STANDARD
+    this.coverAspectRatio = settings.coverAspectRatio || BookCoverAspectRatio.SQUARE
     this.bookshelfView = settings.bookshelfView || BookshelfView.STANDARD
 
     this.logLevel = settings.logLevel || Logger.logLevel

From 1be0ff7654b01eb36e0839f20206e291954e17bf Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 8 Jan 2022 17:03:33 -0600
Subject: [PATCH 30/52] Add:Scanner set default cover provider #291

---
 client/components/modals/edit-tabs/Match.vue | 17 +----
 client/pages/config/index.vue                | 76 ++++++++++++--------
 client/store/scanners.js                     | 16 ++++-
 server/objects/ServerSettings.js             |  3 +
 server/scanner/Scanner.js                    |  3 +-
 5 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/client/components/modals/edit-tabs/Match.vue b/client/components/modals/edit-tabs/Match.vue
index f082bc48..65fb88c9 100644
--- a/client/components/modals/edit-tabs/Match.vue
+++ b/client/components/modals/edit-tabs/Match.vue
@@ -104,20 +104,6 @@ export default {
       searchTitle: null,
       searchAuthor: null,
       lastSearch: null,
-      providers: [
-        {
-          text: 'Google Books',
-          value: 'google'
-        },
-        {
-          text: 'Open Library',
-          value: 'openlibrary'
-        },
-        {
-          text: 'Audible',
-          value: 'audible'
-        }
-      ],
       provider: 'google',
       searchResults: [],
       hasSearched: false,
@@ -156,6 +142,9 @@ export default {
     },
     bookCoverAspectRatio() {
       return this.$store.getters['getBookCoverAspectRatio']
+    },
+    providers() {
+      return this.$store.state.scanners.providers
     }
   },
   methods: {
diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index 79e69c81..a09fb046 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -7,34 +7,6 @@
         <h1 class="text-xl">Settings</h1>
       </div>
 
-      <div class="flex items-center py-2">
-        <ui-toggle-switch v-model="newServerSettings.scannerParseSubtitle" small :disabled="updatingServerSettings" @input="updateScannerParseSubtitle" />
-        <ui-tooltip :text="parseSubtitleTooltip">
-          <p class="pl-4 text-lg">Scanner parse subtitles <span class="material-icons icon-text">info_outlined</span></p>
-        </ui-tooltip>
-      </div>
-
-      <div class="flex items-center py-2">
-        <ui-toggle-switch v-model="newServerSettings.scannerFindCovers" :disabled="updatingServerSettings" @input="updateScannerFindCovers" />
-        <ui-tooltip :text="scannerFindCoversTooltip">
-          <p class="pl-4 text-lg">Scanner find covers <span class="material-icons icon-text">info_outlined</span></p>
-        </ui-tooltip>
-      </div>
-
-      <div class="flex items-center py-2">
-        <ui-toggle-switch v-model="newServerSettings.scannerPreferAudioMetadata" :disabled="updatingServerSettings" @input="updateScannerPreferAudioMeta" />
-        <ui-tooltip :text="scannerPreferAudioMetaTooltip">
-          <p class="pl-4 text-lg">Scanner prefer audio metadata <span class="material-icons icon-text">info_outlined</span></p>
-        </ui-tooltip>
-      </div>
-
-      <div class="flex items-center py-2">
-        <ui-toggle-switch v-model="newServerSettings.scannerPreferOpfMetadata" :disabled="updatingServerSettings" @input="updateScannerPreferOpfMeta" />
-        <ui-tooltip :text="scannerPreferOpfMetaTooltip">
-          <p class="pl-4 text-lg">Scanner prefer OPF metadata <span class="material-icons icon-text">info_outlined</span></p>
-        </ui-tooltip>
-      </div>
-
       <div class="flex items-center py-2">
         <ui-toggle-switch v-model="storeCoversInAudiobookDir" :disabled="updatingServerSettings" @input="updateCoverStorageDestination" />
         <ui-tooltip :text="coverDestinationTooltip">
@@ -55,6 +27,42 @@
           <p class="pl-4 text-lg">Use alternative library bookshelf view <span class="material-icons icon-text">info_outlined</span></p>
         </ui-tooltip>
       </div>
+
+      <div class="flex items-center mb-2 mt-8">
+        <h1 class="text-xl">Scanner Settings</h1>
+      </div>
+
+      <div class="flex items-center py-2">
+        <ui-toggle-switch v-model="newServerSettings.scannerParseSubtitle" small :disabled="updatingServerSettings" @input="updateScannerParseSubtitle" />
+        <ui-tooltip :text="parseSubtitleTooltip">
+          <p class="pl-4 text-lg">Scanner parse subtitles <span class="material-icons icon-text">info_outlined</span></p>
+        </ui-tooltip>
+      </div>
+
+      <div class="flex items-center py-2">
+        <ui-toggle-switch v-model="newServerSettings.scannerFindCovers" :disabled="updatingServerSettings" @input="updateScannerFindCovers" />
+        <ui-tooltip :text="scannerFindCoversTooltip">
+          <p class="pl-4 text-lg">Scanner find covers <span class="material-icons icon-text">info_outlined</span></p>
+        </ui-tooltip>
+        <div class="flex-grow" />
+      </div>
+      <div v-if="newServerSettings.scannerFindCovers" class="w-44 ml-14 mb-2">
+        <ui-dropdown v-model="newServerSettings.scannerCoverProvider" small :items="providers" label="Cover Provider" @input="updateScannerCoverProvider" :disabled="updatingServerSettings" />
+      </div>
+
+      <div class="flex items-center py-2">
+        <ui-toggle-switch v-model="newServerSettings.scannerPreferAudioMetadata" :disabled="updatingServerSettings" @input="updateScannerPreferAudioMeta" />
+        <ui-tooltip :text="scannerPreferAudioMetaTooltip">
+          <p class="pl-4 text-lg">Scanner prefer audio metadata <span class="material-icons icon-text">info_outlined</span></p>
+        </ui-tooltip>
+      </div>
+
+      <div class="flex items-center py-2">
+        <ui-toggle-switch v-model="newServerSettings.scannerPreferOpfMetadata" :disabled="updatingServerSettings" @input="updateScannerPreferOpfMeta" />
+        <ui-tooltip :text="scannerPreferOpfMetaTooltip">
+          <p class="pl-4 text-lg">Scanner prefer OPF metadata <span class="material-icons icon-text">info_outlined</span></p>
+        </ui-tooltip>
+      </div>
     </div>
 
     <div class="h-0.5 bg-primary bg-opacity-30 w-full" />
@@ -85,9 +93,9 @@
             </ui-tooltip>
           </div>
         </div>
-        <div class="hidden md:block">
+        <!-- <div class="hidden md:block">
           <a href="https://github.com/advplyr/audiobookshelf/discussions/75#discussion-3604812" target="_blank" class="text-blue-500 hover:text-blue-300 underline">Join the discussion</a>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -145,6 +153,9 @@ export default {
     bookshelfViewTooltip() {
       return 'Alternative bookshelf view that shows title & author under book covers'
     },
+    providers() {
+      return this.$store.state.scanners.providers
+    },
     showExperimentalFeatures: {
       get() {
         return this.$store.state.showExperimentalFeatures
@@ -160,6 +171,11 @@ export default {
         scannerFindCovers: !!val
       })
     },
+    updateScannerCoverProvider(val) {
+      this.updateServerSettings({
+        scannerCoverProvider: val
+      })
+    },
     updateCoverStorageDestination(val) {
       this.newServerSettings.coverDestination = val ? this.$constants.CoverDestination.AUDIOBOOK : this.$constants.CoverDestination.METADATA
       this.updateServerSettings({
diff --git a/client/store/scanners.js b/client/store/scanners.js
index 1a106332..8312e712 100644
--- a/client/store/scanners.js
+++ b/client/store/scanners.js
@@ -1,5 +1,19 @@
 export const state = () => ({
-  libraryScans: []
+  libraryScans: [],
+  providers: [
+    {
+      text: 'Google Books',
+      value: 'google'
+    },
+    {
+      text: 'Open Library',
+      value: 'openlibrary'
+    },
+    {
+      text: 'Audible',
+      value: 'audible'
+    }
+  ]
 })
 
 export const getters = {
diff --git a/server/objects/ServerSettings.js b/server/objects/ServerSettings.js
index 3e13804b..34bacb6c 100644
--- a/server/objects/ServerSettings.js
+++ b/server/objects/ServerSettings.js
@@ -12,6 +12,7 @@ class ServerSettings {
     // Scanner
     this.scannerParseSubtitle = false
     this.scannerFindCovers = false
+    this.scannerCoverProvider = 'google'
     this.scannerPreferAudioMetadata = false
     this.scannerPreferOpfMetadata = false
 
@@ -49,6 +50,7 @@ class ServerSettings {
     this.autoTagNew = settings.autoTagNew
     this.newTagExpireDays = settings.newTagExpireDays
     this.scannerFindCovers = !!settings.scannerFindCovers
+    this.scannerCoverProvider = settings.scannerCoverProvider || 'google'
     this.scannerParseSubtitle = settings.scannerParseSubtitle
     this.scannerPreferAudioMetadata = !!settings.scannerPreferAudioMetadata
     this.scannerPreferOpfMetadata = !!settings.scannerPreferOpfMetadata
@@ -82,6 +84,7 @@ class ServerSettings {
       autoTagNew: this.autoTagNew,
       newTagExpireDays: this.newTagExpireDays,
       scannerFindCovers: this.scannerFindCovers,
+      scannerCoverProvider: this.scannerCoverProvider,
       scannerParseSubtitle: this.scannerParseSubtitle,
       scannerPreferAudioMetadata: this.scannerPreferAudioMetadata,
       scannerPreferOpfMetadata: this.scannerPreferOpfMetadata,
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 177d5db0..8290c4c2 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -519,7 +519,8 @@ class Scanner {
       titleDistance: 2,
       authorDistance: 2
     }
-    var results = await this.bookFinder.findCovers('google', audiobook.title, audiobook.authorFL, options)
+    var scannerCoverProvider = this.db.serverSettings.scannerCoverProvider
+    var results = await this.bookFinder.findCovers(scannerCoverProvider, audiobook.title, audiobook.authorFL, options)
     if (results.length) {
       if (libraryScan) libraryScan.addLog(LogLevel.DEBUG, `Found best cover for "${audiobook.title}"`)
       else Logger.debug(`[Scanner] Found best cover for "${audiobook.title}"`)

From 19cb8ba9a97b4814746806b866d5b6a742b7fa48 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 8 Jan 2022 18:05:38 -0600
Subject: [PATCH 31/52] Add:Alt bookshelf view add volume number infront of
 title #232

---
 client/components/cards/LazyBookCard.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index cfe0f1e9..1b29c664 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -6,7 +6,9 @@
     </div>
 
     <div v-if="isAlternativeBookshelfView" class="absolute left-0 z-50 w-full" :style="{ bottom: `-${sizeMultiplier * 3}rem` }">
-      <p class="truncate" :style="{ fontSize: 0.9 * sizeMultiplier + 'rem' }">{{ title }}</p>
+      <p class="truncate" :style="{ fontSize: 0.9 * sizeMultiplier + 'rem' }">
+        <span v-if="volumeNumber">#{{ volumeNumber }}&nbsp;</span>{{ title }}
+      </p>
       <p class="truncate text-gray-400" :style="{ fontSize: 0.8 * sizeMultiplier + 'rem' }">{{ authorFL }}</p>
     </div>
 

From c22eaae3bfe99fe953d686376d8e373d4f44ac07 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 8 Jan 2022 18:15:06 -0600
Subject: [PATCH 32/52] Version bump 1.6.55

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 920dc48e..87734320 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.54",
+  "version": "1.6.55",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index f38679e2..c5a480bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.54",
+  "version": "1.6.55",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From afd2b8c98f9ec7c7615b469bffce23f9bc1b8094 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 9 Jan 2022 17:36:25 -0600
Subject: [PATCH 33/52] Add:Smart audio track order based on best match track
 and disc #155

---
 client/pages/audiobook/_id/edit.vue |   8 +-
 server/objects/AudioFile.js         |  24 ++--
 server/objects/AudioFileMetadata.js |   4 +
 server/scanner/AudioFileScanner.js  | 198 ++++++++++++++++++----------
 server/scanner/AudioProbeData.js    |  19 ++-
 server/utils/prober.js              |   3 +-
 6 files changed, 171 insertions(+), 85 deletions(-)

diff --git a/client/pages/audiobook/_id/edit.vue b/client/pages/audiobook/_id/edit.vue
index 27c378ac..81fd888e 100644
--- a/client/pages/audiobook/_id/edit.vue
+++ b/client/pages/audiobook/_id/edit.vue
@@ -22,7 +22,8 @@
           <span class="text-white">Track From Metadata</span>
           <span class="material-icons ml-1" :class="currentSort === 'metadata' ? 'text-white text-opacity-100 text-lg' : 'text-sm'">{{ currentSort === 'metadata' ? 'expand_more' : 'unfold_more' }}</span>
         </div>
-        <div class="font-mono w-20 text-center">CD From Filename</div>
+        <div class="font-mono w-20 text-center">Disc From Filename</div>
+        <div class="font-mono w-20 text-center">Disc From Metadata</div>
         <div class="font-book text-center px-4 flex-grow flex items-center cursor-pointer text-white text-opacity-40 hover:text-opacity-100" @click="sortByFilename" @mousedown.prevent>
           <span class="text-white">Filename</span>
           <span class="material-icons ml-1" :class="currentSort === 'filename' ? 'text-white text-opacity-100 text-lg' : 'text-sm'">{{ currentSort === 'filename' ? 'expand_more' : 'unfold_more' }}</span>
@@ -49,7 +50,10 @@
               {{ audio.trackNumFromMeta }}
             </div>
             <div class="font-book truncate px-4 w-20">
-              {{ audio.cdNumFromFilename }}
+              {{ audio.discNumFromFilename }}
+            </div>
+            <div class="font-book truncate px-4 w-20">
+              {{ audio.discNumFromMeta }}
             </div>
             <div class="font-book truncate px-4 flex-grow">
               {{ audio.filename }}
diff --git a/server/objects/AudioFile.js b/server/objects/AudioFile.js
index 2e33f0ef..196381a2 100644
--- a/server/objects/AudioFile.js
+++ b/server/objects/AudioFile.js
@@ -14,8 +14,9 @@ class AudioFile {
     this.addedAt = null
 
     this.trackNumFromMeta = null
+    this.discNumFromMeta = null
     this.trackNumFromFilename = null
-    this.cdNumFromFilename = null
+    this.discNumFromFilename = null
 
     this.format = null
     this.duration = null
@@ -42,16 +43,6 @@ class AudioFile {
     }
   }
 
-  // Sort number takes cd num into account
-  // get sortNumber() {
-  //   if (this.manuallyVerified) return this.index
-  //   var num = this.index
-  //   if (this.cdNumFromFilename && !isNaN(this.cdNumFromFilename)) {
-  //     num += (Number(this.cdNumFromFilename) * 1000)
-  //   }
-  //   return num
-  // }
-
   toJSON() {
     return {
       index: this.index,
@@ -62,8 +53,9 @@ class AudioFile {
       fullPath: this.fullPath,
       addedAt: this.addedAt,
       trackNumFromMeta: this.trackNumFromMeta,
+      discNumFromMeta: this.discNumFromMeta,
       trackNumFromFilename: this.trackNumFromFilename,
-      cdNumFromFilename: this.cdNumFromFilename,
+      discNumFromFilename: this.discNumFromFilename,
       manuallyVerified: !!this.manuallyVerified,
       invalid: !!this.invalid,
       exclude: !!this.exclude,
@@ -97,8 +89,11 @@ class AudioFile {
     this.error = data.error || null
 
     this.trackNumFromMeta = data.trackNumFromMeta
+    this.discNumFromMeta = data.discNumFromMeta
     this.trackNumFromFilename = data.trackNumFromFilename
-    this.cdNumFromFilename = data.cdNumFromFilename
+
+    if (data.cdNumFromFilename !== undefined) this.discNumFromFilename = data.cdNumFromFilename // TEMP:Support old var name
+    else this.discNumFromFilename = data.discNumFromFilename
 
     this.format = data.format
     this.duration = data.duration
@@ -132,8 +127,9 @@ class AudioFile {
     this.addedAt = Date.now()
 
     this.trackNumFromMeta = fileData.trackNumFromMeta
+    this.discNumFromMeta = fileData.discNumFromMeta
     this.trackNumFromFilename = fileData.trackNumFromFilename
-    this.cdNumFromFilename = fileData.cdNumFromFilename
+    this.discNumFromFilename = fileData.discNumFromFilename
 
     this.format = probeData.format
     this.duration = probeData.duration
diff --git a/server/objects/AudioFileMetadata.js b/server/objects/AudioFileMetadata.js
index c838df9a..6d2a2267 100644
--- a/server/objects/AudioFileMetadata.js
+++ b/server/objects/AudioFileMetadata.js
@@ -7,6 +7,7 @@ class AudioFileMetadata {
     this.tagSeries = null
     this.tagSeriesPart = null
     this.tagTrack = null
+    this.tagDisc = null
     this.tagSubtitle = null
     this.tagAlbumArtist = null
     this.tagDate = null
@@ -42,6 +43,7 @@ class AudioFileMetadata {
     this.tagSeries = metadata.tagSeries || null
     this.tagSeriesPart = metadata.tagSeriesPart || null
     this.tagTrack = metadata.tagTrack || null
+    this.tagDisc = metadata.tagDisc || null
     this.tagSubtitle = metadata.tagSubtitle || null
     this.tagAlbumArtist = metadata.tagAlbumArtist || null
     this.tagDate = metadata.tagDate || null
@@ -63,6 +65,7 @@ class AudioFileMetadata {
     this.tagSeries = payload.file_tag_series || null
     this.tagSeriesPart = payload.file_tag_seriespart || null
     this.tagTrack = payload.file_tag_track || null
+    this.tagDisc = payload.file_tag_disc || null
     this.tagSubtitle = payload.file_tag_subtitle || null
     this.tagAlbumArtist = payload.file_tag_albumartist || null
     this.tagDate = payload.file_tag_date || null
@@ -84,6 +87,7 @@ class AudioFileMetadata {
       tagSeries: payload.file_tag_series || null,
       tagSeriesPart: payload.file_tag_seriespart || null,
       tagTrack: payload.file_tag_track || null,
+      tagDisc: payload.file_tag_disc || null,
       tagSubtitle: payload.file_tag_subtitle || null,
       tagAlbumArtist: payload.file_tag_albumartist || null,
       tagDate: payload.file_tag_date || null,
diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js
index 94311208..c4239108 100644
--- a/server/scanner/AudioFileScanner.js
+++ b/server/scanner/AudioFileScanner.js
@@ -9,11 +9,7 @@ const { LogLevel } = require('../utils/constants')
 class AudioFileScanner {
   constructor() { }
 
-  getTrackNumberFromMeta(scanData) {
-    return !isNaN(scanData.trackNumber) && scanData.trackNumber !== null ? Math.trunc(Number(scanData.trackNumber)) : null
-  }
-
-  getTrackNumberFromFilename(bookScanData, filename) {
+  getTrackAndDiscNumberFromFilename(bookScanData, filename) {
     const { title, author, series, publishYear } = bookScanData
     var partbasename = Path.basename(filename, Path.extname(filename))
 
@@ -23,39 +19,24 @@ class AudioFileScanner {
     if (series) partbasename = partbasename.replace(series, '')
     if (publishYear) partbasename = partbasename.replace(publishYear)
 
-    // Remove eg. "disc 1" from path
-    partbasename = partbasename.replace(/\bdisc \d\d?\b/i, '')
-
-    // Remove "cd01" or "cd 01" from path
-    partbasename = partbasename.replace(/\bcd ?\d\d?\b/i, '')
-
-    var numbersinpath = partbasename.match(/\d{1,4}/g)
-    if (!numbersinpath) return null
-
-    var number = numbersinpath.length ? parseInt(numbersinpath[0]) : null
-    return number
-  }
-
-  getCdNumberFromFilename(bookScanData, filename) {
-    const { title, author, series, publishYear } = bookScanData
-    var partbasename = Path.basename(filename, Path.extname(filename))
-
-    // Remove title, author, series, and publishYear from filename if there
-    if (title) partbasename = partbasename.replace(title, '')
-    if (author) partbasename = partbasename.replace(author, '')
-    if (series) partbasename = partbasename.replace(series, '')
-    if (publishYear) partbasename = partbasename.replace(publishYear)
-
-    var cdNumber = null
-
-    var cdmatch = partbasename.match(/\b(disc|cd) ?(\d\d?)\b/i)
-    if (cdmatch && cdmatch.length > 2 && cdmatch[2]) {
-      if (!isNaN(cdmatch[2])) {
-        cdNumber = Number(cdmatch[2])
+    // Look for disc number
+    var discNumber = null
+    var discMatch = partbasename.match(/\b(disc|cd) ?(\d\d?)\b/i)
+    if (discMatch && discMatch.length > 2 && discMatch[2]) {
+      if (!isNaN(discMatch[2])) {
+        discNumber = Number(discMatch[2])
       }
+
+      // Remove disc number from filename
+      partbasename = partbasename.replace(/\b(disc|cd) ?(\d\d?)\b/i, '')
     }
 
-    return cdNumber
+    var numbersinpath = partbasename.match(/\d{1,4}/g)
+    var trackNumber = numbersinpath && numbersinpath.length ? parseInt(numbersinpath[0]) : null
+    return {
+      trackNumber,
+      discNumber
+    }
   }
 
   getAverageScanDurationMs(results) {
@@ -76,20 +57,21 @@ class AudioFileScanner {
     // Logger.debug(`[AudioFileScanner] Finished Probe ${audioFileData.fullPath} elapsed ${msToTimestamp(Date.now() - probeStart, true)}`)
 
     var audioFile = new AudioFile()
-    audioFileData.trackNumFromMeta = this.getTrackNumberFromMeta(probeData)
-    audioFileData.trackNumFromFilename = this.getTrackNumberFromFilename(bookScanData, audioFileData.filename)
-    audioFileData.cdNumFromFilename = this.getCdNumberFromFilename(bookScanData, audioFileData.filename)
-    audioFile.setDataFromProbe(audioFileData, probeData)
-    if (audioFile.embeddedCoverArt) {
+    audioFileData.trackNumFromMeta = probeData.trackNumber
+    audioFileData.discNumFromMeta = probeData.discNumber
+
+    const { trackNumber, discNumber } = this.getTrackAndDiscNumberFromFilename(bookScanData, audioFileData.filename)
+    audioFileData.trackNumFromFilename = trackNumber
+    audioFileData.discNumFromFilename = discNumber
+
+    audioFile.setDataFromProbe(audioFileData, probeData)
 
-    }
     return {
       audioFile,
       elapsed: Date.now() - probeStart
     }
   }
 
-
   // Returns array of { AudioFile, elapsed, averageScanDuration } from audio file scan objects
   async executeAudioFileScans(audioFileDataArray, bookScanData) {
     var proms = []
@@ -105,6 +87,84 @@ class AudioFileScanner {
     }
   }
 
+  isSequential(nums) {
+    if (!nums || !nums.length) return false
+    if (nums.length === 1) return true
+    var prev = nums[0]
+    for (let i = 1; i < nums.length; i++) {
+      if (nums[i] - prev > 1) return false
+      prev = nums[i]
+    }
+    return true
+  }
+
+  removeDupes(nums) {
+    if (!nums || !nums.length) return []
+    if (nums.length === 1) return nums
+
+    var nodupes = [nums[0]]
+    nums.forEach((num) => {
+      if (num > nodupes[nodupes.length - 1]) nodupes.push(num)
+    })
+    return nodupes
+  }
+
+  // Must be all audiofiles in audiobook
+  runSmartTrackOrder(audiobook, audioFiles) {
+    var discsFromFilename = []
+    var tracksFromFilename = []
+    var discsFromMeta = []
+    var tracksFromMeta = []
+
+    audioFiles.forEach((af) => {
+      if (af.discNumFromFilename !== null) discsFromFilename.push(af.discNumFromFilename)
+      if (af.discNumFromMeta !== null) discsFromMeta.push(af.discNumFromMeta)
+      if (af.trackNumFromFilename !== null) tracksFromFilename.push(af.trackNumFromFilename)
+      if (af.trackNumFromMeta !== null) tracksFromMeta.push(af.trackNumFromMeta)
+      af.validateTrackIndex() // Sets error if no valid track number
+    })
+    discsFromFilename.sort((a, b) => a - b)
+    discsFromMeta.sort((a, b) => a - b)
+    tracksFromFilename.sort((a, b) => a - b)
+    tracksFromMeta.sort((a, b) => a - b)
+    console.log('AB DISCS', audiobook.title, discsFromFilename, discsFromMeta)
+    console.log('AB TRACKS', audiobook.title, tracksFromFilename, tracksFromMeta)
+
+    var discKey = null
+    if (discsFromMeta.length === audioFiles.length && this.isSequential(discsFromMeta)) {
+      discKey = 'discNumFromMeta'
+    } else if (discsFromFilename.length === audioFiles.length && this.isSequential(discsFromFilename)) {
+      discKey = 'discNumFromFilename'
+    }
+
+    var trackKey = null
+    tracksFromFilename = this.removeDupes(tracksFromFilename)
+    tracksFromMeta = this.removeDupes(tracksFromMeta)
+    if (tracksFromFilename.length > tracksFromMeta.length) {
+      trackKey = 'trackNumFromFilename'
+    } else {
+      trackKey = 'trackNumFromMeta'
+    }
+
+
+    if (discKey !== null) {
+      Logger.debug(`[AudioFileScanner] Smart track order for "${audiobook.title}" using disc key ${discKey} and track key ${trackKey}`)
+      audioFiles.sort((a, b) => {
+        let Dx = a[discKey] - b[discKey]
+        if (Dx === 0) Dx = a[trackKey] - b[trackKey]
+        return Dx
+      })
+    } else {
+      Logger.debug(`[AudioFileScanner] Smart track order for "${audiobook.title}" using track key ${trackKey}`)
+      audioFiles.sort((a, b) => a[trackKey] - b[trackKey])
+    }
+
+    for (let i = 0; i < audioFiles.length; i++) {
+      audioFiles[i].index = i + 1
+      audiobook.addAudioFile(audioFiles[i])
+    }
+  }
+
   async scanAudioFiles(audioFileDataArray, bookScanData, audiobook, preferAudioMetadata, libraryScan = null) {
     var hasUpdated = false
 
@@ -114,36 +174,42 @@ class AudioFileScanner {
         libraryScan.addLog(LogLevel.DEBUG, `Book "${bookScanData.path}" Audio file scan took ${audioScanResult.elapsed}ms for ${audioScanResult.audioFiles.length} with average time of ${audioScanResult.averageScanDuration}ms`)
       }
 
-      var totalAudioFilesToInclude = audiobook.audioFilesToInclude.filter(af => !audioScanResult.audioFiles.find(_af => _af.ino === af.ino)).length + audioScanResult.audioFiles.length
+      var numExistingAudioFilesToInclude = audiobook.audioFilesToInclude.filter(af => !audioScanResult.audioFiles.find(_af => _af.ino === af.ino)).length
+      var totalAudioFilesToInclude = numExistingAudioFilesToInclude + audioScanResult.audioFiles.length
 
-      // validate & add/update audio files to audiobook
-      for (let i = 0; i < audioScanResult.audioFiles.length; i++) {
-        var newAF = audioScanResult.audioFiles[i]
-        var existingAF = audiobook.getAudioFileByIno(newAF.ino)
+      if (numExistingAudioFilesToInclude <= 0) { // SMART TRACK ORDER for New or empty audiobooks
+        this.runSmartTrackOrder(audiobook, audioScanResult.audioFiles)
+        hasUpdated = true
+      } else {
+        // validate & add/update audio files to existing audiobook
+        for (let i = 0; i < audioScanResult.audioFiles.length; i++) {
+          var newAF = audioScanResult.audioFiles[i]
+          var existingAF = audiobook.getAudioFileByIno(newAF.ino)
 
-        var trackIndex = null
-        if (totalAudioFilesToInclude === 1) { // Single track audiobooks
-          trackIndex = 1
-        } else if (existingAF && existingAF.manuallyVerified) { // manually verified audio files use existing index
-          trackIndex = existingAF.index
-        } else {
-          trackIndex = newAF.validateTrackIndex()
-        }
-
-        if (trackIndex !== null) {
-          if (audiobook.checkHasTrackNum(trackIndex, newAF.ino)) {
-            newAF.setDuplicateTrackNumber(trackIndex)
+          var trackIndex = null
+          if (totalAudioFilesToInclude === 1) { // Single track audiobooks
+            trackIndex = 1
+          } else if (existingAF && existingAF.manuallyVerified) { // manually verified audio files use existing index
+            trackIndex = existingAF.index
           } else {
-            newAF.index = trackIndex
+            trackIndex = newAF.validateTrackIndex()
           }
-        }
-        if (existingAF) {
-          if (audiobook.updateAudioFile(newAF)) {
+
+          if (trackIndex !== null) {
+            if (audiobook.checkHasTrackNum(trackIndex, newAF.ino)) {
+              newAF.setDuplicateTrackNumber(trackIndex)
+            } else {
+              newAF.index = trackIndex
+            }
+          }
+          if (existingAF) {
+            if (audiobook.updateAudioFile(newAF)) {
+              hasUpdated = true
+            }
+          } else {
+            audiobook.addAudioFile(newAF)
             hasUpdated = true
           }
-        } else {
-          audiobook.addAudioFile(newAF)
-          hasUpdated = true
         }
       }
 
diff --git a/server/scanner/AudioProbeData.js b/server/scanner/AudioProbeData.js
index 0fd294ec..05e09891 100644
--- a/server/scanner/AudioProbeData.js
+++ b/server/scanner/AudioProbeData.js
@@ -19,6 +19,9 @@ class AudioProbeData {
 
     this.trackNumber = null
     this.trackTotal = null
+
+    this.discNumber = null
+    this.discTotal = null
   }
 
   getEmbeddedCoverArt(videoStream) {
@@ -55,10 +58,22 @@ class AudioProbeData {
     if (this.audioFileMetadata.tagTrack) {
       var trackParts = this.audioFileMetadata.tagTrack.split('/').map(part => Number(part))
       if (trackParts.length > 0) {
-        this.trackNumber = trackParts[0]
+        // Fractional track numbers not supported
+        this.trackNumber = !isNaN(trackParts[0]) ? Math.trunc(trackParts[0]) : null
       }
       if (trackParts.length > 1) {
-        this.trackTotal = trackParts[1]
+        this.trackTotal = !isNaN(trackParts[1]) ? trackParts[1] : null
+      }
+    }
+
+    // Parse disc tag
+    if (this.audioFileMetadata.tagDisc) {
+      var discParts = this.audioFileMetadata.tagDisc.split('/').map(p => Number(p))
+      if (discParts.length > 0) {
+        this.discNumber = !isNaN(discParts[0]) ? Math.trunc(discParts[0]) : null
+      }
+      if (discParts.length > 1) {
+        this.discTotal = !isNaN(discParts[1]) ? discParts[1] : null
       }
     }
   }
diff --git a/server/utils/prober.js b/server/utils/prober.js
index d31c419e..b8fe0d83 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -128,7 +128,7 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
 function parseChapters(chapters) {
   if (!chapters) return []
   return chapters.map(chap => {
-    var title = chap['TAG:title'] || chap.title || chap.tags.title || ''
+    var title = chap['TAG:title'] || chap.title || chap.tags.title || ''
     var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
     return {
       id: chap.id,
@@ -152,6 +152,7 @@ function parseTags(format, verbose) {
     file_tag_title: tryGrabTags(format, 'title', 'tit2', 'tt2'),
     file_tag_subtitle: tryGrabTags(format, 'subtitle', 'tit3', 'tt3'),
     file_tag_track: tryGrabTags(format, 'track', 'trck', 'trk'),
+    file_tag_disc: tryGrabTags(format, 'discnumber', 'disc', 'disk', 'tpos'),
     file_tag_album: tryGrabTags(format, 'album', 'talb', 'tal'),
     file_tag_artist: tryGrabTags(format, 'artist', 'tpe1', 'tp1'),
     file_tag_albumartist: tryGrabTags(format, 'albumartist', 'album_artist', 'tpe2'),

From b284a9bd577b09adf0093932377baf618429778b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 9 Jan 2022 18:37:16 -0600
Subject: [PATCH 34/52] Add:Language and ASIN id3 tag parse, language filter,
 asin search, asin audible match, add fields to details #305

---
 client/components/app/LazyBookshelf.vue       | 18 ++++++++++++++
 .../components/cards/AudiobookSearchCard.vue  |  3 ++-
 client/components/controls/FilterSelect.vue   | 10 +++++++-
 .../components/modals/edit-tabs/Details.vue   | 24 ++++++++++++++++---
 client/components/modals/edit-tabs/Match.vue  | 23 ++++++++++--------
 client/components/tables/LibrariesTable.vue   |  2 +-
 client/pages/batch/index.vue                  | 24 +++++++++++++++++--
 client/store/libraries.js                     |  6 ++++-
 server/objects/AudioFileMetadata.js           | 10 +++++++-
 server/objects/Book.js                        | 22 ++++++++++++++---
 server/scanner/AudioFileScanner.js            |  2 --
 server/utils/libraryHelpers.js                |  9 +++++--
 server/utils/prober.js                        |  2 ++
 13 files changed, 128 insertions(+), 27 deletions(-)

diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 3c036ece..085a8074 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -18,6 +18,9 @@
     </div>
     <div v-else-if="!totalShelves && initialized" class="w-full py-16">
       <p class="text-xl text-center">{{ emptyMessage }}</p>
+      <div class="flex justify-center mt-2">
+        <ui-btn v-if="hasFilter" color="primary" @click="clearFilter">Clear Filter</ui-btn>
+      </div>
     </div>
 
     <widgets-cover-size-widget class="fixed bottom-4 right-4 z-30" />
@@ -86,6 +89,7 @@ export default {
     emptyMessage() {
       if (this.page === 'series') return `You have no series`
       if (this.page === 'collections') return "You haven't made any collections yet"
+      if (this.hasFilter) return `No Results for filter "${this.filterValue}"`
       return 'No results'
     },
     entityName() {
@@ -120,6 +124,17 @@ export default {
     hasFilter() {
       return this.filterBy && this.filterBy !== 'all'
     },
+    filterName() {
+      if (!this.filterBy) return ''
+      var filter = this.filterBy.split('.')[0]
+      filter = filter.substr(0, 1).toUpperCase() + filter.substr(1)
+      return filter
+    },
+    filterValue() {
+      if (!this.filterBy) return ''
+      if (!this.filterBy.includes('.')) return ''
+      return this.$decode(this.filterBy.split('.')[1])
+    },
     currentLibraryId() {
       return this.$store.state.libraries.currentLibraryId
     },
@@ -175,6 +190,9 @@ export default {
     showBookshelfTextureModal() {
       this.$store.commit('globals/setShowBookshelfTextureModal', true)
     },
+    clearFilter() {
+      this.$store.dispatch('user/updateUserSettings', { filterBy: 'all' })
+    },
     editEntity(entity) {
       if (this.entityName === 'books' || this.entityName === 'series-books') {
         var bookIds = this.entities.map((e) => e.id)
diff --git a/client/components/cards/AudiobookSearchCard.vue b/client/components/cards/AudiobookSearchCard.vue
index 159f02b0..13fa980e 100644
--- a/client/components/cards/AudiobookSearchCard.vue
+++ b/client/components/cards/AudiobookSearchCard.vue
@@ -10,7 +10,7 @@
       <p v-if="matchKey !== 'authorFL'" class="text-xs text-gray-200 truncate">by {{ authorFL }}</p>
       <p v-else class="truncate text-xs text-gray-200" v-html="matchHtml" />
 
-      <div v-if="matchKey === 'series' || matchKey === 'tags' || matchKey === 'isbn'" class="m-0 p-0 truncate text-xs" v-html="matchHtml" />
+      <div v-if="matchKey === 'series' || matchKey === 'tags' || matchKey === 'isbn' || matchKey === 'asin'" class="m-0 p-0 truncate text-xs" v-html="matchHtml" />
     </div>
   </div>
 </template>
@@ -71,6 +71,7 @@ export default {
       if (this.matchKey === 'tags') return `<p class="truncate">Tags: ${html}</p>`
       if (this.matchKey === 'authorFL') 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>`
       return `${html}`
     }
diff --git a/client/components/controls/FilterSelect.vue b/client/components/controls/FilterSelect.vue
index 6d7d3b08..e466788f 100644
--- a/client/components/controls/FilterSelect.vue
+++ b/client/components/controls/FilterSelect.vue
@@ -14,7 +14,7 @@
       </div>
     </button>
 
-    <div v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+    <div v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-96 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
       <ul v-show="!sublist" class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
         <template v-for="item in items">
           <li :key="item.value" class="text-gray-50 select-none relative py-2 pr-9 cursor-pointer hover:bg-black-400" :class="item.value === selected ? 'bg-primary bg-opacity-50' : ''" role="option" @click="clickedOption(item)">
@@ -97,6 +97,11 @@ export default {
           value: 'narrators',
           sublist: true
         },
+        {
+          text: 'Language',
+          value: 'languages',
+          sublist: true
+        },
         {
           text: 'Progress',
           value: 'progress',
@@ -155,6 +160,9 @@ export default {
     narrators() {
       return this.filterData.narrators || []
     },
+    languages() {
+      return this.filterData.languages || []
+    },
     progress() {
       return ['Read', 'Unread', 'In Progress']
     },
diff --git a/client/components/modals/edit-tabs/Details.vue b/client/components/modals/edit-tabs/Details.vue
index c13eb1c0..919841dc 100644
--- a/client/components/modals/edit-tabs/Details.vue
+++ b/client/components/modals/edit-tabs/Details.vue
@@ -2,9 +2,14 @@
   <div class="w-full h-full relative">
     <form class="w-full h-full" @submit.prevent="submitForm">
       <div ref="formWrapper" class="px-4 py-6 details-form-wrapper w-full overflow-hidden overflow-y-auto">
-        <ui-text-input-with-label v-model="details.title" label="Title" />
-
-        <ui-text-input-with-label v-model="details.subtitle" label="Subtitle" class="mt-2" />
+        <div class="flex -mx-1">
+          <div class="w-1/2 px-1">
+            <ui-text-input-with-label v-model="details.title" label="Title" />
+          </div>
+          <div class="flex-grow px-1">
+            <ui-text-input-with-label v-model="details.subtitle" label="Subtitle" />
+          </div>
+        </div>
 
         <div class="flex mt-2 -mx-1">
           <div class="w-3/4 px-1">
@@ -43,8 +48,17 @@
             <ui-text-input-with-label v-model="details.publisher" label="Publisher" />
           </div>
           <div class="flex-grow px-1">
+            <ui-text-input-with-label v-model="details.language" label="Language" />
+          </div>
+        </div>
+
+        <div class="flex mt-2 -mx-1">
+          <div class="w-1/3 px-1">
             <ui-text-input-with-label v-model="details.isbn" label="ISBN" />
           </div>
+          <div class="w-1/3 px-1">
+            <ui-text-input-with-label v-model="details.asin" label="ASIN" />
+          </div>
         </div>
       </div>
 
@@ -90,7 +104,9 @@ export default {
         volumeNumber: null,
         publishYear: null,
         publisher: null,
+        language: null,
         isbn: null,
+        asin: null,
         genres: []
       },
       newTags: [],
@@ -231,7 +247,9 @@ export default {
       this.details.volumeNumber = this.book.volumeNumber
       this.details.publishYear = this.book.publishYear
       this.details.publisher = this.book.publisher || null
+      this.details.language = this.book.language || null
       this.details.isbn = this.book.isbn || null
+      this.details.asin = this.book.asin || null
 
       this.newTags = this.audiobook.tags || []
     },
diff --git a/client/components/modals/edit-tabs/Match.vue b/client/components/modals/edit-tabs/Match.vue
index 65fb88c9..1eb2258c 100644
--- a/client/components/modals/edit-tabs/Match.vue
+++ b/client/components/modals/edit-tabs/Match.vue
@@ -65,10 +65,7 @@
           <ui-checkbox v-model="selectedMatchUsage.publishYear" />
           <ui-text-input-with-label v-model="selectedMatch.publishYear" :disabled="!selectedMatchUsage.publishYear" label="Publish Year" class="flex-grow ml-4" />
         </div>
-        <div v-if="selectedMatch.isbn" class="flex items-center py-2">
-          <ui-checkbox v-model="selectedMatchUsage.isbn" />
-          <ui-text-input-with-label v-model="selectedMatch.isbn" :disabled="!selectedMatchUsage.isbn" label="ISBN" class="flex-grow ml-4" />
-        </div>
+
         <div v-if="selectedMatch.series" class="flex items-center py-2">
           <ui-checkbox v-model="selectedMatchUsage.series" />
           <ui-text-input-with-label v-model="selectedMatch.series" :disabled="!selectedMatchUsage.series" label="Series" class="flex-grow ml-4" />
@@ -77,10 +74,14 @@
           <ui-checkbox v-model="selectedMatchUsage.volumeNumber" />
           <ui-text-input-with-label v-model="selectedMatch.volumeNumber" :disabled="!selectedMatchUsage.volumeNumber" label="Volume Number" class="flex-grow ml-4" />
         </div>
-        <!-- <div v-if="selectedMatch.asin" class="flex items-center py-2">
+        <div v-if="selectedMatch.isbn" class="flex items-center py-2">
+          <ui-checkbox v-model="selectedMatchUsage.isbn" />
+          <ui-text-input-with-label v-model="selectedMatch.isbn" :disabled="!selectedMatchUsage.isbn" label="ISBN" class="flex-grow ml-4" />
+        </div>
+        <div v-if="selectedMatch.asin" class="flex items-center py-2">
           <ui-checkbox v-model="selectedMatchUsage.asin" />
           <ui-text-input-with-label v-model="selectedMatch.asin" :disabled="!selectedMatchUsage.asin" label="ASIN" class="flex-grow ml-4" />
-        </div> -->
+        </div>
         <div class="flex items-center justify-end py-2">
           <ui-btn color="success" type="submit">Update</ui-btn>
         </div>
@@ -115,11 +116,12 @@ export default {
         author: true,
         narrator: true,
         description: true,
-        isbn: true,
         publisher: true,
         publishYear: true,
         series: true,
-        volumeNumber: true
+        volumeNumber: true,
+        asin: true,
+        isbn: true
       }
     }
   },
@@ -194,11 +196,12 @@ export default {
         author: true,
         narrator: true,
         description: true,
-        isbn: true,
         publisher: true,
         publishYear: true,
         series: true,
-        volumeNumber: true
+        volumeNumber: true,
+        asin: true,
+        isbn: true
       }
 
       if (this.audiobook.id !== this.audiobookId) {
diff --git a/client/components/tables/LibrariesTable.vue b/client/components/tables/LibrariesTable.vue
index 9966dfe2..4500d08c 100644
--- a/client/components/tables/LibrariesTable.vue
+++ b/client/components/tables/LibrariesTable.vue
@@ -9,7 +9,7 @@
     <draggable :list="libraryCopies" v-bind="dragOptions" class="list-group" draggable=".item" tag="div" @start="startDrag" @end="endDrag">
       <template v-for="library in libraryCopies">
         <div :key="library.id" class="item">
-          <modals-libraries-library-item :library="library" :selected="currentLibraryId === library.id" :show-edit="true" :dragging="drag" @edit="editLibrary" @sort="draggableSort" @click="setLibrary" />
+          <modals-libraries-library-item :library="library" :selected="currentLibraryId === library.id" :show-edit="true" :dragging="drag" @edit="editLibrary" @click="setLibrary" />
         </div>
       </template>
     </draggable>
diff --git a/client/pages/batch/index.vue b/client/pages/batch/index.vue
index 2082e1e4..adde46d5 100644
--- a/client/pages/batch/index.vue
+++ b/client/pages/batch/index.vue
@@ -67,10 +67,30 @@
               </div>
             </div>
 
-            <div class="flex mt-2 -mx-1">
+            <!-- <div class="flex mt-2 -mx-1">
               <div class="w-1/2 px-1">
                 <ui-text-input-with-label v-model="audiobook.book.narrator" label="Narrator" />
               </div>
+            </div> -->
+            <div class="flex mt-2 -mx-1">
+              <div class="w-1/3 px-1">
+                <ui-text-input-with-label v-model="audiobook.book.narrator" label="Narrator" />
+              </div>
+              <div class="w-1/3 px-1">
+                <ui-text-input-with-label v-model="audiobook.book.publisher" label="Publisher" />
+              </div>
+              <div class="flex-grow px-1">
+                <ui-text-input-with-label v-model="audiobook.book.language" label="Language" />
+              </div>
+            </div>
+
+            <div class="flex mt-2 -mx-1">
+              <div class="w-1/3 px-1">
+                <ui-text-input-with-label v-model="audiobook.book.isbn" label="ISBN" />
+              </div>
+              <div class="w-1/3 px-1">
+                <ui-text-input-with-label v-model="audiobook.book.asin" label="ASIN" />
+              </div>
             </div>
           </div>
         </div>
@@ -223,7 +243,7 @@ export default {
       return arr1.join(',') !== arr2.join(',')
     },
     compareAudiobooks(newAb, origAb) {
-      const bookKeysToCheck = ['title', 'subtitle', 'narrator', 'author', 'publishYear', 'series', 'volumeNumber', 'description']
+      const bookKeysToCheck = ['title', 'subtitle', 'narrator', 'author', 'publishYear', 'series', 'volumeNumber', 'description', 'language', 'publisher', 'isbn', 'asin']
       var newBook = newAb.book
       var origBook = origAb.book
       var diffObj = {}
diff --git a/client/store/libraries.js b/client/store/libraries.js
index 3ed19240..29b776cd 100644
--- a/client/store/libraries.js
+++ b/client/store/libraries.js
@@ -187,7 +187,8 @@ export const mutations = {
       genres: [],
       tags: [],
       series: [],
-      narrators: []
+      narrators: [],
+      languages: []
     }
     */
 
@@ -218,5 +219,8 @@ export const mutations = {
         if (genre && !state.filterData.genres.includes(genre)) state.filterData.genres.push(genre)
       })
     }
+    if (audiobook.book.language && !state.filterData.languages.includes(audiobook.book.language)) {
+      state.filterData.languages.push(audiobook.book.language)
+    }
   }
 }
\ No newline at end of file
diff --git a/server/objects/AudioFileMetadata.js b/server/objects/AudioFileMetadata.js
index 6d2a2267..0b6abe11 100644
--- a/server/objects/AudioFileMetadata.js
+++ b/server/objects/AudioFileMetadata.js
@@ -18,6 +18,8 @@ class AudioFileMetadata {
     this.tagEncoder = null
     this.tagEncodedBy = null
     this.tagIsbn = null
+    this.tagLanguage = null
+    this.tagASIN = null
 
     if (metadata) {
       this.construct(metadata)
@@ -54,6 +56,8 @@ class AudioFileMetadata {
     this.tagEncoder = metadata.tagEncoder || null
     this.tagEncodedBy = metadata.tagEncodedBy || null
     this.tagIsbn = metadata.tagIsbn || null
+    this.tagLanguage = metadata.tagLanguage || null
+    this.tagASIN = metadata.tagASIN || null
   }
 
   // Data parsed in prober.js
@@ -76,6 +80,8 @@ class AudioFileMetadata {
     this.tagEncoder = payload.file_tag_encoder || null
     this.tagEncodedBy = payload.file_tag_encodedby || null
     this.tagIsbn = payload.file_tag_isbn || null
+    this.tagLanguage = payload.file_tag_language || null
+    this.tagASIN = payload.file_tag_asin || null
   }
 
   updateData(payload) {
@@ -97,7 +103,9 @@ class AudioFileMetadata {
       tagDescription: payload.file_tag_description || null,
       tagEncoder: payload.file_tag_encoder || null,
       tagEncodedBy: payload.file_tag_encodedby || null,
-      tagIsbn: payload.file_tag_isbn || nulll
+      tagIsbn: payload.file_tag_isbn || null,
+      tagLanguage: payload.file_tag_language || null,
+      tagASIN: payload.file_tag_asin || null
     }
 
     var hasUpdates = false
diff --git a/server/objects/Book.js b/server/objects/Book.js
index f60215bc..3bf149ac 100644
--- a/server/objects/Book.js
+++ b/server/objects/Book.js
@@ -18,7 +18,8 @@ class Book {
     this.publisher = null
     this.description = null
     this.isbn = null
-    this.langauge = null
+    this.asin = null
+    this.language = null
     this.cover = null
     this.coverFullPath = null
     this.genres = []
@@ -43,7 +44,9 @@ class Book {
   get _authorsList() { return this._author.split(', ') }
   get _narratorsList() { return this._narrator.split(', ') }
   get _genres() { return this.genres || [] }
-  get _isbn() { return this.isbn || '' }
+  get _language() { return this.language || '' }
+  get _isbn() { return this.isbn || '' }
+  get _asin() { return this.asin || '' }
 
   get shouldSearchForCover() {
     if (this.cover) return false
@@ -67,6 +70,7 @@ class Book {
     this.publisher = book.publisher
     this.description = book.description
     this.isbn = book.isbn || null
+    this.asin = book.asin || null
     this.language = book.language || null
     this.cover = book.cover
     this.coverFullPath = book.coverFullPath || null
@@ -98,6 +102,7 @@ class Book {
       publisher: this.publisher,
       description: this.description,
       isbn: this.isbn,
+      asin: this.asin,
       language: this.language,
       cover: this.cover,
       coverFullPath: this.coverFullPath,
@@ -156,6 +161,7 @@ class Book {
     this.publishYear = data.publishYear || null
     this.description = data.description || null
     this.isbn = data.isbn || null
+    this.asin = data.asin || null
     this.language = data.language || null
     this.cover = data.cover || null
     this.coverFullPath = data.coverFullPath || null
@@ -283,7 +289,9 @@ class Book {
     // ISBN match has to be exact to prevent isbn matches to flood results. Remove dashes since isbn might have those
     var isbnMatch = this._isbn.toLowerCase().replace(/-/g, '') === search.replace(/-/g, '')
 
-    var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : false
+    var asinMatch = this._asin.toLowerCase() === search
+
+    var bookMatchKey = titleMatch ? 'title' : subtitleMatch ? 'subtitle' : authorsMatched.length ? 'authorFL' : seriesMatch ? 'series' : isbnMatch ? 'isbn' : asinMatch ? 'asin' : false
 
     var bookMatchText = bookMatchKey ? this[bookMatchKey] : ''
     return {
@@ -352,6 +360,14 @@ class Book {
       {
         tag: 'tagIsbn',
         key: 'isbn'
+      },
+      {
+        tag: 'tagLanguage',
+        key: 'language'
+      },
+      {
+        tag: 'tagASIN',
+        key: 'asin'
       }
     ]
 
diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js
index c4239108..9700bf44 100644
--- a/server/scanner/AudioFileScanner.js
+++ b/server/scanner/AudioFileScanner.js
@@ -127,8 +127,6 @@ class AudioFileScanner {
     discsFromMeta.sort((a, b) => a - b)
     tracksFromFilename.sort((a, b) => a - b)
     tracksFromMeta.sort((a, b) => a - b)
-    console.log('AB DISCS', audiobook.title, discsFromFilename, discsFromMeta)
-    console.log('AB TRACKS', audiobook.title, tracksFromFilename, tracksFromMeta)
 
     var discKey = null
     if (discsFromMeta.length === audioFiles.length && this.isSequential(discsFromMeta)) {
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 4a568757..ff2636ed 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -11,7 +11,7 @@ module.exports = {
   getFiltered(audiobooks, filterBy, user) {
     var filtered = audiobooks
 
-    var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators']
+    var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators', 'languages']
     var group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
     if (group) {
       var filterVal = filterBy.replace(`${group}.`, '')
@@ -33,6 +33,8 @@ module.exports = {
           if (filter === 'In Progress' && (userAudiobook && !userAudiobook.isRead && userAudiobook.progress > 0)) return true
           return false
         })
+      } else if (group === 'languages') {
+        filtered = filtered.filter(ab => ab.book && ab.book.language === filter)
       }
     } else if (filterBy === 'issues') {
       filtered = filtered.filter(ab => {
@@ -49,7 +51,8 @@ module.exports = {
       genres: [],
       tags: [],
       series: [],
-      narrators: []
+      narrators: [],
+      languages: []
     }
     audiobooks.forEach((ab) => {
       if (ab.book._authorsList.length) {
@@ -73,12 +76,14 @@ module.exports = {
           if (narrator && !data.narrators.includes(narrator)) data.narrators.push(narrator)
         })
       }
+      if (ab.book._language && !data.languages.includes(ab.book._language)) data.languages.push(ab.book._language)
     })
     data.authors = naturalSort(data.authors).asc()
     data.genres = naturalSort(data.genres).asc()
     data.tags = naturalSort(data.tags).asc()
     data.series = naturalSort(data.series).asc()
     data.narrators = naturalSort(data.narrators).asc()
+    data.languages = naturalSort(data.languages).asc()
     return data
   },
 
diff --git a/server/utils/prober.js b/server/utils/prober.js
index b8fe0d83..28cf74b2 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -165,6 +165,8 @@ function parseTags(format, verbose) {
     file_tag_series: tryGrabTag(format, 'series'),
     file_tag_seriespart: tryGrabTag(format, 'series-part'),
     file_tag_isbn: tryGrabTag(format, 'isbn'),
+    file_tag_language: tryGrabTab(format, 'language', 'lang'),
+    file_tag_asin: tryGrabTag(format, 'asin'),
 
     // Not sure if these are actually used yet or not
     file_tag_creation_time: tryGrabTag(format, 'creation_time'),

From 59d6c377e5b86436c4e21d365bdca71a6c509afb Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 9 Jan 2022 18:37:47 -0600
Subject: [PATCH 35/52] Version bump 1.6.56

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 87734320..1afbd997 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.55",
+  "version": "1.6.56",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index c5a480bf..e4e4d415 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.55",
+  "version": "1.6.56",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 411183e4b43cf2c8d8985103df1459e7f27e89b9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 9 Jan 2022 19:21:13 -0600
Subject: [PATCH 36/52] Fix:Typo in function for language tags #305

---
 server/utils/prober.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/prober.js b/server/utils/prober.js
index 28cf74b2..9929fff5 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -165,7 +165,7 @@ function parseTags(format, verbose) {
     file_tag_series: tryGrabTag(format, 'series'),
     file_tag_seriespart: tryGrabTag(format, 'series-part'),
     file_tag_isbn: tryGrabTag(format, 'isbn'),
-    file_tag_language: tryGrabTab(format, 'language', 'lang'),
+    file_tag_language: tryGrabTags(format, 'language', 'lang'),
     file_tag_asin: tryGrabTag(format, 'asin'),
 
     // Not sure if these are actually used yet or not

From e5f8be5b2460ed98f38564e9ff4a04622c578951 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 10 Jan 2022 11:12:47 -0600
Subject: [PATCH 37/52] Fix:Scanner smart re-order

---
 server/Watcher.js                  |  1 +
 server/scanner/AudioFileScanner.js | 61 ++++++++++++++----------------
 server/scanner/Scanner.js          | 33 ++++++++++++++--
 3 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/server/Watcher.js b/server/Watcher.js
index c9fede87..7912d485 100644
--- a/server/Watcher.js
+++ b/server/Watcher.js
@@ -120,6 +120,7 @@ class FolderWatcher extends EventEmitter {
 
   onRename(libraryId, pathFrom, pathTo) {
     Logger.debug(`[Watcher] Rename ${pathFrom} => ${pathTo}`)
+    this.addFileUpdate(libraryId, pathFrom, 'renamed')
     this.addFileUpdate(libraryId, pathTo, 'renamed')
   }
 
diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js
index 9700bf44..9cfd6660 100644
--- a/server/scanner/AudioFileScanner.js
+++ b/server/scanner/AudioFileScanner.js
@@ -109,7 +109,6 @@ class AudioFileScanner {
     return nodupes
   }
 
-  // Must be all audiofiles in audiobook
   runSmartTrackOrder(audiobook, audioFiles) {
     var discsFromFilename = []
     var tracksFromFilename = []
@@ -159,7 +158,12 @@ class AudioFileScanner {
 
     for (let i = 0; i < audioFiles.length; i++) {
       audioFiles[i].index = i + 1
-      audiobook.addAudioFile(audioFiles[i])
+      var existingAF = audiobook.getAudioFileByIno(audioFiles[i].ino)
+      if (existingAF) {
+        audiobook.updateAudioFile(audioFiles[i])
+      } else {
+        audiobook.addAudioFile(audioFiles[i])
+      }
     }
   }
 
@@ -172,43 +176,34 @@ class AudioFileScanner {
         libraryScan.addLog(LogLevel.DEBUG, `Book "${bookScanData.path}" Audio file scan took ${audioScanResult.elapsed}ms for ${audioScanResult.audioFiles.length} with average time of ${audioScanResult.averageScanDuration}ms`)
       }
 
-      var numExistingAudioFilesToInclude = audiobook.audioFilesToInclude.filter(af => !audioScanResult.audioFiles.find(_af => _af.ino === af.ino)).length
-      var totalAudioFilesToInclude = numExistingAudioFilesToInclude + audioScanResult.audioFiles.length
+      var totalAudioFilesToInclude = audioScanResult.audioFiles.length
+      var newAudioFiles = audioScanResult.audioFiles.filter(af => {
+        return !audiobook.audioFilesToInclude.find(_af => _af.ino === af.ino)
+      })
 
-      if (numExistingAudioFilesToInclude <= 0) { // SMART TRACK ORDER for New or empty audiobooks
-        this.runSmartTrackOrder(audiobook, audioScanResult.audioFiles)
-        hasUpdated = true
+      if (newAudioFiles.length) {
+        // Single Track Audiobooks
+        if (totalAudioFilesToInclude === 1) {
+          var af = audioScanResult.audioFiles[0]
+          af.index = 1
+          audiobook.addAudioFile(af)
+          hasUpdated = true
+        } else {
+          this.runSmartTrackOrder(audiobook, audioScanResult.audioFiles)
+          hasUpdated = true
+        }
       } else {
-        // validate & add/update audio files to existing audiobook
-        for (let i = 0; i < audioScanResult.audioFiles.length; i++) {
-          var newAF = audioScanResult.audioFiles[i]
-          var existingAF = audiobook.getAudioFileByIno(newAF.ino)
-
-          var trackIndex = null
-          if (totalAudioFilesToInclude === 1) { // Single track audiobooks
-            trackIndex = 1
-          } else if (existingAF && existingAF.manuallyVerified) { // manually verified audio files use existing index
-            trackIndex = existingAF.index
-          } else {
-            trackIndex = newAF.validateTrackIndex()
-          }
-
-          if (trackIndex !== null) {
-            if (audiobook.checkHasTrackNum(trackIndex, newAF.ino)) {
-              newAF.setDuplicateTrackNumber(trackIndex)
-            } else {
-              newAF.index = trackIndex
-            }
-          }
+        Logger.debug(`[AudioFileScanner] No audio track re-order required`)
+        // Only update metadata not index
+        audioScanResult.audioFiles.forEach((af) => {
+          var existingAF = audiobook.getAudioFileByIno(af.ino)
           if (existingAF) {
-            if (audiobook.updateAudioFile(newAF)) {
+            af.index = existingAF.index
+            if (audiobook.updateAudioFile(af)) {
               hasUpdated = true
             }
-          } else {
-            audiobook.addAudioFile(newAF)
-            hasUpdated = true
           }
-        }
+        })
       }
 
       // Set book details from audio file ID3 tags, optional prefer
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 8290c4c2..cf6aea17 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -322,7 +322,7 @@ class Scanner {
   }
 
   async rescanAudiobook(audiobookCheckData, libraryScan) {
-    const { newAudioFileData, newOtherFileData, audiobook, bookScanData, updated, existingAudioFileData, existingOtherFileData } = audiobookCheckData
+    const { newAudioFileData, audioFilesRemoved, newOtherFileData, audiobook, bookScanData, updated, existingAudioFileData, existingOtherFileData } = audiobookCheckData
     libraryScan.addLog(LogLevel.DEBUG, `Library "${libraryScan.libraryName}" Re-scanning "${audiobook.path}"`)
     var hasUpdated = updated
 
@@ -342,7 +342,7 @@ class Scanner {
       }
     }
     // Scan new audio files
-    if (newAudioFileData.length) {
+    if (newAudioFileData.length || audioFilesRemoved.length) {
       if (await AudioFileScanner.scanAudioFiles(newAudioFileData, bookScanData, audiobook, libraryScan.preferAudioMetadata, libraryScan)) {
         hasUpdated = true
       }
@@ -459,11 +459,38 @@ class Scanner {
   async scanFolderUpdates(library, folder, fileUpdateBookGroup) {
     Logger.debug(`[Scanner] Scanning file update groups in folder "${folder.id}" of library "${library.name}"`)
 
+    // First pass - Remove files in parent dirs of audiobooks and remap the fileupdate group
+    //    Test Case: Moving audio files from audiobook folder to author folder should trigger a re-scan of audiobook
+    var updateGroup = { ...fileUpdateBookGroup }
+    for (const bookDir in updateGroup) {
+      var bookDirNestedFiles = fileUpdateBookGroup[bookDir].filter(b => b.includes('/'))
+      if (!bookDirNestedFiles.length) continue;
+
+      var firstNest = bookDirNestedFiles[0].split('/').shift()
+      var altDir = `${bookDir}/${firstNest}`
+
+      var fullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), bookDir)
+      var childAudiobook = this.db.audiobooks.find(ab => ab.fullPath !== fullPath && ab.fullPath.startsWith(fullPath))
+      if (!childAudiobook) {
+        continue;
+      }
+      var altFullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), altDir)
+      var altChildAudiobook = this.db.audiobooks.find(ab => ab.fullPath !== altFullPath && ab.fullPath.startsWith(altFullPath))
+      if (altChildAudiobook) {
+        continue;
+      }
+
+      delete fileUpdateBookGroup[bookDir]
+      fileUpdateBookGroup[altDir] = bookDirNestedFiles.map((f) => f.split('/').slice(1).join('/'))
+      Logger.warn(`[Scanner] Some files were modified in a parent directory of an audiobook "${childAudiobook.title}" - ignoring`)
+    }
+
+    // Second pass: Check for new/updated/removed audiobooks
     var bookGroupingResults = {}
     for (const bookDir in fileUpdateBookGroup) {
       var fullPath = Path.posix.join(folder.fullPath.replace(/\\/g, '/'), bookDir)
 
-      // Check if book dir group is already an audiobook or in a subdir of an audiobook
+      // Check if book dir group is already an audiobook
       var existingAudiobook = this.db.audiobooks.find(ab => fullPath.startsWith(ab.fullPath))
       if (existingAudiobook) {
 

From 018cebb0f52d35c53a72627a8adf590aaa215d10 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 10 Jan 2022 11:13:12 -0600
Subject: [PATCH 38/52] Version bump 1.6.57

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 1afbd997..3bd45199 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.56",
+  "version": "1.6.57",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index e4e4d415..541f4692 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.56",
+  "version": "1.6.57",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From 712aad2f14c885097f869ac08ebfcbee9043b137 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 10 Jan 2022 17:57:51 -0600
Subject: [PATCH 39/52] Fix:FFprobe requires path update config #302

---
 build/debian/DEBIAN/preinst | 2 ++
 index.js                    | 1 +
 server/utils/prober.js      | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/build/debian/DEBIAN/preinst b/build/debian/DEBIAN/preinst
index 3a2e271d..8edeccba 100644
--- a/build/debian/DEBIAN/preinst
+++ b/build/debian/DEBIAN/preinst
@@ -83,6 +83,7 @@ setup_config_interactive() {
   METADATA_PATH=$DATA_PATH/metadata
   CONFIG_PATH=$DATA_PATH/config
   FFMPEG_PATH=/usr/lib/audiobookshelf-ffmpeg/ffmpeg
+  FFPROBE_PATH=/usr/lib/audiobookshelf-ffmpeg/ffprobe
   PORT=$PORT"
 
     echo "$config_text"
@@ -105,6 +106,7 @@ setup_config() {
   METADATA_PATH=$DEFAULT_DATA_PATH/metadata
   CONFIG_PATH=$DEFAULT_DATA_PATH/config
   FFMPEG_PATH=/usr/lib/audiobookshelf-ffmpeg/ffmpeg
+  FFPROBE_PATH=/usr/lib/audiobookshelf-ffmpeg/ffprobe
   PORT=$DEFAULT_PORT"
 
     echo "$config_text"
diff --git a/index.js b/index.js
index 9b1acfda..f6c26bba 100644
--- a/index.js
+++ b/index.js
@@ -12,6 +12,7 @@ if (isDev) {
   process.env.METADATA_PATH = devEnv.MetadataPath
   process.env.AUDIOBOOK_PATH = devEnv.AudiobookPath
   process.env.FFMPEG_PATH = devEnv.FFmpegPath
+  process.env.FFPROBE_PATH = devEnv.FFProbePath
 }
 
 const PORT = process.env.PORT || 80
diff --git a/server/utils/prober.js b/server/utils/prober.js
index 9929fff5..c912875c 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -256,7 +256,11 @@ function parseProbeData(data, verbose = false) {
 
 // Updated probe returns AudioProbeData object
 function probe(filepath, verbose = false) {
-  return ffprobe(filepath)
+  var options = {}
+  if (process.env.FFPROBE_PATH) {
+    options.path = process.env.FFPROBE_PATH
+  }
+  return ffprobe(filepath, options)
     .then(raw => {
       var rawProbeData = parseProbeData(raw, verbose)
       if (!rawProbeData || !rawProbeData.audio_stream) {

From 3abb1fdf4891713ede2033d95abeb9678876f1bf Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 10 Jan 2022 17:58:39 -0600
Subject: [PATCH 40/52] Version bump 1.6.58

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 3bd45199..8a9b9d53 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.57",
+  "version": "1.6.58",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 541f4692..d6ed6810 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.57",
+  "version": "1.6.58",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From c45f74cbf164d8835bb71127bb92f0ac85c40d22 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 11 Jan 2022 18:19:08 -0600
Subject: [PATCH 41/52] Fix:Debian pkg validateFunction #302

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6ed6810..8d39eb4a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,10 @@
   },
   "bin": "prod.js",
   "pkg": {
-    "assets": "client/dist/**/*",
+    "assets": [
+      "client/dist/**/*",
+      "server/Db.js"
+    ],
     "scripts": [
       "prod.js",
       "server/**/*.js"

From 024627fefca7f3ffb2136e248d1af6591a6f51af Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 13 Jan 2022 16:43:32 -0600
Subject: [PATCH 42/52] Fix:Ensure chapter start/end are numbers

---
 server/utils/prober.js | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/server/utils/prober.js b/server/utils/prober.js
index c912875c..a6e79f39 100644
--- a/server/utils/prober.js
+++ b/server/utils/prober.js
@@ -125,15 +125,37 @@ function parseMediaStreamInfo(stream, all_streams, total_bit_rate) {
   return info
 }
 
+function isNullOrNaN(val) {
+  return val === null || isNaN(val)
+}
+
+
+/* Example chapter object
+ * {
+      "id": 71,
+      "time_base": "1/1000",
+      "start": 80792671,
+      "start_time": "80792.671000",
+      "end": 81084755,
+      "end_time": "81084.755000",
+      "tags": {
+          "title": "072"
+      }
+ * }
+ */
 function parseChapters(chapters) {
   if (!chapters) return []
   return chapters.map(chap => {
-    var title = chap['TAG:title'] || chap.title || chap.tags.title || ''
+    var title = chap['TAG:title'] || chap.title || ''
+    if (!title && chap.tags && chap.tags.title) title = chap.tags.title
+
     var timebase = chap.time_base && chap.time_base.includes('/') ? Number(chap.time_base.split('/')[1]) : 1
+    var start = !isNullOrNaN(chap.start_time) ? Number(chap.start_time) : !isNullOrNaN(chap.start) ? Number(chap.start) / timebase : 0
+    var end = !isNullOrNaN(chap.end_time) ? Number(chap.end_time) : !isNullOrNaN(chap.end) ? Number(chap.end) / timebase : 0
     return {
       id: chap.id,
-      start: !isNaN(chap.start_time) ? chap.start_time : (chap.start / timebase),
-      end: chap.end_time || (chap.end / timebase),
+      start,
+      end,
       title
     }
   })

From 5280ab222bcc64618272a5681e8424f09e7132ac Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 14 Jan 2022 19:10:17 -0600
Subject: [PATCH 43/52] Readme update

---
 readme.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/readme.md b/readme.md
index 69d0aa8d..bdeec505 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@ Audiobookshelf is a self-hosted audiobook server for managing and playing your a
 
 ### Features
 
-* Fully **open-source**, including the [android app](https://github.com/advplyr/audiobookshelf-app) *(in beta)*
+* Fully **open-source**, including the [android & iOS app](https://github.com/advplyr/audiobookshelf-app) *(in beta)*
 * Stream all audiobook formats on the fly
 * Multi-user support w/ custom permissions
 * Keeps progress per user and syncs across devices
@@ -52,6 +52,8 @@ Available in Unraid Community Apps
 docker pull advplyr/audiobookshelf
 
 docker run -d \
+  -e AUDIOBOOKSHELF_UID=99 \
+  -e AUDIOBOOKSHELF_GID=100 \
   -p 13378:80 \
   -v </path/to/audiobooks>:/audiobooks \
   -v </path/to/config>:/config \
@@ -191,17 +193,7 @@ For this to work you must enable at least the following mods using `a2enmod`:
 
 ## Run from source
 
-Note: you will need `npm`, `node12`, and `ffmpeg` to run this project locally
-
-```bash
-git clone https://github.com/advplyr/audiobookshelf.git
-cd audiobookshelf
-
-# All paths default to root directory. Config path is the database.
-# Directories will be created if they don't exist
-# Paths are relative to the root directory, so "../Audiobooks" would be a valid path
-npm run prod -- -p [PORT] --audiobooks [AUDIOBOOKS_PATH] --config [CONFIG_PATH] --metadata [METADATA_PATH]
-```
+[See discussion](https://github.com/advplyr/audiobookshelf/discussions/259#discussioncomment-1869729)
 
 ## Contributing / How to Support
 

From 0335da44776e05be4aa8718769ad35206948d9b2 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 10:31:05 -0600
Subject: [PATCH 44/52] Change:Debian packager post install and post remove

---
 build/debian/DEBIAN/postinst |  3 +++
 build/debian/DEBIAN/postrm   | 20 ++++++++++++++++++++
 build/debian/DEBIAN/preinst  | 12 +++++-------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 build/debian/DEBIAN/postrm

diff --git a/build/debian/DEBIAN/postinst b/build/debian/DEBIAN/postinst
index dd6394b5..51cfe75b 100644
--- a/build/debian/DEBIAN/postinst
+++ b/build/debian/DEBIAN/postinst
@@ -2,6 +2,8 @@
 set -e
 set -o pipefail
 
+FFMPEG_INSTALL_DIR="/usr/lib/audiobookshelf-ffmpeg/"
+
 declare -r init_type='auto'
 declare -ri no_rebuild='0'
 
@@ -81,5 +83,6 @@ add_user 'audiobookshelf' '' 'audiobookshelf' 'audiobookshelf user-daemon' '/bin
 mkdir -p '/var/log/audiobookshelf'
 chown -R 'audiobookshelf:audiobookshelf' '/var/log/audiobookshelf'
 chown -R 'audiobookshelf:audiobookshelf' '/usr/share/audiobookshelf'
+chown -R 'audiobookshelf:audiobookshelf' "$FFMPEG_INSTALL_DIR"
 
 start_service 'audiobookshelf'
diff --git a/build/debian/DEBIAN/postrm b/build/debian/DEBIAN/postrm
new file mode 100644
index 00000000..1ee16af1
--- /dev/null
+++ b/build/debian/DEBIAN/postrm
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+FFMPEG_INSTALL_DIR="/usr/lib/audiobookshelf-ffmpeg/"
+ABS_BINARY_PATH="/usr/share/audiobookshelf/audiobookshelf"
+
+remove_ffmpeg() {
+  echo "Forcefully removing audiobookshelf-ffmpeg: $FFMPEG_INSTALL_DIR"
+  rm -rf "$FFMPEG_INSTALL_DIR"
+}
+
+remove_binary() {
+  echo "Removing audiobookshelf binary: $ABS_BINARY_PATH"
+  rm "$ABS_BINARY_PATH"
+}
+
+echo ">> Cleaning up"
+remove_ffmpeg()
+remove_binary()
\ No newline at end of file
diff --git a/build/debian/DEBIAN/preinst b/build/debian/DEBIAN/preinst
index 8edeccba..81203bec 100644
--- a/build/debian/DEBIAN/preinst
+++ b/build/debian/DEBIAN/preinst
@@ -2,6 +2,7 @@
 set -e
 set -o pipefail
 
+FFMPEG_INSTALL_DIR="/usr/lib/audiobookshelf-ffmpeg/"
 DEFAULT_AUDIOBOOK_PATH="/usr/share/audiobookshelf/audiobooks"
 DEFAULT_DATA_PATH="/usr/share/audiobookshelf"
 DEFAULT_PORT=7331
@@ -12,20 +13,17 @@ install_ffmpeg() {
   echo "Starting FFMPEG Install"
 
   WGET="wget https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz"
-  TARGET_DIR="/usr/lib/audiobookshelf-ffmpeg/"
 
-  if ! cd "$TARGET_DIR"; then
-    echo "WARNING: can't access working directory ($TARGET_DIR) creating it" >&2
-    mkdir "$TARGET_DIR"
-    cd "$TARGET_DIR"
+  if ! cd "$FFMPEG_INSTALL_DIR"; then
+    echo "WARNING: can't access working directory ($FFMPEG_INSTALL_DIR) creating it" >&2
+    mkdir "$FFMPEG_INSTALL_DIR"
+    cd "$FFMPEG_INSTALL_DIR"
   fi
 
   $WGET
   tar xvf ffmpeg-git-amd64-static.tar.xz --strip-components=1
   rm ffmpeg-git-amd64-static.tar.xz
 
-  chown -R 'audiobookshelf:audiobookshelf' "$TARGET_DIR"
-
   echo "Good to go on Ffmpeg... hopefully"
 }
 

From be7aa3e39f13252c9c459618bfbb6dd485ac2466 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 11:11:50 -0600
Subject: [PATCH 45/52] Version bump 1.6.59

---
 client/package.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/package.json b/client/package.json
index 8a9b9d53..35223b19 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.6.58",
+  "version": "1.6.59",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
diff --git a/package.json b/package.json
index 8d39eb4a..7517cbcc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.6.58",
+  "version": "1.6.59",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {

From f1f55e9c4f49ea1431645c0aa3bbc288b1cde150 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 11:41:10 -0600
Subject: [PATCH 46/52] Fix:Linuxpackager debian not overwriting

---
 build/linuxpackager | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/linuxpackager b/build/linuxpackager
index 98692b78..506c56ed 100755
--- a/build/linuxpackager
+++ b/build/linuxpackager
@@ -32,6 +32,7 @@ echo "--------------------"
 # Create debian control file
 
 mkdir -p dist
+rm -rf dist/debian
 cp -R build/debian dist/debian
 chmod -R 775 dist/debian
 

From 8a71a6f9637f47de54e0aee9408ad339790482c7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 11:48:25 -0600
Subject: [PATCH 47/52] Fix:postrm bash functinos

---
 build/debian/DEBIAN/postrm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/debian/DEBIAN/postrm b/build/debian/DEBIAN/postrm
index 1ee16af1..821951ab 100644
--- a/build/debian/DEBIAN/postrm
+++ b/build/debian/DEBIAN/postrm
@@ -16,5 +16,5 @@ remove_binary() {
 }
 
 echo ">> Cleaning up"
-remove_ffmpeg()
-remove_binary()
\ No newline at end of file
+remove_ffmpeg
+remove_binary
\ No newline at end of file

From 06c7776b152464dce291c6378cceab007d474249 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 12:01:28 -0600
Subject: [PATCH 48/52] Fix:Bash debian postrm script

---
 build/debian/DEBIAN/postrm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/build/debian/DEBIAN/postrm b/build/debian/DEBIAN/postrm
index 821951ab..e63fafb7 100644
--- a/build/debian/DEBIAN/postrm
+++ b/build/debian/DEBIAN/postrm
@@ -6,13 +6,19 @@ FFMPEG_INSTALL_DIR="/usr/lib/audiobookshelf-ffmpeg/"
 ABS_BINARY_PATH="/usr/share/audiobookshelf/audiobookshelf"
 
 remove_ffmpeg() {
-  echo "Forcefully removing audiobookshelf-ffmpeg: $FFMPEG_INSTALL_DIR"
-  rm -rf "$FFMPEG_INSTALL_DIR"
+  if [[ -d "$FFMPEG_INSTALL_DIR" ]]
+  then
+    echo "Forcefully removing audiobookshelf-ffmpeg: $FFMPEG_INSTALL_DIR"
+    rm -r "$FFMPEG_INSTALL_DIR"
+  fi
 }
 
 remove_binary() {
-  echo "Removing audiobookshelf binary: $ABS_BINARY_PATH"
-  rm "$ABS_BINARY_PATH"
+  if [[ -f "$ABS_BINARY_PATH" ]]
+  then
+      echo "Removing audiobookshelf binary: $ABS_BINARY_PATH"
+      rm "$ABS_BINARY_PATH"
+  fi
 }
 
 echo ">> Cleaning up"

From 48921c315000d528bad97d703186e637e9bd273f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 15 Jan 2022 12:15:59 -0600
Subject: [PATCH 49/52] Change:Remove post remove bash

---
 build/debian/DEBIAN/postrm | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 build/debian/DEBIAN/postrm

diff --git a/build/debian/DEBIAN/postrm b/build/debian/DEBIAN/postrm
deleted file mode 100644
index e63fafb7..00000000
--- a/build/debian/DEBIAN/postrm
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-FFMPEG_INSTALL_DIR="/usr/lib/audiobookshelf-ffmpeg/"
-ABS_BINARY_PATH="/usr/share/audiobookshelf/audiobookshelf"
-
-remove_ffmpeg() {
-  if [[ -d "$FFMPEG_INSTALL_DIR" ]]
-  then
-    echo "Forcefully removing audiobookshelf-ffmpeg: $FFMPEG_INSTALL_DIR"
-    rm -r "$FFMPEG_INSTALL_DIR"
-  fi
-}
-
-remove_binary() {
-  if [[ -f "$ABS_BINARY_PATH" ]]
-  then
-      echo "Removing audiobookshelf binary: $ABS_BINARY_PATH"
-      rm "$ABS_BINARY_PATH"
-  fi
-}
-
-echo ">> Cleaning up"
-remove_ffmpeg
-remove_binary
\ No newline at end of file

From 8442a629fbc7b16b63cf2c7fdfa11866f03d1354 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 16 Jan 2022 11:17:09 -0600
Subject: [PATCH 50/52] Fix:Get libraries endpoint return only libraries
 accessible to user

---
 server/controllers/LibraryController.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 3c3ebf05..e6415bee 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -29,6 +29,11 @@ class LibraryController {
   }
 
   findAll(req, res) {
+    var librariesAccessible = req.user.librariesAccessible || []
+    if (librariesAccessible && librariesAccessible.length) {
+      return res.json(this.db.libraries.filter(lib => librariesAccessible.includes(lib.id)).map(lib => lib.toJSON()))
+    }
+
     res.json(this.db.libraries.map(lib => lib.toJSON()))
   }
 

From 156a4ed01d3301f70cc062f5ec4740d67716e7df Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 16 Jan 2022 13:37:32 -0600
Subject: [PATCH 51/52] Fix:Get library check user access

---
 server/controllers/LibraryController.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index e6415bee..0f6c1380 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -38,6 +38,12 @@ class LibraryController {
   }
 
   async findOne(req, res) {
+    var librariesAccessible = req.user.librariesAccessible || []
+    if (librariesAccessible && librariesAccessible.length && !librariesAccessible.includes(req.library.id)) {
+      Logger.warn(`[LibraryController] Library ${req.library.id} not accessible to user ${req.user.username}`)
+      return res.sendStatus(404)
+    }
+
     if (req.query.include && req.query.include === 'filterdata') {
       var books = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
       return res.json({

From 336fbedc759a9c47f20f2d385b844c129bb4c4b5 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 16 Jan 2022 14:10:46 -0600
Subject: [PATCH 52/52] Fix:Library controller middleware for user accessible
 libraries

---
 server/controllers/LibraryController.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 0f6c1380..7576c4ce 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -38,12 +38,6 @@ class LibraryController {
   }
 
   async findOne(req, res) {
-    var librariesAccessible = req.user.librariesAccessible || []
-    if (librariesAccessible && librariesAccessible.length && !librariesAccessible.includes(req.library.id)) {
-      Logger.warn(`[LibraryController] Library ${req.library.id} not accessible to user ${req.user.username}`)
-      return res.sendStatus(404)
-    }
-
     if (req.query.include && req.query.include === 'filterdata') {
       var books = this.db.audiobooks.filter(ab => ab.libraryId === req.library.id)
       return res.json({
@@ -424,6 +418,12 @@ class LibraryController {
   }
 
   middleware(req, res, next) {
+    var librariesAccessible = req.user.librariesAccessible || []
+    if (librariesAccessible && librariesAccessible.length && !librariesAccessible.includes(req.params.id)) {
+      Logger.warn(`[LibraryController] Library ${req.params.id} not accessible to user ${req.user.username}`)
+      return res.sendStatus(404)
+    }
+
     var library = this.db.libraries.find(lib => lib.id === req.params.id)
     if (!library) {
       return res.status(404).send('Library not found')