Version bump 2.2.18

Save Progress for EPUBs

Dockerfile

@@ -14,10 +14,7 @@ RUN apk update && \
     apk add --no-cache --update \
     curl \
     tzdata \
-    ffmpeg \
-    make \
-    python3 \
-    g++
+    ffmpeg
 
 COPY --from=tone /usr/local/bin/tone /usr/local/bin/
 COPY --from=build /client/dist /client/dist
@@ -26,8 +23,6 @@ COPY server server
 
 RUN npm ci --only=production
 
-RUN apk del make python3 g++
-
 EXPOSE 80
 HEALTHCHECK \
     --interval=30s \

client/components/app/Appbar.vue

@@ -58,9 +58,6 @@
           <span class="material-icons text-2xl -ml-2 pr-1 text-white">play_arrow</span>
           {{ $strings.ButtonPlay }}
         </ui-btn>
-        <ui-tooltip v-if="userIsAdminOrUp && isBookLibrary" :text="$strings.ButtonQuickMatch" direction="bottom">
-          <ui-icon-btn :disabled="processingBatch" icon="auto_awesome" @click="batchAutoMatchClick" class="mx-1.5" />
-        </ui-tooltip>
         <ui-tooltip v-if="isBookLibrary" :text="selectedIsFinished ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" direction="bottom">
           <ui-read-icon-btn :disabled="processingBatch" :is-read="selectedIsFinished" @click="toggleBatchRead" class="mx-1.5" />
         </ui-tooltip>
@@ -75,8 +72,11 @@
         <ui-tooltip v-if="userCanDelete" :text="$strings.ButtonRemove" direction="bottom">
           <ui-icon-btn :disabled="processingBatch" icon="delete" bg-color="error" class="mx-1.5" @click="batchDeleteClick" />
         </ui-tooltip>
-        <ui-tooltip :text="$strings.LabelDeselectAll" direction="bottom">
-          <span class="material-icons text-4xl px-4 hover:text-gray-100 cursor-pointer" :class="processingBatch ? 'text-gray-400' : ''" @click="cancelSelectionMode">close</span>
+
+        <ui-context-menu-dropdown v-if="contextMenuItems.length && !processingBatch" :items="contextMenuItems" class="ml-1" @action="contextMenuAction" />
+
+        <ui-tooltip :text="$strings.LabelDeselectAll" direction="bottom" class="flex items-center">
+          <span class="material-icons text-3xl px-4 hover:text-gray-100 cursor-pointer" :class="processingBatch ? 'text-gray-400' : ''" @click="cancelSelectionMode">close</span>
         </ui-tooltip>
       </div>
     </div>
