Abort backup if it is getting too large #89, support for ebook only book folders #75

.dockerignore

@@ -6,6 +6,7 @@ npm-debug.log
 /config
 /audiobooks
 /audiobooks2
+/media/
 /metadata
 dev.js
 test/

.gitignore

@@ -4,6 +4,7 @@ node_modules/
 /config/
 /audiobooks/
 /audiobooks2/
+/media/
 /metadata/
 test/
 /client/.nuxt/

client/components/app/Appbar.vue

@@ -18,7 +18,7 @@
             <p class="text-sm text-white text-opacity-70 leading-3 font-book pl-2">{{ libraryName }}</p>
           </div> -->
         <!-- </div> -->
-        <div class="bg-black bg-opacity-20 rounded-sm py-1.5 px-3 flex items-center border border-bg text-white text-opacity-70 cursor-pointer hover:bg-opacity-10 hover:text-opacity-90" @click="clickLibrary">
+        <div class="bg-black bg-opacity-20 rounded-md py-1.5 px-3 flex items-center text-white text-opacity-70 cursor-pointer hover:bg-opacity-10 hover:text-opacity-90" @click="clickLibrary">
           <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>

client/components/app/BookShelf.vue

@@ -77,6 +77,11 @@ export default {
         this.$store.commit('audiobooks/setSearchResults', this.searchResults)
         this.setBookshelfEntities()
       })
