Support server v1.4.0, multiple libraries, new static request routes

components/app/Appbar.vue

@@ -8,7 +8,13 @@
         <span class="material-icons text-3xl text-white">arrow_back</span>
       </a>
       <div>
-        <p class="text-lg font-book leading-4">AudioBookshelf</p>
+        <div class="px-4 py-2 bg-bg bg-opacity-30 rounded-md flex items-center" @click="clickShowLibraryModal">
+          <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+          </svg>
+          <p class="text-lg font-book leading-4 ml-2">{{ currentLibraryName }}</p>
+        </div>
+        <!-- <p class="text-lg font-book leading-4">AudioBookshelf</p> -->
       </div>
       <div class="flex-grow" />
       <!-- <ui-menu :label="username" :items="menuItems" @action="menuAction" class="ml-5" /> -->
@@ -47,6 +53,12 @@ export default {
     }
   },
   computed: {
+    currentLibrary() {
+      return this.$store.getters['libraries/getCurrentLibrary']
+    },
+    currentLibraryName() {
+      return this.currentLibrary ? this.currentLibrary.name : 'Main'
+    },
     showBack() {
       return this.$route.name !== 'index'
     },
@@ -65,6 +77,9 @@ export default {
     }
   },
   methods: {
+    clickShowLibraryModal() {
+      this.$store.commit('libraries/setShowModal', true)
+    },
     back() {
       if (this.$route.name === 'audiobook-id-edit') {
         this.$router.push(`/audiobook/${this.$route.params.id}`)

components/app/Bookshelf.vue

@@ -12,6 +12,9 @@
       <div class="py-4">No Audiobooks</div>
       <ui-btn v-if="hasFilters" @click="clearFilter">Clear Filter</ui-btn>
     </div>
+    <div v-show="isLoading" class="absolute top-0 left-0 w-full h-full flex items-center justify-center bg-black bg-opacity-70 z-20">
+      <div class="py-4">Loading...</div>
+    </div>
   </div>
 </template>
 
@@ -25,6 +28,9 @@ export default {
     }
   },
   computed: {
+    isLoading() {
+      return this.$store.state.audiobooks.isLoading
+    },
     cardWidth() {
       return 140
     },
@@ -81,10 +87,17 @@ export default {
         this.calcShelves()
       }
     },
+    async loadAudiobooks() {
+      var currentLibrary = await this.$localStore.getCurrentLibrary()
+      if (currentLibrary) {
+        this.$store.commit('libraries/setCurrentLibrary', currentLibrary.id)
+      }
+      this.$store.dispatch('audiobooks/load')
+    },
     socketConnected(isConnected) {
       if (isConnected) {
         console.log('Connected - Load from server')
-        this.$store.dispatch('audiobooks/load')
+        this.loadAudiobooks()
       } else {
         console.log('Disconnected - Reset to local storage')
         this.$store.commit('audiobooks/reset')
@@ -106,7 +119,7 @@ export default {
 
     this.$server.on('connected', this.socketConnected)
     if (this.$server.connected) {
-      this.$store.dispatch('audiobooks/load')
+      this.loadAudiobooks()
     } else {
       console.log('Bookshelf - Server not connected using downloaded')
     }

components/app/StreamContainer.vue

@@ -112,14 +112,16 @@ export default {
         return `${this.$store.state.serverUrl}/Logo.png`
       }
       if (this.cover.startsWith('http')) return this.cover
-      var _clean = this.cover.replace(/\\/g, '/')
-      if (_clean.startsWith('/local')) {
-        var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
-        return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
-      } else if (_clean.startsWith('/metadata')) {
-        return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
-      }
-      return _clean
+      var coverSrc = this.$store.getters['audiobooks/getBookCoverSrc'](this.audiobook)
+      return coverSrc
+      // var _clean = this.cover.replace(/\\/g, '/')
+      // if (_clean.startsWith('/local')) {
+      //   var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
+      //   return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
+      // } else if (_clean.startsWith('/metadata')) {
+      //   return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
+      // }
+      // return _clean
     }
   },
   methods: {

components/cards/BookCover.vue

@@ -97,16 +97,16 @@ export default {
     fullCoverUrl() {
       if (this.downloadCover) return this.downloadCover
       else if (!this.networkConnected) return this.placeholderUrl
-
-      if (this.cover.startsWith('http')) return this.cover
-      var _clean = this.cover.replace(/\\/g, '/')
-      if (_clean.startsWith('/local')) {
-        var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
-        return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
-      } else if (_clean.startsWith('/metadata')) {
-        return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
-      }
-      return _clean
+      return this.$store.getters['audiobooks/getBookCoverSrc'](this.audiobook)
+      // if (this.cover.startsWith('http')) return this.cover
+      // var _clean = this.cover.replace(/\\/g, '/')
+      // if (_clean.startsWith('/local')) {
+      //   var _cover = process.env.NODE_ENV !== 'production' && process.env.PROD !== '1' ? _clean.replace('/local', '') : _clean
+      //   return `${this.$store.state.serverUrl}${_cover}?token=${this.userToken}&ts=${Date.now()}`
+      // } else if (_clean.startsWith('/metadata')) {
+      //   return `${this.$store.state.serverUrl}${_clean}?token=${this.userToken}&ts=${Date.now()}`
+      // }
+      // return _clean
     },
     cover() {
       return this.book.cover || this.placeholderUrl

components/modals/LibrariesModal.vue

@@ -0,0 +1,65 @@
+<template>
+  <modals-modal v-model="show" :width="300" :processing="processing" height="100%">
+    <template #outer>
+      <div class="absolute top-4 left-4 z-40" style="max-width: 80%">
+        <p class="text-white text-2xl truncate">Libraries</p>
+      </div>
+    </template>
+
+    <div class="w-full h-full overflow-hidden absolute top-0 left-0 flex items-center justify-center" @click="show = false">
+      <div class="w-full overflow-x-hidden overflow-y-auto bg-primary rounded-lg border border-white border-opacity-20" style="max-height: 75%" @click.stop>
+        <ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
+          <template v-for="library in libraries">
+            <li :key="library.id" class="text-gray-50 select-none relative py-3 cursor-pointer hover:bg-black-400" :class="currentLibraryId === library.id ? 'bg-bg bg-opacity-80' : ''" role="option" @click="clickedOption(library)">
+              <div v-show="currentLibraryId === library.id" class="absolute top-0 left-0 w-0.5 bg-warning h-full" />
+              <div class="flex items-center px-3">
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+                </svg>
+
+                <span class="font-normal block truncate text-lg ml-4">{{ library.name }}</span>
+              </div>
+            </li>
+          </template>
+        </ul>
+      </div>
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      processing: false
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.$store.state.libraries.showModal
+      },
+      set(val) {
+        this.$store.commit('libraries/setShowModal', val)
+      }
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
+    libraries() {
+      return this.$store.state.libraries.libraries
+    }
+  },
+  methods: {
+    async clickedOption(lib) {
+      this.show = false
+
+      this.$store.commit('libraries/setCurrentLibrary', lib.id)
+      await this.$store.dispatch('audiobooks/load')
+
+      this.$localStore.setCurrentLibrary(lib)
+    }
+  },
+  mounted() {}
+}
+</script>