@@ -160,9 +160,59 @@ export default {
     },
     isHttps() {
       return location.protocol === 'https:' || process.env.NODE_ENV === 'development'
+    },
+    contextMenuItems() {
+      if (!this.userIsAdminOrUp) return []
+
+      const options = [
+        {
+          text: this.$strings.ButtonQuickMatch,
+          action: 'quick-match'
+        }
+      ]
+
+      if (!this.isPodcastLibrary && this.selectedMediaItemsArePlayable) {
+        options.push({
+          text: 'Quick Embed Metadata',
+          action: 'quick-embed'
+        })
+      }
+
+      return options
     }
   },
   methods: {
+    requestBatchQuickEmbed() {
+      const payload = {
+        message: 'Warning! Quick embed will not backup your audio files. Make sure that you have a backup of your audio files. <br><br>Would you like to continue?',
+        callback: (confirmed) => {
+          if (confirmed) {
+            this.$axios
+              .$post(`/api/tools/batch/embed-metadata`, {
+                libraryItemIds: this.selectedMediaItems.map((i) => i.id)
+              })
+              .then(() => {
+                console.log('Audio metadata embed started')
+                this.cancelSelectionMode()
+              })
+              .catch((error) => {
+                console.error('Audio metadata embed failed', error)
+                const errorMsg = error.response.data || 'Failed to embed metadata'
+                this.$toast.error(errorMsg)
+              })
+          }
+        },
+        type: 'yesNo'
+      }
+      this.$store.commit('globals/setConfirmPrompt', payload)
+    },
+    contextMenuAction(action) {
+      if (action === 'quick-embed') {
+        this.requestBatchQuickEmbed()
+      } else if (action === 'quick-match') {
+        this.batchAutoMatchClick()
+      }
+    },
     async playSelectedItems() {
       this.$store.commit('setProcessingBatch', true)
 

client/components/cards/LazyBookCard.vue

@@ -325,8 +325,13 @@ export default {
       if (this.episodeProgress) return this.episodeProgress
       return this.store.getters['user/getUserMediaProgress'](this.libraryItemId)
     },
+    useEBookProgress() {
+      if (!this.userProgress || this.userProgress.progress) return false
+      return this.userProgress.ebookProgress > 0
+    },
     userProgressPercent() {
-      return this.userProgress ? this.userProgress.progress || 0 : 0
+      if (this.useEBookProgress) return Math.max(Math.min(1, this.userProgress.ebookProgress), 0)
+      return this.userProgress ? Math.max(Math.min(1, this.userProgress.progress), 0) || 0 : 0
     },
     itemIsFinished() {
       return this.userProgress ? !!this.userProgress.isFinished : false

client/components/controls/LibraryFilterSelect.vue

@@ -185,6 +185,11 @@ export default {
           value: 'tracks',
           sublist: true
         },
+        {
+          text: this.$strings.LabelAbridged,
+          value: 'abridged',
+          sublist: false
+        },
         {
           text: this.$strings.ButtonIssues,
           value: 'issues',

client/components/modals/item/tabs/Cover.vue

@@ -2,7 +2,8 @@
   <div class="w-full h-full overflow-hidden overflow-y-auto px-2 sm:px-4 py-6 relative">
     <div class="flex flex-wrap">
       <div class="relative">
-        <covers-book-cover :library-item="libraryItem" :book-cover-aspect-ratio="bookCoverAspectRatio" />
+        <covers-preview-cover :src="$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId, null, true)" :width="120" :book-cover-aspect-ratio="bookCoverAspectRatio" />
+
         <!-- book cover overlay -->
         <div v-if="media.coverPath" class="absolute top-0 left-0 w-full h-full z-10 opacity-0 hover:opacity-100 transition-opacity duration-100">
           <div class="absolute top-0 left-0 w-full h-16 bg-gradient-to-b from-black-600 to-transparent" />
@@ -27,14 +28,14 @@
           </form>
         </div>
 
-        <div v-if="localCovers.length" class="mb-4 mt-6 border-t border-b border-primary">
+        <div v-if="localCovers.length" class="mb-4 mt-6 border-t border-b border-white border-opacity-10">
           <div class="flex items-center justify-center py-2">
             <p>{{ localCovers.length }} local image{{ localCovers.length !== 1 ? 's' : '' }}</p>
             <div class="flex-grow" />
             <ui-btn small @click="showLocalCovers = !showLocalCovers">{{ showLocalCovers ? $strings.ButtonHide : $strings.ButtonShow }}</ui-btn>
           </div>
 
-          <div v-if="showLocalCovers" class="flex items-center justify-center">
+          <div v-if="showLocalCovers" class="flex items-center justify-center pb-2">
             <template v-for="cover in localCovers">
               <div :key="cover.path" class="m-0.5 mb-5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover.metadata.path === coverPath ? 'border-yellow-300' : ''" @click="setCover(cover)">
                 <div class="h-24 bg-primary" :style="{ width: 96 / bookCoverAspectRatio + 'px' }">

client/components/modals/item/tabs/Match.vue

@@ -34,13 +34,25 @@
       </div>
       <ui-checkbox v-model="selectAll" checkbox-bg="bg" @input="selectAllToggled" />
       <form @submit.prevent="submitMatchUpdate">
-        <div v-if="selectedMatchOrig.cover" class="flex items-center py-2">
-          <ui-checkbox v-model="selectedMatchUsage.cover" checkbox-bg="bg" @input="checkboxToggled" />
-          <ui-text-input-with-label v-model="selectedMatch.cover" :disabled="!selectedMatchUsage.cover" readonly :label="$strings.LabelCover" class="flex-grow mx-4" />
-          <div class="min-w-12 max-w-12 md:min-w-16 md:max-w-16">
-            <a :href="selectedMatch.cover" target="_blank" class="w-full bg-primary">
-              <img :src="selectedMatch.cover" class="h-full w-full object-contain" />
-            </a>
+        <div v-if="selectedMatchOrig.cover" class="flex flex-wrap md:flex-nowrap items-center justify-center">
+          <div class="flex flex-grow items-center py-2">
+            <ui-checkbox v-model="selectedMatchUsage.cover" checkbox-bg="bg" @input="checkboxToggled" />
+            <ui-text-input-with-label v-model="selectedMatch.cover" :disabled="!selectedMatchUsage.cover" readonly :label="$strings.LabelCover" class="flex-grow mx-4" />
+          </div>
+
+          <div class="flex py-2">
+            <div>
+              <p class="text-center text-gray-200">New</p>
+              <a :href="selectedMatch.cover" target="_blank" class="bg-primary">
+                <covers-preview-cover :src="selectedMatch.cover" :width="100" :book-cover-aspect-ratio="bookCoverAspectRatio" />
+              </a>
+            </div>
+            <div v-if="media.coverPath">
+              <p class="text-center text-gray-200">Current</p>
+              <a :href="$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId, null, true)" target="_blank" class="bg-primary">
+                <covers-preview-cover :src="$store.getters['globals/getLibraryItemCoverSrcById'](libraryItemId, null, true)" :width="100" :book-cover-aspect-ratio="bookCoverAspectRatio" />
+              </a>
+            </div>
           </div>
         </div>
         <div v-if="selectedMatchOrig.title" class="flex items-center py-2">
@@ -164,13 +176,20 @@
             <p v-if="mediaMetadata.releaseDate" class="text-xs ml-1 text-white text-opacity-60">{{ $strings.LabelCurrently }} {{ mediaMetadata.releaseDate || '' }}</p>
           </div>
         </div>
-        <div v-if="selectedMatchOrig.explicit != null" class="flex items-center py-2">
+        <div v-if="selectedMatchOrig.explicit != null" class="flex items-center pb-2" :class="{ 'pt-2': mediaMetadata.explicit == null }">
           <ui-checkbox v-model="selectedMatchUsage.explicit" checkbox-bg="bg" @input="checkboxToggled" />
-          <div class="flex-grow ml-4">
-            <ui-checkbox v-model="selectedMatch.explicit" :label="$strings.LabelExplicit" checkbox-bg="primary" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
+          <div class="flex-grow ml-4" :class="{ 'pt-4': mediaMetadata.explicit != null }">
+            <ui-checkbox v-model="selectedMatch.explicit" :label="$strings.LabelExplicit" :disabled="!selectedMatchUsage.explicit" :checkbox-bg="!selectedMatchUsage.explicit ? 'bg' : 'primary'" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
             <p v-if="mediaMetadata.explicit != null" class="text-xs ml-1 text-white text-opacity-60">{{ $strings.LabelCurrently }} {{ mediaMetadata.explicit ? 'Explicit (checked)' : 'Not Explicit (unchecked)' }}</p>
           </div>
         </div>
+        <div v-if="selectedMatchOrig.abridged != null" class="flex items-center pb-2" :class="{ 'pt-2': mediaMetadata.abridged == null }">
+          <ui-checkbox v-model="selectedMatchUsage.abridged" checkbox-bg="bg" @input="checkboxToggled" />
+          <div class="flex-grow ml-4" :class="{ 'pt-4': mediaMetadata.abridged != null }">
+            <ui-checkbox v-model="selectedMatch.abridged" :label="$strings.LabelAbridged" :disabled="!selectedMatchUsage.abridged" :checkbox-bg="!selectedMatchUsage.abridged ? 'bg' : 'primary'" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
+            <p v-if="mediaMetadata.abridged != null" class="text-xs ml-1 text-white text-opacity-60">{{ $strings.LabelCurrently }} {{ mediaMetadata.abridged ? 'Abridged (checked)' : 'Unabridged (unchecked)' }}</p>
+          </div>
+        </div>
 
         <div class="flex items-center justify-end py-2">
           <ui-btn color="success" type="submit">{{ $strings.ButtonSubmit }}</ui-btn>
@@ -216,6 +235,7 @@ export default {
         explicit: true,
         asin: true,
         isbn: true,
+        abridged: true,
         // Podcast specific
         itunesPageUrl: true,
         itunesId: true,
@@ -360,6 +380,7 @@ export default {
         explicit: true,
         asin: true,
         isbn: true,
+        abridged: true,
         // Podcast specific
         itunesPageUrl: true,
         itunesId: true,
@@ -476,7 +497,6 @@ export default {
           } else if (key === 'narrator') {
             updatePayload.metadata.narrators = this.selectedMatch[key].split(',').map((v) => v.trim())
           } else if (key === 'genres') {
-            // updatePayload.metadata.genres = this.selectedMatch[key].split(',').map((v) => v.trim())
             updatePayload.metadata.genres = [...this.selectedMatch[key]]
           } else if (key === 'tags') {
             updatePayload.tags = this.selectedMatch[key].split(',').map((v) => v.trim())

client/components/modals/item/tabs/Tools.vue

@@ -46,8 +46,20 @@
             >{{ $strings.ButtonOpenManager }}
             <span class="material-icons text-lg ml-2">launch</span>
           </ui-btn>
+
+          <ui-btn v-if="!isMetadataEmbedQueued && !isEmbedTaskRunning" class="w-full mt-4" small @click.stop="quickEmbed">Quick Embed</ui-btn>
         </div>
       </div>
+
+      <!-- queued alert -->
+      <widgets-alert v-if="isMetadataEmbedQueued" type="warning" class="mt-4">
+        <p class="text-lg">Queued for metadata embed ({{ queuedEmbedLIds.length }} in queue)</p>
+      </widgets-alert>
+
+      <!-- processing alert -->
+      <widgets-alert v-if="isEmbedTaskRunning" type="warning" class="mt-4">
+        <p class="text-lg">Currently embedding metadata</p>
+      </widgets-alert>
     </div>
 
     <p v-if="!mediaTracks.length" class="text-lg text-center my-8">{{ $strings.MessageNoAudioTracks }}</p>
@@ -71,10 +83,10 @@ export default {
       return this.$store.state.showExperimentalFeatures
     },
     libraryItemId() {
-      return this.libraryItem ? this.libraryItem.id : null
+      return this.libraryItem?.id || null
     },
     media() {
-      return this.libraryItem ? this.libraryItem.media || {} : {}
+      return this.libraryItem?.media || {}
     },
     mediaTracks() {
       return this.media.tracks || []
@@ -92,9 +104,49 @@ export default {
     showMp3Split() {
       if (!this.mediaTracks.length) return false
       return this.isSingleM4b && this.chapters.length
+    },
+    queuedEmbedLIds() {
+      return this.$store.state.tasks.queuedEmbedLIds || []
+    },
+    isMetadataEmbedQueued() {
+      return this.queuedEmbedLIds.some((lid) => lid === this.libraryItemId)
+    },
+    tasks() {
+      return this.$store.getters['tasks/getTasksByLibraryItemId'](this.libraryItemId)
+    },
+    embedTask() {
+      return this.tasks.find((t) => t.action === 'embed-metadata')
+    },
+    encodeTask() {
+      return this.tasks.find((t) => t.action === 'encode-m4b')
+    },
+    isEmbedTaskRunning() {
+      return this.embedTask && !this.embedTask?.isFinished
+    },
+    isEncodeTaskRunning() {
+      return this.encodeTask && !this.encodeTask?.isFinished
     }
   },
-  methods: {},
-  mounted() {}
+  methods: {
+    quickEmbed() {
+      const payload = {
+        message: 'Warning! Quick embed will not backup your audio files. Make sure that you have a backup of your audio files. <br><br>Would you like to continue?',
+        callback: (confirmed) => {
+          if (confirmed) {
+            this.$axios
+              .$post(`/api/tools/item/${this.libraryItemId}/embed-metadata`)
+              .then(() => {
+                console.log('Audio metadata encode started')
+              })
+              .catch((error) => {
+                console.error('Audio metadata encode failed', error)
+              })
+          }
+        },
+        type: 'yesNo'
+      }
+      this.$store.commit('globals/setConfirmPrompt', payload)
+    }
+  }
 }
 </script>

client/components/readers/EpubReader.vue

@@ -1,18 +1,14 @@
 <template>
   <div class="h-full w-full">
-    <div class="h-full flex items-center">
-      <div style="width: 100px; max-width: 100px" class="h-full flex items-center overflow-x-hidden justify-center">
-        <span v-show="hasPrev" class="material-icons text-white text-opacity-50 hover:text-opacity-80 cursor-pointer text-6xl" @mousedown.prevent @click="prev">chevron_left</span>
+    <div class="h-full flex items-center justify-center">
+      <div style="width: 100px; max-width: 100px" class="h-full hidden sm:flex items-center overflow-x-hidden justify-center">
+        <span v-if="hasPrev" class="material-icons text-white text-opacity-50 hover:text-opacity-80 cursor-pointer text-6xl" @mousedown.prevent @click="prev">chevron_left</span>
       </div>
-      <div id="frame" class="w-full" style="height: 650px">
-        <div id="viewer" class="border border-gray-100 bg-white shadow-md"></div>
-
-        <div class="py-4 flex justify-center" style="height: 50px">
-          <p>{{ progress }}%</p>
-        </div>
+      <div id="frame" class="w-full" style="height: 80%">
+        <div id="viewer"></div>
       </div>
-      <div style="width: 100px; max-width: 100px" class="h-full flex items-center justify-center overflow-x-hidden">
-        <span v-show="hasNext" class="material-icons text-white text-opacity-50 hover:text-opacity-80 cursor-pointer text-6xl" @mousedown.prevent @click="next">chevron_right</span>
+      <div style="width: 100px; max-width: 100px" class="h-full hidden sm:flex items-center justify-center overflow-x-hidden">
+        <span v-if="hasNext" class="material-icons text-white text-opacity-50 hover:text-opacity-80 cursor-pointer text-6xl" @mousedown.prevent @click="next">chevron_right</span>
       </div>
     </div>
   </div>
@@ -21,108 +17,252 @@
 <script>
 import ePub from 'epubjs'
 
+/**
+ * @typedef {object} EpubReader
+ * @property {ePub.Book} book
+ * @property {ePub.Rendition} rendition
+ */
 export default {
   props: {
-    url: String
+    url: String,
+    libraryItem: {
+      type: Object,
+      default: () => {}
+    }
   },
   data() {
     return {
+      windowWidth: 0,
+      /** @type {ePub.Book} */
       book: null,
-      rendition: null,
-      chapters: [],
-      title: '',
-      author: '',
-      progress: 0,
-      hasNext: true,
-      hasPrev: false
+      /** @type {ePub.Rendition} */
+      rendition: null
     }
   },
-  computed: {},
-  methods: {
-    changedChapter() {
-      if (this.rendition) {
-        this.rendition.display(this.selectedChapter)
-      }
+  computed: {
+    /** @returns {string} */
+    libraryItemId() {
+      return this.libraryItem?.id
     },
+    hasPrev() {
+      return !this.rendition?.location?.atStart
+    },
+    hasNext() {
+      return !this.rendition?.location?.atEnd
+    },
+    /** @returns {Array<ePub.NavItem>} */
+    chapters() {
+      return this.book ? this.book.navigation.toc : []
+    },
+    userMediaProgress() {
+      if (!this.libraryItemId) return
+      return this.$store.getters['user/getUserMediaProgress'](this.libraryItemId)
+    },
+    localStorageLocationsKey() {
+      return `ebookLocations-${this.libraryItemId}`
+    },
+    readerWidth() {
+      if (this.windowWidth < 640) return this.windowWidth
+      return this.windowWidth - 200
+    }
+  },
+  methods: {
     prev() {
-      if (this.rendition) {
-        this.rendition.prev()
-      }
+      return this.rendition?.prev()
     },
     next() {
-      if (this.rendition) {
-        this.rendition.next()
+      return this.rendition?.next()
+    },
+    goToChapter(href) {
+      return this.rendition?.display(href)
+    },
+    keyUp(e) {
+      const rtl = this.book.package.metadata.direction === 'rtl'
+      if ((e.keyCode || e.which) == 37) {
+        return rtl ? this.next() : this.prev()
+      } else if ((e.keyCode || e.which) == 39) {
+        return rtl ? this.prev() : this.next()
       }
     },
-    keyUp() {
-      if ((e.keyCode || e.which) == 37) {
-        this.prev()
-      } else if ((e.keyCode || e.which) == 39) {
-        this.next()
+    /**
+     * @param {object} payload
+     * @param {string} payload.ebookLocation - CFI of the current location
+     * @param {string} payload.ebookProgress - eBook Progress Percentage
+     */
+    updateProgress(payload) {
+      this.$axios.$patch(`/api/me/progress/${this.libraryItemId}`, payload).catch((error) => {
+        console.error('EpubReader.updateProgress failed:', error)
+      })
+    },
+    getAllEbookLocationData() {
+      const locations = []
+      let totalSize = 0 // Total in bytes
+
+      for (const key in localStorage) {
+        if (!localStorage.hasOwnProperty(key) || !key.startsWith('ebookLocations-')) {
+          continue
+        }
+
+        try {
+          const ebookLocations = JSON.parse(localStorage[key])
+          if (!ebookLocations.locations) throw new Error('Invalid locations object')
+
+          ebookLocations.key = key
+          ebookLocations.size = (localStorage[key].length + key.length) * 2
+          locations.push(ebookLocations)
+          totalSize += ebookLocations.size
+        } catch (error) {
+          console.error('Failed to parse ebook locations', key, error)
+          localStorage.removeItem(key)
+        }
+      }
+
+      // Sort by oldest lastAccessed first
+      locations.sort((a, b) => a.lastAccessed - b.lastAccessed)
+
+      return {
+        locations,
+        totalSize
+      }
+    },
+    /** @param {string} locationString */
+    checkSaveLocations(locationString) {
+      const maxSizeInBytes = 3000000 // Allow epub locations to take up to 3MB of space
+      const newLocationsSize = JSON.stringify({ lastAccessed: Date.now(), locations: locationString }).length * 2
+
+      // Too large overall
+      if (newLocationsSize > maxSizeInBytes) {
+        console.error('Epub locations are too large to store. Size =', newLocationsSize)
+        return
+      }
+
+      const ebookLocationsData = this.getAllEbookLocationData()
+
+      let availableSpace = maxSizeInBytes - ebookLocationsData.totalSize
+
+      // Remove epub locations until there is room for locations
+      while (availableSpace < newLocationsSize && ebookLocationsData.locations.length) {
+        const oldestLocation = ebookLocationsData.locations.shift()
+        console.log(`Removing cached locations for epub "${oldestLocation.key}" taking up ${oldestLocation.size} bytes`)
+        availableSpace += oldestLocation.size
+        localStorage.removeItem(oldestLocation.key)
+      }
+
+      console.log(`Cacheing epub locations with key "${this.localStorageLocationsKey}" taking up ${newLocationsSize} bytes`)
+      this.saveLocations(locationString)
+    },
+    /** @param {string} locationString */
+    saveLocations(locationString) {
+      localStorage.setItem(
+        this.localStorageLocationsKey,
+        JSON.stringify({
+          lastAccessed: Date.now(),
+          locations: locationString
+        })
+      )
+    },
+    loadLocations() {
+      const locationsObjString = localStorage.getItem(this.localStorageLocationsKey)
+      if (!locationsObjString) return null
+
+      const locationsObject = JSON.parse(locationsObjString)
+
+      // Remove invalid location objects
+      if (!locationsObject.locations) {
+        console.error('Invalid epub locations stored', this.localStorageLocationsKey)
+        localStorage.removeItem(this.localStorageLocationsKey)
+        return null
+      }
+
+      // Update lastAccessed
+      this.saveLocations(locationsObject.locations)
+
+      return locationsObject.locations
+    },
+    /** @param {string} location - CFI of the new location */
+    relocated(location) {
+      if (this.userMediaProgress?.ebookLocation === location.start.cfi) {
+        return
+      }
+
+      if (location.end.percentage) {
+        this.updateProgress({
+          ebookLocation: location.start.cfi,
+          ebookProgress: location.end.percentage
+        })
+      } else {
+        this.updateProgress({
+          ebookLocation: location.start.cfi
+        })
       }
     },
     initEpub() {
-      // var book = ePub(this.url, {
-      //   requestHeaders: {
-      //     Authorization: `Bearer ${this.userToken}`
-      //   }
-      // })
-      var book = ePub(this.url)
-      this.book = book
+      /** @type {EpubReader} */
+      const reader = this
 
-      this.rendition = book.renderTo('viewer', {
-        width: window.innerWidth - 200,
-        height: 600,
-        ignoreClass: 'annotator-hl',
-        manager: 'continuous',
-        spread: 'always'
+      /** @type {ePub.Book} */
+      reader.book = new ePub(reader.url, {
+        width: this.readerWidth,
+        height: window.innerHeight - 50
       })
-      var displayed = this.rendition.display()
 
-      book.ready
-        .then(() => {
-          console.log('Book ready')
-          return book.locations.generate(1600)
+      /** @type {ePub.Rendition} */
+      reader.rendition = reader.book.renderTo('viewer', {
+        width: this.readerWidth,
+        height: window.innerHeight * 0.8
+      })
+
+      // load saved progress
+      reader.rendition.display(this.userMediaProgress?.ebookLocation || reader.book.locations.start)
+
+      // load style
+      reader.rendition.themes.default({ '*': { color: '#fff!important' } })
+
+      reader.book.ready.then(() => {
+        // set up event listeners
+        reader.rendition.on('relocated', reader.relocated)
+        reader.rendition.on('keydown', reader.keyUp)
+
+        let touchStart = 0
+        let touchEnd = 0
+        reader.rendition.on('touchstart', (event) => {
+          touchStart = event.changedTouches[0].screenX
         })
-        .then((locations) => {
-          // console.log('Loaded locations', locations)
-          // Wait for book to be rendered to get current page
-          displayed.then(() => {
-            // Get the current CFI
-            var currentLocation = this.rendition.currentLocation()
-            if (!currentLocation.start) {
-              console.error('No Start', currentLocation)
-            } else {
-              var currentPage = book.locations.percentageFromCfi(currentLocation.start.cfi)
-              // console.log('current page', currentPage)
-            }
+
+        reader.rendition.on('touchend', (event) => {
+          touchEnd = event.changedTouches[0].screenX
+          const touchDistanceX = Math.abs(touchEnd - touchStart)
+          if (touchStart < touchEnd && touchDistanceX > 120) {
+            this.next()
+          }
+          if (touchStart > touchEnd && touchDistanceX > 120) {
+            this.prev()
+          }
+        })
+
+        // load ebook cfi locations
+        const savedLocations = this.loadLocations()
+        if (savedLocations) {
+          reader.book.locations.load(savedLocations)
+        } else {
+          reader.book.locations.generate().then(() => {
+            this.checkSaveLocations(reader.book.locations.save())
           })
-        })
-
-      book.loaded.navigation.then((toc) => {
-        var _chapters = []
-        toc.forEach((chapter) => {
-          _chapters.push(chapter)
-        })
-        this.chapters = _chapters
-      })
-      book.loaded.metadata.then((metadata) => {
-        this.author = metadata.creator
-        this.title = metadata.title
-      })
-
-      this.rendition.on('keyup', this.keyUp)
-
-      this.rendition.on('relocated', (location) => {
-        var percent = book.locations.percentageFromCfi(location.start.cfi)
-        this.progress = Math.floor(percent * 100)
-
-        this.hasNext = !location.atEnd
-        this.hasPrev = !location.atStart
+        }
       })
+    },
+    resize() {
+      this.windowWidth = window.innerWidth
+      this.rendition?.resize(this.readerWidth, window.innerHeight * 0.8)
     }
   },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.resize)
+    this.book?.destroy()
+  },
   mounted() {
+    this.windowWidth = window.innerWidth
+    window.addEventListener('resize', this.resize)
     this.initEpub()
   }
 }

client/components/readers/EpubReader2.vue

@@ -1,88 +0,0 @@
-<template>
-  <div class="h-full w-full">
-    <div id="viewer" class="border border-gray-100 bg-white text-black shadow-md h-screen overflow-y-auto p-4" v-html="pageHtml"></div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    url: String,
-    libraryItem: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  data() {
-    return {
-      bookInfo: {},
-      page: 0,
-      numPages: 0,
-      pageHtml: '',
-      progress: 0
-    }
-  },
-  computed: {
-    libraryItemId() {
-      return this.libraryItem ? this.libraryItem.id : null
-    },
-    hasPrev() {
-      return this.page > 0
-    },
-    hasNext() {
-      return this.page < this.numPages - 1
-    }
-  },
-  methods: {
-    prev() {
-      if (!this.hasPrev) return
-      this.page--
-      this.loadPage()
-    },
-    next() {
-      if (!this.hasNext) return
-      this.page++
-      this.loadPage()
-    },
-    keyUp() {
-      if ((e.keyCode || e.which) == 37) {
-        this.prev()
-      } else if ((e.keyCode || e.which) == 39) {
-        this.next()
-      }
-    },
-    loadPage() {
-      this.$axios
-        .$get(`/api/ebooks/${this.libraryItemId}/page/${this.page}?dev=${this.$isDev ? 1 : 0}`)
-        .then((html) => {
-          this.pageHtml = html
-        })
-        .catch((error) => {
-          console.error('Failed to load page', error)
-          this.$toast.error('Failed to load page')
-        })
-    },
-    loadInfo() {
-      this.$axios
-        .$get(`/api/ebooks/${this.libraryItemId}/info?dev=${this.$isDev ? 1 : 0}`)
-        .then((bookInfo) => {
-          this.bookInfo = bookInfo
-          this.numPages = bookInfo.pages
-          this.page = 0
-          this.loadPage()
-        })
-        .catch((error) => {
-          console.error('Failed to load page', error)
-          this.$toast.error('Failed to load info')
-        })
-    },
-    initEpub() {
-      if (!this.libraryItemId) return
-      this.loadInfo()
-    }
-  },
-  mounted() {
-    this.initEpub()
-  }
-}
-</script>

client/components/readers/Reader.vue

@@ -1,24 +1,48 @@
 <template>
   <div v-if="show" class="w-screen h-screen fixed top-0 left-0 z-60 bg-primary text-white">
-    <div class="absolute top-4 right-4 z-20">
-      <span class="material-icons cursor-pointer text-4xl" @click="close">close</span>
+    <div class="absolute top-4 left-4 z-20">
+      <span v-if="hasToC && !tocOpen" ref="tocButton" class="material-icons cursor-pointer text-2xl" @click="toggleToC">menu</span>
     </div>
 
-    <div class="absolute top-4 left-4">
-      <h1 class="text-2xl mb-1">{{ abTitle }}</h1>
-      <p v-if="abAuthor">by {{ abAuthor }}</p>
+    <div class="absolute top-4 left-1/2 transform -translate-x-1/2">
+      <h1 class="text-lg sm:text-xl md:text-2xl mb-1" style="line-height: 1.15; font-weight: 100">
+        <span style="font-weight: 600">{{ abTitle }}</span>
+        <span v-if="abAuthor" style="display: inline"> – </span>
+        <span v-if="abAuthor">{{ abAuthor }}</span>
+      </h1>
+    </div>
+
+    <div class="absolute top-4 right-4 z-20">
+      <span v-if="hasSettings" class="material-icons cursor-pointer text-2xl" @click="openSettings">settings</span>
+      <span class="material-icons cursor-pointer text-2xl" @click="close">close</span>
     </div>
 
     <component v-if="componentName" ref="readerComponent" :is="componentName" :url="ebookUrl" :library-item="selectedLibraryItem" />
 
-    <div class="absolute bottom-2 left-2">{{ ebookType }}</div>
+    <!-- TOC side nav -->
+    <div v-if="tocOpen" class="w-full h-full fixed inset-0 bg-black/20 z-20" @click.stop.prevent="toggleToC"></div>
+    <div v-if="hasToC" class="w-72 h-full max-h-full absolute top-0 left-0 bg-bg shadow-xl transition-transform z-30" :class="tocOpen ? 'translate-x-0' : '-translate-x-72'" @click.stop.prevent="toggleToC">
+      <div class="p-4 h-full overflow-hidden">
+        <p class="text-lg font-semibold mb-2">Table of Contents</p>
+        <div class="tocContent">
+          <ul>
+            <li v-for="chapter in chapters" :key="chapter.id" class="py-1">
+              <a :href="chapter.href" @click.prevent="$refs.readerComponent.goToChapter(chapter.href)">{{ chapter.label }}</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
   data() {
-    return {}
+    return {
+      chapters: [],
+      tocOpen: false
+    }
   },
   watch: {
     show(newVal) {
@@ -37,13 +61,18 @@ export default {
       }
     },
     componentName() {
-      if (this.ebookType === 'epub' && this.$isDev) return 'readers-epub-reader2'
-      else if (this.ebookType === 'epub') return 'readers-epub-reader'
+      if (this.ebookType === 'epub') return 'readers-epub-reader'
       else if (this.ebookType === 'mobi') return 'readers-mobi-reader'
       else if (this.ebookType === 'pdf') return 'readers-pdf-reader'
       else if (this.ebookType === 'comic') return 'readers-comic-reader'
       return null
     },
+    hasToC() {
+      return this.isEpub
+    },
+    hasSettings() {
+      return false
+    },
     abTitle() {
       return this.mediaMetadata.title
     },
@@ -111,18 +140,29 @@ export default {
     }
   },
   methods: {
+    toggleToC() {
+      this.tocOpen = !this.tocOpen
+      this.chapters = this.$refs.readerComponent.chapters
+    },
+    openSettings() {},
     hotkey(action) {
       console.log('Reader hotkey', action)
       if (!this.$refs.readerComponent) return
 
       if (action === this.$hotkeys.EReader.NEXT_PAGE) {
-        if (this.$refs.readerComponent.next) this.$refs.readerComponent.next()
+        this.next()
       } else if (action === this.$hotkeys.EReader.PREV_PAGE) {
-        if (this.$refs.readerComponent.prev) this.$refs.readerComponent.prev()
+        this.prev()
       } else if (action === this.$hotkeys.EReader.CLOSE) {
         this.close()
       }
     },
+    next() {
+      if (this.$refs.readerComponent?.next) this.$refs.readerComponent.next()
+    },
+    prev() {
+      if (this.$refs.readerComponent?.prev) this.$refs.readerComponent.prev()
+    },
     registerListeners() {
       this.$eventBus.$on('reader-hotkey', this.hotkey)
     },
@@ -151,4 +191,8 @@ export default {
 .ebook-viewer {
   height: calc(100% - 96px);
 }
+.tocContent {
+  height: calc(100% - 36px);
+  overflow-y: auto;
+}
 </style>

client/components/ui/Checkbox.vue

@@ -4,7 +4,7 @@
       <input v-model="selected" :disabled="disabled" type="checkbox" class="opacity-0 absolute" :class="!disabled ? 'cursor-pointer' : ''" />
       <svg v-if="selected" class="fill-current pointer-events-none" :class="svgClass" viewBox="0 0 20 20"><path d="M0 11l2-2 5 5L18 3l2 2L7 18z" /></svg>
     </div>
-    <div v-if="label" class="select-none text-gray-100" :class="labelClassname">{{ label }}</div>
+    <div v-if="label" class="select-none" :class="[labelClassname, disabled ? 'text-gray-400' : 'text-gray-100']">{{ label }}</div>
   </label>
 </template>
 

client/components/widgets/BookDetailsEdit.vue

@@ -50,7 +50,7 @@
       </div>
 
       <div class="flex flex-wrap mt-2 -mx-1">
-        <div class="w-full md:w-1/2 px-1">
+        <div class="w-full md:w-1/4 px-1">
           <ui-text-input-with-label ref="publisherInput" v-model="details.publisher" :label="$strings.LabelPublisher" />
         </div>
         <div class="w-1/2 md:w-1/4 px-1 mt-2 md:mt-0">
@@ -61,6 +61,11 @@
             <ui-checkbox v-model="details.explicit" :label="$strings.LabelExplicit" checkbox-bg="primary" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
           </div>
         </div>
+        <div class="flex-grow px-1 pt-6 mt-2 md:mt-0">
+          <div class="flex justify-center">
+            <ui-checkbox v-model="details.abridged" :label="$strings.LabelAbridged" checkbox-bg="primary" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
+          </div>
+        </div>
       </div>
     </form>
   </div>
@@ -89,7 +94,8 @@ export default {
         isbn: null,
         asin: null,
         genres: [],
-        explicit: false
+        explicit: false,
+        abridged: false
       },
       newTags: []
     }
@@ -271,6 +277,7 @@ export default {
       this.details.isbn = this.mediaMetadata.isbn || null
       this.details.asin = this.mediaMetadata.asin || null
       this.details.explicit = !!this.mediaMetadata.explicit
+      this.details.abridged = !!this.mediaMetadata.abridged
       this.newTags = [...(this.media.tags || [])]
     },
     submitForm() {

client/components/widgets/NotificationWidget.vue

@@ -73,6 +73,8 @@ export default {
           return `/library/${task.data.libraryId}/podcast/download-queue`
         case 'encode-m4b':
           return `/audiobook/${task.data.libraryItemId}/manage?tool=m4b`
+        case 'embed-metadata':
+          return `/audiobook/${task.data.libraryItemId}/manage?tool=embed`
         default:
           return ''
       }

client/layouts/default.vue

@@ -278,6 +278,13 @@ export default {
       console.log('Task finished', task)
       this.$store.commit('tasks/addUpdateTask', task)
     },
+    metadataEmbedQueueUpdate(data) {
+      if (data.queued) {
+        this.$store.commit('tasks/addQueuedEmbedLId', data.libraryItemId)
+      } else {
+        this.$store.commit('tasks/removeQueuedEmbedLId', data.libraryItemId)
+      }
+    },
     userUpdated(user) {
       if (this.$store.state.user.user.id === user.id) {
         this.$store.commit('user/setUser', user)
@@ -418,6 +425,7 @@ export default {
       // Task Listeners
       this.socket.on('task_started', this.taskStarted)
       this.socket.on('task_finished', this.taskFinished)
+      this.socket.on('metadata_embed_queue_update', this.metadataEmbedQueueUpdate)
 
       this.socket.on('backup_applied', this.backupApplied)
 
@@ -531,12 +539,18 @@ export default {
     },
     loadTasks() {
       this.$axios
-        .$get('/api/tasks')
+        .$get('/api/tasks?include=queue')
         .then((payload) => {
           console.log('Fetched tasks', payload)
           if (payload.tasks) {
             this.$store.commit('tasks/setTasks', payload.tasks)
           }
+          if (payload.queuedTaskData?.embedMetadata?.length) {
+            this.$store.commit(
+              'tasks/setQueuedEmbedLIds',
+              payload.queuedTaskData.embedMetadata.map((td) => td.libraryItemId)
+            )
+          }
         })
         .catch((error) => {
           console.error('Failed to load tasks', error)

client/package-lock.json

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

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.2.17",
+  "version": "2.2.18",
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
   "scripts": {

client/pages/audiobook/_id/manage.vue

@@ -62,14 +62,20 @@
     <div class="w-full h-px bg-white bg-opacity-10 my-8" />
 
     <div class="w-full max-w-4xl mx-auto">
-      <div v-if="isEmbedTool" class="w-full flex justify-end items-center mb-4">
-        <ui-checkbox v-if="!isFinished" v-model="shouldBackupAudioFiles" label="Backup audio files" medium checkbox-bg="bg" label-class="pl-2 text-base md:text-lg" @input="toggleBackupAudioFiles" />
+      <!-- queued alert -->
+      <widgets-alert v-if="isMetadataEmbedQueued" type="warning" class="mb-4">
+        <p class="text-lg">Audiobook is queued for metadata embed ({{ queuedEmbedLIds.length }} in queue)</p>
+      </widgets-alert>
+      <!-- metadata embed action buttons -->
+      <div v-else-if="isEmbedTool" class="w-full flex justify-end items-center mb-4">
+        <ui-checkbox v-if="!isTaskFinished" v-model="shouldBackupAudioFiles" :disabled="processing" label="Backup audio files" medium checkbox-bg="bg" label-class="pl-2 text-base md:text-lg" @input="toggleBackupAudioFiles" />
 
         <div class="flex-grow" />
 
-        <ui-btn v-if="!isFinished" color="primary" :loading="processing" @click.stop="embedClick">{{ $strings.ButtonStartMetadataEmbed }}</ui-btn>
+        <ui-btn v-if="!isTaskFinished" color="primary" :loading="processing" @click.stop="embedClick">{{ $strings.ButtonStartMetadataEmbed }}</ui-btn>
         <p v-else class="text-success text-lg font-semibold">{{ $strings.MessageEmbedFinished }}</p>
       </div>
+      <!-- m4b embed action buttons -->
       <div v-else class="w-full flex items-center mb-4">
         <button :disabled="processing" class="text-sm uppercase text-gray-200 flex items-center pt-px pl-1 pr-2 hover:bg-white/5 rounded-md" @click="showEncodeOptions = !showEncodeOptions">
           <span class="material-icons text-xl">{{ showEncodeOptions ? 'check_box' : 'check_box_outline_blank' }}</span> <span class="pl-1">Use Advanced Options</span>
@@ -83,6 +89,7 @@
         <p v-else class="text-success text-lg font-semibold">{{ $strings.MessageM4BFinished }}</p>
       </div>
 
+      <!-- advanced encoding options -->
       <div v-if="isM4BTool" class="overflow-hidden">
         <transition name="slide">
           <div v-if="showEncodeOptions" class="mb-4 pb-4 border-b border-white/10">
@@ -191,6 +198,7 @@ export default {
       cnosole.error('No audio files')
       return redirect('/?error=no audio files')
     }
+
     return {
       libraryItem
     }
@@ -200,7 +208,6 @@ export default {
       processing: false,
       audiofilesEncoding: {},
       audiofilesFinished: {},
-      isFinished: false,
       toneObject: null,
       selectedTool: 'embed',
       isCancelingEncode: false,
@@ -272,11 +279,28 @@ export default {
     isTaskFinished() {
       return this.task && this.task.isFinished
     },
+    tasks() {
+      return this.$store.getters['tasks/getTasksByLibraryItemId'](this.libraryItemId)
+    },
+    embedTask() {
+      return this.tasks.find((t) => t.action === 'embed-metadata')
+    },
+    encodeTask() {
+      return this.tasks.find((t) => t.action === 'encode-m4b')
+    },
     task() {
-      return this.$store.getters['tasks/getTaskByLibraryItemId'](this.libraryItemId)
+      if (this.isEmbedTool) return this.embedTask
+      else if (this.isM4BTool) return this.encodeTask
+      return null
     },
     taskRunning() {
       return this.task && !this.task.isFinished
+    },
+    queuedEmbedLIds() {
+      return this.$store.state.tasks.queuedEmbedLIds || []
+    },
+    isMetadataEmbedQueued() {
+      return this.queuedEmbedLIds.some((lid) => lid === this.libraryItemId)
     }
   },
   methods: {
@@ -322,7 +346,7 @@ export default {
         .catch((error) => {
           var errorMsg = error.response ? error.response.data || 'Unknown Error' : 'Unknown Error'
           this.$toast.error(errorMsg)
-          this.processing = true
+          this.processing = false
         })
     },
     embedClick() {
@@ -349,24 +373,6 @@ export default {
           this.processing = false
         })
     },
-    audioMetadataStarted(data) {
-      console.log('audio metadata started', data)
-      if (data.libraryItemId !== this.libraryItemId) return
-      this.audiofilesFinished = {}
-    },
-    audioMetadataFinished(data) {
-      console.log('audio metadata finished', data)
-      if (data.libraryItemId !== this.libraryItemId) return
-      this.processing = false
-      this.audiofilesEncoding = {}
-
-      if (data.failed) {
-        this.$toast.error(data.error)
-      } else {
-        this.isFinished = true
-        this.$toast.success('Audio file metadata updated')
-      }
-    },
     audiofileMetadataStarted(data) {
       if (data.libraryItemId !== this.libraryItemId) return
       this.$set(this.audiofilesEncoding, data.ino, true)
@@ -412,14 +418,10 @@ export default {
   },
   mounted() {
     this.init()
-    this.$root.socket.on('audio_metadata_started', this.audioMetadataStarted)
-    this.$root.socket.on('audio_metadata_finished', this.audioMetadataFinished)
     this.$root.socket.on('audiofile_metadata_started', this.audiofileMetadataStarted)
     this.$root.socket.on('audiofile_metadata_finished', this.audiofileMetadataFinished)
   },
   beforeDestroy() {
-    this.$root.socket.off('audio_metadata_started', this.audioMetadataStarted)
-    this.$root.socket.off('audio_metadata_finished', this.audioMetadataFinished)
     this.$root.socket.off('audiofile_metadata_started', this.audiofileMetadataStarted)
     this.$root.socket.off('audiofile_metadata_finished', this.audiofileMetadataFinished)
   }

client/pages/item/_id/index.vue

@@ -124,6 +124,14 @@
                   {{ sizePretty }}
                 </div>
               </div>
+              <div v-if="isBook" class="flex py-0.5">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">{{ $strings.LabelAbridged }}</span>
+                </div>
+                <div>
+                  {{ isAbridged ? 'Yes' : 'No' }}
+                </div>
+              </div>
             </div>
             <div class="hidden md:block flex-grow" />
           </div>
@@ -156,7 +164,7 @@
           <div v-if="!isPodcast && progressPercent > 0" class="px-4 py-2 mt-4 bg-primary text-sm font-semibold rounded-md text-gray-100 relative max-w-max mx-auto md:mx-0" :class="resettingProgress ? 'opacity-25' : ''">
             <p v-if="progressPercent < 1" class="leading-6">{{ $strings.LabelYourProgress }}: {{ Math.round(progressPercent * 100) }}%</p>
             <p v-else class="text-xs">{{ $strings.LabelFinished }} {{ $formatDate(userProgressFinishedAt, dateFormat) }}</p>
-            <p v-if="progressPercent < 1" class="text-gray-200 text-xs">{{ $getString('LabelTimeRemaining', [$elapsedPretty(userTimeRemaining)]) }}</p>
+            <p v-if="progressPercent < 1 && !useEBookProgress" class="text-gray-200 text-xs">{{ $getString('LabelTimeRemaining', [$elapsedPretty(userTimeRemaining)]) }}</p>
             <p class="text-gray-400 text-xs pt-1">{{ $strings.LabelStarted }} {{ $formatDate(userProgressStartedAt, dateFormat) }}</p>
 
             <div v-if="!resettingProgress" class="absolute -top-1.5 -right-1.5 p-1 w-5 h-5 rounded-full bg-bg hover:bg-error border border-primary flex items-center justify-center cursor-pointer" @click.stop="clearProgressClick">
@@ -319,7 +327,10 @@ export default {
       return this.libraryItem.isInvalid
     },
     isExplicit() {
-      return this.mediaMetadata.explicit || false
+      return !!this.mediaMetadata.explicit
+    },
+    isAbridged() {
+      return !!this.mediaMetadata.abridged
     },
     invalidAudioFiles() {
       if (!this.isBook) return []
@@ -471,7 +482,12 @@ export default {
       const duration = this.userMediaProgress.duration || this.duration
       return duration - this.userMediaProgress.currentTime
     },
+    useEBookProgress() {
+      if (!this.userMediaProgress || this.userMediaProgress.progress) return false
+      return this.userMediaProgress.ebookProgress > 0
+    },
     progressPercent() {
+      if (this.useEBookProgress) return Math.max(Math.min(1, this.userMediaProgress.ebookProgress), 0)
       return this.userMediaProgress ? Math.max(Math.min(1, this.userMediaProgress.progress), 0) : 0
     },
     userProgressStartedAt() {

client/store/globals.js

@@ -99,14 +99,14 @@ export const getters = {
 
     return `${rootState.routerBasePath}/api/items/${libraryItemId}/cover?token=${userToken}&ts=${lastUpdate}`
   },
-  getLibraryItemCoverSrcById: (state, getters, rootState, rootGetters) => (libraryItemId, placeholder = null) => {
+  getLibraryItemCoverSrcById: (state, getters, rootState, rootGetters) => (libraryItemId, placeholder = null, raw = false) => {
     if (!placeholder) placeholder = `${rootState.routerBasePath}/book_placeholder.jpg`
     if (!libraryItemId) return placeholder
     var userToken = rootGetters['user/getToken']
     if (process.env.NODE_ENV !== 'production') { // Testing
-      return `http://localhost:3333${rootState.routerBasePath}/api/items/${libraryItemId}/cover?token=${userToken}`
+      return `http://localhost:3333${rootState.routerBasePath}/api/items/${libraryItemId}/cover?token=${userToken}${raw ? '&raw=1' : ''}`
     }
-    return `${rootState.routerBasePath}/api/items/${libraryItemId}/cover?token=${userToken}`
+    return `${rootState.routerBasePath}/api/items/${libraryItemId}/cover?token=${userToken}${raw ? '&raw=1' : ''}`
   },
   getIsBatchSelectingMediaItems: (state) => {
     return state.selectedMediaItems.length

client/store/tasks.js

@@ -1,11 +1,12 @@
 
 export const state = () => ({
-  tasks: []
+  tasks: [],
+  queuedEmbedLIds: []
 })
 
 export const getters = {
-  getTaskByLibraryItemId: (state) => (libraryItemId) => {
-    return state.tasks.find(t => t.data && t.data.libraryItemId === libraryItemId)
+  getTasksByLibraryItemId: (state) => (libraryItemId) => {
+    return state.tasks.filter(t => t.data && t.data.libraryItemId === libraryItemId)
   }
 }
 
@@ -18,14 +19,31 @@ export const mutations = {
     state.tasks = tasks
   },
   addUpdateTask(state, task) {
-    var index = state.tasks.findIndex(d => d.id === task.id)
+    const index = state.tasks.findIndex(d => d.id === task.id)
     if (index >= 0) {
       state.tasks.splice(index, 1, task)
     } else {
+      // Remove duplicate (only have one library item per action)
+      state.tasks = state.tasks.filter(_task => {
+        if (!_task.data?.libraryItemId || _task.action !== task.action) return true
+        return _task.data.libraryItemId !== task.data.libraryItemId
+      })
+
       state.tasks.push(task)
     }
   },
   removeTask(state, task) {
     state.tasks = state.tasks.filter(d => d.id !== task.id)
+  },
+  setQueuedEmbedLIds(state, libraryItemIds) {
+    state.queuedEmbedLIds = libraryItemIds
+  },
+  addQueuedEmbedLId(state, libraryItemId) {
+    if (!state.queuedEmbedLIds.some(lid => lid === libraryItemId)) {
+      state.queuedEmbedLIds.push(libraryItemId)
+    }
+  },
+  removeQueuedEmbedLId(state, libraryItemId) {
+    state.queuedEmbedLIds = state.queuedEmbedLIds.filter(lid => lid !== libraryItemId)
   }
 }

client/strings/de.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Bibliothek aktualisieren",
   "HeaderUsers": "Benutzer",
   "HeaderYourStats": "Eigene Statistiken",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Kontoart",
   "LabelAccountTypeAdmin": "Admin",
   "LabelAccountTypeGuest": "Gast",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Mehrfachdatei",
   "LabelTracksSingleTrack": "Einzeldatei",
   "LabelType": "Typ",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Unbekannt",
   "LabelUpdateCover": "Titelbild aktualisieren",
   "LabelUpdateCoverHelp": "Erlaube das Überschreiben bestehender Titelbilder für die ausgewählten Hörbücher wenn eine Übereinstimmung gefunden wird",

client/strings/en-us.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Update Library",
   "HeaderUsers": "Users",
   "HeaderYourStats": "Your Stats",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Account Type",
   "LabelAccountTypeAdmin": "Admin",
   "LabelAccountTypeGuest": "Guest",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Multi-track",
   "LabelTracksSingleTrack": "Single-track",
   "LabelType": "Type",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Unknown",
   "LabelUpdateCover": "Update Cover",
   "LabelUpdateCoverHelp": "Allow overwriting of existing covers for the selected books when a match is located",
@@ -636,4 +638,4 @@
   "ToastSocketFailedToConnect": "Socket failed to connect",
   "ToastUserDeleteFailed": "Failed to delete user",
   "ToastUserDeleteSuccess": "User deleted"
-}
+}

client/strings/es.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Actualizar Biblioteca",
   "HeaderUsers": "Usuarios",
   "HeaderYourStats": "Tus Estáticas",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Tipo de Cuenta",
   "LabelAccountTypeAdmin": "Administrador",
   "LabelAccountTypeGuest": "Invitado",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Multi-track",
   "LabelTracksSingleTrack": "Single-track",
   "LabelType": "Tipo",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Desconocido",
   "LabelUpdateCover": "Actualizar Portada",
   "LabelUpdateCoverHelp": "Permitir sobrescribir portadas existentes de los libros seleccionados cuando sean encontrados.",

client/strings/fr.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Mettre à jour la bibliothèque",
   "HeaderUsers": "Utilisateurs",
   "HeaderYourStats": "Vos statistiques",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Type de compte",
   "LabelAccountTypeAdmin": "Admin",
   "LabelAccountTypeGuest": "Invité",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Piste multiple",
   "LabelTracksSingleTrack": "Piste simple",
   "LabelType": "Type",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Inconnu",
   "LabelUpdateCover": "Mettre à jour la couverture",
   "LabelUpdateCoverHelp": "Autoriser la mise à jour de la couverture existante lorsqu’une correspondance est trouvée",

client/strings/hr.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Aktualiziraj biblioteku",
   "HeaderUsers": "Korinici",
   "HeaderYourStats": "Tvoja statistika",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Vrsta korisničkog računa",
   "LabelAccountTypeAdmin": "Administrator",
   "LabelAccountTypeGuest": "Gost",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Multi-track",
   "LabelTracksSingleTrack": "Single-track",
   "LabelType": "Tip",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Nepoznato",
   "LabelUpdateCover": "Aktualiziraj Cover",
   "LabelUpdateCoverHelp": "Dozvoli postavljanje novog covera za odabrane knjige nakon što je match pronađen.",

client/strings/it.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Aggiorna Libreria",
   "HeaderUsers": "Utenti",
   "HeaderYourStats": "Statistiche Personali",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Tipo di Account",
   "LabelAccountTypeAdmin": "Admin",
   "LabelAccountTypeGuest": "Ospite",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Multi-traccia",
   "LabelTracksSingleTrack": "Traccia-singola",
   "LabelType": "Tipo",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Sconosciuto",
   "LabelUpdateCover": "Aggiornamento Cover",
   "LabelUpdateCoverHelp": "Consenti la sovrascrittura delle copertine esistenti per i libri selezionati quando viene trovata una corrispondenza",
@@ -636,4 +638,4 @@
   "ToastSocketFailedToConnect": "Socket non riesce a connettersi",
   "ToastUserDeleteFailed": "Errore eliminazione utente",
   "ToastUserDeleteSuccess": "Utente eliminato"
-}
+}

client/strings/pl.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Zaktualizuj bibliotekę",
   "HeaderUsers": "Użytkownicy",
   "HeaderYourStats": "Twoje statystyki",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Typ konta",
   "LabelAccountTypeAdmin": "Administrator",
   "LabelAccountTypeGuest": "Gość",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Multi-track",
   "LabelTracksSingleTrack": "Single-track",
   "LabelType": "Typ",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Nieznany",
   "LabelUpdateCover": "Zaktalizuj odkładkę",
   "LabelUpdateCoverHelp": "Umożliwienie nadpisania istniejących okładek dla wybranych książek w przypadku znalezienia dopasowania",

client/strings/ru.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "Обновить библиотеку",
   "HeaderUsers": "Пользователи",
   "HeaderYourStats": "Ваша статистика",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "Тип учетной записи",
   "LabelAccountTypeAdmin": "Администратор",
   "LabelAccountTypeGuest": "Гость",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "Мультитрек",
   "LabelTracksSingleTrack": "Один трек",
   "LabelType": "Тип",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "Неизвестно",
   "LabelUpdateCover": "Обновить обложку",
   "LabelUpdateCoverHelp": "Позволяет перезаписывать существующие обложки для выбранных книг если будут найдены",

client/strings/zh-cn.json

@@ -155,6 +155,7 @@
   "HeaderUpdateLibrary": "更新媒体库",
   "HeaderUsers": "用户",
   "HeaderYourStats": "你的统计数据",
+  "LabelAbridged": "Abridged",
   "LabelAccountType": "帐户类型",
   "LabelAccountTypeAdmin": "管理员",
   "LabelAccountTypeGuest": "来宾",
@@ -420,6 +421,7 @@
   "LabelTracksMultiTrack": "多轨",
   "LabelTracksSingleTrack": "单轨",
   "LabelType": "类型",
+  "LabelUnabridged": "Unabridged",
   "LabelUnknown": "未知",
   "LabelUpdateCover": "更新封面",
   "LabelUpdateCoverHelp": "找到匹配项时允许覆盖所选书籍存在的封面",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.2.17",
+  "version": "2.2.18",
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",
   "scripts": {
@@ -35,12 +35,10 @@
     "graceful-fs": "^4.2.10",
     "htmlparser2": "^8.0.1",
     "node-tone": "^1.0.1",
-    "sequelize": "^6.29.1",
     "socket.io": "^4.5.4",
-    "sqlite3": "^5.1.4",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
     "nodemon": "^2.0.20"
   }
-}
+}

server/Database.js

@@ -1,93 +0,0 @@
-const Path = require('path')
-const { Sequelize } = require('sequelize')
-
-const Logger = require('./Logger')
-
-class Database {
-  constructor() {
-    this.sequelize = null
-  }
-
-  get models() {
-    return this.sequelize?.models || {}
-  }
-
-  async init(force = false) {
-    if (!await this.connect()) {
-      throw new Error('Database connection failed')
-    }
-
-    await this.buildModels(force)
-    Logger.info(`[Database] Db initialized`, Object.keys(this.sequelize.models))
-  }
-
-  async connect() {
-    const dbPath = Path.join(global.ConfigPath, 'database.sqlite')
-    Logger.info(`[Database] Initializing db at "${dbPath}"`)
-    this.sequelize = new Sequelize({
-      dialect: 'sqlite',
-      storage: dbPath,
-      logging: false
-    })
-
-    // Helper function
-    this.sequelize.uppercaseFirst = str => str ? `${str[0].toUpperCase()}${str.substr(1)}` : ''
-
-    try {
-      await this.sequelize.authenticate()
-      Logger.info(`[Database] Db connection was successful`)
-      return true
-    } catch (error) {
-      Logger.error(`[Database] Failed to connect to db`, error)
-      return false
-    }
-  }
-
-  buildModels(force = false) {
-    require('./models/User')(this.sequelize)
-    require('./models/FileMetadata')(this.sequelize)
-    require('./models/EBookFile')(this.sequelize)
-    require('./models/Book')(this.sequelize)
-    require('./models/Podcast')(this.sequelize)
-    require('./models/Library')(this.sequelize)
-    require('./models/LibraryFolder')(this.sequelize)
-    require('./models/LibraryItem')(this.sequelize)
-    require('./models/PodcastEpisode')(this.sequelize)
-    require('./models/MediaProgress')(this.sequelize)
-    require('./models/LibraryFile')(this.sequelize)
-    require('./models/Person')(this.sequelize)
-    require('./models/AudioBookmark')(this.sequelize)
-    require('./models/MediaFile')(this.sequelize)
-    require('./models/MediaStream')(this.sequelize)
-    require('./models/AudioTrack')(this.sequelize)
-    require('./models/BookAuthor')(this.sequelize)
-    require('./models/BookChapter')(this.sequelize)
-    require('./models/Genre')(this.sequelize)
-    require('./models/BookGenre')(this.sequelize)
-    require('./models/PodcastGenre')(this.sequelize)
-    require('./models/BookNarrator')(this.sequelize)
-    require('./models/Series')(this.sequelize)
-    require('./models/BookSeries')(this.sequelize)
-    require('./models/Tag')(this.sequelize)
-    require('./models/BookTag')(this.sequelize)
-    require('./models/PodcastTag')(this.sequelize)
-    require('./models/Collection')(this.sequelize)
-    require('./models/CollectionBook')(this.sequelize)
-    require('./models/Playlist')(this.sequelize)
-    require('./models/PlaylistMediaItem')(this.sequelize)
-    require('./models/Device')(this.sequelize)
-    require('./models/PlaybackSession')(this.sequelize)
-    require('./models/PlaybackSessionListenTime')(this.sequelize)
-    require('./models/Feed')(this.sequelize)
-    require('./models/FeedEpisode')(this.sequelize)
-    require('./models/Setting')(this.sequelize)
-    require('./models/LibrarySetting')(this.sequelize)
-    require('./models/Notification')(this.sequelize)
-    require('./models/UserPermission')(this.sequelize)
-
-    return this.sequelize.sync({ force })
-  }
-}
-
-
-module.exports = new Database()

server/Server.js

@@ -8,8 +8,7 @@ const rateLimit = require('./libs/expressRateLimit')
 const { version } = require('../package.json')
 
 // Utils
-const dbMigration2 = require('./utils/migrations/dbMigrationOld')
-const dbMigration3 = require('./utils/migrations/dbMigration')
+const dbMigration = require('./utils/dbMigration')
 const filePerms = require('./utils/filePerms')
 const fileUtils = require('./utils/fileUtils')
 const Logger = require('./Logger')
@@ -18,11 +17,8 @@ const Auth = require('./Auth')
 const Watcher = require('./Watcher')
 const Scanner = require('./scanner/Scanner')
 const Db = require('./Db')
-const Database = require('./Database')
 const SocketAuthority = require('./SocketAuthority')
 
-const routes = require('./routes/index')
-
 const ApiRouter = require('./routers/ApiRouter')
 const HlsRouter = require('./routers/HlsRouter')
 const StaticRouter = require('./routers/StaticRouter')
@@ -86,7 +82,6 @@ class Server {
 
     // Routers
     this.apiRouter = new ApiRouter(this)
-
     this.hlsRouter = new HlsRouter(this.db, this.auth, this.playbackSessionManager)
     this.staticRouter = new StaticRouter(this.db)
 
@@ -104,18 +99,13 @@ class Server {
     Logger.info('[Server] Init v' + version)
     await this.playbackSessionManager.removeOrphanStreams()
 
-    // TODO: Test new db connection
-    const force = false
-    await Database.init(force)
-    if (force) await dbMigration3.migrate()
-
     const previousVersion = await this.db.checkPreviousVersion() // Returns null if same server version
     if (previousVersion) {
       Logger.debug(`[Server] Upgraded from previous version ${previousVersion}`)
     }
     if (previousVersion && previousVersion.localeCompare('2.0.0') < 0) { // Old version data model migration
       Logger.debug(`[Server] Previous version was < 2.0.0 - migration required`)
-      await dbMigration2.migrate(this.db)
+      await dbMigration.migrate(this.db)
     } else {
       await this.db.init()
     }
@@ -172,7 +162,6 @@ class Server {
     // Static folder
     router.use(express.static(Path.join(global.appRoot, 'static')))
 
-    router.use('/api/v1', routes)
     router.use('/api', this.authMiddleware.bind(this), this.apiRouter.router)
     router.use('/hls', this.authMiddleware.bind(this), this.hlsRouter.router)
     router.use('/s', this.authMiddleware.bind(this), this.staticRouter.router)

server/controllers/MeController.js

@@ -256,13 +256,13 @@ class MeController {
   }
 
   // GET: api/me/items-in-progress
-  async getAllLibraryItemsInProgress(req, res) {
+  getAllLibraryItemsInProgress(req, res) {
     const limit = !isNaN(req.query.limit) ? Number(req.query.limit) || 25 : 25
 
-    var itemsInProgress = []
+    let itemsInProgress = []
     for (const mediaProgress of req.user.mediaProgress) {
-      if (!mediaProgress.isFinished && mediaProgress.progress > 0) {
-        const libraryItem = await this.db.getLibraryItem(mediaProgress.libraryItemId)
+      if (!mediaProgress.isFinished && (mediaProgress.progress > 0 || mediaProgress.ebookProgress > 0)) {
+        const libraryItem = this.db.getLibraryItem(mediaProgress.libraryItemId)
         if (libraryItem) {
           if (mediaProgress.episodeId && libraryItem.mediaType === 'podcast') {
             const episode = libraryItem.media.episodes.find(ep => ep.id === mediaProgress.episodeId)

server/controllers/MiscController.js

@@ -90,9 +90,19 @@ class MiscController {
 
   // GET: api/tasks
   getTasks(req, res) {
-    res.json({
+    const includeArray = (req.query.include || '').split(',')
+
+    const data = {
       tasks: this.taskManager.tasks.map(t => t.toJSON())
-    })
+    }
+
+    if (includeArray.includes('queue')) {
+      data.queuedTaskData = {
+        embedMetadata: this.audioMetadataManager.getQueuedTaskData()
+      }
+    }
+
+    res.json(data)
   }
 
   // PATCH: api/settings (admin)

server/controllers/ToolsController.js

@@ -3,14 +3,8 @@ const Logger = require('../Logger')
 class ToolsController {
   constructor() { }
 
-
   // POST: api/tools/item/:id/encode-m4b
   async encodeM4b(req, res) {
-    if (!req.user.isAdminOrUp) {
-      Logger.error('[MiscController] encodeM4b: Non-admin user attempting to make m4b', req.user)
-      return res.sendStatus(403)
-    }
-
     if (req.libraryItem.isMissing || req.libraryItem.isInvalid) {
       Logger.error(`[MiscController] encodeM4b: library item not found or invalid ${req.params.id}`)
       return res.status(404).send('Audiobook not found')
@@ -34,11 +28,6 @@ class ToolsController {
 
   // DELETE: api/tools/item/:id/encode-m4b
   async cancelM4bEncode(req, res) {
-    if (!req.user.isAdminOrUp) {
-      Logger.error('[MiscController] cancelM4bEncode: Non-admin user attempting to cancel m4b encode', req.user)
-      return res.sendStatus(403)
-    }
-
     const workerTask = this.abMergeManager.getPendingTaskByLibraryItemId(req.params.id)
     if (!workerTask) return res.sendStatus(404)
 
@@ -49,14 +38,14 @@ class ToolsController {
 
   // POST: api/tools/item/:id/embed-metadata
   async embedAudioFileMetadata(req, res) {
-    if (!req.user.isAdminOrUp) {
-      Logger.error(`[LibraryItemController] Non-root user attempted to update audio metadata`, req.user)
-      return res.sendStatus(403)
+    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+      Logger.error(`[ToolsController] Invalid library item`)
+      return res.sendStatus(500)
     }
 
-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
-      Logger.error(`[LibraryItemController] Invalid library item`)
-      return res.sendStatus(500)
+    if (this.audioMetadataManager.getIsLibraryItemQueuedOrProcessing(req.libraryItem.id)) {
+      Logger.error(`[ToolsController] Library item (${req.libraryItem.id}) is already in queue or processing`)
+      return res.status(500).send('Library item is already in queue or processing')
     }
 
     const options = {
@@ -67,16 +56,66 @@ class ToolsController {
     res.sendStatus(200)
   }
 
-  itemMiddleware(req, res, next) {
-    var item = this.db.libraryItems.find(li => li.id === req.params.id)
-    if (!item || !item.media) return res.sendStatus(404)
+  // POST: api/tools/batch/embed-metadata
+  async batchEmbedMetadata(req, res) {
+    const libraryItemIds = req.body.libraryItemIds || []
+    if (!libraryItemIds.length) {
+      return res.status(400).send('Invalid request payload')
+    }
 
-    // Check user can access this library item
-    if (!req.user.checkCanAccessLibraryItem(item)) {
+    const libraryItems = []
+    for (const libraryItemId of libraryItemIds) {
+      const libraryItem = this.db.getLibraryItem(libraryItemId)
+      if (!libraryItem) {
+        Logger.error(`[ToolsController] Batch embed metadata library item (${libraryItemId}) not found`)
+        return res.sendStatus(404)
+      }
+
+      // Check user can access this library item
+      if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
+        Logger.error(`[ToolsController] Batch embed metadata library item (${libraryItemId}) not accessible to user`, req.user)
+        return res.sendStatus(403)
+      }
+
+      if (libraryItem.isMissing || !libraryItem.hasAudioFiles || !libraryItem.isBook) {
+        Logger.error(`[ToolsController] Batch embed invalid library item (${libraryItemId})`)
+        return res.sendStatus(500)
+      }
+
+      if (this.audioMetadataManager.getIsLibraryItemQueuedOrProcessing(libraryItemId)) {
+        Logger.error(`[ToolsController] Batch embed library item (${libraryItemId}) is already in queue or processing`)
+        return res.status(500).send('Library item is already in queue or processing')
+      }
+
+      libraryItems.push(libraryItem)
+    }
+
+    const options = {
+      forceEmbedChapters: req.query.forceEmbedChapters === '1',
+      backup: req.query.backup === '1'
+    }
+    this.audioMetadataManager.handleBatchEmbed(req.user, libraryItems, options)
+    res.sendStatus(200)
+  }
+
+  middleware(req, res, next) {
+    if (!req.user.isAdminOrUp) {
+      Logger.error(`[LibraryItemController] Non-root user attempted to access tools route`, req.user)
       return res.sendStatus(403)
     }
 
-    req.libraryItem = item
+    if (req.params.id) {
+      const item = this.db.libraryItems.find(li => li.id === req.params.id)
+      if (!item || !item.media) return res.sendStatus(404)
+
+      // Check user can access this library item
+      if (!req.user.checkCanAccessLibraryItem(item)) {
+        return res.sendStatus(403)
+      }
+
+      req.libraryItem = item
+    }
+
     next()
   }
 }

server/controllers/UserController.js

@@ -11,9 +11,9 @@ class UserController {
   findAll(req, res) {
     if (!req.user.isAdminOrUp) return res.sendStatus(403)
     const hideRootToken = !req.user.isRoot
-    const users = this.db.users.map(u => this.userJsonWithItemProgressDetails(u, hideRootToken))
     res.json({
-      users: users
+      // Minimal toJSONForBrowser does not include mediaProgress and bookmarks
+      users: this.db.users.map(u => u.toJSONForBrowser(hideRootToken, true))
     })
   }
 

server/controllers2/item.controller.js

@@ -1,18 +0,0 @@
-const itemDb = require('../db/item.db')
-
-const getLibraryItem = async (req, res) => {
-  let libraryItem = null
-  if (req.query.minified == 1) {
-    libraryItem = await itemDb.getLibraryItemMinified(req.params.id)
-  } else if (req.query.expanded == 1) {
-    libraryItem = await itemDb.getLibraryItemExpanded(req.params.id)
-  } else {
-    libraryItem = await itemDb.getLibraryItemFull(req.params.id)
-  }
-
-  res.json(libraryItem)
-}
-
-module.exports = {
-  getLibraryItem
-}

server/controllers2/library.controller.js

@@ -1,28 +0,0 @@
-const libraryDb = require('../db/library.db')
-const itemDb = require('../db/item.db')
-
-const getAllLibraries = async (req, res) => {
-  const libraries = await libraryDb.getAllLibraries()
-  res.json({
-    libraries
-  })
-}
-
-const getLibrary = async (req, res) => {
-  const library = await libraryDb.getLibrary(req.params.id)
-  if (!library) return res.sendStatus(404)
-  res.json(library)
-}
-
-const getLibraryItems = async (req, res) => {
-  const libraryItems = await itemDb.getLibraryItemsForLibrary(req.params.id)
-  res.json({
-    libraryItems
-  })
-}
-
-module.exports = {
-  getAllLibraries,
-  getLibrary,
-  getLibraryItems
-}

server/db/item.db.js

@@ -1,353 +0,0 @@
-const { Sequelize } = require('sequelize')
-const Database = require('../Database')
-
-const getLibraryItemMinified = (libraryItemId) => {
-  return Database.models.libraryItem.findByPk(libraryItemId, {
-    include: [
-      {
-        model: Database.models.book,
-        attributes: [
-          'id', 'title', 'subtitle', 'publishedYear', 'publishedDate', 'publisher', 'description', 'isbn', 'asin', 'language', 'explicit',
-          [Sequelize.literal('(SELECT COUNT(*) FROM "audioTracks" WHERE "audioTracks"."mediaItemId" = book.id)'), 'numAudioTracks'],
-          [Sequelize.literal('(SELECT COUNT(*) FROM "bookChapters" WHERE "bookChapters"."bookId" = book.id)'), 'numChapters']
-        ],
-        include: [
-          {
-            model: Database.models.genre,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'authors',
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'narrators',
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.series,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ]
-      },
-      {
-        model: Database.models.podcast,
-        attributes: [
-          'id', 'title', 'author', 'releaseDate', 'feedURL', 'imageURL', 'description', 'itunesPageURL', 'itunesId', 'itunesArtistId', 'language', 'podcastType', 'explicit', 'autoDownloadEpisodes',
-          [Sequelize.literal('(SELECT COUNT(*) FROM "podcastEpisodes" WHERE "podcastEpisodes"."podcastId" = podcast.id)'), 'numPodcastEpisodes']
-        ],
-        include: [
-          {
-            model: Database.models.genre,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-        ]
-      }
-    ]
-  })
-}
-
-const getLibraryItemFull = (libraryItemId) => {
-  return Database.models.libraryItem.findByPk(libraryItemId, {
-    include: [
-      {
-        model: Database.models.book,
-        include: [
-          {
-            model: Database.models.audioTrack
-          },
-          {
-            model: Database.models.genre,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'authors',
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'narrators',
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          },
-          {
-            model: Database.models.bookChapter
-          },
-          {
-            model: Database.models.eBookFile,
-            include: 'fileMetadata'
-          }
-        ]
-      },
-      {
-        model: Database.models.podcast,
-        include: [
-          {
-            model: Database.models.podcastEpisode,
-            include: {
-              model: Database.models.audioTrack
-            }
-          },
-          {
-            model: Database.models.genre,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            through: {
-              attributes: []
-            }
-          },
-        ]
-      }
-    ]
-  })
-}
-
-const getLibraryItemExpanded = (libraryItemId) => {
-  return Database.models.libraryItem.findByPk(libraryItemId, {
-    include: [
-      {
-        model: Database.models.book,
-        include: [
-          {
-            model: Database.models.fileMetadata,
-            as: 'imageFile'
-          },
-          {
-            model: Database.models.audioTrack,
-            include: {
-              model: Database.models.mediaFile,
-              include: [
-                'fileMetadata',
-                'mediaStreams'
-              ]
-            }
-          },
-          {
-            model: Database.models.genre,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'authors',
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'narrators',
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          },
-          {
-            model: Database.models.bookChapter
-          },
-          {
-            model: Database.models.eBookFile,
-            include: 'fileMetadata'
-          }
-        ]
-      },
-      {
-        model: Database.models.podcast,
-        include: [
-          {
-            model: Database.models.fileMetadata,
-            as: 'imageFile'
-          },
-          {
-            model: Database.models.podcastEpisode,
-            include: {
-              model: Database.models.audioTrack,
-              include: {
-                model: Database.models.mediaFile,
-                include: [
-                  'fileMetadata',
-                  'mediaStreams'
-                ]
-              }
-            }
-          },
-          {
-            model: Database.models.genre,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            through: {
-              attributes: []
-            }
-          },
-        ]
-      },
-      {
-        model: Database.models.libraryFile,
-        include: 'fileMetadata'
-      },
-      'libraryFolder',
-      'library'
-    ]
-  })
-}
-
-const getLibraryItemsForLibrary = async (libraryId) => {
-  return Database.models.libraryItem.findAll({
-    where: {
-      libraryId
-    },
-    limit: 50,
-    order: [
-      [Database.models.book, 'title', 'DESC'],
-      [Database.models.podcast, 'title', 'DESC']
-    ],
-    include: [
-      {
-        model: Database.models.book,
-        attributes: [
-          'id', 'title', 'subtitle', 'publishedYear', 'publishedDate', 'publisher', 'description', 'isbn', 'asin', 'language', 'explicit',
-          [Sequelize.literal('(SELECT COUNT(*) FROM "audioTracks" WHERE "audioTracks"."mediaItemId" = book.id)'), 'numAudioTracks'],
-          [Sequelize.literal('(SELECT COUNT(*) FROM "bookChapters" WHERE "bookChapters"."bookId" = book.id)'), 'numChapters']
-        ],
-        include: [
-          {
-            model: Database.models.genre,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'authors',
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.person,
-            as: 'narrators',
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.series,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ]
-      },
-      {
-        model: Database.models.podcast,
-        attributes: [
-          'id', 'title', 'author', 'releaseDate', 'feedURL', 'imageURL', 'description', 'itunesPageURL', 'itunesId', 'itunesArtistId', 'language', 'podcastType', 'explicit', 'autoDownloadEpisodes',
-          [Sequelize.literal('(SELECT COUNT(*) FROM "podcastEpisodes" WHERE "podcastEpisodes"."podcastId" = podcast.id)'), 'numPodcastEpisodes']
-        ],
-        include: [
-          {
-            model: Database.models.genre,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: Database.models.tag,
-            attributes: ['id', 'name'],
-            through: {
-              attributes: []
-            }
-          },
-        ]
-      }
-    ]
-  })
-}
-
-module.exports = {
-  getLibraryItemMinified,
-  getLibraryItemFull,
-  getLibraryItemExpanded,
-  getLibraryItemsForLibrary
-}

server/db/library.db.js

@@ -1,24 +0,0 @@
-const Database = require('../Database')
-
-const getAllLibraries = () => {
-  return Database.models.library.findAll({
-    include: {
-      model: Database.models.librarySetting,
-      attributes: ['key', 'value']
-    }
-  })
-}
-
-const getLibrary = (libraryId) => {
-  return Database.models.library.findByPk(libraryId, {
-    include: {
-      model: Database.models.librarySetting,
-      attributes: ['key', 'value']
-    }
-  })
-}
-
-module.exports = {
-  getAllLibraries,
-  getLibrary
-}

server/managers/AudioMetadataManager.js

@@ -5,18 +5,42 @@ const Logger = require('../Logger')
 
 const fs = require('../libs/fsExtra')
 
-const { secondsToTimestamp } = require('../utils/index')
 const toneHelpers = require('../utils/toneHelpers')
-const filePerms = require('../utils/filePerms')
+
+const Task = require('../objects/Task')
 
 class AudioMetadataMangaer {
   constructor(db, taskManager) {
     this.db = db
     this.taskManager = taskManager
+
+    this.itemsCacheDir = Path.join(global.MetadataPath, 'cache/items')
+
+    this.MAX_CONCURRENT_TASKS = 1
+    this.tasksRunning = []
+    this.tasksQueued = []
+  }
+
+  /**
+  * Get queued task data
+  * @return {Array}
+  */
+  getQueuedTaskData() {
+    return this.tasksQueued.map(t => t.data)
+  }
+
+  getIsLibraryItemQueuedOrProcessing(libraryItemId) {
+    return this.tasksQueued.some(t => t.data.libraryItemId === libraryItemId) || this.tasksRunning.some(t => t.data.libraryItemId === libraryItemId)
   }
 
   getToneMetadataObjectForApi(libraryItem) {
-    return toneHelpers.getToneMetadataObject(libraryItem)
+    return toneHelpers.getToneMetadataObject(libraryItem, libraryItem.media.chapters, libraryItem.media.tracks.length)
+  }
+
+  handleBatchEmbed(user, libraryItems, options = {}) {
+    libraryItems.forEach((li) => {
+      this.updateMetadataForItem(user, li, options)
+    })
   }
 
   async updateMetadataForItem(user, libraryItem, options = {}) {
@@ -25,99 +49,144 @@ class AudioMetadataMangaer {
 
     const audioFiles = libraryItem.media.includedAudioFiles
 
-    const itemAudioMetadataPayload = {
-      userId: user.id,
+    const task = new Task()
+
+    const itemCachePath = Path.join(this.itemsCacheDir, libraryItem.id)
+
+    // Only writing chapters for single file audiobooks
+    const chapters = (audioFiles.length == 1 || forceEmbedChapters) ? libraryItem.media.chapters.map(c => ({ ...c })) : null
+
+    // Create task
+    const taskData = {
       libraryItemId: libraryItem.id,
-      startedAt: Date.now(),
-      audioFiles: audioFiles.map(af => ({ index: af.index, ino: af.ino, filename: af.metadata.filename }))
+      libraryItemPath: libraryItem.path,
+      userId: user.id,
+      audioFiles: audioFiles.map(af => (
+        {
+          index: af.index,
+          ino: af.ino,
+          filename: af.metadata.filename,
+          path: af.metadata.path,
+          cachePath: Path.join(itemCachePath, af.metadata.filename)
+        }
+      )),
+      coverPath: libraryItem.media.coverPath,
+      metadataObject: toneHelpers.getToneMetadataObject(libraryItem, chapters, audioFiles.length),
+      itemCachePath,
+      chapters,
+      options: {
+        forceEmbedChapters,
+        backupFiles
+      }
     }
+    const taskDescription = `Embedding metadata in audiobook "${libraryItem.media.metadata.title}".`
+    task.setData('embed-metadata', 'Embedding Metadata', taskDescription, taskData)
 
-    SocketAuthority.emitter('audio_metadata_started', itemAudioMetadataPayload)
+    if (this.tasksRunning.length >= this.MAX_CONCURRENT_TASKS) {
+      Logger.info(`[AudioMetadataManager] Queueing embed metadata for audiobook "${libraryItem.media.metadata.title}"`)
+      SocketAuthority.adminEmitter('metadata_embed_queue_update', {
+        libraryItemId: libraryItem.id,
+        queued: true
+      })
+      this.tasksQueued.push(task)
+    } else {
+      this.runMetadataEmbed(task)
+    }
+  }
 
-    // Ensure folder for backup files
-    const itemCacheDir = Path.join(global.MetadataPath, `cache/items/${libraryItem.id}`)
+  async runMetadataEmbed(task) {
+    this.tasksRunning.push(task)
+    this.taskManager.addTask(task)
+
+    Logger.info(`[AudioMetadataManager] Starting metadata embed task`, task.description)
+
+    // Ensure item cache dir exists
     let cacheDirCreated = false
-    if (!await fs.pathExists(itemCacheDir)) {
-      await fs.mkdir(itemCacheDir)
-      await filePerms.setDefault(itemCacheDir, true)
+    if (!await fs.pathExists(task.data.itemCachePath)) {
+      await fs.mkdir(task.data.itemCachePath)
       cacheDirCreated = true
     }
 
-    // Write chapters file
-    const toneJsonPath = Path.join(itemCacheDir, 'metadata.json')
-
+    // Create metadata json file
+    const toneJsonPath = Path.join(task.data.itemCachePath, 'metadata.json')
     try {
-      const chapters = (audioFiles.length == 1 || forceEmbedChapters) ? libraryItem.media.chapters : null
-      await toneHelpers.writeToneMetadataJsonFile(libraryItem, chapters, toneJsonPath, audioFiles.length)
+      await fs.writeFile(toneJsonPath, JSON.stringify({ meta: task.data.metadataObject }, null, 2))
     } catch (error) {
       Logger.error(`[AudioMetadataManager] Write metadata.json failed`, error)
-
-      itemAudioMetadataPayload.failed = true
-      itemAudioMetadataPayload.error = 'Failed to write metadata.json'
-      SocketAuthority.emitter('audio_metadata_finished', itemAudioMetadataPayload)
+      task.setFailed('Failed to write metadata.json')
+      this.handleTaskFinished(task)
       return
     }
 
-    const results = []
-    for (const af of audioFiles) {
-      const result = await this.updateAudioFileMetadataWithTone(libraryItem, af, toneJsonPath, itemCacheDir, backupFiles)
-      results.push(result)
+    // Tag audio files
+    for (const af of task.data.audioFiles) {
+      SocketAuthority.adminEmitter('audiofile_metadata_started', {
+        libraryItemId: task.data.libraryItemId,
+        ino: af.ino
+      })
+
+      // Backup audio file
+      if (task.data.options.backupFiles) {
+        try {
+          const backupFilePath = Path.join(task.data.itemCachePath, af.filename)
+          await fs.copy(af.path, backupFilePath)
+          Logger.debug(`[AudioMetadataManager] Backed up audio file at "${backupFilePath}"`)
+        } catch (err) {
+          Logger.error(`[AudioMetadataManager] Failed to backup audio file "${af.path}"`, err)
+        }
+      }
+
+      const _toneMetadataObject = {
+        'ToneJsonFile': toneJsonPath,
+        'TrackNumber': af.index,
+      }
+
+      if (task.data.coverPath) {
+        _toneMetadataObject['CoverFile'] = task.data.coverPath
+      }
+
+      const success = await toneHelpers.tagAudioFile(af.path, _toneMetadataObject)
+      if (success) {
+        Logger.info(`[AudioMetadataManager] Successfully tagged audio file "${af.path}"`)
+      }
+
+      SocketAuthority.adminEmitter('audiofile_metadata_finished', {
+        libraryItemId: task.data.libraryItemId,
+        ino: af.ino
+      })
     }
 
     // Remove temp cache file/folder if not backing up
-    if (!backupFiles) {
+    if (!task.data.options.backupFiles) {
       // If cache dir was created from this then remove it
       if (cacheDirCreated) {
-        await fs.remove(itemCacheDir)
+        await fs.remove(task.data.itemCachePath)
       } else {
         await fs.remove(toneJsonPath)
       }
     }
 
-    const elapsed = Date.now() - itemAudioMetadataPayload.startedAt
-    Logger.debug(`[AudioMetadataManager] Elapsed ${secondsToTimestamp(elapsed / 1000, true)}`)
-    itemAudioMetadataPayload.results = results
-    itemAudioMetadataPayload.elapsed = elapsed
-    itemAudioMetadataPayload.finishedAt = Date.now()
-    SocketAuthority.emitter('audio_metadata_finished', itemAudioMetadataPayload)
+    task.setFinished()
+    this.handleTaskFinished(task)
   }
 
-  async updateAudioFileMetadataWithTone(libraryItem, audioFile, toneJsonPath, itemCacheDir, backupFiles) {
-    const resultPayload = {
-      libraryItemId: libraryItem.id,
-      index: audioFile.index,
-      ino: audioFile.ino,
-      filename: audioFile.metadata.filename
-    }
-    SocketAuthority.emitter('audiofile_metadata_started', resultPayload)
+  handleTaskFinished(task) {
+    this.taskManager.taskFinished(task)
+    this.tasksRunning = this.tasksRunning.filter(t => t.id !== task.id)
 
-    // Backup audio file
-    if (backupFiles) {
-      try {
-        const backupFilePath = Path.join(itemCacheDir, audioFile.metadata.filename)
-        await fs.copy(audioFile.metadata.path, backupFilePath)
-        Logger.debug(`[AudioMetadataManager] Backed up audio file at "${backupFilePath}"`)
-      } catch (err) {
-        Logger.error(`[AudioMetadataManager] Failed to backup audio file "${audioFile.metadata.path}"`, err)
-      }
+    if (this.tasksRunning.length < this.MAX_CONCURRENT_TASKS && this.tasksQueued.length) {
+      Logger.info(`[AudioMetadataManager] Task finished and dequeueing next task. ${this.tasksQueued} tasks queued.`)
+      const nextTask = this.tasksQueued.shift()
+      SocketAuthority.emitter('metadata_embed_queue_update', {
+        libraryItemId: nextTask.data.libraryItemId,
+        queued: false
+      })
+      this.runMetadataEmbed(nextTask)
+    } else if (this.tasksRunning.length > 0) {
+      Logger.debug(`[AudioMetadataManager] Task finished but not dequeueing. Currently running ${this.tasksRunning.length} tasks. ${this.tasksQueued.length} tasks queued.`)
+    } else {
+      Logger.debug(`[AudioMetadataManager] Task finished and no tasks remain in queue`)
     }
-
-    const _toneMetadataObject = {
-      'ToneJsonFile': toneJsonPath,
-      'TrackNumber': audioFile.index,
-    }
-
-    if (libraryItem.media.coverPath) {
-      _toneMetadataObject['CoverFile'] = libraryItem.media.coverPath
-    }
-
-    resultPayload.success = await toneHelpers.tagAudioFile(audioFile.metadata.path, _toneMetadataObject)
-    if (resultPayload.success) {
-      Logger.info(`[AudioMetadataManager] Successfully tagged audio file "${audioFile.metadata.path}"`)
-    }
-
-    SocketAuthority.emitter('audiofile_metadata_finished', resultPayload)
-    return resultPayload
   }
 }
 module.exports = AudioMetadataMangaer

server/managers/PodcastManager.js

@@ -4,11 +4,12 @@ const SocketAuthority = require('../SocketAuthority')
 const fs = require('../libs/fsExtra')
 
 const { getPodcastFeed } = require('../utils/podcastUtils')
-const { downloadFile, removeFile } = require('../utils/fileUtils')
+const { removeFile, downloadFile } = require('../utils/fileUtils')
 const filePerms = require('../utils/filePerms')
 const { levenshteinDistance } = require('../utils/index')
 const opmlParser = require('../utils/parsers/parseOPML')
 const prober = require('../utils/prober')
+const ffmpegHelpers = require('../utils/ffmpegHelpers')
 
 const LibraryFile = require('../objects/files/LibraryFile')
 const PodcastEpisodeDownload = require('../objects/PodcastEpisodeDownload')
@@ -93,10 +94,22 @@ class PodcastManager {
       await filePerms.setDefault(this.currentDownload.libraryItem.path)
     }
 
-    let success = await downloadFile(this.currentDownload.url, this.currentDownload.targetPath).then(() => true).catch((error) => {
-      Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
-      return false
-    })
+
+    let success = false
+    if (this.currentDownload.urlFileExtension === 'mp3') {
+      // Download episode and tag it
+      success = await ffmpegHelpers.downloadPodcastEpisode(this.currentDownload).catch((error) => {
+        Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
+        return false
+      })
+    } else {
+      // Download episode only
+      success = await downloadFile(this.currentDownload.url, this.currentDownload.targetPath).then(() => true).catch((error) => {
+        Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
+        return false
+      })
+    }
+
     if (success) {
       success = await this.scanAddPodcastEpisodeAudioFile()
       if (!success) {
@@ -126,22 +139,22 @@ class PodcastManager {
   }
 
   async scanAddPodcastEpisodeAudioFile() {
-    var libraryFile = await this.getLibraryFile(this.currentDownload.targetPath, this.currentDownload.targetRelPath)
+    const libraryFile = await this.getLibraryFile(this.currentDownload.targetPath, this.currentDownload.targetRelPath)
 
     // TODO: Set meta tags on new audio file
 
-    var audioFile = await this.probeAudioFile(libraryFile)
+    const audioFile = await this.probeAudioFile(libraryFile)
     if (!audioFile) {
       return false
     }
 
-    var libraryItem = this.db.libraryItems.find(li => li.id === this.currentDownload.libraryItem.id)
+    const libraryItem = this.db.libraryItems.find(li => li.id === this.currentDownload.libraryItem.id)
     if (!libraryItem) {
       Logger.error(`[PodcastManager] Podcast Episode finished but library item was not found ${this.currentDownload.libraryItem.id}`)
       return false
     }
 
-    var podcastEpisode = this.currentDownload.podcastEpisode
+    const podcastEpisode = this.currentDownload.podcastEpisode
     podcastEpisode.audioFile = audioFile
     libraryItem.media.addPodcastEpisode(podcastEpisode)
     if (libraryItem.isInvalid) {

server/models/AudioBookmark.js

@@ -1,75 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-/*
- * Polymorphic association: https://sequelize.org/docs/v6/advanced-association-concepts/polymorphic-associations/
- * Book has many AudioBookmark. PodcastEpisode has many AudioBookmark.
- */
-module.exports = (sequelize) => {
-  class AudioBookmark extends Model {
-    getMediaItem(options) {
-      if (!this.mediaItemType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaItemType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  AudioBookmark.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    mediaItemId: DataTypes.UUIDV4,
-    mediaItemType: DataTypes.STRING,
-    title: DataTypes.STRING,
-    time: DataTypes.INTEGER
-  }, {
-    sequelize,
-    modelName: 'audioBookmark'
-  })
-
-  const { user, book, podcastEpisode } = sequelize.models
-  book.hasMany(AudioBookmark, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'book'
-    }
-  })
-  AudioBookmark.belongsTo(book, { foreignKey: 'mediaItemId', constraints: false })
-
-  podcastEpisode.hasMany(AudioBookmark, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'podcastEpisode'
-    }
-  })
-  AudioBookmark.belongsTo(podcastEpisode, { foreignKey: 'mediaItemId', constraints: false })
-
-  AudioBookmark.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-
-    for (const instance of findResult) {
-      if (instance.mediaItemType === 'book' && instance.book !== undefined) {
-        instance.mediaItem = instance.book
-        instance.dataValues.mediaItem = instance.dataValues.book
-      } else if (instance.mediaItemType === 'podcastEpisode' && instance.podcastEpisode !== undefined) {
-        instance.mediaItem = instance.podcastEpisode
-        instance.dataValues.mediaItem = instance.dataValues.podcastEpisode
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcastEpisode
-      delete instance.dataValues.podcastEpisode
-    }
-  })
-
-  user.hasMany(AudioBookmark)
-  AudioBookmark.belongsTo(user)
-
-  return AudioBookmark
-}

server/models/AudioTrack.js

@@ -1,82 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-/*
- * Polymorphic association: https://sequelize.org/docs/v6/advanced-association-concepts/polymorphic-associations/
- * Book has many AudioTrack. PodcastEpisode has one AudioTrack.
- */
-module.exports = (sequelize) => {
-  class AudioTrack extends Model {
-    getMediaItem(options) {
-      if (!this.mediaItemType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaItemType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  AudioTrack.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    mediaItemId: DataTypes.UUIDV4,
-    mediaItemType: DataTypes.STRING,
-    index: DataTypes.INTEGER,
-    startOffset: DataTypes.FLOAT,
-    duration: DataTypes.FLOAT,
-    title: DataTypes.STRING,
-    mimeType: DataTypes.STRING,
-    codec: DataTypes.STRING,
-    trackNumber: DataTypes.INTEGER,
-    discNumber: DataTypes.INTEGER
-  }, {
-    sequelize,
-    modelName: 'audioTrack'
-  })
-
-  const { book, podcastEpisode, mediaFile } = sequelize.models
-
-  mediaFile.hasOne(AudioTrack)
-  AudioTrack.belongsTo(mediaFile)
-
-  book.hasMany(AudioTrack, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'book'
-    }
-  })
-  AudioTrack.belongsTo(book, { foreignKey: 'mediaItemId', constraints: false })
-
-  podcastEpisode.hasOne(AudioTrack, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'podcastEpisode'
-    }
-  })
-  AudioTrack.belongsTo(podcastEpisode, { foreignKey: 'mediaItemId', constraints: false })
-
-  AudioTrack.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-
-    for (const instance of findResult) {
-      if (instance.mediaItemType === 'book' && instance.book !== undefined) {
-        instance.mediaItem = instance.book
-        instance.dataValues.mediaItem = instance.dataValues.book
-      } else if (instance.mediaItemType === 'podcastEpisode' && instance.podcastEpisode !== undefined) {
-        instance.mediaItem = instance.podcastEpisode
-        instance.dataValues.mediaItem = instance.dataValues.podcastEpisode
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcastEpisode
-      delete instance.dataValues.podcastEpisode
-    }
-  })
-
-  return AudioTrack
-}

server/models/Book.js

@@ -1,38 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Book extends Model { }
-
-  Book.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    title: DataTypes.STRING,
-    subtitle: DataTypes.STRING,
-    publishedYear: DataTypes.STRING,
-    publishedDate: DataTypes.STRING,
-    publisher: DataTypes.STRING,
-    description: DataTypes.TEXT,
-    isbn: DataTypes.STRING,
-    asin: DataTypes.STRING,
-    language: DataTypes.STRING,
-    explicit: DataTypes.BOOLEAN,
-    lastCoverSearchQuery: DataTypes.STRING,
-    lastCoverSearch: DataTypes.DATE
-  }, {
-    sequelize,
-    modelName: 'book'
-  })
-
-  const { fileMetadata, eBookFile } = sequelize.models
-
-  fileMetadata.hasOne(Book, { foreignKey: 'imageFileId' })
-  Book.belongsTo(fileMetadata, { as: 'imageFile', foreignKey: 'imageFileId' }) // Ref: https://sequelize.org/docs/v6/core-concepts/assocs/#defining-an-alias
-
-  eBookFile.hasOne(Book)
-  Book.belongsTo(eBookFile)
-
-  return Book
-}

server/models/BookAuthor.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookAuthor extends Model { }
-
-  BookAuthor.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'bookAuthor',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, person } = sequelize.models
-  book.belongsToMany(person, { through: BookAuthor, as: 'authors', otherKey: 'authorId' })
-  person.belongsToMany(book, { through: BookAuthor, foreignKey: 'authorId' })
-
-  book.hasMany(BookAuthor)
-  BookAuthor.belongsTo(book)
-
-  person.hasMany(BookAuthor, { foreignKey: 'authorId' })
-  BookAuthor.belongsTo(person, { as: 'author', foreignKey: 'authorId' })
-
-  return BookAuthor
-}

server/models/BookChapter.js

@@ -1,27 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookChapter extends Model { }
-
-  BookChapter.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    index: DataTypes.INTEGER,
-    title: DataTypes.STRING,
-    start: DataTypes.FLOAT,
-    end: DataTypes.FLOAT
-  }, {
-    sequelize,
-    modelName: 'bookChapter'
-  })
-
-  const { book } = sequelize.models
-
-  book.hasMany(BookChapter)
-  BookChapter.belongsTo(book)
-
-  return BookChapter
-}

server/models/BookGenre.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookGenre extends Model { }
-
-  BookGenre.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'bookGenre',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, genre } = sequelize.models
-  book.belongsToMany(genre, { through: BookGenre })
-  genre.belongsToMany(book, { through: BookGenre })
-
-  book.hasMany(BookGenre)
-  BookGenre.belongsTo(book)
-
-  genre.hasMany(BookGenre)
-  BookGenre.belongsTo(genre)
-
-  return BookGenre
-}

server/models/BookNarrator.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookNarrator extends Model { }
-
-  BookNarrator.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'bookNarrator',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, person } = sequelize.models
-  book.belongsToMany(person, { through: BookNarrator, as: 'narrators', otherKey: 'narratorId' })
-  person.belongsToMany(book, { through: BookNarrator, foreignKey: 'narratorId' })
-
-  book.hasMany(BookNarrator)
-  BookNarrator.belongsTo(book)
-
-  person.hasMany(BookNarrator, { foreignKey: 'narratorId' })
-  BookNarrator.belongsTo(person, { as: 'narrator', foreignKey: 'narratorId' })
-
-  return BookNarrator
-}

server/models/BookSeries.js

@@ -1,32 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookSeries extends Model { }
-
-  BookSeries.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    sequence: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'bookSeries',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, series } = sequelize.models
-  book.belongsToMany(series, { through: BookSeries })
-  series.belongsToMany(book, { through: BookSeries })
-
-  book.hasMany(BookSeries)
-  BookSeries.belongsTo(book)
-
-  series.hasMany(BookSeries)
-  BookSeries.belongsTo(series)
-
-  return BookSeries
-}

server/models/BookTag.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class BookTag extends Model { }
-
-  BookTag.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'bookTag',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, tag } = sequelize.models
-  book.belongsToMany(tag, { through: BookTag })
-  tag.belongsToMany(book, { through: BookTag })
-
-  book.hasMany(BookTag)
-  BookTag.belongsTo(book)
-
-  tag.hasMany(BookTag)
-  BookTag.belongsTo(tag)
-
-  return BookTag
-}

server/models/Collection.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Collection extends Model { }
-
-  Collection.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    description: DataTypes.TEXT
-  }, {
-    sequelize,
-    modelName: 'collection'
-  })
-
-  const { library } = sequelize.models
-
-  library.hasMany(Collection)
-  Collection.belongsTo(library)
-
-  return Collection
-}

server/models/CollectionBook.js

@@ -1,32 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class CollectionBook extends Model { }
-
-  CollectionBook.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    timestamps: true,
-    updatedAt: false,
-    modelName: 'collectionBook'
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { book, collection } = sequelize.models
-  book.belongsToMany(collection, { through: CollectionBook })
-  collection.belongsToMany(book, { through: CollectionBook })
-
-  book.hasMany(CollectionBook)
-  CollectionBook.belongsTo(book)
-
-  collection.hasMany(CollectionBook)
-  CollectionBook.belongsTo(collection)
-
-  return CollectionBook
-}

server/models/Device.js

@@ -1,29 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Device extends Model { }
-
-  Device.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    identifier: DataTypes.STRING,
-    clientName: DataTypes.STRING, // e.g. Abs Web, Abs Android
-    clientVersion: DataTypes.STRING,
-    ipAddress: DataTypes.STRING,
-    deviceName: DataTypes.STRING, // e.g. Windows 10 Chrome, Google Pixel 6, Apple iPhone 10,3
-    deviceVersion: DataTypes.STRING // e.g. Browser version or Android SDK
-  }, {
-    sequelize,
-    modelName: 'device'
-  })
-
-  const { user } = sequelize.models
-
-  user.hasMany(Device)
-  Device.belongsTo(user)
-
-  return Device
-}

server/models/EBookFile.js

@@ -1,24 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class EBookFile extends Model { }
-
-  EBookFile.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    format: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'eBookFile'
-  })
-
-  const { fileMetadata } = sequelize.models
-
-  fileMetadata.hasOne(EBookFile, { foreignKey: 'fileMetadataId' })
-  EBookFile.belongsTo(fileMetadata, { as: 'fileMetadata', foreignKey: 'fileMetadataId' })
-
-  return EBookFile
-}

server/models/Feed.js

@@ -1,117 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-/*
- * Polymorphic association: https://sequelize.org/docs/v6/advanced-association-concepts/polymorphic-associations/
- * Feeds can be created from LibraryItem, Collection, Playlist or Series
- */
-module.exports = (sequelize) => {
-  class Feed extends Model {
-    getEntity(options) {
-      if (!this.entityType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.entityType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  Feed.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    slug: DataTypes.STRING,
-    entityType: DataTypes.STRING,
-    entityId: DataTypes.UUIDV4,
-    entityUpdatedAt: DataTypes.DATE,
-    serverAddress: DataTypes.STRING,
-    feedURL: DataTypes.STRING,
-    imageURL: DataTypes.STRING,
-    siteURL: DataTypes.STRING,
-    title: DataTypes.STRING,
-    description: DataTypes.TEXT,
-    author: DataTypes.STRING,
-    podcastType: DataTypes.STRING,
-    language: DataTypes.STRING,
-    ownerName: DataTypes.STRING,
-    ownerEmail: DataTypes.STRING,
-    explicit: DataTypes.BOOLEAN,
-    preventIndexing: DataTypes.BOOLEAN
-  }, {
-    sequelize,
-    modelName: 'feed'
-  })
-
-  const { user, libraryItem, collection, series, playlist } = sequelize.models
-
-  user.hasMany(Feed)
-  Feed.belongsTo(user)
-
-  libraryItem.hasMany(Feed, {
-    foreignKey: 'entityId',
-    constraints: false,
-    scope: {
-      entityType: 'libraryItem'
-    }
-  })
-  Feed.belongsTo(libraryItem, { foreignKey: 'entityId', constraints: false })
-
-  collection.hasMany(Feed, {
-    foreignKey: 'entityId',
-    constraints: false,
-    scope: {
-      entityType: 'collection'
-    }
-  })
-  Feed.belongsTo(collection, { foreignKey: 'entityId', constraints: false })
-
-  series.hasMany(Feed, {
-    foreignKey: 'entityId',
-    constraints: false,
-    scope: {
-      entityType: 'series'
-    }
-  })
-  Feed.belongsTo(series, { foreignKey: 'entityId', constraints: false })
-
-  playlist.hasMany(Feed, {
-    foreignKey: 'entityId',
-    constraints: false,
-    scope: {
-      entityType: 'playlist'
-    }
-  })
-  Feed.belongsTo(playlist, { foreignKey: 'entityId', constraints: false })
-
-  Feed.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-    for (const instance of findResult) {
-      if (instance.entityType === 'libraryItem' && instance.libraryItem !== undefined) {
-        instance.entity = instance.libraryItem
-        instance.dataValues.entity = instance.dataValues.libraryItem
-      } else if (instance.entityType === 'collection' && instance.collection !== undefined) {
-        instance.entity = instance.collection
-        instance.dataValues.entity = instance.dataValues.collection
-      } else if (instance.entityType === 'series' && instance.series !== undefined) {
-        instance.entity = instance.series
-        instance.dataValues.entity = instance.dataValues.series
-      } else if (instance.entityType === 'playlist' && instance.playlist !== undefined) {
-        instance.entity = instance.playlist
-        instance.dataValues.entity = instance.dataValues.playlist
-      }
-
-      // To prevent mistakes:
-      delete instance.libraryItem
-      delete instance.dataValues.libraryItem
-      delete instance.collection
-      delete instance.dataValues.collection
-      delete instance.series
-      delete instance.dataValues.series
-      delete instance.playlist
-      delete instance.dataValues.playlist
-    }
-  })
-
-  return Feed
-}

server/models/FeedEpisode.js

@@ -1,37 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class FeedEpisode extends Model { }
-
-  FeedEpisode.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    title: DataTypes.STRING,
-    author: DataTypes.STRING,
-    description: DataTypes.TEXT,
-    siteURL: DataTypes.STRING,
-    enclosureURL: DataTypes.STRING,
-    enclosureType: DataTypes.STRING,
-    enclosureSize: DataTypes.BIGINT,
-    pubDate: DataTypes.STRING,
-    season: DataTypes.STRING,
-    episode: DataTypes.STRING,
-    episodeType: DataTypes.STRING,
-    duration: DataTypes.FLOAT,
-    filePath: DataTypes.STRING,
-    explicit: DataTypes.BOOLEAN
-  }, {
-    sequelize,
-    modelName: 'feedEpisode'
-  })
-
-  const { feed } = sequelize.models
-
-  feed.hasMany(FeedEpisode)
-  FeedEpisode.belongsTo(feed)
-
-  return FeedEpisode
-}

server/models/FileMetadata.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class FileMetadata extends Model { }
-
-  FileMetadata.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    ino: DataTypes.STRING,
-    filename: DataTypes.STRING,
-    ext: DataTypes.STRING,
-    path: DataTypes.STRING,
-    size: DataTypes.BIGINT,
-    mtime: DataTypes.DATE(6),
-    ctime: DataTypes.DATE(6),
-    birthtime: DataTypes.DATE(6)
-  }, {
-    sequelize,
-    freezeTableName: true, // sequelize uses datum as singular of data
-    name: {
-      singular: 'fileMetadata',
-      plural: 'fileMetadata'
-    },
-    modelName: 'fileMetadata'
-  })
-
-  return FileMetadata
-}

server/models/Genre.js

@@ -1,20 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Genre extends Model { }
-
-  Genre.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    cleanName: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'genre'
-  })
-
-  return Genre
-}

server/models/Library.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Library extends Model { }
-
-  Library.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    displayOrder: DataTypes.INTEGER,
-    icon: DataTypes.STRING,
-    mediaType: DataTypes.STRING,
-    provider: DataTypes.STRING,
-    lastScan: DataTypes.DATE,
-    lastScanVersion: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'library'
-  })
-
-  return Library
-}

server/models/LibraryFile.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class LibraryFile extends Model { }
-
-  LibraryFile.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'libraryFile'
-  })
-
-  const { libraryItem, fileMetadata } = sequelize.models
-  libraryItem.hasMany(LibraryFile)
-  LibraryFile.belongsTo(libraryItem)
-
-  fileMetadata.hasOne(LibraryFile, { foreignKey: 'fileMetadataId' })
-  LibraryFile.belongsTo(fileMetadata, { as: 'fileMetadata', foreignKey: 'fileMetadataId' })
-
-  return LibraryFile
-}

server/models/LibraryFolder.js

@@ -1,23 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class LibraryFolder extends Model { }
-
-  LibraryFolder.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    path: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'libraryFolder'
-  })
-
-  const { library } = sequelize.models
-  library.hasMany(LibraryFolder)
-  LibraryFolder.belongsTo(library)
-
-  return LibraryFolder
-}

server/models/LibraryItem.js

@@ -1,82 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class LibraryItem extends Model {
-    getMedia(options) {
-      if (!this.mediaType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  LibraryItem.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    ino: DataTypes.STRING,
-    path: DataTypes.STRING,
-    relPath: DataTypes.STRING,
-    mediaId: DataTypes.UUIDV4,
-    mediaType: DataTypes.STRING,
-    isFile: DataTypes.BOOLEAN,
-    isMissing: DataTypes.BOOLEAN,
-    isInvalid: DataTypes.BOOLEAN,
-    mtime: DataTypes.DATE(6),
-    ctime: DataTypes.DATE(6),
-    birthtime: DataTypes.DATE(6),
-    lastScan: DataTypes.DATE,
-    lastScanVersion: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'libraryItem'
-  })
-
-  const { library, libraryFolder, book, podcast } = sequelize.models
-  library.hasMany(LibraryItem)
-  LibraryItem.belongsTo(library)
-
-  libraryFolder.hasMany(LibraryItem)
-  LibraryItem.belongsTo(libraryFolder)
-
-  book.hasOne(LibraryItem, {
-    foreignKey: 'mediaId',
-    constraints: false,
-    scope: {
-      mediaType: 'book'
-    }
-  })
-  LibraryItem.belongsTo(book, { foreignKey: 'mediaId', constraints: false })
-
-  podcast.hasOne(LibraryItem, {
-    foreignKey: 'mediaId',
-    constraints: false,
-    scope: {
-      mediaType: 'podcast'
-    }
-  })
-  LibraryItem.belongsTo(podcast, { foreignKey: 'mediaId', constraints: false })
-
-  LibraryItem.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-    for (const instance of findResult) {
-      if (instance.mediaType === 'book' && instance.book !== undefined) {
-        instance.media = instance.book
-        instance.dataValues.media = instance.dataValues.book
-      } else if (instance.mediaType === 'podcast' && instance.podcast !== undefined) {
-        instance.media = instance.podcast
-        instance.dataValues.media = instance.dataValues.podcast
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcast
-      delete instance.dataValues.podcast
-    }
-  })
-
-  return LibraryItem
-}

server/models/LibrarySetting.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class LibrarySetting extends Model { }
-
-  LibrarySetting.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    key: DataTypes.STRING,
-    value: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'librarySetting'
-  })
-
-  const { library } = sequelize.models
-
-  library.hasMany(LibrarySetting)
-  LibrarySetting.belongsTo(library)
-
-  return LibrarySetting
-}

server/models/MediaFile.js

@@ -1,29 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class MediaFile extends Model { }
-
-  MediaFile.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    formatName: DataTypes.STRING,
-    formatNameLong: DataTypes.STRING,
-    duration: DataTypes.FLOAT,
-    bitrate: DataTypes.INTEGER,
-    size: DataTypes.BIGINT,
-    tags: DataTypes.JSON
-  }, {
-    sequelize,
-    modelName: 'mediaFile'
-  })
-
-  const { fileMetadata } = sequelize.models
-
-  fileMetadata.hasOne(MediaFile, { foreignKey: 'fileMetadataId' })
-  MediaFile.belongsTo(fileMetadata, { as: 'fileMetadata', foreignKey: 'fileMetadataId' })
-
-  return MediaFile
-}

