Merge branch 'advplyr:master' into MarkAsRead

pages/item/_id.vue

@@ -13,8 +13,9 @@
         <p class="text-sm text-gray-400">by {{ author }}</p>
         <p v-if="numTracks" class="text-gray-300 text-sm my-1">
           {{ $elapsedPretty(duration) }}
-          <span class="px-4">{{ $bytesPretty(size) }}</span>
+          <span v-if="!isLocal" class="px-4">{{ $bytesPretty(size) }}</span>
         </p>
+        <p v-if="numTracks" class="text-gray-300 text-sm my-1">{{ numTracks }} Tracks</p>
 
         <div v-if="!isPodcast && progressPercent > 0" class="px-4 py-2 bg-primary text-sm font-semibold rounded-md text-gray-200 mt-4 relative" :class="resettingProgress ? 'opacity-25' : ''">
           <p class="leading-6">Your Progress: {{ Math.round(progressPercent * 100) }}%</p>

pages/search.vue

@@ -76,7 +76,11 @@ export default {
   },
   methods: {
     async runSearch(value) {
+      if (this.isFetching && this.lastSearch === value) return
+
       this.lastSearch = value
+      this.$store.commit('globals/setLastSearch', value)
+
       if (!this.lastSearch) {
         this.bookResults = []
         this.podcastResults = []
@@ -89,6 +93,10 @@ export default {
         console.error('Search error', error)
         return []
       })
+      if (value !== this.lastSearch) {
+        console.log(`runSearch: New search was made for ${this.lastSearch} - results are from ${value}`)
+        return
+      }
       console.log('RESULTS', results)
 
       this.isFetching = false
@@ -113,7 +121,12 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(this.setFocus())
+    if (this.$store.state.globals.lastSearch) {
+      this.search = this.$store.state.globals.lastSearch
+      this.runSearch(this.search)
+    } else {
+      this.$nextTick(this.setFocus())
+    }
   }
 }
 </script>