Merge remote-tracking branch 'remotes/upstream/master'

client/pages/audiobook/_id/chapters.vue

@@ -141,10 +141,21 @@
         </div>
       </template>
       <div class="w-full h-full max-h-full text-sm rounded-lg bg-bg shadow-lg border border-black-300 relative">
-        <div v-if="!chapterData" class="flex p-20">
-          <ui-text-input-with-label v-model.trim="asinInput" label="ASIN" />
-          <ui-dropdown v-model="regionInput" :label="$strings.LabelRegion" small :items="audibleRegions" class="w-32 mx-1" />
-          <ui-btn small color="bg-primary" class="mt-5" @click="findChapters">{{ $strings.ButtonSearch }}</ui-btn>
+        <div v-if="!chapterData" class="flex flex-col items-center justify-center p-20">
+          <div class="relative">
+            <div class="flex items-end space-x-2">
+              <ui-text-input-with-label v-model.trim="asinInput" label="ASIN" />
+              <ui-dropdown v-model="regionInput" :label="$strings.LabelRegion" small :items="audibleRegions" class="w-32" />
+              <ui-btn small color="bg-primary" @click="findChapters">{{ $strings.ButtonSearch }}</ui-btn>
+            </div>
+
+            <div class="absolute left-0 mt-1.5 text-error text-s h-5">
+              <p v-if="asinError">{{ asinError }}</p>
+              <p v-if="asinError">{{ $strings.MessageAsinCheck }}</p>
+            </div>
+
+            <div class="invisible h-5 mt-1 text-xs"></div>
+          </div>
         </div>
         <div v-else class="w-full p-4">
           <div class="flex justify-between mb-4">
@@ -221,6 +232,11 @@ export default {
       return redirect('/')
     }
 