server/models/MediaProgress.js

@@ -1,79 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-/*
- * Polymorphic association: https://sequelize.org/docs/v6/advanced-association-concepts/polymorphic-associations/
- * Book has many MediaProgress. PodcastEpisode has many MediaProgress.
- */
-module.exports = (sequelize) => {
-  class MediaProgress extends Model {
-    getMediaItem(options) {
-      if (!this.mediaItemType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaItemType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  MediaProgress.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    mediaItemId: DataTypes.UUIDV4,
-    mediaItemType: DataTypes.STRING,
-    duration: DataTypes.FLOAT,
-    currentTime: DataTypes.FLOAT,
-    isFinished: DataTypes.BOOLEAN,
-    hideFromContinueListening: DataTypes.BOOLEAN,
-    finishedAt: DataTypes.DATE
-  }, {
-    sequelize,
-    modelName: 'mediaProgress'
-  })
-
-  const { book, podcastEpisode, user } = sequelize.models
-
-  book.hasMany(MediaProgress, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'book'
-    }
-  })
-  MediaProgress.belongsTo(book, { foreignKey: 'mediaItemId', constraints: false })
-
-  podcastEpisode.hasMany(MediaProgress, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'podcastEpisode'
-    }
-  })
-  MediaProgress.belongsTo(podcastEpisode, { foreignKey: 'mediaItemId', constraints: false })
-
-  MediaProgress.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-
-    for (const instance of findResult) {
-      if (instance.mediaItemType === 'book' && instance.book !== undefined) {
-        instance.mediaItem = instance.book
-        instance.dataValues.mediaItem = instance.dataValues.book
-      } else if (instance.mediaItemType === 'podcastEpisode' && instance.podcastEpisode !== undefined) {
-        instance.mediaItem = instance.podcastEpisode
-        instance.dataValues.mediaItem = instance.dataValues.podcastEpisode
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcastEpisode
-      delete instance.dataValues.podcastEpisode
-    }
-  })
-
-  user.hasMany(MediaProgress)
-  MediaProgress.belongsTo(user)
-
-  return MediaProgress
-}