+    },
+    '$route.query.filter'() {
+      if (this.$route.query.filter && this.$route.query.filter !== this.filterBy) {
+        this.$store.dispatch('user/updateUserSettings', { filterBy: this.$route.query.filter })
+      }
     }
   },
   computed: {
@@ -171,6 +176,7 @@ export default {
       this.currSearchParams = this.buildSearchParams()
 
       var entities = this.entities
+
       var groups = []
       var currentRow = 0
       var currentGroup = []

client/components/app/BookShelfToolbar.vue

@@ -4,13 +4,16 @@
       <template v-if="page !== 'search' && !isHome">
         <p v-if="!selectedSeries" class="font-book">{{ numShowing }} {{ entityName }}</p>
         <div v-else class="flex items-center">
-          <div @click="seriesBackArrow" class="rounded-full h-10 w-10 flex items-center justify-center hover:bg-white hover:bg-opacity-10 cursor-pointer">
-            <span class="material-icons text-3xl text-white">west</span>
+          <div @click="seriesBackArrow" class="rounded-full h-9 w-9 flex items-center justify-center hover:bg-white hover:bg-opacity-10 cursor-pointer">
+            <span class="material-icons text-2xl text-white">west</span>
           </div>
           <!-- <span class="material-icons text-2xl cursor-pointer" @click="seriesBackArrow">west</span> -->
           <p class="pl-4 font-book text-lg">
-            {{ selectedSeries }} <span class="ml-3 font-mono text-lg bg-black bg-opacity-30 rounded-lg px-1 py-0.5">{{ numShowing }}</span>
+            {{ selectedSeries }}
           </p>
+          <div class="w-6 h-6 rounded-full bg-black bg-opacity-30 flex items-center justify-center ml-3">
+            <span class="font-mono">{{ numShowing }}</span>
+          </div>
         </div>
         <div class="flex-grow" />
 

client/components/app/Reader.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="value" class="w-screen h-screen fixed top-0 left-0 z-50 bg-white text-black">
+  <div v-if="show" class="w-screen h-screen fixed top-0 left-0 z-50 bg-white text-black">
     <div class="absolute top-4 right-4 z-10">
       <span class="material-icons cursor-pointer text-4xl" @click="show = false">close</span>
     </div>
@@ -35,10 +35,6 @@
 import ePub from 'epubjs'
 
 export default {
-  props: {
-    value: Boolean,
-    url: String
-  },
   data() {
     return {
       book: null,
@@ -63,12 +59,34 @@ export default {
   computed: {
     show: {
       get() {
-        return this.value
+        return this.$store.state.showEReader
       },
       set(val) {
-        this.$emit('input', val)
+        this.$store.commit('setShowEReader', val)
       }
     },
+    selectedAudiobook() {
+      return this.$store.state.selectedAudiobook
+    },
+    libraryId() {
+      return this.selectedAudiobook.libraryId
+    },
+    folderId() {
+      return this.selectedAudiobook.folderId
+    },
+    ebooks() {
+      return this.selectedAudiobook.ebooks || []
+    },
+    epubEbook() {
+      return this.ebooks.find((eb) => eb.ext === '.epub')
+    },
+    epubPath() {
+      return this.epubEbook ? this.epubEbook.path : null
+    },
+    url() {
+      if (!this.epubPath) return null
+      return `/ebook/${this.libraryId}/${this.folderId}/${this.epubPath}`
+    },
     userToken() {
       return this.$store.getters['user/getToken']
     }
@@ -116,7 +134,7 @@ export default {
     init() {
       this.registerListeners()
 
-      console.log('epub', this.url)
+      console.log('epub', this.url, this.epubEbook, this.ebooks)
       // var book = ePub(this.url, {
       //   requestHeaders: {
       //     Authorization: `Bearer ${this.userToken}`

client/components/cards/AudiobookSearchCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex h-full px-1 overflow-hidden">
-    <cards-book-cover :audiobook="audiobook" :width="40" />
+    <cards-book-cover :audiobook="audiobook" :width="50" />
     <div class="flex-grow px-2 searchCardContent h-full">
       <p class="truncate text-sm">{{ title }}</p>
       <p class="text-xs text-gray-200 truncate">by {{ author }}</p>
@@ -38,7 +38,7 @@ export default {
 <style>
 .searchCardContent {
   width: calc(100% - 80px);
-  height: calc(40px * 1.5);
+  height: calc(50px * 1.5);
   display: flex;
   flex-direction: column;
   justify-content: center;

client/components/cards/AuthorSearchCard.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="flex h-full px-1 overflow-hidden">
+    <img src="https://rpgplanner.com/wp-content/uploads/2020/06/no-photo-available.png" class="w-40 h-40 max-h-40 object-contain" style="max-height: 40px; max-width: 40px" />
+    <div class="flex-grow px-2 authorSearchCardContent h-full">
+      <p class="truncate text-sm">{{ author }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    author: String
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.searchCardContent {
+  width: calc(100% - 80px);
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>

client/components/cards/BookCard.vue

@@ -14,11 +14,16 @@
           <cards-book-cover :audiobook="audiobook" :author-override="authorFormat" :width="width" />
 
           <div v-show="isHovering || isSelectionMode" class="absolute top-0 left-0 w-full h-full bg-black rounded" :class="overlayWrapperClasslist">
-            <div v-show="!isSelectionMode && !isMissing" class="h-full flex items-center justify-center">
+            <div v-show="showPlayButton" class="h-full flex items-center justify-center">
               <div class="hover:text-gray-200 hover:scale-110 transform duration-200" @click.stop.prevent="play">
                 <span class="material-icons" :style="{ fontSize: playIconFontSize + 'rem' }">play_circle_filled</span>
               </div>
             </div>
+            <div v-show="showReadButton" class="h-full flex items-center justify-center">
+              <div class="hover:text-gray-200 hover:scale-110 transform duration-200" @click.stop.prevent="clickReadEBook">
+                <span class="material-icons" :style="{ fontSize: playIconFontSize + 'rem' }">auto_stories</span>
+              </div>
+            </div>
 
             <div v-if="userCanUpdate" v-show="!isSelectionMode" class="absolute cursor-pointer hover:text-yellow-300 hover:scale-125 transform duration-50" :style="{ top: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem' }" @click.stop.prevent="editClick">
               <span class="material-icons" :style="{ fontSize: sizeMultiplier + 'rem' }">edit</span>
@@ -34,9 +39,14 @@
           </div>
 
           <!-- EBook Icon -->
-          <div v-if="showExperimentalFeatures && hasEbook" class="absolute rounded-full bg-blue-500 w-6 h-6 flex items-center justify-center bg-opacity-90" :style="{ bottom: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem` }">
+          <div
+            v-if="showSmallEBookIcon"
+            class="absolute rounded-full bg-blue-500 flex items-center justify-center bg-opacity-90 hover:scale-125 transform duration-200"
+            :style="{ bottom: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem`, width: 1.5 * sizeMultiplier + 'rem', height: 1.5 * sizeMultiplier + 'rem' }"
+            @click.stop.prevent="clickReadEBook"
+          >
             <!-- <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }">EBook</p> -->
-            <span class="material-icons text-white text-base">auto_stories</span>
+            <span class="material-icons text-white" :style="{ fontSize: sizeMultiplier * 1 + 'rem' }">auto_stories</span>
           </div>
 
           <div v-show="!isSelectionMode" class="absolute bottom-0 left-0 h-1 shadow-sm max-w-full" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: width * userProgressPercent + 'px' }"></div>
@@ -90,8 +100,10 @@ export default {
     hasEbook() {
       return this.audiobook.numEbooks
     },
+    hasTracks() {
+      return this.audiobook.numTracks
+    },
     isSelectionMode() {
-      // return this.$store.getters['getNumAudiobooksSelected']
       return !!this.selectedAudiobooks.length
     },
     selectedAudiobooks() {
@@ -150,11 +162,23 @@ export default {
       return this.userProgress ? !!this.userProgress.isRead : false
     },
     showError() {
-      return this.hasMissingParts || this.hasInvalidParts || this.isMissing
+      return this.hasMissingParts || this.hasInvalidParts || this.isMissing || this.isIncomplete
+    },
+    showReadButton() {
+      return !this.isSelectionMode && this.showExperimentalFeatures && !this.showPlayButton && this.hasEbook
+    },
+    showPlayButton() {
+      return !this.isSelectionMode && !this.isMissing && !this.isIncomplete && this.hasTracks
+    },
+    showSmallEBookIcon() {
+      return !this.isSelectionMode && this.showExperimentalFeatures && this.hasEbook
     },
     isMissing() {
       return this.audiobook.isMissing
     },
+    isIncomplete() {
+      return this.audiobook.isIncomplete
+    },
     hasMissingParts() {
       return this.audiobook.hasMissingParts
     },
@@ -163,6 +187,7 @@ export default {
     },
     errorText() {
       if (this.isMissing) return 'Audiobook directory is missing!'
+      else if (this.isIncomplete) return 'Audiobook has no audio tracks & ebook'
       var txt = ''
       if (this.hasMissingParts) {
         txt = `${this.hasMissingParts} missing parts.`
@@ -211,6 +236,9 @@ export default {
         e.preventDefault()
         this.selectBtnClick()
       }
+    },
+    clickReadEBook() {
+      this.$store.commit('showEReader', this.audiobook)
     }
   }
 }

client/components/cards/PreviewCover.vue

@@ -1,10 +1,14 @@
 <template>
-  <div class="relative rounded-sm overflow-hidden" :style="{ height: width * 1.6 + 'px', width: width + 'px', maxWidth: width + 'px', minWidth: width + 'px' }">
+  <div class="relative rounded-sm overflow-hidden" :style="{ height: width * 1.6 + 'px', width: width + 'px', maxWidth: width + 'px', minWidth: width + 'px' }" @mouseover="isHovering = true" @mouseleave="isHovering = false">
     <div class="w-full h-full relative">
       <div v-if="showCoverBg" class="bg-primary absolute top-0 left-0 w-full h-full">
         <div class="w-full h-full z-0" ref="coverBg" />
       </div>
       <img ref="cover" :src="cover" @error="imageError" @load="imageLoaded" class="w-full h-full absolute top-0 left-0" :class="showCoverBg ? 'object-contain' : 'object-cover'" />
+
+      <a v-if="!imageFailed && showOpenNewTab && isHovering" :href="cover" @click.stop target="_blank" class="absolute bg-primary flex items-center justify-center shadow-sm rounded-full hover:scale-110 transform duration-100" :style="{ top: sizeMultiplier * 0.5 + 'rem', right: sizeMultiplier * 0.5 + 'rem', width: 2.5 * sizeMultiplier + 'rem', height: 2.5 * sizeMultiplier + 'rem' }">
+        <span class="material-icons" :style="{ fontSize: sizeMultiplier * 1.75 + 'rem' }">open_in_new</span>
+      </a>
     </div>
 
     <div v-if="imageFailed" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full bg-red-100" :style="{ padding: placeholderCoverPadding + 'rem' }">
@@ -23,12 +27,16 @@ export default {
     width: {
       type: Number,
       default: 120
-    }
+    },
+    showOpenNewTab: Boolean
   },
   data() {
     return {
       imageFailed: false,
-      showCoverBg: false
+      showCoverBg: false,
+      isHovering: false,
+      naturalHeight: 0,
+      naturalWidth: 0
     }
   },
   watch: {
@@ -60,6 +68,9 @@ export default {
     imageLoaded() {
       if (this.$refs.cover) {
         var { naturalWidth, naturalHeight } = this.$refs.cover
+        this.naturalHeight = naturalHeight
+        this.naturalWidth = naturalWidth
+
         var aspectRatio = naturalHeight / naturalWidth
         var arDiff = Math.abs(aspectRatio - 1.6)
 

client/components/cards/SeriesSearchCard.vue

@@ -0,0 +1,36 @@
+<template>
+  <div class="flex h-full px-1 overflow-hidden">
+    <cards-group-cover :name="series" :book-items="bookItems" :width="60" :height="60" />
+    <div class="flex-grow px-2 seriesSearchCardContent h-full">
+      <p class="truncate text-sm">{{ series }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    series: String,
+    bookItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.seriesSearchCardContent {
+  width: calc(100% - 80px);
+  height: 60px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>

client/components/controls/GlobalSearch.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="w-64 ml-8 relative">
+  <div class="w-80 ml-6 relative">
     <form @submit.prevent="submitSearch">
       <ui-text-input ref="input" v-model="search" placeholder="Search.." @input="inputUpdate" @focus="focussed" @blur="blurred" class="w-full h-8 text-sm" />
     </form>
@@ -7,23 +7,42 @@
       <span v-if="!search" class="material-icons" style="font-size: 1.2rem">search</span>
       <span v-else class="material-icons" style="font-size: 1.2rem">close</span>
     </div>
-    <div v-show="showMenu && (lastSearch || isTyping)" class="absolute z-40 -mt-px 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 && (lastSearch || isTyping)" class="absolute z-40 -mt-px w-full bg-bg border border-black-200 shadow-lg rounded-md py-1 px-2 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm globalSearchMenu">
       <ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
         <li v-if="isTyping" class="py-2 px-2">
-          <p>Typing...</p>
+          <p>Thinking...</p>
         </li>
         <li v-else-if="isFetching" class="py-2 px-2">
           <p>Fetching...</p>
         </li>
-        <li v-else-if="!items.length" class="py-2 px-2">
+        <li v-else-if="!totalResults" class="py-2 px-2">
           <p>No Results</p>
         </li>
         <template v-else>
-          <template v-for="item in items">
-            <li :key="item.id" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickedOption(item)">
-              <template v-if="item.type === 'audiobook'">
-                <cards-audiobook-search-card :audiobook="item.data" />
-              </template>
+          <p class="uppercase text-xs text-gray-400 my-1 px-1 font-semibold">Books</p>
+          <template v-for="item in audiobookResults">
+            <li :key="item.audiobook.id" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
+              <nuxt-link :to="`/audiobook/${item.audiobook.id}`">
+                <cards-audiobook-search-card :audiobook="item.audiobook" />
+              </nuxt-link>
+            </li>
+          </template>
+
+          <p v-if="authorResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Authors</p>
+          <template v-for="item in authorResults">
+            <li :key="item.author" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf?filter=authors.${$encode(item.author)}`">
+                <cards-author-search-card :author="item.author" />
+              </nuxt-link>
+            </li>
+          </template>
+
+          <p v-if="seriesResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Series</p>
+          <template v-for="item in seriesResults">
+            <li :key="item.series" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickedOption(item.series)">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series?series=${$encode(item.series)}`">
+                <cards-series-search-card :series="item.series" :book-items="item.audiobooks" />
+              </nuxt-link>
             </li>
           </template>
         </template>
@@ -42,7 +61,9 @@ export default {
       isTyping: false,
       isFetching: false,
       search: null,
-      items: [],
+      audiobookResults: [],
+      authorResults: [],
+      seriesResults: [],
       searchTimeout: null,
       lastSearch: null
     }
@@ -53,6 +74,9 @@ export default {
     },
     currentLibraryId() {
       return this.$store.state.libraries.currentLibraryId
+    },
+    totalResults() {
+      return this.audiobookResults.length + this.seriesResults.length + this.authorResults.length
     }
   },
   methods: {
@@ -61,7 +85,9 @@ export default {
       this.$router.push(`/library/${this.currentLibraryId}/bookshelf/search?query=${this.search}`)
 
       this.search = null
-      this.items = []
+      this.audiobookResults = []
+      this.authorResults = []
+      this.seriesResults = []
       this.showMenu = false
       this.$nextTick(() => {
         if (this.$refs.input) {
@@ -86,22 +112,19 @@ export default {
         return
       }
       this.isFetching = true
-      var results = await this.$axios.$get(`/api/audiobooks?q=${value}`).catch((error) => {
+
+      var searchResults = await this.$axios.$get(`/api/library/${this.currentLibraryId}/search?q=${value}`).catch((error) => {
         console.error('Search error', error)
         return []
       })
+      this.audiobookResults = searchResults.audiobooks || []
+      this.authorResults = searchResults.authors || []
+      this.seriesResults = searchResults.series || []
+
       this.isFetching = false
       if (!this.showMenu) {
         return
       }
-
-      this.items = results.map((res) => {
-        return {
-          id: res.id,
-          data: res,
-          type: 'audiobook'
-        }
-      })
     },
     inputUpdate(val) {
       clearTimeout(this.searchTimeout)
@@ -114,21 +137,25 @@ export default {
       this.searchTimeout = setTimeout(() => {
         this.isTyping = false
         this.runSearch(val)
-      }, 1000)
-    },
-    clickedOption(option) {
-      if (option.type === 'audiobook') {
-        this.$router.push(`/audiobook/${option.data.id}`)
-      }
+      }, 750)
     },
     clickClear() {
       if (this.search) {
         this.search = null
-        this.items = []
+        this.lastSearch = null
+        this.audiobookResults = []
+        this.authorResults = []
+        this.seriesResults = []
         this.showMenu = false
       }
     }
   },
   mounted() {}
 }
-</script>
+</script>
+
+<style>
+.globalSearchMenu {
+  max-height: 80vh;
+}
+</style>

client/components/modals/EditModal.vue

@@ -36,11 +36,11 @@ export default {
           title: 'Cover',
           component: 'modals-edit-tabs-cover'
         },
-        {
-          id: 'match',
-          title: 'Match',
-          component: 'modals-edit-tabs-match'
-        },
+        // {
+        //   id: 'match',
+        //   title: 'Match',
+        //   component: 'modals-edit-tabs-match'
+        // },
         {
           id: 'tracks',
           title: 'Tracks',

client/components/modals/edit-tabs/Cover.vue

@@ -53,14 +53,11 @@
             </div>
           </div>
         </form>
-        <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-60 overflow-y-scroll mt-2 max-w-full">
+        <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-80 overflow-y-scroll mt-2 max-w-full">
           <p v-if="!coversFound.length">No Covers Found</p>
           <template v-for="cover in coversFound">
             <div :key="cover" class="m-0.5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === imageUrl ? 'border-yellow-300' : ''" @click="setCover(cover)">
-              <div class="h-24 bg-primary" style="width: 60px">
-                <img :src="cover" class="h-full w-full object-contain" />
-              </div>
-              <!-- <img :src="cover" class="h-24 object-cover" style="width: 60px" /> -->
+              <cards-preview-cover :src="cover" :width="80" show-open-new-tab />
             </div>
           </template>
         </div>

client/components/modals/edit-tabs/Download.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="w-full h-full overflow-hidden overflow-y-auto px-4 py-6">
     <p class="text-center text-lg mb-4 py-8">Preparing downloads can take several minutes and will be stored in <span class="bg-primary bg-opacity-75 font-mono p-1 text-base">/metadata/downloads</span>. After the download is ready, it will remain available for 60 minutes, then be deleted.<br />Download will timeout after 15 minutes.</p>
-    <div class="w-full border border-black-200 p-4 my-4">
+    <div v-if="showM4bDownload" class="w-full border border-black-200 p-4 my-4">
       <div class="flex items-center">
         <div>
           <p class="text-lg">M4B Audiobook File <span class="text-error">*</span></p>
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div class="w-full flex items-center justify-center absolute bottom-4 left-0 right-0 text-center">
+    <div v-if="showM4bDownload" class="w-full flex items-center justify-center absolute bottom-4 left-0 right-0 text-center">
       <p class="text-error text-lg">* <strong>Experimental:</strong> Merging multiple .m4b files may have issues. <a href="https://github.com/advplyr/audiobookshelf/issues" class="underline text-blue-600" target="_blank">Report issues here.</a></p>
     </div>
 
@@ -89,6 +89,9 @@ export default {
     audiobookId() {
       return this.audiobook ? this.audiobook.id : null
     },
+    _audiobook() {
+      return this.audiobook || {}
+    },
     downloads() {
       return this.$store.getters['downloads/getDownloads'](this.audiobookId)
     },
@@ -120,6 +123,9 @@ export default {
     },
     totalFiles() {
       return this.audioFiles.length + this.otherFiles.length
+    },
+    showM4bDownload() {
+      return !this._audiobook.isMissing && !this._audiobook.isIncomplete && this._audiobook.tracks.length
     }
   },
   methods: {

client/components/modals/edit-tabs/Tracks.vue

@@ -1,41 +1,44 @@
 <template>
   <div class="w-full h-full overflow-y-auto overflow-x-hidden px-4 py-6">
-    <div class="w-full bg-primary px-4 py-2 flex items-center">
-      <div class="h-7 w-7 rounded-full bg-white bg-opacity-10 flex items-center justify-center">
-        <span class="text-sm font-mono">{{ tracks.length }}</span>
+    <template v-if="hasTracks">
+      <div class="w-full bg-primary px-4 py-2 flex items-center">
+        <div class="h-7 w-7 rounded-full bg-white bg-opacity-10 flex items-center justify-center">
+          <span class="text-sm font-mono">{{ tracks.length }}</span>
+        </div>
+        <div class="flex-grow" />
+        <ui-btn small :color="showFullPath ? 'gray-600' : 'primary'" class="mr-2" @click.stop="showFullPath = !showFullPath">Full Path</ui-btn>
+        <nuxt-link v-if="userCanUpdate" :to="`/audiobook/${audiobook.id}/edit`" class="mr-4">
+          <ui-btn small color="primary">Manage Tracks</ui-btn>
+        </nuxt-link>
       </div>
-      <div class="flex-grow" />
-      <ui-btn small :color="showFullPath ? 'gray-600' : 'primary'" class="mr-2" @click.stop="showFullPath = !showFullPath">Full Path</ui-btn>
-      <nuxt-link v-if="userCanUpdate" :to="`/audiobook/${audiobook.id}/edit`" class="mr-4">
-        <ui-btn small color="primary">Manage Tracks</ui-btn>
-      </nuxt-link>
-    </div>
-    <table class="text-sm tracksTable">
-      <tr class="font-book">
-        <th>#</th>
-        <th class="text-left">Filename</th>
-        <th class="text-left">Size</th>
-        <th class="text-left">Duration</th>
-        <th v-if="showDownload" class="text-center">Download</th>
-      </tr>
-      <template v-for="track in tracksCleaned">
-        <tr :key="track.index">
-          <td class="text-center">
-            <p>{{ track.index }}</p>
-          </td>
-          <td class="font-sans">{{ showFullPath ? track.fullPath : track.filename }}</td>
-          <td class="font-mono">
-            {{ $bytesPretty(track.size) }}
-          </td>
-          <td class="font-mono">
-            {{ $secondsToTimestamp(track.duration) }}
-          </td>
-          <td v-if="showDownload" class="font-mono text-center">
-            <a :href="`/s/book/${audiobook.id}/${track.relativePath}?token=${userToken}`" download><span class="material-icons icon-text">download</span></a>
-          </td>
+      <table class="text-sm tracksTable">
+        <tr class="font-book">
+          <th>#</th>
+          <th class="text-left">Filename</th>
+          <th class="text-left">Size</th>
+          <th class="text-left">Duration</th>
+          <th v-if="showDownload" class="text-center">Download</th>
         </tr>
-      </template>
-    </table>
+        <template v-for="track in tracksCleaned">
+          <tr :key="track.index">
+            <td class="text-center">
+              <p>{{ track.index }}</p>
+            </td>
+            <td class="font-sans">{{ showFullPath ? track.fullPath : track.filename }}</td>
+            <td class="font-mono">
+              {{ $bytesPretty(track.size) }}
+            </td>
+            <td class="font-mono">
+              {{ $secondsToTimestamp(track.duration) }}
+            </td>
+            <td v-if="showDownload" class="font-mono text-center">
+              <a :href="`/s/book/${audiobook.id}/${track.relativePath}?token=${userToken}`" download><span class="material-icons icon-text">download</span></a>
+            </td>
+          </tr>
+        </template>
+      </table>
+    </template>
+    <div v-else class="flex my-4 text-center justify-center text-xl">No Audio Tracks</div>
   </div>
 </template>
 
@@ -94,6 +97,9 @@ export default {
     },
     showDownload() {
       return this.userCanDownload && !this.isMissing
+    },
+    hasTracks() {
+      return this.audiobook.tracks.length
     }
   },
   methods: {

client/components/modals/libraries/LibraryItem.vue

@@ -11,7 +11,12 @@
     <div class="flex-grow" />
     <ui-btn v-show="mouseover && !libraryScan && canScan" small color="bg" @click.stop="scan">Scan</ui-btn>
     <span v-show="mouseover && !libraryScan && showEdit && canEdit" class="material-icons text-xl text-gray-300 hover:text-gray-50 ml-4" @click.stop="editClick">edit</span>
-    <span v-show="!libraryScan && mouseover && showEdit && canDelete" class="material-icons text-xl text-gray-300 ml-3" :class="isMain ? 'text-opacity-5 cursor-not-allowed' : 'hover:text-gray-50'" @click.stop="deleteClick">delete</span>
+    <span v-show="!libraryScan && mouseover && showEdit && canDelete && !isDeleting" class="material-icons text-xl text-gray-300 ml-3" :class="isMain ? 'text-opacity-5 cursor-not-allowed' : 'hover:text-gray-50'" @click.stop="deleteClick">delete</span>
+    <div v-show="isDeleting" class="text-xl text-gray-300 ml-3 animate-spin" :class="isMain ? 'text-opacity-5 cursor-not-allowed' : 'hover:text-gray-50'" @click.stop="deleteClick">
+      <svg viewBox="0 0 24 24" class="w-6 h-6">
+        <path fill="currentColor" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
+      </svg>
+    </div>
   </div>
 </template>
 
@@ -27,7 +32,8 @@ export default {
   },
   data() {
     return {
-      mouseover: false
+      mouseover: false,
+      isDeleting: false
     }
   },
   computed: {
@@ -54,12 +60,29 @@ export default {
     editClick() {
       this.$emit('edit', this.library)
     },
-    deleteClick() {
-      if (this.isMain) return
-      this.$emit('delete', this.library)
-    },
     scan() {
       this.$root.socket.emit('scan', this.library.id)
+    },
+    deleteClick() {
+      if (this.isMain) return
+      if (confirm(`Are you sure you want to permanently delete library "${this.library.name}"?`)) {
+        this.isDeleting = true
+        this.$axios
+          .$delete(`/api/library/${this.library.id}`)
+          .then((data) => {
+            this.isDeleting = false
+            if (data.error) {
+              this.$toast.error(data.error)
+            } else {
+              this.$toast.success('Library deleted')
+            }
+          })
+          .catch((error) => {
+            console.error('Failed to delete library', error)
+            this.$toast.error('Failed to delete library')
+            this.isDeleting = false
+          })
+      }
     }
   },
   mounted() {}

client/components/tables/LibrariesTable.vue

@@ -8,7 +8,7 @@
     </div>
 
     <template v-for="library in libraries">
-      <modals-libraries-library-item :key="library.id" :library="library" :selected="currentLibraryId === library.id" :show-edit="true" @edit="editLibrary" @delete="deleteLibrary" @click="clickLibrary" />
+      <modals-libraries-library-item :key="library.id" :library="library" :selected="currentLibraryId === library.id" :show-edit="true" @edit="editLibrary" @click="clickLibrary" />
     </template>
     <modals-edit-library-modal v-model="showLibraryModal" :library="selectedLibrary" />
   </div>
@@ -38,27 +38,6 @@ export default {
       await this.$store.dispatch('libraries/fetch', library.id)
       this.$router.push(`/library/${library.id}`)
     },
-    deleteLibrary(library) {
-      if (library.id === 'main') return
-      // if (confirm(`Are you sure you want to permanently delete user "${user.username}"?`)) {
-      //   this.isDeletingUser = true
-      //   this.$axios
-      //     .$delete(`/api/user/${user.id}`)
-      //     .then((data) => {
-      //       this.isDeletingUser = false
-      //       if (data.error) {
-      //         this.$toast.error(data.error)
-      //       } else {
-      //         this.$toast.success('User deleted')
-      //       }
-      //     })
-      //     .catch((error) => {
-      //       console.error('Failed to delete user', error)
-      //       this.$toast.error('Failed to delete user')
-      //       this.isDeletingUser = false
-      //     })
-      // }
-    },
     clickAddLibrary() {
       this.selectedLibrary = null
       this.showLibraryModal = true

client/layouts/default.vue

@@ -7,6 +7,7 @@
     <app-stream-container ref="streamContainer" />
     <modals-libraries-modal />
     <modals-edit-modal />
+    <app-reader />
     <!-- <widgets-scan-alert /> -->
   </div>
 </template>

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {

client/pages/audiobook/_id/index.vue

@@ -57,7 +57,7 @@
                   </template>
                 </div>
               </div>
-              <div class="flex py-0.5">
+              <div v-if="tracks.length" class="flex py-0.5">
                 <div class="w-32">
                   <span class="text-white text-opacity-60 uppercase text-sm">Duration</span>
                 </div>
@@ -65,7 +65,7 @@
                   {{ durationPretty }}
                 </div>
               </div>
-              <div class="flex py-0.5">
+              <div v-if="tracks.length" class="flex py-0.5">
                 <div class="w-32">
                   <span class="text-white text-opacity-60 uppercase text-sm">Size</span>
                 </div>
@@ -73,16 +73,20 @@
                   {{ sizePretty }}
                 </div>
               </div>
-              <!-- 
-              <p v-if="narrator" class="text-base">
-                <span class="text-white text-opacity-60">By:</span> <nuxt-link :to="`/library/${libraryId}/bookshelf?filter=authors.${$encode(author)}`" class="hover:underline">{{ author }}</nuxt-link>
-              </p> -->
-              <!-- <p v-if="narrator" class="text-base"><span class="text-white text-opacity-60">Narrated by:</span> {{ narrator }}</p>
-              <p v-if="publishYear" class="text-base"><span class="text-white text-opacity-60">Publish year:</span> {{ publishYear }}</p>
-              <p v-if="genres.length" class="text-base"><span class="text-white text-opacity-60">Genres:</span> {{ genres.join(', ') }}</p> -->
             </div>
             <div class="flex-grow" />
           </div>
+
+          <!-- Alerts -->
+          <div v-show="showExperimentalReadAlert" class="bg-error p-4 rounded-xl flex items-center">
+            <span class="material-icons text-2xl">warning_amber</span>
+            <p class="ml-4">Book has no audio tracks but has valid ebook files. The e-reader is experimental and can be turned on in config.</p>
+          </div>
+          <div v-show="showEpubAlert" class="bg-error p-4 rounded-xl flex items-center mt-2">
+            <span class="material-icons text-2xl">warning_amber</span>
+            <p class="ml-4">Book has valid ebook files, but the experimental e-reader currently only supports epub files.</p>
+          </div>
+
           <div v-if="progressPercent > 0 && progressPercent < 1" class="px-4 py-2 mt-4 bg-primary text-sm font-semibold rounded-md text-gray-200 relative max-w-max" :class="resettingProgress ? 'opacity-25' : ''">
             <p class="leading-6">Your Progress: {{ Math.round(progressPercent * 100) }}%</p>
             <p class="text-gray-400 text-xs">{{ $elapsedPretty(userTimeRemaining) }} remaining</p>
@@ -92,13 +96,13 @@
           </div>
 
           <div class="flex items-center pt-4">
-            <ui-btn v-if="!isMissing" :disabled="streaming" color="success" :padding-x="4" small class="flex items-center h-9 mr-2" @click="startStream">
+            <ui-btn v-if="showPlayButton" :disabled="streaming" color="success" :padding-x="4" small class="flex items-center h-9 mr-2" @click="startStream">
               <span v-show="!streaming" class="material-icons -ml-2 pr-1 text-white">play_arrow</span>
               {{ streaming ? 'Streaming' : 'Play' }}
             </ui-btn>
-            <ui-btn v-else color="error" :padding-x="4" small class="flex items-center h-9 mr-2">
+            <ui-btn v-else-if="isMissing || isIncomplete" color="error" :padding-x="4" small class="flex items-center h-9 mr-2">
               <span v-show="!streaming" class="material-icons -ml-2 pr-1 text-white">error</span>
-              Missing
+              {{ isMissing ? 'Missing' : 'Incomplete' }}
             </ui-btn>
 
             <ui-btn v-if="showExperimentalFeatures && epubEbook" color="info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
@@ -141,7 +145,7 @@
             </div>
           </div>
 
-          <tables-tracks-table :tracks="tracks" :audiobook="audiobook" class="mt-6" />
+          <tables-tracks-table v-if="tracks.length" :tracks="tracks" :audiobook="audiobook" class="mt-6" />
 
           <tables-audio-files-table v-if="otherAudioFiles.length" :audiobook-id="audiobook.id" :files="otherAudioFiles" class="mt-6" />
 
@@ -150,7 +154,7 @@
       </div>
     </div>
 
-    <app-reader v-if="showExperimentalFeatures" v-model="showReader" :url="epubUrl" />
+    <!-- <app-reader v-if="showExperimentalFeatures" v-model="showReader" :url="epubUrl" /> -->
   </div>
 </template>
 
@@ -175,7 +179,6 @@ export default {
   },
   data() {
     return {
-      showReader: false,
       isRead: false,
       resettingProgress: false,
       isProcessingReadUpdate: false
@@ -230,6 +233,12 @@ export default {
     isMissing() {
       return this.audiobook.isMissing
     },
+    isIncomplete() {
+      return this.audiobook.isIncomplete
+    },
+    showPlayButton() {
+      return !this.isMissing && !this.isIncomplete && this.tracks.length
+    },
     missingParts() {
       return this.audiobook.missingParts || []
     },
@@ -313,16 +322,15 @@ export default {
     ebooks() {
       return this.audiobook.ebooks
     },
+    showEpubAlert() {
+      return this.ebooks.length && !this.epubEbook && !this.tracks.length
+    },
+    showExperimentalReadAlert() {
+      return !this.tracks.length && this.ebooks.length && !this.showExperimentalFeatures
+    },
     epubEbook() {
       return this.audiobook.ebooks.find((eb) => eb.ext === '.epub')
     },
-    epubPath() {
-      return this.epubEbook ? this.epubEbook.path : null
-    },
-    epubUrl() {
-      if (!this.epubPath) return null
-      return `/ebook/${this.libraryId}/${this.folderId}/${this.epubPath}`
-    },
     userToken() {
       return this.$store.getters['user/getToken']
     },
@@ -365,7 +373,7 @@ export default {
   },
   methods: {
     openEbook() {
-      this.showReader = true
+      this.$store.commit('showEReader', this.audiobook)
     },
     toggleRead() {
       var updatePayload = {

client/store/index.js

@@ -7,6 +7,7 @@ export const state = () => ({
   streamAudiobook: null,
   editModalTab: 'details',
   showEditModal: false,
+  showEReader: false,
   selectedAudiobook: null,
   playOnLoad: false,
   developerMode: false,
@@ -111,6 +112,14 @@ export const mutations = {
   setShowEditModal(state, val) {
     state.showEditModal = val
   },
+  showEReader(state, audiobook) {
+    console.log('Show EReader', audiobook)
+    state.selectedAudiobook = audiobook
+    state.showEReader = true
+  },
+  setShowEReader(state, val) {
+    state.showEReader = val
+  },
   setDeveloperMode(state, val) {
     state.developerMode = val
   },

images/banner.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 6702.73 1277.37"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:url(#linear-gradient);}.cls-3{font-size:800px;fill:#c9c9c9;font-family:GentiumBookBasic, Gentium Book Basic;}.cls-4{font-size:420px;fill:#474747;font-family:GentiumBasic, Gentium Basic;}</style><linearGradient id="linear-gradient" x1="617.37" y1="20.7" x2="617.37" y2="1216.56" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#cd9d49"/><stop offset="0.99" stop-color="#875d27"/></linearGradient></defs><title>bgAsset 6</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_2-2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="Layer_5" data-name="Layer 5"><circle class="cls-1" cx="618.63" cy="618.63" r="618.63"/></g><circle class="cls-2" cx="617.37" cy="618.63" r="597.93"/></g><path class="cls-1" d="M1005.57,574.08c-4.84-4-12.37-10-22.58-17v-79.2c0-201.93-163.69-365.63-365.62-365.63h0c-201.93,0-365.63,163.7-365.63,365.63v79.2c-10.21,7-17.74,13-22.58,17A18.15,18.15,0,0,0,222.63,588v94.89a18.15,18.15,0,0,0,6.53,14c11.29,9.4,37.19,29.1,77.52,49.31v9.22c0,24.88,16,45,35.84,45h0c19.79,0,35.84-20.16,35.84-45V527.83c0-24.87-16.05-45-35.84-45h0c-19,0-34.48,18.51-35.75,41.94l-.09,0v-46.9c0-171.59,139.1-310.69,310.69-310.69h0c171.58,0,310.68,139.1,310.68,310.69v46.9l-.08,0c-1.27-23.43-16.79-41.94-35.76-41.94h0c-19.79,0-35.83,20.17-35.83,45V755.4c0,24.88,16,45,35.83,45h0c19.8,0,35.84-20.16,35.84-45v-9.22c40.33-20.21,66.24-39.91,77.52-49.31a18.15,18.15,0,0,0,6.53-14V588A18.15,18.15,0,0,0,1005.57,574.08Z"/><path class="cls-1" d="M489.87,969.71a43.31,43.31,0,0,0,43.3-43.3V441.64a43.3,43.3,0,0,0-43.3-43.29H445.15a43.3,43.3,0,0,0-43.3,43.29V926.41a43.31,43.31,0,0,0,43.3,43.3Zm-71.69-455.1h98.67v10.31H418.18Z"/><path class="cls-1" d="M639.73,969.71A43.3,43.3,0,0,0,683,926.41V441.64a43.29,43.29,0,0,0-43.29-43.29H595a43.29,43.29,0,0,0-43.29,43.29V926.41A43.3,43.3,0,0,0,595,969.71ZM568,514.61H666.7v10.31H568Z"/><path class="cls-1" d="M789.59,969.71a43.3,43.3,0,0,0,43.29-43.3V441.64a43.29,43.29,0,0,0-43.29-43.29H744.86a43.3,43.3,0,0,0-43.3,43.29V926.41a43.31,43.31,0,0,0,43.3,43.3Zm-71.7-455.1h98.67v10.31H717.89Z"/><rect class="cls-1" x="294.5" y="984.69" width="645.74" height="65.25" rx="32.63"/></g><g id="Layer_6" data-name="Layer 6"><text class="cls-3" transform="translate(1492.27 670.42)">audiobookshelf</text><text class="cls-4" transform="translate(1492.27 1128.69)">self-hosted audiobook server</text></g></g></svg>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -411,15 +411,6 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
       "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
     },
-    "cookie-parser": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.5.tgz",
-      "integrity": "sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==",
-      "requires": {
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6"
-      }
-    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "start": "node index.js",
     "client": "cd client && npm install && npm run generate",
     "prod": "npm run client && npm install && node prod.js",
-    "build-win": "npm run build-prep && pkg -t node12-win-x64 -o ./dist/win/audiobookshelf .",
+    "build-win": "pkg -t node12-win-x64 -o ./dist/win/audiobookshelf .",
     "build-linux": "build/linuxpackager"
   },
   "bin": "prod.js",
@@ -26,7 +26,6 @@
     "axios": "^0.21.1",
     "bcryptjs": "^2.4.3",
     "command-line-args": "^5.2.0",
-    "cookie-parser": "^1.4.5",
     "date-and-time": "^2.0.1",
     "epub": "^1.2.1",
     "express": "^4.17.1",

readme.md

@@ -1,15 +1,36 @@
-# AudioBookshelf
+<br />
+<div align="center">
+   <img alt="Audiobookshelf Banner" src="https://github.com/advplyr/audiobookshelf/raw/master/images/banner.svg" width="600">
 
-AudioBookshelf is a self-hosted audiobook server for managing and playing your audiobooks.
+  <p align="center">
+    <br />
+    <a href="https://audiobookshelf.org/docs">Documentation</a>
+    ·
+    <a href="https://audiobookshelf.org/install">Install Guides</a>
+    ·
+    <a href="https://audiobookshelf.org/showcase">Showcase</a>
+  </p>
+</div>
 
-See [Install guides](https://audiobookshelf.org/install) and [documentation](https://audiobookshelf.org/docs)
+## About
+
+Audiobookshelf is a self-hosted audiobook server for managing and playing your audiobooks.
+
+### Features
+
+* Fully **open-source**, including the [android 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
+* Auto-detects library updates, no need to re-scan
+* Upload full audiobooks and covers
+* Backup your metadata + automated daily backups
+
+Is there a feature you are looking for? [Suggest it](https://github.com/advplyr/audiobookshelf/issues/new)
 
 Android app is in beta, try it out on the [Google Play Store](https://play.google.com/store/apps/details?id=com.audiobookshelf.app)
 
-**Free & open source Android/iOS app is in development**
-
-<img alt="Screenshot1" src="https://github.com/advplyr/audiobookshelf/raw/master/images/ss_streaming.png" />
-
+<img alt="Library Screenshot" src="https://github.com/advplyr/audiobookshelf/raw/master/images/LibraryStream.png" />
 
 ## Organizing your audiobooks
 

server/ApiController.js

@@ -30,6 +30,7 @@ class ApiController {
     this.router.get('/find/:method', this.find.bind(this))
 
     this.router.get('/libraries', this.getLibraries.bind(this))
+    this.router.get('/library/:id/search', this.searchLibrary.bind(this))
     this.router.get('/library/:id', this.getLibrary.bind(this))
     this.router.delete('/library/:id', this.deleteLibrary.bind(this))
     this.router.patch('/library/:id', this.updateLibrary.bind(this))
@@ -97,6 +98,53 @@ class ApiController {
     res.json(libraries)
   }
 
+  searchLibrary(req, res) {
+    var library = this.db.libraries.find(lib => lib.id === req.params.id)
+    if (!library) {
+      return res.status(404).send('Library not found')
+    }
+    if (!req.query.q) {
+      return res.status(400).send('No query string')
+    }
+    var maxResults = req.query.max || 3
+
+    var bookMatches = []
+    var authorMatches = {}
+    var seriesMatches = {}
+
+    var audiobooksInLibrary = this.db.audiobooks.filter(ab => ab.libraryId === library.id)
+    audiobooksInLibrary.forEach((ab) => {
+      var queryResult = ab.searchQuery(req.query.q)
+      if (queryResult.book) {
+        bookMatches.push({
+          audiobook: ab,
+          matchKey: queryResult.book
+        })
+      }
+      if (queryResult.author && !authorMatches[queryResult.author]) {
+        authorMatches[queryResult.author] = {
+          author: queryResult.author
+        }
+      }
+      if (queryResult.series) {
+        if (!seriesMatches[queryResult.series]) {
+          seriesMatches[queryResult.series] = {
+            series: queryResult.series,
+            audiobooks: [ab]
+          }
+        } else {
+          seriesMatches[queryResult.series].audiobooks.push(ab)
+        }
+      }
+    })
+
+    res.json({
+      audiobooks: bookMatches.slice(0, maxResults),
+      authors: Object.values(authorMatches).slice(0, maxResults),
+      series: Object.values(seriesMatches).slice(0, maxResults)
+    })
+  }
+
   getLibrary(req, res) {
     var library = this.db.libraries.find(lib => lib.id === req.params.id)
     if (!library) {
@@ -563,8 +611,14 @@ class ApiController {
     if (!settingsUpdate || !isObject(settingsUpdate)) {
       return res.status(500).send('Invalid settings update object')
     }
+
     var madeUpdates = this.db.serverSettings.update(settingsUpdate)
     if (madeUpdates) {
+      // If backup schedule is updated - update backup manager
+      if (settingsUpdate.backupSchedule !== undefined) {
+        this.backupManager.updateCronSchedule()
+      }
+
       await this.db.updateEntity('settings', this.db.serverSettings)
     }
     return res.json({

server/BackupManager.js

@@ -21,14 +21,19 @@ class BackupManager {
     this.Gid = Gid
     this.db = db
 
+    this.scheduleTask = null
+
     this.backups = []
+
+    // If backup exceeds this value it will be aborted
+    this.MaxBytesBeforeAbort = 1000000000 // ~ 1GB
   }
 
   get serverSettings() {
     return this.db.serverSettings || {}
   }
 
-  async init(overrideCron = null) {
+  async init() {
     var backupsDirExists = await fs.pathExists(this.BackupPath)
     if (!backupsDirExists) {
       await fs.ensureDir(this.BackupPath)
@@ -36,16 +41,34 @@ class BackupManager {
     }
 
     await this.loadBackups()
+    this.scheduleCron()
+  }
 
+  scheduleCron() {
     if (!this.serverSettings.backupSchedule) {
       Logger.info(`[BackupManager] Auto Backups are disabled`)
       return
     }
     try {
-      var cronSchedule = overrideCron || this.serverSettings.backupSchedule
-      cron.schedule(cronSchedule, this.runBackup.bind(this))
+      var cronSchedule = this.serverSettings.backupSchedule
+      this.scheduleTask = cron.schedule(cronSchedule, this.runBackup.bind(this))
     } catch (error) {
-      Logger.error(`[BackupManager] Failed to schedule backup cron ${this.serverSettings.backupSchedule}`)
+      Logger.error(`[BackupManager] Failed to schedule backup cron ${this.serverSettings.backupSchedule}`, error)
+    }
+  }
+
+  updateCronSchedule() {
+    if (this.scheduleTask && !this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Disabling backup schedule`)
+      if (this.scheduleTask.destroy) this.scheduleTask.destroy()
+      this.scheduleTask = null
+    } else if (!this.scheduleTask && this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Starting backup schedule ${this.serverSettings.backupSchedule}`)
+      this.scheduleCron()
+    } else if (this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Restarting backup schedule ${this.serverSettings.backupSchedule}`)
+      if (this.scheduleTask.destroy) this.scheduleTask.destroy()
+      this.scheduleCron()
     }
   }
 
@@ -171,6 +194,7 @@ class BackupManager {
   }
 
   async runBackup() {
+    // Check if Metadata Path is inside Config Path (otherwise there will be an infinite loop as the archiver tries to zip itself)
     Logger.info(`[BackupManager] Running Backup`)
     var metadataBooksPath = this.serverSettings.backupMetadataCovers ? Path.join(this.MetadataPath, 'books') : null
 
@@ -213,6 +237,7 @@ class BackupManager {
 
   async removeBackup(backup) {
     try {
+      Logger.debug(`[BackupManager] Removing Backup "${backup.fullPath}"`)
       await fs.remove(backup.fullPath)
       this.backups = this.backups.filter(b => b.id !== backup.id)
       Logger.info(`[BackupManager] Backup "${backup.id}" Removed`)
@@ -243,6 +268,15 @@ class BackupManager {
         Logger.debug('Data has been drained')
       })
 
+      output.on('finish', () => {
+        Logger.debug('Write Stream Finished')
+      })
+
+      output.on('error', (err) => {
+        Logger.debug('Write Stream Error', err)
+        reject(err)
+      })
+
       // good practice to catch warnings (ie stat failures and other non-blocking errors)
       archive.on('warning', function (err) {
         if (err.code === 'ENOENT') {
@@ -259,6 +293,16 @@ class BackupManager {
         Logger.error(`[BackupManager] Archiver error: ${err.message}`)
         reject(err)
       })
+      archive.on('progress', ({ fs: fsobj }) => {
+        if (fsobj.processedBytes > this.MaxBytesBeforeAbort) {
+          Logger.error(`[BackupManager] Archiver is too large - aborting to prevent endless loop, Bytes Processed: ${fsobj.processedBytes}`)
+          archive.abort()
+          setTimeout(() => {
+            this.removeBackup(backup)
+            output.destroy('Backup too large') // Promise is reject in write stream error evt
+          }, 500)
+        }
+      })
 
       // pipe archive data to the file
       archive.pipe(output)

server/Scanner.js

@@ -143,18 +143,21 @@ class Scanner {
       forceAudioFileScan = true
     }
 
-    // ino is now set for every file in scandir
+    // inode is required
     audiobookData.audioFiles = audiobookData.audioFiles.filter(af => af.ino)
 
-    // REMOVE: No valid audio files
-    // TODO: Label as incomplete, do not actually delete
-    if (!audiobookData.audioFiles.length) {
-      Logger.error(`[Scanner] "${existingAudiobook.title}" no valid audio files found - removing audiobook`)
-
-      await this.db.removeEntity('audiobook', existingAudiobook.id)
-      this.emitter('audiobook_removed', existingAudiobook.toJSONMinified())
-
-      return ScanResult.REMOVED
+    // No valid ebook and audio files found, mark as incomplete
+    var ebookFiles = audiobookData.otherFiles.filter(f => f.filetype === 'ebook')
+    if (!audiobookData.audioFiles.length && !ebookFiles.length) {
+      Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found - marking as incomplete`)
+      existingAudiobook.setLastScan(version)
+      existingAudiobook.isIncomplete = true
+      await this.db.updateAudiobook(existingAudiobook)
+      this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
+      return ScanResult.UPDATED
+    } else if (existingAudiobook.isIncomplete) { // Was incomplete but now is not
+      Logger.info(`[Scanner] "${existingAudiobook.title}" was incomplete but now has book files`)
+      existingAudiobook.isIncomplete = false
     }
 
     // Check for audio files that were removed
@@ -219,14 +222,15 @@ class Scanner {
       await audioFileScanner.scanAudioFiles(existingAudiobook, newAudioFiles)
     }
 
-    // If after a scan no valid audio tracks remain
-    // TODO: Label as incomplete, do not actually delete
-    if (!existingAudiobook.tracks.length) {
-      Logger.error(`[Scanner] "${existingAudiobook.title}" has no valid tracks after update - removing audiobook`)
-
-      await this.db.removeEntity('audiobook', existingAudiobook.id)
-      this.emitter('audiobook_removed', existingAudiobook.toJSONMinified())
-      return ScanResult.REMOVED
+    // After scanning audio files, some may no longer be valid
+    //   so make sure the directory still has valid book files
+    if (!existingAudiobook.tracks.length && !ebookFiles.length) {
+      Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found after update - marking as incomplete`)
+      existingAudiobook.setLastScan(version)
+      existingAudiobook.isIncomplete = true
+      await this.db.updateAudiobook(existingAudiobook)
+      this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
+      return ScanResult.UPDATED
     }
 
     var hasUpdates = hasUpdatedIno || hasUpdatedLibraryOrFolder || removedAudioFiles.length || removedAudioTracks.length || newAudioFiles.length || hasUpdatedAudioFiles
@@ -269,8 +273,9 @@ class Scanner {
   }
 
   async scanNewAudiobook(audiobookData) {
-    if (!audiobookData.audioFiles.length) {
-      Logger.error('[Scanner] No valid audio tracks for Audiobook', audiobookData.path)
+    var ebookFiles = audiobookData.otherFiles.map(f => f.filetype === 'ebook')
+    if (!audiobookData.audioFiles.length && !ebookFiles.length) {
+      Logger.error('[Scanner] No valid audio files and ebooks for Audiobook', audiobookData.path)
       return null
     }
 
@@ -279,8 +284,9 @@ class Scanner {
 
     // Scan audio files and set tracks, pulls metadata
     await audioFileScanner.scanAudioFiles(audiobook, audiobookData.audioFiles)
-    if (!audiobook.tracks.length) {
-      Logger.warn('[Scanner] Invalid audiobook, no valid tracks', audiobook.title)
+
+    if (!audiobook.tracks.length && !audiobook.ebooks.length) {
+      Logger.warn('[Scanner] Invalid audiobook, no valid audio tracks and ebook files', audiobook.title)
       return null
     }
 

server/objects/Audiobook.js

@@ -37,6 +37,8 @@ class Audiobook {
 
     // Audiobook was scanned and not found
     this.isMissing = false
+    // Audiobook no longer has "book" files
+    this.isInvalid = false
 
     if (audiobook) {
       this.construct(audiobook)
@@ -70,6 +72,7 @@ class Audiobook {
     }
 
     this.isMissing = !!audiobook.isMissing
+    this.isInvalid = !!audiobook.isInvalid
   }
 
   get title() {
@@ -175,7 +178,8 @@ class Audiobook {
       audioFiles: this._audioFiles.map(audioFile => audioFile.toJSON()),
       otherFiles: this._otherFiles.map(otherFile => otherFile.toJSON()),
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
@@ -197,10 +201,12 @@ class Audiobook {
       hasMissingParts: this.missingParts ? this.missingParts.length : 0,
       hasInvalidParts: this.invalidParts ? this.invalidParts.length : 0,
       // numEbooks: this.ebooks.length,
-      numEbooks: this.hasEpub ? 1 : 0,
+      ebooks: this.ebooks.map(ebook => ebook.toJSON()),
+      numEbooks: this.hasEpub ? 1 : 0, // Only supporting epubs in the reader currently
       numTracks: this.tracks.length,
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
@@ -220,15 +226,16 @@ class Audiobook {
       sizePretty: this.sizePretty,
       missingParts: this.missingParts,
       invalidParts: this.invalidParts,
-      audioFiles: (this.audioFiles || []).map(audioFile => audioFile.toJSON()),
-      otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON()),
-      ebooks: (this.ebooks || []).map(ebook => ebook.toJSON()),
+      audioFiles: this._audioFiles.map(audioFile => audioFile.toJSON()),
+      otherFiles: this._otherFiles.map(otherFile => otherFile.toJSON()),
+      ebooks: this.ebooks.map(ebook => ebook.toJSON()),
       numEbooks: this.hasEpub ? 1 : 0,
       tags: this.tags,
       book: this.bookToJSON(),
       tracks: this.tracksToJSON(),
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
@@ -623,6 +630,10 @@ class Audiobook {
     return this.book.isSearchMatch(search.toLowerCase().trim())
   }
 
+  searchQuery(search) {
+    return this.book.getQueryMatches(search.toLowerCase().trim())
+  }
+
   getAudioFileByIno(ino) {
     return this.audioFiles.find(af => af.ino === ino)
   }

server/objects/Book.js

@@ -5,7 +5,6 @@ const parseAuthors = require('../utils/parseAuthors')
 
 class Book {
   constructor(book = null) {
-    this.olid = null
     this.title = null
     this.subtitle = null
     this.author = null
@@ -46,7 +45,6 @@ class Book {
   }
 
   construct(book) {
-    this.olid = book.olid
     this.title = book.title
     this.subtitle = book.subtitle || null
     this.author = book.author
@@ -69,7 +67,6 @@ class Book {
 
   toJSON() {
     return {
-      olid: this.olid,
       title: this.title,
       subtitle: this.subtitle,
       author: this.author,
@@ -111,7 +108,6 @@ class Book {
   }
 
   setData(data) {
-    this.olid = data.olid || null
     this.title = data.title || null
     this.subtitle = data.subtitle || null
     this.author = data.author || null
@@ -217,6 +213,17 @@ class Book {
     return this._title.toLowerCase().includes(search) || this._subtitle.toLowerCase().includes(search) || this._author.toLowerCase().includes(search) || this._series.toLowerCase().includes(search)
   }
 
+  getQueryMatches(search) {
+    var titleMatch = this._title.toLowerCase().includes(search) || this._subtitle.toLowerCase().includes(search)
+    var authorMatch = this._author.toLowerCase().includes(search)
+    var seriesMatch = this._series.toLowerCase().includes(search)
+    return {
+      book: titleMatch ? 'title' : authorMatch ? 'author' : seriesMatch ? 'series' : false,
+      author: authorMatch ? this._author : false,
+      series: seriesMatch ? this._series : false
+    }
+  }
+
   setDetailsFromFileMetadata(audioFileMetadata) {
     const MetadataMapArray = [
       {

server/objects/Library.js

@@ -5,6 +5,7 @@ class Library {
     this.id = null
     this.name = null
     this.folders = []
+    this.icon = 'database'
 
     this.lastScan = 0
 
@@ -24,6 +25,8 @@ class Library {
     this.id = library.id
     this.name = library.name
     this.folders = (library.folders || []).map(f => new Folder(f))
+    this.icon = library.icon || 'database'
+
     this.createdAt = library.createdAt
     this.lastUpdate = library.lastUpdate
   }
@@ -33,6 +36,7 @@ class Library {
       id: this.id,
       name: this.name,
       folders: (this.folders || []).map(f => f.toJSON()),
+      icon: this.icon,
       createdAt: this.createdAt,
       lastUpdate: this.lastUpdate
     }
@@ -55,6 +59,7 @@ class Library {
         return newFolder
       })
     }
+    this.icon = data.icon || 'database'
     this.createdAt = Date.now()
     this.lastUpdate = Date.now()
   }

server/utils/scandir.js

@@ -16,11 +16,12 @@ function getPaths(path) {
   })
 }
 
-function isAudioFile(path) {
+function isBookFile(path) {
   if (!path) return false
   var ext = Path.extname(path)
   if (!ext) return false
-  return globals.SupportedAudioTypes.includes(ext.slice(1).toLowerCase())
+  var extclean = ext.slice(1).toLowerCase()
+  return globals.SupportedAudioTypes.includes(extclean) || globals.SupportedEbookTypes.includes(extclean)
 }
 
 // Input: array of relative file paths
@@ -36,17 +37,18 @@ function groupFilesIntoAudiobookPaths(paths, useAllFileTypes = false) {
     return pathsA - pathsB
   })
 
-  // Step 2.5: Seperate audio files and other files (optional)
-  var audioFilePaths = []
+  // Step 2.5: Seperate audio/ebook files and other files (optional)
+  //              - Directories without an audio or ebook file will not be included
+  var bookFilePaths = []
   var otherFilePaths = []
   pathsFiltered.forEach(path => {
-    if (isAudioFile(path) || useAllFileTypes) audioFilePaths.push(path)
+    if (isBookFile(path) || useAllFileTypes) bookFilePaths.push(path)
     else otherFilePaths.push(path)
   })
 
   // Step 3: Group audio files in audiobooks
   var audiobookGroup = {}
-  audioFilePaths.forEach((path) => {
+  bookFilePaths.forEach((path) => {
     var dirparts = Path.dirname(path).split(Path.sep)
     var numparts = dirparts.length
     var _path = ''