+    // Fetch and set library if this items library does not match the current
+    if (store.state.libraries.currentLibraryId !== libraryItem.libraryId || !store.state.libraries.filterData) {
+      await store.dispatch('libraries/fetch', libraryItem.libraryId)
+    }
+
     var previousRoute = from ? from.fullPath : null
     if (from && from.path === '/login') previousRoute = null
     return {
@@ -244,6 +260,7 @@ export default {
       findingChapters: false,
       showFindChaptersModal: false,
       chapterData: null,
+      asinError: null,
       showSecondInputs: false,
       audibleRegions: ['US', 'CA', 'UK', 'AU', 'FR', 'DE', 'JP', 'IT', 'IN', 'ES'],
       hasChanges: false
@@ -541,14 +558,14 @@ export default {
 
       this.findingChapters = true
       this.chapterData = null
+      this.asinError = null // used to show warning about audible vs amazon ASIN
       this.$axios
         .$get(`/api/search/chapters?asin=${this.asinInput}&region=${this.regionInput}`)
         .then((data) => {
           this.findingChapters = false
 
           if (data.error) {
-            this.$toast.error(data.error)
-            this.showFindChaptersModal = false
+            this.asinError = this.$getString(data.stringKey)
           } else {
             console.log('Chapter data', data)
             this.chapterData = data

client/pages/audiobook/_id/edit.vue

@@ -103,6 +103,12 @@ export default {
       console.error('No need to edit library item that is 1 file...')
       return redirect('/')
     }
+
+    // Fetch and set library if this items library does not match the current
+    if (store.state.libraries.currentLibraryId !== libraryItem.libraryId || !store.state.libraries.filterData) {
+      await store.dispatch('libraries/fetch', libraryItem.libraryId)
+    }
+
     return {
       libraryItem,
       files: libraryItem.media.audioFiles ? libraryItem.media.audioFiles.map((af) => ({ ...af, include: !af.exclude })) : []

client/pages/audiobook/_id/manage.vue

@@ -195,10 +195,15 @@ export default {
       return redirect('/?error=invalid media type')
     }
     if (!libraryItem.media.audioFiles.length) {
-      cnosole.error('No audio files')
+      console.error('No audio files')
       return redirect('/?error=no audio files')
     }
 
+    // Fetch and set library if this items library does not match the current
+    if (store.state.libraries.currentLibraryId !== libraryItem.libraryId || !store.state.libraries.filterData) {
+      await store.dispatch('libraries/fetch', libraryItem.libraryId)
+    }
+
     return {
       libraryItem
     }

client/pages/config/rss-feeds.vue

@@ -32,7 +32,7 @@
               <p class="truncate">{{ feed.meta.title }}</p>
             </td>
             <!--  -->
-            <td class="hidden xl:table-cell">
+            <td class="hidden xl:table-cell max-w-48">
               <p class="truncate">{{ feed.slug }}</p>
             </td>
             <!--  -->
@@ -57,7 +57,7 @@
             </td>
             <!--  -->
             <td class="text-center">
-              <ui-icon-btn icon="delete" class="mx-0.5" :size="7" bg-color="bg-error" outlined @click.stop="deleteFeedClick(feed)" />
+              <ui-icon-btn icon="delete" class="mx-0.5 text-white/70" borderless :size="7" iconFontSize="1.25rem" outlined @click.stop="deleteFeedClick(feed)" />
             </td>
           </tr>
         </table>

client/pages/item/_id/index.vue

@@ -91,15 +91,15 @@
               {{ isMissing ? $strings.LabelMissing : $strings.LabelIncomplete }}
             </ui-btn>
 
-            <ui-tooltip v-if="showQueueBtn" :text="isQueued ? $strings.ButtonQueueRemoveItem : $strings.ButtonQueueAddItem" direction="top">
-              <ui-icon-btn :icon="isQueued ? 'playlist_add_check' : 'playlist_play'" :bg-color="isQueued ? 'bg-primary' : 'bg-success/60'" class="mx-0.5" :class="isQueued ? 'text-success' : ''" @click="queueBtnClick" />
-            </ui-tooltip>
-
             <ui-btn v-if="showReadButton" color="bg-info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
               <span class="material-symbols text-2xl -ml-2 pr-2 text-white" aria-hidden="true">auto_stories</span>
               {{ $strings.ButtonRead }}
             </ui-btn>
 
+            <ui-tooltip v-if="showQueueBtn" :text="isQueued ? $strings.ButtonQueueRemoveItem : $strings.ButtonQueueAddItem" direction="top">
+              <ui-icon-btn :icon="isQueued ? 'playlist_add_check' : 'playlist_play'" :bg-color="isQueued ? 'bg-primary' : 'bg-success/60'" class="mx-0.5" :class="isQueued ? 'text-success' : ''" @click="queueBtnClick" />
+            </ui-tooltip>
+
             <ui-tooltip v-if="userCanUpdate" :text="$strings.LabelEdit" direction="top">
               <ui-icon-btn icon="&#xe3c9;" outlined class="mx-0.5" :aria-label="$strings.LabelEdit" @click="editClick" />
             </ui-tooltip>

client/pages/library/_library/podcast/latest.vue

@@ -250,7 +250,7 @@ export default {
     },
     async loadRecentEpisodes(page = 0) {
       this.processing = true
-      const episodePayload = await this.$axios.$get(`/api/libraries/${this.libraryId}/recent-episodes?limit=25&page=${page}`).catch((error) => {
+      const episodePayload = await this.$axios.$get(`/api/libraries/${this.libraryId}/recent-episodes?limit=50&page=${page}`).catch((error) => {
         console.error('Failed to get recent episodes', error)
         this.$toast.error(this.$strings.ToastFailedToLoadData)
         return null

client/pages/library/_library/stats.vue

@@ -89,14 +89,16 @@
 
 <script>
 export default {
-  asyncData({ redirect, store }) {
+  async asyncData({ redirect, store, params }) {
     if (!store.getters['user/getIsAdminOrUp']) {
       redirect('/')
       return
     }
 
-    if (!store.state.libraries.currentLibraryId) {
-      return redirect('/config')
+    const libraryId = params.library
+    const library = await store.dispatch('libraries/fetch', libraryId)
+    if (!library) {
+      return redirect(`/oops?message=Library "${libraryId}" not found`)
     }
     return {}
   },

client/pages/share/_slug.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full h-dvh max-h-dvh overflow-hidden" :style="{ backgroundColor: coverRgb }">
+  <div class="w-full max-w-full h-dvh max-h-dvh overflow-hidden" :style="{ backgroundColor: coverRgb }">
     <div class="w-screen h-screen absolute inset-0 pointer-events-none" style="background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(38, 38, 38, 1) 80%)"></div>
     <div class="absolute inset-0 w-screen h-dvh flex items-center justify-center z-10">
       <div class="w-full p-2 sm:p-4 md:p-8">
@@ -64,7 +64,7 @@ export default {
       return this.mediaItemShare.playbackSession
     },
     coverUrl() {
-      if (!this.playbackSession.coverPath) return `${this.$config.routerBasePath}/book_placeholder.jpg`
+      if (!this.playbackSession.coverPath) return this.$store.getters['globals/getPlaceholderCoverSrc']
       return `${this.$config.routerBasePath}/public/share/${this.mediaItemShare.slug}/cover`
     },
     downloadUrl() {
@@ -335,8 +335,11 @@ export default {
       }
     },
     resize() {
-      this.windowWidth = window.innerWidth
-      this.windowHeight = window.innerHeight
+      setTimeout(() => {
+        this.windowWidth = window.innerWidth
+        this.windowHeight = window.innerHeight
+        this.$store.commit('globals/updateWindowSize', { width: window.innerWidth, height: window.innerHeight })
+      }, 100)
     },
     playerError(error) {
       console.error('Player error', error)

client/pages/upload/index.vue

@@ -316,9 +316,8 @@ export default {
         .$post('/api/upload', form)
         .then(() => true)
         .catch((error) => {
-          console.error('Failed', error)
-          var errorMessage = error.response && error.response.data ? error.response.data : 'Oops, something went wrong...'
-          this.$toast.error(errorMessage)
+          console.error('Failed to upload item', error)
+          this.$toast.error(error.response?.data || 'Oops, something went wrong...')
           return false
         })
     },
@@ -382,13 +381,9 @@ export default {
         }
       }
 
-      let itemsUploaded = 0
-      let itemsFailed = 0
       for (const item of itemsToUpload) {
         this.updateItemCardStatus(item.index, 'uploading')
         const result = await this.uploadItem(item)
-        if (result) itemsUploaded++
-        else itemsFailed++
         this.updateItemCardStatus(item.index, result ? 'success' : 'failed')
       }
       this.processing = false