server/models/MediaStream.js

@@ -1,49 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class MediaStream extends Model { }
-
-  MediaStream.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    index: DataTypes.INTEGER,
-    codecType: DataTypes.STRING,
-    codec: DataTypes.STRING,
-    channels: DataTypes.INTEGER,
-    channelLayout: DataTypes.STRING,
-    bitrate: DataTypes.INTEGER,
-    timeBase: DataTypes.STRING,
-    duration: DataTypes.FLOAT,
-    sampleRate: DataTypes.INTEGER,
-    language: DataTypes.STRING,
-    default: DataTypes.BOOLEAN,
-    // Video stream specific
-    profile: DataTypes.STRING,
-    width: DataTypes.INTEGER,
-    height: DataTypes.INTEGER,
-    codedWidth: DataTypes.INTEGER,
-    codedHeight: DataTypes.INTEGER,
-    pixFmt: DataTypes.STRING,
-    level: DataTypes.INTEGER,
-    frameRate: DataTypes.FLOAT,
-    colorSpace: DataTypes.STRING,
-    colorRange: DataTypes.STRING,
-    chromaLocation: DataTypes.STRING,
-    displayAspectRatio: DataTypes.FLOAT,
-    // Chapters JSON
-    chapters: DataTypes.JSON
-  }, {
-    sequelize,
-    modelName: 'mediaStream'
-  })
-
-  const { mediaFile } = sequelize.models
-
-  mediaFile.hasMany(MediaStream)
-  MediaStream.belongsTo(mediaFile)
-
-  return MediaStream
-}

