Fix: Always re-load libraries when changing users #4694

client/components/app/BookShelfRow.vue

@@ -93,10 +93,10 @@ export default {
     editAuthor(author) {
       this.$store.commit('globals/showEditAuthorModal', author)
     },
-    editItem(libraryItem) {
+    editItem(libraryItem, tab = 'details') {
       var itemIds = this.shelf.entities.map((e) => e.id)
       this.$store.commit('setBookshelfBookIds', itemIds)
-      this.$store.commit('showEditModal', libraryItem)
+      this.$store.commit('showEditModalOnTab', { libraryItem, tab: tab || 'details' })
     },
     editEpisode({ libraryItem, episode }) {
       this.$store.commit('setEpisodeTableEpisodeIds', [episode.id])

client/components/app/LazyBookshelf.vue

@@ -232,11 +232,11 @@ export default {
     clearFilter() {
       this.$store.dispatch('user/updateUserSettings', { filterBy: 'all' })
     },
-    editEntity(entity) {
+    editEntity(entity, tab = 'details') {
       if (this.entityName === 'items' || this.entityName === 'series-books') {
         const bookIds = this.entities.map((e) => e.id)
         this.$store.commit('setBookshelfBookIds', bookIds)
-        this.$store.commit('showEditModal', entity)
+        this.$store.commit('showEditModalOnTab', { libraryItem: entity, tab: tab || 'details' })
       } else if (this.entityName === 'collections') {
         this.$store.commit('globals/setEditCollection', entity)
       } else if (this.entityName === 'playlists') {

client/components/cards/LazyBookCard.vue

@@ -788,11 +788,11 @@ export default {
     },
     showEditModalFiles() {
       // More menu func
-      this.store.commit('showEditModalOnTab', { libraryItem: this.libraryItem, tab: 'files' })
+      this.$emit('edit', this.libraryItem, 'files')
     },
     showEditModalMatch() {
       // More menu func
-      this.store.commit('showEditModalOnTab', { libraryItem: this.libraryItem, tab: 'match' })
+      this.$emit('edit', this.libraryItem, 'match')
     },
     sendToDevice(deviceName) {
       // More menu func

client/components/widgets/ItemSlider.vue

@@ -132,10 +132,10 @@ export default {
     editAuthor(author) {
       this.$store.commit('globals/showEditAuthorModal', author)
     },
-    editItem(libraryItem) {
+    editItem(libraryItem, tab = 'details') {
       var itemIds = this.items.map((e) => e.id)
       this.$store.commit('setBookshelfBookIds', itemIds)
-      this.$store.commit('showEditModal', libraryItem)
+      this.$store.commit('showEditModalOnTab', { libraryItem, tab: tab || 'details' })
     },
     selectItem(payload) {
       this.$emit('selectEntity', payload)

client/mixins/bookshelfCardsHelpers.js

@@ -118,8 +118,8 @@ export default {
         propsData: props,
         parent: this,
         created() {
-          this.$on('edit', (entity) => {
+          this.$on('edit', (entity, tab) => {
-            if (_this.editEntity) _this.editEntity(entity)
+            if (_this.editEntity) _this.editEntity(entity, tab)
           })
           this.$on('select', ({ entity, shiftKey }) => {
             if (_this.selectEntity) _this.selectEntity(entity, shiftKey)

client/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.29.0",
+      "version": "2.30.0",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",

client/pages/audiobook/_id/chapters.vue

@@ -117,10 +117,10 @@
                 </button>
               </ui-tooltip>
               <ui-tooltip :text="selectedChapterId === chapter.id && isPlayingChapter ? $strings.MessagePauseChapter : $strings.MessagePlayChapter" direction="bottom">
-                <button class="w-7 h-7 rounded-full flex items-center justify-center text-gray-300 hover:text-white transform hover:scale-110 duration-150" @click="playChapter(chapter)">
+                <button :disabled="!getAudioTrackForTime(chapter.start)" class="w-7 h-7 rounded-full flex items-center justify-center text-gray-300 hover:text-white transform hover:scale-110 duration-150 disabled:opacity-50 disabled:cursor-not-allowed" @click="playChapter(chapter)">
                   <widgets-loading-spinner v-if="selectedChapterId === chapter.id && isLoadingChapter" />
                   <span v-else-if="selectedChapterId === chapter.id && isPlayingChapter" class="material-symbols text-base">pause</span>
-                  <span v-else class="material-symbols text-base">play_arrow</span>
+                  <span v-else class="material-symbols text-xl">play_arrow</span>
                 </button>
               </ui-tooltip>
               <ui-tooltip v-if="selectedChapterId === chapter.id && (isPlayingChapter || isLoadingChapter)" :text="$strings.TooltipAdjustChapterStart" direction="bottom">
@@ -594,6 +594,14 @@ export default {
 
       this.hasChanges = hasChanges
     },
+    getAudioTrackForTime(time) {
+      if (typeof time !== 'number') {
+        return null
+      }
+      return this.tracks.find((at) => {
+        return time >= at.startOffset && time < at.startOffset + at.duration
+      })
+    },
     playChapter(chapter) {
       console.log('Play Chapter', chapter.id)
       if (this.selectedChapterId === chapter.id) {
@@ -608,9 +616,12 @@ export default {
         this.destroyAudioEl()
       }
 
-      const audioTrack = this.tracks.find((at) => {
+      const audioTrack = this.getAudioTrackForTime(chapter.start)
-        return chapter.start >= at.startOffset && chapter.start < at.startOffset + at.duration
+      if (!audioTrack) {
-      })
+        console.error('No audio track found for chapter', chapter)
+        return
+      }
+
       this.selectedChapter = chapter
       this.isLoadingChapter = true
 

client/pages/login.vue

@@ -189,6 +189,7 @@ export default {
         require('@/plugins/chromecast.js').default(this)
       }
 
+      this.$store.commit('libraries/setLastLoad', 0) // Ensure libraries get loaded again when switching users
       this.$store.commit('libraries/setCurrentLibrary', { id: userDefaultLibraryId })
       this.$store.commit('user/setUser', user)
       // Access token only returned from login, not authorize

client/plugins/i18n.js

@@ -29,6 +29,7 @@ const languageCodeMap = {
   ru: { label: 'Русский', dateFnsLocale: 'ru' },
   sl: { label: 'Slovenščina', dateFnsLocale: 'sl' },
   sv: { label: 'Svenska', dateFnsLocale: 'sv' },
+  tr: { label: 'Türkçe', dateFnsLocale: 'tr' },
   uk: { label: 'Українська', dateFnsLocale: 'uk' },
   'vi-vn': { label: 'Tiếng Việt', dateFnsLocale: 'vi' },
   'zh-cn': { label: '简体中文 (Simplified Chinese)', dateFnsLocale: 'zhCN' },

client/store/libraries.js

@@ -159,7 +159,7 @@ export const actions = {
       .$get(`/api/libraries`)
       .then((data) => {
         commit('set', data.libraries)
-        commit('setLastLoad')
+        commit('setLastLoad', new Date())
       })
       .catch((error) => {
         console.error('Failed', error)
@@ -176,8 +176,8 @@ export const mutations = {
   setFoldersLastUpdate(state) {
     state.folderLastUpdate = Date.now()
   },
-  setLastLoad(state) {
+  setLastLoad(state, date) {
-    state.lastLoad = Date.now()
+    state.lastLoad = date
   },
   setLibraryIssues(state, val) {
     state.issues = val

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.29.0",
+      "version": "2.30.0",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",