server/models/Notification.js

@@ -1,29 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Notification extends Model { }
-
-  Notification.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    eventName: DataTypes.STRING,
-    urls: DataTypes.JSON, // JSON array of urls
-    titleTemplate: DataTypes.STRING(1000),
-    bodyTemplate: DataTypes.TEXT,
-    type: DataTypes.STRING,
-    lastFiredAt: DataTypes.DATE,
-    lastAttemptFailed: DataTypes.BOOLEAN,
-    numConsecutiveFailedAttempts: DataTypes.INTEGER,
-    numTimesFired: DataTypes.INTEGER,
-    enabled: DataTypes.BOOLEAN,
-    extraData: DataTypes.JSON
-  }, {
-    sequelize,
-    modelName: 'notification'
-  })
-
-  return Notification
-}

server/models/Person.js

@@ -1,26 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Person extends Model { }
-
-  Person.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    type: DataTypes.STRING,
-    name: DataTypes.STRING,
-    asin: DataTypes.STRING,
-    description: DataTypes.TEXT
-  }, {
-    sequelize,
-    modelName: 'person'
-  })
-
-  const { fileMetadata } = sequelize.models
-  fileMetadata.hasMany(Person, { foreignKey: 'imageFileId' })
-  Person.belongsTo(fileMetadata, { as: 'imageFile', foreignKey: 'imageFileId' }) // Ref: https://sequelize.org/docs/v6/core-concepts/assocs/#defining-an-alias
-
-  return Person
-}

server/models/PlaybackSession.js

@@ -1,81 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PlaybackSession extends Model {
-    getMediaItem(options) {
-      if (!this.mediaItemType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaItemType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  PlaybackSession.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    mediaItemId: DataTypes.UUIDV4,
-    mediaItemType: DataTypes.STRING,
-    displayTitle: DataTypes.STRING,
-    displayAuthor: DataTypes.STRING,
-    duration: DataTypes.FLOAT,
-    playMethod: DataTypes.STRING,
-    mediaPlayer: DataTypes.STRING,
-    startTime: DataTypes.FLOAT,
-    currentTime: DataTypes.FLOAT,
-    serverVersion: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'playbackSession'
-  })
-
-  const { book, podcastEpisode, user, device } = sequelize.models
-
-  user.hasMany(PlaybackSession)
-  PlaybackSession.belongsTo(user)
-
-  device.hasMany(PlaybackSession)
-  PlaybackSession.belongsTo(device)
-
-  book.hasMany(PlaybackSession, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'book'
-    }
-  })
-  PlaybackSession.belongsTo(book, { foreignKey: 'mediaItemId', constraints: false })
-
-  podcastEpisode.hasOne(PlaybackSession, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'podcastEpisode'
-    }
-  })
-  PlaybackSession.belongsTo(podcastEpisode, { foreignKey: 'mediaItemId', constraints: false })
-
-  PlaybackSession.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-
-    for (const instance of findResult) {
-      if (instance.mediaItemType === 'book' && instance.book !== undefined) {
-        instance.mediaItem = instance.book
-        instance.dataValues.mediaItem = instance.dataValues.book
-      } else if (instance.mediaItemType === 'podcastEpisode' && instance.podcastEpisode !== undefined) {
-        instance.mediaItem = instance.podcastEpisode
-        instance.dataValues.mediaItem = instance.dataValues.podcastEpisode
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcastEpisode
-      delete instance.dataValues.podcastEpisode
-    }
-  })
-
-  return PlaybackSession
-}

server/models/PlaybackSessionListenTime.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PlaybackSessionListenTime extends Model { }
-
-  PlaybackSessionListenTime.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    time: DataTypes.INTEGER,
-    date: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'playbackSessionListenTime'
-  })
-
-  const { playbackSession } = sequelize.models
-
-  playbackSession.hasMany(PlaybackSessionListenTime)
-  PlaybackSessionListenTime.belongsTo(playbackSession)
-
-  return PlaybackSessionListenTime
-}

server/models/Playlist.js

@@ -1,27 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Playlist extends Model { }
-
-  Playlist.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    description: DataTypes.TEXT
-  }, {
-    sequelize,
-    modelName: 'playlist'
-  })
-
-  const { library, user } = sequelize.models
-  library.hasMany(Playlist)
-  Playlist.belongsTo(library)
-
-  user.hasMany(Playlist)
-  Playlist.belongsTo(user)
-
-  return Playlist
-}

server/models/PlaylistMediaItem.js

@@ -1,72 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PlaylistMediaItem extends Model {
-    getMediaItem(options) {
-      if (!this.mediaItemType) return Promise.resolve(null)
-      const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaItemType)}`
-      return this[mixinMethodName](options)
-    }
-  }
-
-  PlaylistMediaItem.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    mediaItemId: DataTypes.UUIDV4,
-    mediaItemType: DataTypes.STRING
-  }, {
-    sequelize,
-    timestamps: true,
-    updatedAt: false,
-    modelName: 'playlistMediaItem'
-  })
-
-  const { book, podcastEpisode, playlist } = sequelize.models
-
-  book.hasMany(PlaylistMediaItem, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'book'
-    }
-  })
-  PlaylistMediaItem.belongsTo(book, { foreignKey: 'mediaItemId', constraints: false })
-
-  podcastEpisode.hasOne(PlaylistMediaItem, {
-    foreignKey: 'mediaItemId',
-    constraints: false,
-    scope: {
-      mediaItemType: 'podcastEpisode'
-    }
-  })
-  PlaylistMediaItem.belongsTo(podcastEpisode, { foreignKey: 'mediaItemId', constraints: false })
-
-  PlaylistMediaItem.addHook('afterFind', findResult => {
-    if (!findResult) return
-
-    if (!Array.isArray(findResult)) findResult = [findResult]
-
-    for (const instance of findResult) {
-      if (instance.mediaItemType === 'book' && instance.book !== undefined) {
-        instance.mediaItem = instance.book
-        instance.dataValues.mediaItem = instance.dataValues.book
-      } else if (instance.mediaItemType === 'podcastEpisode' && instance.podcastEpisode !== undefined) {
-        instance.mediaItem = instance.podcastEpisode
-        instance.dataValues.mediaItem = instance.dataValues.podcastEpisode
-      }
-      // To prevent mistakes:
-      delete instance.book
-      delete instance.dataValues.book
-      delete instance.podcastEpisode
-      delete instance.dataValues.podcastEpisode
-    }
-  })
-
-  playlist.hasMany(PlaylistMediaItem)
-  PlaylistMediaItem.belongsTo(playlist)
-
-  return PlaylistMediaItem
-}

server/models/Podcast.js

@@ -1,43 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Podcast extends Model { }
-
-  Podcast.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    title: DataTypes.STRING,
-    author: DataTypes.STRING,
-    releaseDate: DataTypes.STRING,
-    feedURL: DataTypes.STRING,
-    imageURL: DataTypes.STRING,
-    description: DataTypes.TEXT,
-    itunesPageURL: DataTypes.STRING,
-    itunesId: DataTypes.STRING,
-    itunesArtistId: DataTypes.STRING,
-    language: DataTypes.STRING,
-    podcastType: DataTypes.STRING,
-    explicit: DataTypes.BOOLEAN,
-
-    autoDownloadEpisodes: DataTypes.BOOLEAN,
-    autoDownloadSchedule: DataTypes.STRING,
-    lastEpisodeCheck: DataTypes.DATE,
-    maxEpisodesToKeep: DataTypes.INTEGER,
-    maxNewEpisodesToDownload: DataTypes.INTEGER,
-    lastCoverSearchQuery: DataTypes.STRING,
-    lastCoverSearch: DataTypes.DATE
-  }, {
-    sequelize,
-    modelName: 'podcast'
-  })
-
-  const { fileMetadata } = sequelize.models
-
-  fileMetadata.hasOne(Podcast, { foreignKey: 'imageFileId' })
-  Podcast.belongsTo(fileMetadata, { as: 'imageFile', foreignKey: 'imageFileId' }) // Ref: https://sequelize.org/docs/v6/core-concepts/assocs/#defining-an-alias
-
-  return Podcast
-}

server/models/PodcastEpisode.js

@@ -1,34 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PodcastEpisode extends Model { }
-
-  PodcastEpisode.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    index: DataTypes.INTEGER,
-    season: DataTypes.STRING,
-    episode: DataTypes.STRING,
-    episodeType: DataTypes.STRING,
-    title: DataTypes.STRING,
-    subtitle: DataTypes.STRING(1000),
-    description: DataTypes.TEXT,
-    pubDate: DataTypes.STRING,
-    enclosureURL: DataTypes.STRING,
-    enclosureSize: DataTypes.BIGINT,
-    enclosureType: DataTypes.STRING,
-    publishedAt: DataTypes.DATE
-  }, {
-    sequelize,
-    modelName: 'podcastEpisode'
-  })
-
-  const { podcast } = sequelize.models
-  podcast.hasMany(PodcastEpisode)
-  PodcastEpisode.belongsTo(podcast)
-
-  return PodcastEpisode
-}

server/models/PodcastGenre.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PodcastGenre extends Model { }
-
-  PodcastGenre.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'podcastGenre',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { podcast, genre } = sequelize.models
-  podcast.belongsToMany(genre, { through: PodcastGenre })
-  genre.belongsToMany(podcast, { through: PodcastGenre })
-
-  podcast.hasMany(PodcastGenre)
-  PodcastGenre.belongsTo(podcast)
-
-  genre.hasMany(PodcastGenre)
-  PodcastGenre.belongsTo(genre)
-
-  return PodcastGenre
-}

server/models/PodcastTag.js

@@ -1,31 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class PodcastTag extends Model { }
-
-  PodcastTag.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    }
-  }, {
-    sequelize,
-    modelName: 'podcastTag',
-    timestamps: false
-  })
-
-  // Super Many-to-Many
-  // ref: https://sequelize.org/docs/v6/advanced-association-concepts/advanced-many-to-many/#the-best-of-both-worlds-the-super-many-to-many-relationship
-  const { podcast, tag } = sequelize.models
-  podcast.belongsToMany(tag, { through: PodcastTag })
-  tag.belongsToMany(podcast, { through: PodcastTag })
-
-  podcast.hasMany(PodcastTag)
-  PodcastTag.belongsTo(podcast)
-
-  tag.hasMany(PodcastTag)
-  PodcastTag.belongsTo(tag)
-
-  return PodcastTag
-}

server/models/Series.js

@@ -1,20 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Series extends Model { }
-
-  Series.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    description: DataTypes.TEXT
-  }, {
-    sequelize,
-    modelName: 'series'
-  })
-
-  return Series
-}

server/models/Setting.js

@@ -1,19 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Setting extends Model { }
-
-  Setting.init({
-    key: {
-      type: DataTypes.STRING,
-      primaryKey: true
-    },
-    value: DataTypes.STRING,
-    type: DataTypes.INTEGER
-  }, {
-    sequelize,
-    modelName: 'setting'
-  })
-
-  return Setting
-}

server/models/Tag.js

@@ -1,20 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class Tag extends Model { }
-
-  Tag.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    name: DataTypes.STRING,
-    cleanName: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'tag'
-  })
-
-  return Tag
-}

server/models/User.js

@@ -1,33 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class User extends Model { }
-
-  User.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    username: DataTypes.STRING,
-    email: DataTypes.STRING,
-    pash: DataTypes.STRING,
-    type: DataTypes.STRING,
-    token: DataTypes.STRING,
-    isActive: {
-      type: DataTypes.BOOLEAN,
-      defaultValue: false
-    },
-    isLocked: {
-      type: DataTypes.BOOLEAN,
-      defaultValue: false
-    },
-    lastSeen: DataTypes.DATE,
-    extraData: DataTypes.JSON
-  }, {
-    sequelize,
-    modelName: 'user'
-  })
-
-  return User
-}

server/models/UserPermission.js

@@ -1,25 +0,0 @@
-const { DataTypes, Model } = require('sequelize')
-
-module.exports = (sequelize) => {
-  class UserPermission extends Model { }
-
-  UserPermission.init({
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true
-    },
-    key: DataTypes.STRING,
-    value: DataTypes.STRING
-  }, {
-    sequelize,
-    modelName: 'userPermission'
-  })
-
-  const { user } = sequelize.models
-
-  user.hasMany(UserPermission)
-  UserPermission.belongsTo(user)
-
-  return UserPermission
-}

server/objects/PodcastEpisodeDownload.js

@@ -41,8 +41,12 @@ class PodcastEpisodeDownload {
     }
   }
 
+  get urlFileExtension() {
+    const cleanUrl = this.url.split('?')[0] // Remove query string
+    return Path.extname(cleanUrl).substring(1).toLowerCase()
+  }
   get fileExtension() {
-    const extname = Path.extname(this.url).substring(1).toLowerCase()
+    const extname = this.urlFileExtension
     if (globals.SupportedAudioTypes.includes(extname)) return extname
     return 'mp3'
   }

server/objects/entities/PodcastEpisode.js

@@ -1,4 +1,5 @@
 const Path = require('path')
+const Logger = require('../../Logger')
 const { getId, cleanStringForSearch } = require('../../utils/index')
 const AudioFile = require('../files/AudioFile')
 const AudioTrack = require('../files/AudioTrack')
@@ -106,6 +107,10 @@ class PodcastEpisode {
   get enclosureUrl() {
     return this.enclosure ? this.enclosure.url : null
   }
+  get pubYear() {
+    if (!this.publishedAt) return null
+    return new Date(this.publishedAt).getFullYear()
+  }
 
   setData(data, index = 1) {
     this.id = getId('ep')
@@ -128,6 +133,9 @@ class PodcastEpisode {
     this.audioFile = audioFile
     this.title = Path.basename(audioFile.metadata.filename, Path.extname(audioFile.metadata.filename))
     this.index = index
+
+    this.setDataFromAudioMetaTags(audioFile.metaTags, true)
+
     this.addedAt = Date.now()
     this.updatedAt = Date.now()
   }
@@ -164,5 +172,76 @@ class PodcastEpisode {
   searchQuery(query) {
     return cleanStringForSearch(this.title).includes(query)
   }
+
+  setDataFromAudioMetaTags(audioFileMetaTags, overrideExistingDetails = false) {
+    if (!audioFileMetaTags) return false
+
+    const MetadataMapArray = [
+      {
+        tag: 'tagComment',
+        altTag: 'tagSubtitle',
+        key: 'description'
+      },
+      {
+        tag: 'tagSubtitle',
+        key: 'subtitle'
+      },
+      {
+        tag: 'tagDate',
+        key: 'pubDate'
+      },
+      {
+        tag: 'tagDisc',
+        key: 'season',
+      },
+      {
+        tag: 'tagTrack',
+        altTag: 'tagSeriesPart',
+        key: 'episode'
+      },
+      {
+        tag: 'tagTitle',
+        key: 'title'
+      },
+      {
+        tag: 'tagEpisodeType',
+        key: 'episodeType'
+      }
+    ]
+
+    MetadataMapArray.forEach((mapping) => {
+      let value = audioFileMetaTags[mapping.tag]
+      let tagToUse = mapping.tag
+      if (!value && mapping.altTag) {
+        tagToUse = mapping.altTag
+        value = audioFileMetaTags[mapping.altTag]
+      }
+
+      if (value && typeof value === 'string') {
+        value = value.trim() // Trim whitespace
+
+        if (mapping.key === 'pubDate' && (!this.pubDate || overrideExistingDetails)) {
+          const pubJsDate = new Date(value)
+          if (pubJsDate && !isNaN(pubJsDate)) {
+            this.publishedAt = pubJsDate.valueOf()
+            this.pubDate = value
+            Logger.debug(`[PodcastEpisode] Mapping metadata to key ${tagToUse} => ${mapping.key}: ${this[mapping.key]}`)
+          } else {
+            Logger.warn(`[PodcastEpisode] Mapping pubDate with tag ${tagToUse} has invalid date "${value}"`)
+          }
+        } else if (mapping.key === 'episodeType' && (!this.episodeType || overrideExistingDetails)) {
+          if (['full', 'trailer', 'bonus'].includes(value)) {
+            this.episodeType = value
+            Logger.debug(`[PodcastEpisode] Mapping metadata to key ${tagToUse} => ${mapping.key}: ${this[mapping.key]}`)
+          } else {
+            Logger.warn(`[PodcastEpisode] Mapping episodeType with invalid value "${value}". Must be one of [full, trailer, bonus].`)
+          }
+        } else if (!this[mapping.key] || overrideExistingDetails) {
+          this[mapping.key] = value
+          Logger.debug(`[PodcastEpisode] Mapping metadata to key ${tagToUse} => ${mapping.key}: ${this[mapping.key]}`)
+        }
+      }
+    })
+  }
 }
 module.exports = PodcastEpisode

server/objects/mediaTypes/Podcast.js

@@ -175,6 +175,10 @@ class Podcast {
     return null
   }
 
+  findEpisodeWithInode(inode) {
+    return this.episodes.find(ep => ep.audioFile.ino === inode)
+  }
+
   setData(mediaData) {
     this.metadata = new PodcastMetadata()
     if (mediaData.metadata) {
@@ -315,5 +319,13 @@ class Podcast {
   getEpisode(episodeId) {
     return this.episodes.find(ep => ep.id == episodeId)
   }
+
+  // Audio file metadata tags map to podcast details
+  setMetadataFromAudioFile(overrideExistingDetails = false) {
+    if (!this.episodes.length) return false
+    const audioFile = this.episodes[0].audioFile
+    if (!audioFile?.metaTags) return false
+    return this.metadata.setDataFromAudioMetaTags(audioFile.metaTags, overrideExistingDetails)
+  }
 }
 module.exports = Podcast

server/objects/metadata/AudioMetaTags.js

@@ -1,9 +1,12 @@
 class AudioMetaTags {
   constructor(metadata) {
     this.tagAlbum = null
+    this.tagAlbumSort = null
     this.tagArtist = null
+    this.tagArtistSort = null
     this.tagGenre = null
     this.tagTitle = null
+    this.tagTitleSort = null
     this.tagSeries = null
     this.tagSeriesPart = null
     this.tagTrack = null
@@ -20,6 +23,9 @@ class AudioMetaTags {
     this.tagIsbn = null
     this.tagLanguage = null
     this.tagASIN = null
+    this.tagItunesId = null
+    this.tagPodcastType = null
+    this.tagEpisodeType = null
     this.tagOverdriveMediaMarker = null
     this.tagOriginalYear = null
     this.tagReleaseCountry = null
@@ -94,9 +100,12 @@ class AudioMetaTags {
 
   construct(metadata) {
     this.tagAlbum = metadata.tagAlbum || null
+    this.tagAlbumSort = metadata.tagAlbumSort || null
     this.tagArtist = metadata.tagArtist || null
+    this.tagArtistSort = metadata.tagArtistSort || null
     this.tagGenre = metadata.tagGenre || null
     this.tagTitle = metadata.tagTitle || null
+    this.tagTitleSort = metadata.tagTitleSort || null
     this.tagSeries = metadata.tagSeries || null
     this.tagSeriesPart = metadata.tagSeriesPart || null
     this.tagTrack = metadata.tagTrack || null
@@ -113,6 +122,9 @@ class AudioMetaTags {
     this.tagIsbn = metadata.tagIsbn || null
     this.tagLanguage = metadata.tagLanguage || null
     this.tagASIN = metadata.tagASIN || null
+    this.tagItunesId = metadata.tagItunesId || null
+    this.tagPodcastType = metadata.tagPodcastType || null
+    this.tagEpisodeType = metadata.tagEpisodeType || null
     this.tagOverdriveMediaMarker = metadata.tagOverdriveMediaMarker || null
     this.tagOriginalYear = metadata.tagOriginalYear || null
     this.tagReleaseCountry = metadata.tagReleaseCountry || null
@@ -128,9 +140,12 @@ class AudioMetaTags {
   // Data parsed in prober.js
   setData(payload) {
     this.tagAlbum = payload.file_tag_album || null
+    this.tagAlbumSort = payload.file_tag_albumsort || null
     this.tagArtist = payload.file_tag_artist || null
+    this.tagArtistSort = payload.file_tag_artistsort || null
     this.tagGenre = payload.file_tag_genre || null
     this.tagTitle = payload.file_tag_title || null
+    this.tagTitleSort = payload.file_tag_titlesort || null
     this.tagSeries = payload.file_tag_series || null
     this.tagSeriesPart = payload.file_tag_seriespart || null
     this.tagTrack = payload.file_tag_track || null
@@ -147,6 +162,9 @@ class AudioMetaTags {
     this.tagIsbn = payload.file_tag_isbn || null
     this.tagLanguage = payload.file_tag_language || null
     this.tagASIN = payload.file_tag_asin || null
+    this.tagItunesId = payload.file_tag_itunesid || null
+    this.tagPodcastType = payload.file_tag_podcasttype || null
+    this.tagEpisodeType = payload.file_tag_episodetype || null
     this.tagOverdriveMediaMarker = payload.file_tag_overdrive_media_marker || null
     this.tagOriginalYear = payload.file_tag_originalyear || null
     this.tagReleaseCountry = payload.file_tag_releasecountry || null
@@ -166,9 +184,12 @@ class AudioMetaTags {
   updateData(payload) {
     const dataMap = {
       tagAlbum: payload.file_tag_album || null,
+      tagAlbumSort: payload.file_tag_albumsort || null,
       tagArtist: payload.file_tag_artist || null,
+      tagArtistSort: payload.file_tag_artistsort || null,
       tagGenre: payload.file_tag_genre || null,
       tagTitle: payload.file_tag_title || null,
+      tagTitleSort: payload.file_tag_titlesort || null,
       tagSeries: payload.file_tag_series || null,
       tagSeriesPart: payload.file_tag_seriespart || null,
       tagTrack: payload.file_tag_track || null,
@@ -185,6 +206,9 @@ class AudioMetaTags {
       tagIsbn: payload.file_tag_isbn || null,
       tagLanguage: payload.file_tag_language || null,
       tagASIN: payload.file_tag_asin || null,
+      tagItunesId: payload.file_tag_itunesid || null,
+      tagPodcastType: payload.file_tag_podcasttype || null,
+      tagEpisodeType: payload.file_tag_episodetype || null,
       tagOverdriveMediaMarker: payload.file_tag_overdrive_media_marker || null,
       tagOriginalYear: payload.file_tag_originalyear || null,
       tagReleaseCountry: payload.file_tag_releasecountry || null,

server/objects/metadata/BookMetadata.js

@@ -17,6 +17,7 @@ class BookMetadata {
     this.asin = null
     this.language = null
     this.explicit = false
+    this.abridged = false
 
     if (metadata) {
       this.construct(metadata)
@@ -38,6 +39,7 @@ class BookMetadata {
     this.asin = metadata.asin
     this.language = metadata.language
     this.explicit = !!metadata.explicit
+    this.abridged = !!metadata.abridged
   }
 
   toJSON() {
@@ -55,7 +57,8 @@ class BookMetadata {
       isbn: this.isbn,
       asin: this.asin,
       language: this.language,
-      explicit: this.explicit
+      explicit: this.explicit,
+      abridged: this.abridged
     }
   }
 
@@ -76,7 +79,8 @@ class BookMetadata {
       isbn: this.isbn,
       asin: this.asin,
       language: this.language,
-      explicit: this.explicit
+      explicit: this.explicit,
+      abridged: this.abridged
     }
   }
 
@@ -100,7 +104,8 @@ class BookMetadata {
       authorName: this.authorName,
       authorNameLF: this.authorNameLF,
       narratorName: this.narratorName,
-      seriesName: this.seriesName
+      seriesName: this.seriesName,
+      abridged: this.abridged
     }
   }
 

server/objects/metadata/PodcastMetadata.js

@@ -136,5 +136,74 @@ class PodcastMetadata {
     }
     return hasUpdates
   }
+
+  setDataFromAudioMetaTags(audioFileMetaTags, overrideExistingDetails = false) {
+    const MetadataMapArray = [
+      {
+        tag: 'tagAlbum',
+        altTag: 'tagSeries',
+        key: 'title'
+      },
+      {
+        tag: 'tagArtist',
+        key: 'author'
+      },
+      {
+        tag: 'tagGenre',
+        key: 'genres'
+      },
+      {
+        tag: 'tagLanguage',
+        key: 'language'
+      },
+      {
+        tag: 'tagItunesId',
+        key: 'itunesId'
+      },
+      {
+        tag: 'tagPodcastType',
+        key: 'type',
+      }
+    ]
+
+    const updatePayload = {}
+
+    MetadataMapArray.forEach((mapping) => {
+      let value = audioFileMetaTags[mapping.tag]
+      let tagToUse = mapping.tag
+      if (!value && mapping.altTag) {
+        value = audioFileMetaTags[mapping.altTag]
+        tagToUse = mapping.altTag
+      }
+
+      if (value && typeof value === 'string') {
+        value = value.trim() // Trim whitespace
+
+        if (mapping.key === 'genres' && (!this.genres.length || overrideExistingDetails)) {
+          updatePayload.genres = this.parseGenresTag(value)
+          Logger.debug(`[Podcast] Mapping metadata to key ${tagToUse} => ${mapping.key}: ${updatePayload.genres.join(', ')}`)
+        } else if (!this[mapping.key] || overrideExistingDetails) {
+          updatePayload[mapping.key] = value
+          Logger.debug(`[Podcast] Mapping metadata to key ${tagToUse} => ${mapping.key}: ${updatePayload[mapping.key]}`)
+        }
+      }
+    })
+
+    if (Object.keys(updatePayload).length) {
+      return this.update(updatePayload)
+    }
+    return false
+  }
+
+  parseGenresTag(genreTag) {
+    if (!genreTag || !genreTag.length) return []
+    const separators = ['/', '//', ';']
+    for (let i = 0; i < separators.length; i++) {
+      if (genreTag.includes(separators[i])) {
+        return genreTag.split(separators[i]).map(genre => genre.trim()).filter(g => !!g)
+      }
+    }
+    return [genreTag]
+  }
 }
 module.exports = PodcastMetadata

server/objects/user/MediaProgress.js

@@ -10,6 +10,9 @@ class MediaProgress {
     this.isFinished = false
     this.hideFromContinueListening = false
 
+    this.ebookLocation = null // current cfi tag
+    this.ebookProgress = null // 0 to 1
+
     this.lastUpdate = null
     this.startedAt = null
     this.finishedAt = null
@@ -29,6 +32,8 @@ class MediaProgress {
       currentTime: this.currentTime,
       isFinished: this.isFinished,
       hideFromContinueListening: this.hideFromContinueListening,
+      ebookLocation: this.ebookLocation,
+      ebookProgress: this.ebookProgress,
       lastUpdate: this.lastUpdate,
       startedAt: this.startedAt,
       finishedAt: this.finishedAt
@@ -44,13 +49,15 @@ class MediaProgress {
     this.currentTime = progress.currentTime
     this.isFinished = !!progress.isFinished
     this.hideFromContinueListening = !!progress.hideFromContinueListening
+    this.ebookLocation = progress.ebookLocation || null
+    this.ebookProgress = progress.ebookProgress
     this.lastUpdate = progress.lastUpdate
     this.startedAt = progress.startedAt
     this.finishedAt = progress.finishedAt || null
   }
 
   get inProgress() {
-    return !this.isFinished && this.progress > 0
+    return !this.isFinished && (this.progress > 0 || this.ebookLocation != null)
   }
 
   setData(libraryItemId, progress, episodeId = null) {
@@ -62,6 +69,8 @@ class MediaProgress {
     this.currentTime = progress.currentTime || 0
     this.isFinished = !!progress.isFinished || this.progress == 1
     this.hideFromContinueListening = !!progress.hideFromContinueListening
+    this.ebookLocation = progress.ebookLocation
+    this.ebookProgress = Math.min(1, (progress.ebookProgress || 0))
     this.lastUpdate = Date.now()
     this.finishedAt = null
     if (this.isFinished) {

server/objects/user/User.js

@@ -101,12 +101,12 @@ class User {
     }
   }
 
-  toJSONForBrowser() {
-    return {
+  toJSONForBrowser(hideRootToken = false, minimal = false) {
+    const json = {
       id: this.id,
       username: this.username,
       type: this.type,
-      token: this.token,
+      token: (this.type === 'root' && hideRootToken) ? '' : this.token,
       mediaProgress: this.mediaProgress ? this.mediaProgress.map(li => li.toJSON()) : [],
       seriesHideFromContinueListening: [...this.seriesHideFromContinueListening],
       bookmarks: this.bookmarks ? this.bookmarks.map(b => b.toJSON()) : [],
@@ -119,6 +119,11 @@ class User {
       librariesAccessible: [...this.librariesAccessible],
       itemTagsAccessible: [...this.itemTagsAccessible]
     }
+    if (minimal) {
+      delete json.mediaProgress
+      delete json.bookmarks
+    }
+    return json
   }
 
   // Data broadcasted

server/providers/Audible.js

@@ -19,7 +19,7 @@ class Audible {
     }
 
     cleanResult(item) {
-        const { title, subtitle, asin, authors, narrators, publisherName, summary, releaseDate, image, genres, seriesPrimary, seriesSecondary, language, runtimeLengthMin } = item
+        const { title, subtitle, asin, authors, narrators, publisherName, summary, releaseDate, image, genres, seriesPrimary, seriesSecondary, language, runtimeLengthMin, formatType } = item
 
         const series = []
         if (seriesPrimary) {
@@ -54,7 +54,8 @@ class Audible {
             language: language ? language.charAt(0).toUpperCase() + language.slice(1) : null,
             duration: runtimeLengthMin && !isNaN(runtimeLengthMin) ? Number(runtimeLengthMin) : 0,
             region: item.region || null,
-            rating: item.rating || null
+            rating: item.rating || null,
+            abridged: formatType === 'abridged'
         }
     }
 

server/routers/ApiRouter.js

@@ -271,9 +271,10 @@ class ApiRouter {
     //
     // Tools Routes (Admin and up)
     //
-    this.router.post('/tools/item/:id/encode-m4b', ToolsController.itemMiddleware.bind(this), ToolsController.encodeM4b.bind(this))
-    this.router.delete('/tools/item/:id/encode-m4b', ToolsController.itemMiddleware.bind(this), ToolsController.cancelM4bEncode.bind(this))
-    this.router.post('/tools/item/:id/embed-metadata', ToolsController.itemMiddleware.bind(this), ToolsController.embedAudioFileMetadata.bind(this))
+    this.router.post('/tools/item/:id/encode-m4b', ToolsController.middleware.bind(this), ToolsController.encodeM4b.bind(this))
+    this.router.delete('/tools/item/:id/encode-m4b', ToolsController.middleware.bind(this), ToolsController.cancelM4bEncode.bind(this))
+    this.router.post('/tools/item/:id/embed-metadata', ToolsController.middleware.bind(this), ToolsController.embedAudioFileMetadata.bind(this))
+    this.router.post('/tools/batch/embed-metadata', ToolsController.middleware.bind(this), ToolsController.batchEmbedMetadata.bind(this))
 
     // 
     // RSS Feed Routes (Admin and up)
@@ -339,10 +340,7 @@ class ApiRouter {
   // Helper Methods
   //
   userJsonWithItemProgressDetails(user, hideRootToken = false) {
-    const json = user.toJSONForBrowser()
-    if (json.type === 'root' && hideRootToken) {
-      json.token = ''
-    }
+    const json = user.toJSONForBrowser(hideRootToken)
 
     json.mediaProgress = json.mediaProgress.map(lip => {
       const libraryItem = this.db.libraryItems.find(li => li.id === lip.libraryItemId)
@@ -507,11 +505,16 @@ class ApiRouter {
 
       // Create new authors if in payload
       if (mediaMetadata.authors && mediaMetadata.authors.length) {
-        // TODO: validate authors
         const newAuthors = []
         for (let i = 0; i < mediaMetadata.authors.length; i++) {
-          if (mediaMetadata.authors[i].id.startsWith('new')) {
-            let author = this.db.authors.find(au => au.checkNameEquals(mediaMetadata.authors[i].name))
+          const authorName = (mediaMetadata.authors[i].name || '').trim()
+          if (!authorName) {
+            Logger.error(`[ApiRouter] Invalid author object, no name`, mediaMetadata.authors[i])
+            continue
+          }
+
+          if (!mediaMetadata.authors[i].id || mediaMetadata.authors[i].id.startsWith('new')) {
+            let author = this.db.authors.find(au => au.checkNameEquals(authorName))
             if (!author) {
               author = new Author()
               author.setData(mediaMetadata.authors[i])
@@ -531,11 +534,16 @@ class ApiRouter {
 
       // Create new series if in payload
       if (mediaMetadata.series && mediaMetadata.series.length) {
-        // TODO: validate series
         const newSeries = []
         for (let i = 0; i < mediaMetadata.series.length; i++) {
-          if (mediaMetadata.series[i].id.startsWith('new')) {
-            let seriesItem = this.db.series.find(se => se.checkNameEquals(mediaMetadata.series[i].name))
+          const seriesName = (mediaMetadata.series[i].name || '').trim()
+          if (!seriesName) {
+            Logger.error(`[ApiRouter] Invalid series object, no name`, mediaMetadata.series[i])
+            continue
+          }
+
+          if (!mediaMetadata.series[i].id || mediaMetadata.series[i].id.startsWith('new')) {
+            let seriesItem = this.db.series.find(se => se.checkNameEquals(seriesName))
             if (!seriesItem) {
               seriesItem = new Series()
               seriesItem.setData(mediaMetadata.series[i])

server/routes/index.js

@@ -1,10 +0,0 @@
-const express = require('express')
-const items = require('./items')
-const libraries = require('./libraries')
-
-const router = express.Router()
-
-router.use('/items', items)
-router.use('/libraries', libraries)
-
-module.exports = router

server/routes/items.js

@@ -1,8 +0,0 @@
-const express = require('express')
-const LibraryItemController = require('../controllers2/item.controller')
-
-const router = express.Router()
-
-router.get('/:id', LibraryItemController.getLibraryItem)
-
-module.exports = router

server/routes/libraries.js

@@ -1,10 +0,0 @@
-const express = require('express')
-const LibraryController = require('../controllers2/library.controller')
-
-const router = express.Router()
-
-router.get('/', LibraryController.getAllLibraries)
-router.get('/:id', LibraryController.getLibrary)
-router.get('/:id/items', LibraryController.getLibraryItems)
-
-module.exports = router

server/scanner/MediaFileScanner.js

@@ -296,11 +296,17 @@ class MediaFileScanner {
 
         // Update audio file metadata for audio files already there
         existingAudioFiles.forEach((af) => {
-          const peAudioFile = libraryItem.media.findFileWithInode(af.ino)
-          if (peAudioFile.updateFromScan && peAudioFile.updateFromScan(af)) {
+          const podcastEpisode = libraryItem.media.findEpisodeWithInode(af.ino)
+          if (podcastEpisode?.audioFile.updateFromScan(af)) {
             hasUpdated = true
+
+            podcastEpisode.setDataFromAudioMetaTags(podcastEpisode.audioFile.metaTags, false)
           }
         })
+
+        if (libraryItem.media.setMetadataFromAudioFile(preferAudioMetadata)) {
+          hasUpdated = true
+        }
       } else if (libraryItem.mediaType === 'music') { // Music
         // Only one audio file in library item
         if (newAudioFiles.length) { // New audio file

server/scanner/Scanner.js

@@ -793,7 +793,7 @@ class Scanner {
 
   async quickMatchBookBuildUpdatePayload(libraryItem, matchData, options) {
     // Update media metadata if not set OR overrideDetails flag
-    const detailKeysToUpdate = ['title', 'subtitle', 'description', 'narrator', 'publisher', 'publishedYear', 'genres', 'tags', 'language', 'explicit', 'asin', 'isbn']
+    const detailKeysToUpdate = ['title', 'subtitle', 'description', 'narrator', 'publisher', 'publishedYear', 'genres', 'tags', 'language', 'explicit', 'abridged', 'asin', 'isbn']
     const updatePayload = {}
     updatePayload.metadata = {}
 

server/utils/abmetadataGenerator.js

@@ -121,6 +121,10 @@ const bookMetadataMapper = {
   explicit: {
     to: (m) => m.explicit ? 'Y' : 'N',
     from: (v) => v && v.toLowerCase() == 'y'
+  },
+  abridged: {
+    to: (m) => m.abridged ? 'Y' : 'N',
+    from: (v) => v && v.toLowerCase() == 'y'
   }
 }
 

server/utils/dbMigration.js

@@ -1,33 +1,33 @@
 const Path = require('path')
-const fs = require('../../libs/fsExtra')
-const njodb = require('../../libs/njodb')
+const fs = require('../libs/fsExtra')
+const njodb = require('../libs/njodb')
 
-const { SupportedEbookTypes } = require('../globals')
-const { PlayMethod } = require('../constants')
-const { getId } = require('../index')
-const { filePathToPOSIX } = require('../fileUtils')
-const Logger = require('../../Logger')
+const { SupportedEbookTypes } = require('./globals')
+const { PlayMethod } = require('./constants')
+const { getId } = require('./index')
+const { filePathToPOSIX } = require('./fileUtils')
+const Logger = require('../Logger')
 
-const Library = require('../../objects/Library')
-const LibraryItem = require('../../objects/LibraryItem')
-const Book = require('../../objects/mediaTypes/Book')
+const Library = require('../objects/Library')
+const LibraryItem = require('../objects/LibraryItem')
+const Book = require('../objects/mediaTypes/Book')
 
-const BookMetadata = require('../../objects/metadata/BookMetadata')
-const FileMetadata = require('../../objects/metadata/FileMetadata')
+const BookMetadata = require('../objects/metadata/BookMetadata')
+const FileMetadata = require('../objects/metadata/FileMetadata')
 
-const AudioFile = require('../../objects/files/AudioFile')
-const EBookFile = require('../../objects/files/EBookFile')
-const LibraryFile = require('../../objects/files/LibraryFile')
-const AudioMetaTags = require('../../objects/metadata/AudioMetaTags')
+const AudioFile = require('../objects/files/AudioFile')
+const EBookFile = require('../objects/files/EBookFile')
+const LibraryFile = require('../objects/files/LibraryFile')
+const AudioMetaTags = require('../objects/metadata/AudioMetaTags')
 
-const Author = require('../../objects/entities/Author')
-const Series = require('../../objects/entities/Series')
+const Author = require('../objects/entities/Author')
+const Series = require('../objects/entities/Series')
 
-const MediaProgress = require('../../objects/user/MediaProgress')
-const PlaybackSession = require('../../objects/PlaybackSession')
+const MediaProgress = require('../objects/user/MediaProgress')
+const PlaybackSession = require('../objects/PlaybackSession')
 
-const { isObject } = require('..')
-const User = require('../../objects/user/User')
+const { isObject } = require('.')
+const User = require('../objects/user/User')
 
 var authorsToAdd = []
 var existingDbAuthors = []