Update podcasts to new library item model

Update libraryItem.updatedAt on media update
Merge pull request #3787 from advplyr/fix-remove-episode-from-playlist
2026-06-04 09:50:42 +02:00 · 2025-01-03 16:48:24 -06:00 · 2025-01-03 14:07:27 -06:00 · 2025-01-03 13:04:18 -06:00 · 2025-01-03 12:12:56 -06:00 · 2025-01-03 12:06:20 -06:00
31 changed files with 1663 additions and 766 deletions
@@ -170,6 +170,12 @@ export default {
        this.show = false
      }
    },
+    libraryItemUpdated(libraryItem) {
+      const episode = libraryItem.media.episodes.find((e) => e.id === this.selectedEpisodeId)
+      if (episode) {
+        this.episodeItem = episode
+      }
+    },
    hotkey(action) {
      if (action === this.$hotkeys.Modal.NEXT_PAGE) {
        this.goNextEpisode()
@@ -178,9 +184,15 @@ export default {
      }
    },
    registerListeners() {
+      if (this.libraryItem) {
+        this.$eventBus.$on(`${this.libraryItem.id}_updated`, this.libraryItemUpdated)
+      }
      this.$eventBus.$on('modal-hotkey', this.hotkey)
    },
    unregisterListeners() {
+      if (this.libraryItem) {
+        this.$eventBus.$on(`${this.libraryItem.id}_updated`, this.libraryItemUpdated)
+      }
      this.$eventBus.$off('modal-hotkey', this.hotkey)
    }
  },
@@ -163,13 +163,10 @@ export default {

      this.isProcessing = false
      if (updateResult) {
-        if (updateResult) {
-          this.$toast.success(this.$strings.ToastItemUpdateSuccess)
-          return true
-        } else {
-          this.$toast.info(this.$strings.MessageNoUpdatesWereNecessary)
-        }
+        this.$toast.success(this.$strings.ToastItemUpdateSuccess)
+        return true
      }
+
      return false
    }
  },
@@ -695,6 +695,27 @@ class Database {
      await book.destroy()
    }

+    const playlistMediaItemsWithNoMediaItem = await this.playlistMediaItemModel.findAll({
+      include: [
+        {
+          model: this.bookModel,
+          attributes: ['id']
+        },
+        {
+          model: this.podcastEpisodeModel,
+          attributes: ['id']
+        }
+      ],
+      where: {
+        '$book.id$': null,
+        '$podcastEpisode.id$': null
+      }
+    })
+    for (const playlistMediaItem of playlistMediaItemsWithNoMediaItem) {
+      Logger.warn(`Found playlistMediaItem with no book or podcastEpisode - removing it`)
+      await playlistMediaItem.destroy()
+    }
+
    // Remove empty series
    const emptySeries = await this.seriesModel.findAll({
      include: {
@@ -24,6 +24,16 @@ const ShareManager = require('../managers/ShareManager')
 * @property {import('../models/User')} user
 *
 * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/LibraryItem')} libraryItem
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} LibraryItemControllerRequest
+ *
+ * @typedef RequestLibraryFileObject
+ * @property {import('../objects/files/LibraryFile')} libraryFile
+ *
+ * @typedef {RequestWithUser & RequestEntityObject & RequestLibraryFileObject} LibraryItemControllerRequestWithFile
 */

 class LibraryItemController {
@@ -35,17 +45,17 @@ class LibraryItemController {
   * ?include=progress,rssfeed,downloads,share
   * ?expanded=1
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async findOne(req, res) {
    const includeEntities = (req.query.include || '').split(',')
    if (req.query.expanded == 1) {
-      var item = req.libraryItem.toJSONExpanded()
+      const item = req.libraryItem.toOldJSONExpanded()

      // Include users media progress
      if (includeEntities.includes('progress')) {
-        var episodeId = req.query.episode || null
+        const episodeId = req.query.episode || null
        item.userMediaProgress = req.user.getOldMediaProgress(item.id, episodeId)
      }

@@ -68,28 +78,32 @@ class LibraryItemController {

      return res.json(item)
    }
-    res.json(req.libraryItem)
+    res.json(req.libraryItem.toOldJSON())
  }

  /**
+   * PATCH: /api/items/:id
   *
-   * @param {RequestWithUser} req
+   * @deprecated
+   * Use the updateMedia /api/items/:id/media endpoint instead or updateCover /api/items/:id/cover
+   *
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async update(req, res) {
-    var libraryItem = req.libraryItem
    // Item has cover and update is removing cover so purge it from cache
-    if (libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
-      await CacheManager.purgeCoverCache(libraryItem.id)
+    if (req.libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
+      await CacheManager.purgeCoverCache(req.libraryItem.id)
    }

-    const hasUpdates = libraryItem.update(req.body)
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    const hasUpdates = oldLibraryItem.update(req.body)
    if (hasUpdates) {
      Logger.debug(`[LibraryItemController] Updated now saving`)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(oldLibraryItem)
+      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
    }
-    res.json(libraryItem.toJSON())
+    res.json(oldLibraryItem.toJSON())
  }

  /**
@@ -100,7 +114,7 @@ class LibraryItemController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async delete(req, res) {
@@ -111,14 +125,14 @@ class LibraryItemController {
    const authorIds = []
    const seriesIds = []
    if (req.libraryItem.isPodcast) {
-      mediaItemIds.push(...req.libraryItem.media.episodes.map((ep) => ep.id))
+      mediaItemIds.push(...req.libraryItem.media.podcastEpisodes.map((ep) => ep.id))
    } else {
      mediaItemIds.push(req.libraryItem.media.id)
-      if (req.libraryItem.media.metadata.authors?.length) {
-        authorIds.push(...req.libraryItem.media.metadata.authors.map((au) => au.id))
+      if (req.libraryItem.media.authors?.length) {
+        authorIds.push(...req.libraryItem.media.authors.map((au) => au.id))
      }
-      if (req.libraryItem.media.metadata.series?.length) {
-        seriesIds.push(...req.libraryItem.media.metadata.series.map((se) => se.id))
+      if (req.libraryItem.media.series?.length) {
+        seriesIds.push(...req.libraryItem.media.series.map((se) => se.id))
      }
    }

@@ -155,7 +169,7 @@ class LibraryItemController {
   * GET: /api/items/:id/download
   * Download library item. Zip file if multiple files.
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async download(req, res) {
@@ -164,7 +178,7 @@ class LibraryItemController {
      return res.sendStatus(403)
    }
    const libraryItemPath = req.libraryItem.path
-    const itemTitle = req.libraryItem.media.metadata.title
+    const itemTitle = req.libraryItem.media.title

    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${itemTitle}" at "${libraryItemPath}"`)

@@ -194,11 +208,10 @@ class LibraryItemController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async updateMedia(req, res) {
-    const libraryItem = req.libraryItem
    const mediaPayload = req.body

    if (mediaPayload.url) {
@@ -207,44 +220,44 @@ class LibraryItemController {
    }

    // Book specific
-    if (libraryItem.isBook) {
-      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, libraryItem.libraryId)
+    if (req.libraryItem.isBook) {
+      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, req.libraryItem.libraryId)
    }

    // Podcast specific
    let isPodcastAutoDownloadUpdated = false
-    if (libraryItem.isPodcast) {
-      if (mediaPayload.autoDownloadEpisodes !== undefined && libraryItem.media.autoDownloadEpisodes !== mediaPayload.autoDownloadEpisodes) {
+    if (req.libraryItem.isPodcast) {
+      if (mediaPayload.autoDownloadEpisodes !== undefined && req.libraryItem.media.autoDownloadEpisodes !== mediaPayload.autoDownloadEpisodes) {
        isPodcastAutoDownloadUpdated = true
-      } else if (mediaPayload.autoDownloadSchedule !== undefined && libraryItem.media.autoDownloadSchedule !== mediaPayload.autoDownloadSchedule) {
+      } else if (mediaPayload.autoDownloadSchedule !== undefined && req.libraryItem.media.autoDownloadSchedule !== mediaPayload.autoDownloadSchedule) {
        isPodcastAutoDownloadUpdated = true
      }
    }

    // Book specific - Get all series being removed from this item
    let seriesRemoved = []
-    if (libraryItem.isBook && mediaPayload.metadata?.series) {
+    if (req.libraryItem.isBook && mediaPayload.metadata?.series) {
      const seriesIdsInUpdate = mediaPayload.metadata.series?.map((se) => se.id) || []
-      seriesRemoved = libraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+      seriesRemoved = req.libraryItem.media.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
    }

    let authorsRemoved = []
-    if (libraryItem.isBook && mediaPayload.metadata?.authors) {
+    if (req.libraryItem.isBook && mediaPayload.metadata?.authors) {
      const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-      authorsRemoved = libraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+      authorsRemoved = req.libraryItem.media.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
    }

-    const hasUpdates = libraryItem.media.update(mediaPayload) || mediaPayload.url
+    const hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
    if (hasUpdates) {
-      libraryItem.updatedAt = Date.now()
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()

      if (isPodcastAutoDownloadUpdated) {
-        this.cronManager.checkUpdatePodcastCron(libraryItem)
+        this.cronManager.checkUpdatePodcastCron(req.libraryItem)
      }

-      Logger.debug(`[LibraryItemController] Updated library item media ${libraryItem.media.metadata.title}`)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      Logger.debug(`[LibraryItemController] Updated library item media ${req.libraryItem.media.title}`)
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())

      if (authorsRemoved.length) {
        // Check remove empty authors
@@ -259,14 +272,14 @@ class LibraryItemController {
    }
    res.json({
      updated: hasUpdates,
-      libraryItem
+      libraryItem: req.libraryItem.toOldJSON()
    })
  }

  /**
   * POST: /api/items/:id/cover
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   * @param {boolean} [updateAndReturnJson=true]
   */
@@ -276,15 +289,13 @@ class LibraryItemController {
      return res.sendStatus(403)
    }

-    let libraryItem = req.libraryItem
-
    let result = null
    if (req.body?.url) {
      Logger.debug(`[LibraryItemController] Requesting download cover from url "${req.body.url}"`)
-      result = await CoverManager.downloadCoverFromUrl(libraryItem, req.body.url)
+      result = await CoverManager.downloadCoverFromUrlNew(req.body.url, req.libraryItem.id, req.libraryItem.isFile ? null : req.libraryItem.path)
    } else if (req.files?.cover) {
      Logger.debug(`[LibraryItemController] Handling uploaded cover`)
-      result = await CoverManager.uploadCover(libraryItem, req.files.cover)
+      result = await CoverManager.uploadCover(req.libraryItem, req.files.cover)
    } else {
      return res.status(400).send('Invalid request no file or url')
    }
@@ -296,8 +307,15 @@ class LibraryItemController {
    }

    if (updateAndReturnJson) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      req.libraryItem.media.coverPath = result.cover
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()
+
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
      res.json({
        success: true,
        cover: result.cover
@@ -308,22 +326,28 @@ class LibraryItemController {
  /**
   * PATCH: /api/items/:id/cover
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async updateCover(req, res) {
-    const libraryItem = req.libraryItem
    if (!req.body.cover) {
      return res.status(400).send('Invalid request no cover path')
    }

-    const validationResult = await CoverManager.validateCoverPath(req.body.cover, libraryItem)
+    const validationResult = await CoverManager.validateCoverPath(req.body.cover, req.libraryItem)
    if (validationResult.error) {
      return res.status(500).send(validationResult.error)
    }
    if (validationResult.updated) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      req.libraryItem.media.coverPath = validationResult.cover
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()
+
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
    }
    res.json({
      success: true,
@@ -334,17 +358,22 @@ class LibraryItemController {
  /**
   * DELETE: /api/items/:id/cover
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async removeCover(req, res) {
-    var libraryItem = req.libraryItem
+    if (req.libraryItem.media.coverPath) {
+      req.libraryItem.media.coverPath = null
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()

-    if (libraryItem.media.coverPath) {
-      libraryItem.updateMediaCover('')
-      await CacheManager.purgeCoverCache(libraryItem.id)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
+      await CacheManager.purgeCoverCache(req.libraryItem.id)
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
    }

    res.sendStatus(200)
@@ -353,7 +382,7 @@ class LibraryItemController {
  /**
   * GET: /api/items/:id/cover
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async getCover(req, res) {
@@ -395,11 +424,11 @@ class LibraryItemController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  startPlaybackSession(req, res) {
-    if (!req.libraryItem.media.numTracks) {
+    if (!req.libraryItem.hasAudioTracks) {
      Logger.error(`[LibraryItemController] startPlaybackSession cannot playback ${req.libraryItem.id}`)
      return res.sendStatus(404)
    }
@@ -412,18 +441,18 @@ class LibraryItemController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  startEpisodePlaybackSession(req, res) {
-    var libraryItem = req.libraryItem
-    if (!libraryItem.media.numTracks) {
-      Logger.error(`[LibraryItemController] startPlaybackSession cannot playback ${libraryItem.id}`)
-      return res.sendStatus(404)
+    if (!req.libraryItem.isPodcast) {
+      Logger.error(`[LibraryItemController] startEpisodePlaybackSession invalid media type ${req.libraryItem.id}`)
+      return res.sendStatus(400)
    }
-    var episodeId = req.params.episodeId
-    if (!libraryItem.media.episodes.find((ep) => ep.id === episodeId)) {
-      Logger.error(`[LibraryItemController] startPlaybackSession episode ${episodeId} not found for item ${libraryItem.id}`)
+
+    const episodeId = req.params.episodeId
+    if (!req.libraryItem.media.podcastEpisodes.some((ep) => ep.id === episodeId)) {
+      Logger.error(`[LibraryItemController] startPlaybackSession episode ${episodeId} not found for item ${req.libraryItem.id}`)
      return res.sendStatus(404)
    }

@@ -433,30 +462,55 @@ class LibraryItemController {
  /**
   * PATCH: /api/items/:id/tracks
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async updateTracks(req, res) {
-    var libraryItem = req.libraryItem
-    var orderedFileData = req.body.orderedFileData
-    if (!libraryItem.media.updateAudioTracks) {
-      Logger.error(`[LibraryItemController] updateTracks invalid media type ${libraryItem.id}`)
-      return res.sendStatus(500)
+    const orderedFileData = req.body?.orderedFileData
+
+    if (!req.libraryItem.isBook) {
+      Logger.error(`[LibraryItemController] updateTracks invalid media type ${req.libraryItem.id}`)
+      return res.sendStatus(400)
    }
-    libraryItem.media.updateAudioTracks(orderedFileData)
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    res.json(libraryItem.toJSON())
+    if (!Array.isArray(orderedFileData) || !orderedFileData.length) {
+      Logger.error(`[LibraryItemController] updateTracks invalid orderedFileData ${req.libraryItem.id}`)
+      return res.sendStatus(400)
+    }
+    // Ensure that each orderedFileData has a valid ino and is in the book audioFiles
+    if (orderedFileData.some((fileData) => !fileData?.ino || !req.libraryItem.media.audioFiles.some((af) => af.ino === fileData.ino))) {
+      Logger.error(`[LibraryItemController] updateTracks invalid orderedFileData ${req.libraryItem.id}`)
+      return res.sendStatus(400)
+    }
+
+    let index = 1
+    const updatedAudioFiles = orderedFileData.map((fileData) => {
+      const audioFile = req.libraryItem.media.audioFiles.find((af) => af.ino === fileData.ino)
+      audioFile.manuallyVerified = true
+      audioFile.exclude = !!fileData.exclude
+      if (audioFile.exclude) {
+        audioFile.index = -1
+      } else {
+        audioFile.index = index++
+      }
+      return audioFile
+    })
+    updatedAudioFiles.sort((a, b) => a.index - b.index)
+
+    req.libraryItem.media.audioFiles = updatedAudioFiles
+    req.libraryItem.media.changed('audioFiles', true)
+    await req.libraryItem.media.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+    res.json(req.libraryItem.toOldJSON())
  }

  /**
   * POST /api/items/:id/match
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async match(req, res) {
-    const libraryItem = req.libraryItem
    const reqBody = req.body || {}

    const options = {}
@@ -473,7 +527,8 @@ class LibraryItemController {
      options.overrideDetails = !!reqBody.overrideDetails
    }

-    var matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    var matchResult = await Scanner.quickMatchLibraryItem(this, oldLibraryItem, options)
    res.json(matchResult)
  }

@@ -741,7 +796,7 @@ class LibraryItemController {
  /**
   * POST: /api/items/:id/scan
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async scan(req, res) {
@@ -765,7 +820,7 @@ class LibraryItemController {
  /**
   * GET: /api/items/:id/metadata-object
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  getMetadataObject(req, res) {
@@ -774,7 +829,7 @@ class LibraryItemController {
      return res.sendStatus(403)
    }

-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.includedAudioFiles.length) {
      Logger.error(`[LibraryItemController] Invalid library item`)
      return res.sendStatus(500)
    }
@@ -785,7 +840,7 @@ class LibraryItemController {
  /**
   * POST: /api/items/:id/chapters
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async updateMediaChapters(req, res) {
@@ -794,26 +849,51 @@ class LibraryItemController {
      return res.sendStatus(403)
    }

-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.hasAudioTracks) {
      Logger.error(`[LibraryItemController] Invalid library item`)
      return res.sendStatus(500)
    }

-    if (!req.body.chapters) {
+    if (!Array.isArray(req.body.chapters) || req.body.chapters.some((c) => !c.title || typeof c.title !== 'string' || c.start === undefined || typeof c.start !== 'number' || c.end === undefined || typeof c.end !== 'number')) {
      Logger.error(`[LibraryItemController] Invalid payload`)
      return res.sendStatus(400)
    }

    const chapters = req.body.chapters || []
-    const wasUpdated = req.libraryItem.media.updateChapters(chapters)
-    if (wasUpdated) {
-      await Database.updateLibraryItem(req.libraryItem)
-      SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+
+    let hasUpdates = false
+    if (chapters.length !== req.libraryItem.media.chapters.length) {
+      req.libraryItem.media.chapters = chapters.map((c, index) => {
+        return {
+          id: index,
+          title: c.title,
+          start: c.start,
+          end: c.end
+        }
+      })
+      hasUpdates = true
+    } else {
+      for (const [index, chapter] of chapters.entries()) {
+        const currentChapter = req.libraryItem.media.chapters[index]
+        if (currentChapter.title !== chapter.title || currentChapter.start !== chapter.start || currentChapter.end !== chapter.end) {
+          currentChapter.title = chapter.title
+          currentChapter.start = chapter.start
+          currentChapter.end = chapter.end
+          hasUpdates = true
+        }
+      }
+    }
+
+    if (hasUpdates) {
+      req.libraryItem.media.changed('chapters', true)
+      await req.libraryItem.media.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
    }

    res.json({
      success: true,
-      updated: wasUpdated
+      updated: hasUpdates
    })
  }

@@ -821,7 +901,7 @@ class LibraryItemController {
   * GET: /api/items/:id/ffprobe/:fileid
   * FFProbe JSON result from audio file
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async getFFprobeData(req, res) {
@@ -829,25 +909,21 @@ class LibraryItemController {
      Logger.error(`[LibraryItemController] Non-admin user "${req.user.username}" attempted to get ffprobe data`)
      return res.sendStatus(403)
    }
-    if (req.libraryFile.fileType !== 'audio') {
-      Logger.error(`[LibraryItemController] Invalid filetype "${req.libraryFile.fileType}" for fileid "${req.params.fileid}". Expected audio file`)
-      return res.sendStatus(400)
-    }

-    const audioFile = req.libraryItem.media.findFileWithInode(req.params.fileid)
+    const audioFile = req.libraryItem.getAudioFileWithIno(req.params.fileid)
    if (!audioFile) {
      Logger.error(`[LibraryItemController] Audio file not found with inode value ${req.params.fileid}`)
      return res.sendStatus(404)
    }

-    const ffprobeData = await AudioFileScanner.probeAudioFile(audioFile)
+    const ffprobeData = await AudioFileScanner.probeAudioFile(audioFile.metadata.path)
    res.json(ffprobeData)
  }

  /**
   * GET api/items/:id/file/:fileid
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
   * @param {Response} res
   */
  async getLibraryFile(req, res) {
@@ -870,7 +946,7 @@ class LibraryItemController {
  /**
   * DELETE api/items/:id/file/:fileid
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
   * @param {Response} res
   */
  async deleteLibraryFile(req, res) {
@@ -881,17 +957,49 @@ class LibraryItemController {
    await fs.remove(libraryFile.metadata.path).catch((error) => {
      Logger.error(`[LibraryItemController] Failed to delete library file at "${libraryFile.metadata.path}"`, error)
    })
-    req.libraryItem.removeLibraryFile(req.params.fileid)

-    if (req.libraryItem.media.removeFileWithInode(req.params.fileid)) {
-      // If book has no more media files then mark it as missing
-      if (req.libraryItem.mediaType === 'book' && !req.libraryItem.media.hasMediaEntities) {
-        req.libraryItem.setMissing()
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.filter((lf) => lf.ino !== req.params.fileid)
+    req.libraryItem.changed('libraryFiles', true)
+
+    if (req.libraryItem.isBook) {
+      if (req.libraryItem.media.audioFiles.some((af) => af.ino === req.params.fileid)) {
+        req.libraryItem.media.audioFiles = req.libraryItem.media.audioFiles.filter((af) => af.ino !== req.params.fileid)
+        req.libraryItem.media.changed('audioFiles', true)
+      } else if (req.libraryItem.media.ebookFile?.ino === req.params.fileid) {
+        req.libraryItem.media.ebookFile = null
+        req.libraryItem.media.changed('ebookFile', true)
      }
+      if (!req.libraryItem.media.hasMediaFiles) {
+        req.libraryItem.isMissing = true
+      }
+    } else if (req.libraryItem.media.podcastEpisodes.some((ep) => ep.audioFile.ino === req.params.fileid)) {
+      const episodeToRemove = req.libraryItem.media.podcastEpisodes.find((ep) => ep.audioFile.ino === req.params.fileid)
+      // Remove episode from all playlists
+      await Database.playlistModel.removeMediaItemsFromPlaylists([episodeToRemove.id])
+
+      // Remove episode media progress
+      const numProgressRemoved = await Database.mediaProgressModel.destroy({
+        where: {
+          mediaItemId: episodeToRemove.id
+        }
+      })
+      if (numProgressRemoved > 0) {
+        Logger.info(`[LibraryItemController] Removed media progress for episode ${episodeToRemove.id}`)
+      }
+
+      // Remove episode
+      await episodeToRemove.destroy()
+
+      req.libraryItem.media.podcastEpisodes = req.libraryItem.media.podcastEpisodes.filter((ep) => ep.audioFile.ino !== req.params.fileid)
    }
-    req.libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.libraryItem)
-    SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+
+    if (req.libraryItem.media.changed()) {
+      await req.libraryItem.media.save()
+    }
+
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
    res.sendStatus(200)
  }

@@ -899,7 +1007,7 @@ class LibraryItemController {
   * GET api/items/:id/file/:fileid/download
   * Same as GET api/items/:id/file/:fileid but allows logging and restricting downloads
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
   * @param {Response} res
   */
  async downloadLibraryFile(req, res) {
@@ -911,7 +1019,7 @@ class LibraryItemController {
      return res.sendStatus(403)
    }

-    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.metadata.title}" file at "${libraryFile.metadata.path}"`)
+    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.title}" file at "${libraryFile.metadata.path}"`)

    if (global.XAccel) {
      const encodedURI = encodeUriPath(global.XAccel + libraryFile.metadata.path)
@@ -947,13 +1055,13 @@ class LibraryItemController {
   * fileid is only required when reading a supplementary ebook
   * when no fileid is passed in the primary ebook will be returned
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
   * @param {Response} res
   */
  async getEBookFile(req, res) {
    let ebookFile = null
    if (req.params.fileid) {
-      ebookFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      ebookFile = req.libraryItem.getLibraryFileWithIno(req.params.fileid)
      if (!ebookFile?.isEBookFile) {
        Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
        return res.status(400).send('Invalid ebook file id')
@@ -963,12 +1071,12 @@ class LibraryItemController {
    }

    if (!ebookFile) {
-      Logger.error(`[LibraryItemController] No ebookFile for library item "${req.libraryItem.media.metadata.title}"`)
+      Logger.error(`[LibraryItemController] No ebookFile for library item "${req.libraryItem.media.title}"`)
      return res.sendStatus(404)
    }
    const ebookFilePath = ebookFile.metadata.path

-    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.metadata.title}" ebook at "${ebookFilePath}"`)
+    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.title}" ebook at "${ebookFilePath}"`)

    if (global.XAccel) {
      const encodedURI = encodeUriPath(global.XAccel + ebookFilePath)
@@ -991,28 +1099,55 @@ class LibraryItemController {
   * if an ebook file is the primary ebook, then it will be changed to supplementary
   * if an ebook file is supplementary, then it will be changed to primary
   *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
   * @param {Response} res
   */
  async updateEbookFileStatus(req, res) {
-    const ebookLibraryFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
-    if (!ebookLibraryFile?.isEBookFile) {
+    if (!req.libraryItem.isBook) {
+      Logger.error(`[LibraryItemController] Invalid media type for ebook file status update`)
+      return res.sendStatus(400)
+    }
+    if (!req.libraryFile?.isEBookFile) {
      Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
      return res.status(400).send('Invalid ebook file id')
    }

+    const ebookLibraryFile = req.libraryFile
+    let primaryEbookFile = null
+
+    const ebookLibraryFileInos = req.libraryItem
+      .getLibraryFiles()
+      .filter((lf) => lf.isEBookFile)
+      .map((lf) => lf.ino)
+
    if (ebookLibraryFile.isSupplementary) {
      Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to primary`)
-      req.libraryItem.setPrimaryEbook(ebookLibraryFile)
+
+      primaryEbookFile = ebookLibraryFile.toJSON()
+      delete primaryEbookFile.isSupplementary
+      delete primaryEbookFile.fileType
+      primaryEbookFile.ebookFormat = ebookLibraryFile.metadata.format
    } else {
      Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to supplementary`)
-      ebookLibraryFile.isSupplementary = true
-      req.libraryItem.setPrimaryEbook(null)
    }

-    req.libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.libraryItem)
-    SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+    req.libraryItem.media.ebookFile = primaryEbookFile
+    req.libraryItem.media.changed('ebookFile', true)
+    await req.libraryItem.media.save()
+
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.map((lf) => {
+      if (ebookLibraryFileInos.includes(lf.ino)) {
+        lf.isSupplementary = lf.ino !== primaryEbookFile?.ino
+      }
+      return lf
+    })
+    req.libraryItem.changed('libraryFiles', true)
+
+    req.libraryItem.isMissing = !req.libraryItem.media.hasMediaFiles
+
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
    res.sendStatus(200)
  }

@@ -1023,7 +1158,7 @@ class LibraryItemController {
   * @param {NextFunction} next
   */
  async middleware(req, res, next) {
-    req.libraryItem = await Database.libraryItemModel.getOldById(req.params.id)
+    req.libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
    if (!req.libraryItem?.media) return res.sendStatus(404)

    // Check user can access this library item
@@ -1033,7 +1168,7 @@ class LibraryItemController {

    // For library file routes, get the library file
    if (req.params.fileid) {
-      req.libraryFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      req.libraryFile = req.libraryItem.getLibraryFileWithIno(req.params.fileid)
      if (!req.libraryFile) {
        Logger.error(`[LibraryItemController] Library file "${req.params.fileid}" does not exist for library item`)
        return res.sendStatus(404)
@@ -19,6 +19,11 @@ const LibraryItem = require('../objects/LibraryItem')
 * @property {import('../models/User')} user
 *
 * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/LibraryItem')} libraryItem
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} RequestWithLibraryItem
 */

 class PodcastController {
@@ -112,11 +117,6 @@ class PodcastController {

    res.json(libraryItem.toJSONExpanded())

-    if (payload.episodesToDownload?.length) {
-      Logger.info(`[PodcastController] Podcast created now starting ${payload.episodesToDownload.length} episode downloads`)
-      this.podcastManager.downloadPodcastEpisodes(libraryItem, payload.episodesToDownload)
-    }
-
    // Turn on podcast auto download cron if not already on
    if (libraryItem.media.autoDownloadEpisodes) {
      this.cronManager.checkUpdatePodcastCron(libraryItem)
@@ -213,7 +213,7 @@ class PodcastController {
   *
   * @this import('../routers/ApiRouter')
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async checkNewEpisodes(req, res) {
@@ -222,15 +222,14 @@ class PodcastController {
      return res.sendStatus(403)
    }

-    var libraryItem = req.libraryItem
-    if (!libraryItem.media.metadata.feedUrl) {
-      Logger.error(`[PodcastController] checkNewEpisodes no feed url for item ${libraryItem.id}`)
-      return res.status(500).send('Podcast has no rss feed url')
+    if (!req.libraryItem.media.feedURL) {
+      Logger.error(`[PodcastController] checkNewEpisodes no feed url for item ${req.libraryItem.id}`)
+      return res.status(400).send('Podcast has no rss feed url')
    }

    const maxEpisodesToDownload = !isNaN(req.query.limit) ? Number(req.query.limit) : 3

-    var newEpisodes = await this.podcastManager.checkAndDownloadNewEpisodes(libraryItem, maxEpisodesToDownload)
+    const newEpisodes = await this.podcastManager.checkAndDownloadNewEpisodes(req.libraryItem, maxEpisodesToDownload)
    res.json({
      episodes: newEpisodes || []
    })
@@ -258,23 +257,28 @@ class PodcastController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  getEpisodeDownloads(req, res) {
-    var libraryItem = req.libraryItem
-
-    var downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(libraryItem.id)
+    const downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(req.libraryItem.id)
    res.json({
      downloads: downloadsInQueue.map((d) => d.toJSONForClient())
    })
  }

+  /**
+   * GET: /api/podcasts/:id/search-episode
+   * Search for an episode in a podcast
+   *
+   * @param {RequestWithLibraryItem} req
+   * @param {Response} res
+   */
  async findEpisode(req, res) {
-    const rssFeedUrl = req.libraryItem.media.metadata.feedUrl
+    const rssFeedUrl = req.libraryItem.media.feedURL
    if (!rssFeedUrl) {
      Logger.error(`[PodcastController] findEpisode: Podcast has no feed url`)
-      return res.status(500).send('Podcast does not have an RSS feed URL')
+      return res.status(400).send('Podcast does not have an RSS feed URL')
    }

    const searchTitle = req.query.title
@@ -292,7 +296,7 @@ class PodcastController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async downloadEpisodes(req, res) {
@@ -300,13 +304,13 @@ class PodcastController {
      Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to download episodes`)
      return res.sendStatus(403)
    }
-    const libraryItem = req.libraryItem
+
    const episodes = req.body
-    if (!episodes?.length) {
+    if (!Array.isArray(episodes) || !episodes.length) {
      return res.sendStatus(400)
    }

-    this.podcastManager.downloadPodcastEpisodes(libraryItem, episodes)
+    this.podcastManager.downloadPodcastEpisodes(req.libraryItem, episodes)
    res.sendStatus(200)
  }

@@ -315,7 +319,7 @@ class PodcastController {
   *
   * @this {import('../routers/ApiRouter')}
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async quickMatchEpisodes(req, res) {
@@ -325,10 +329,11 @@ class PodcastController {
    }

    const overrideDetails = req.query.override === '1'
-    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(req.libraryItem, { overrideDetails })
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(oldLibraryItem, { overrideDetails })
    if (episodesUpdated) {
-      await Database.updateLibraryItem(req.libraryItem)
-      SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(oldLibraryItem)
+      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
    }

    res.json({
@@ -339,58 +344,76 @@ class PodcastController {
  /**
   * PATCH: /api/podcasts/:id/episode/:episodeId
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async updateEpisode(req, res) {
-    const libraryItem = req.libraryItem
-
-    var episodeId = req.params.episodeId
-    if (!libraryItem.media.checkHasEpisode(episodeId)) {
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === req.params.episodeId)
+    if (!episode) {
      return res.status(404).send('Episode not found')
    }

-    if (libraryItem.media.updateEpisode(episodeId, req.body)) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    const updatePayload = {}
+    const supportedStringKeys = ['title', 'subtitle', 'description', 'pubDate', 'episode', 'season', 'episodeType']
+    for (const key in req.body) {
+      if (supportedStringKeys.includes(key) && typeof req.body[key] === 'string') {
+        updatePayload[key] = req.body[key]
+      } else if (key === 'chapters' && Array.isArray(req.body[key]) && req.body[key].every((ch) => typeof ch === 'object' && ch.title && ch.start)) {
+        updatePayload[key] = req.body[key]
+      } else if (key === 'publishedAt' && typeof req.body[key] === 'number') {
+        updatePayload[key] = req.body[key]
+      }
    }

-    res.json(libraryItem.toJSONExpanded())
+    if (Object.keys(updatePayload).length) {
+      episode.set(updatePayload)
+      if (episode.changed()) {
+        Logger.info(`[PodcastController] Updated episode "${episode.title}" keys`, episode.changed())
+        await episode.save()
+
+        SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+      } else {
+        Logger.info(`[PodcastController] No changes to episode "${episode.title}"`)
+      }
+    }
+
+    res.json(req.libraryItem.toOldJSONExpanded())
  }

  /**
   * GET: /api/podcasts/:id/episode/:episodeId
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async getEpisode(req, res) {
    const episodeId = req.params.episodeId
-    const libraryItem = req.libraryItem

-    const episode = libraryItem.media.episodes.find((ep) => ep.id === episodeId)
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === episodeId)
    if (!episode) {
-      Logger.error(`[PodcastController] getEpisode episode ${episodeId} not found for item ${libraryItem.id}`)
+      Logger.error(`[PodcastController] getEpisode episode ${episodeId} not found for item ${req.libraryItem.id}`)
      return res.sendStatus(404)
    }

-    res.json(episode)
+    res.json(episode.toOldJSON(req.libraryItem.id))
  }

  /**
   * DELETE: /api/podcasts/:id/episode/:episodeId
   *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
   * @param {Response} res
   */
  async removeEpisode(req, res) {
    const episodeId = req.params.episodeId
-    const libraryItem = req.libraryItem
    const hardDelete = req.query.hard === '1'

-    const episode = libraryItem.media.episodes.find((ep) => ep.id === episodeId)
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === episodeId)
    if (!episode) {
-      Logger.error(`[PodcastController] removeEpisode episode ${episodeId} not found for item ${libraryItem.id}`)
+      Logger.error(`[PodcastController] removeEpisode episode ${episodeId} not found for item ${req.libraryItem.id}`)
      return res.sendStatus(404)
    }

@@ -407,36 +430,8 @@ class PodcastController {
        })
    }

-    // Remove episode from Podcast and library file
-    const episodeRemoved = libraryItem.media.removeEpisode(episodeId)
-    if (episodeRemoved?.audioFile) {
-      libraryItem.removeLibraryFile(episodeRemoved.audioFile.ino)
-    }
-
-    // Update/remove playlists that had this podcast episode
-    const playlistMediaItems = await Database.playlistMediaItemModel.findAll({
-      where: {
-        mediaItemId: episodeId
-      },
-      include: {
-        model: Database.playlistModel,
-        include: Database.playlistMediaItemModel
-      }
-    })
-    for (const pmi of playlistMediaItems) {
-      const numItems = pmi.playlist.playlistMediaItems.length - 1
-
-      if (!numItems) {
-        Logger.info(`[PodcastController] Playlist "${pmi.playlist.name}" has no more items - removing it`)
-        const jsonExpanded = await pmi.playlist.getOldJsonExpanded()
-        SocketAuthority.clientEmitter(pmi.playlist.userId, 'playlist_removed', jsonExpanded)
-        await pmi.playlist.destroy()
-      } else {
-        await pmi.destroy()
-        const jsonExpanded = await pmi.playlist.getOldJsonExpanded()
-        SocketAuthority.clientEmitter(pmi.playlist.userId, 'playlist_updated', jsonExpanded)
-      }
-    }
+    // Remove episode from playlists
+    await Database.playlistModel.removeMediaItemsFromPlaylists([episodeId])

    // Remove media progress for this episode
    const mediaProgressRemoved = await Database.mediaProgressModel.destroy({
@@ -448,9 +443,16 @@ class PodcastController {
      Logger.info(`[PodcastController] Removed ${mediaProgressRemoved} media progress for episode ${episode.id}`)
    }

-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    res.json(libraryItem.toJSON())
+    // Remove episode
+    await episode.destroy()
+
+    // Remove library file
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.filter((file) => file.ino !== episode.audioFile.ino)
+    req.libraryItem.changed('libraryFiles', true)
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+    res.json(req.libraryItem.toOldJSON())
  }

  /**
@@ -460,15 +462,15 @@ class PodcastController {
   * @param {NextFunction} next
   */
  async middleware(req, res, next) {
-    const item = await Database.libraryItemModel.getOldById(req.params.id)
-    if (!item?.media) return res.sendStatus(404)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
+    if (!libraryItem?.media) return res.sendStatus(404)

-    if (!item.isPodcast) {
+    if (!libraryItem.isPodcast) {
      return res.sendStatus(500)
    }

    // Check user can access this library item
-    if (!req.user.checkCanAccessLibraryItem(item)) {
+    if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
      return res.sendStatus(403)
    }

@@ -480,7 +482,7 @@ class PodcastController {
      return res.sendStatus(403)
    }

-    req.libraryItem = item
+    req.libraryItem = libraryItem
    next()
  }
 }
@@ -149,7 +149,7 @@ class SessionController {
   * @param {Response} res
   */
  async getOpenSession(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.playbackSession.libraryItemId)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(req.playbackSession.libraryItemId)
    const sessionForClient = req.playbackSession.toJSONForClient(libraryItem)
    res.json(sessionForClient)
  }
@@ -70,14 +70,13 @@ class ShareController {
    }

    try {
-      const oldLibraryItem = await Database.mediaItemShareModel.getMediaItemsOldLibraryItem(mediaItemShare.mediaItemId, mediaItemShare.mediaItemType)
-
-      if (!oldLibraryItem) {
+      const libraryItem = await Database.mediaItemShareModel.getMediaItemsLibraryItem(mediaItemShare.mediaItemId, mediaItemShare.mediaItemType)
+      if (!libraryItem) {
        return res.status(404).send('Media item not found')
      }

      let startOffset = 0
-      const publicTracks = oldLibraryItem.media.includedAudioFiles.map((audioFile) => {
+      const publicTracks = libraryItem.media.includedAudioFiles.map((audioFile) => {
        const audioTrack = {
          index: audioFile.index,
          startOffset,
@@ -86,7 +85,7 @@ class ShareController {
          contentUrl: `${global.RouterBasePath}/public/share/${slug}/track/${audioFile.index}`,
          mimeType: audioFile.mimeType,
          codec: audioFile.codec || null,
-          metadata: audioFile.metadata.clone()
+          metadata: structuredClone(audioFile.metadata)
        }
        startOffset += audioTrack.duration
        return audioTrack
@@ -105,12 +104,12 @@ class ShareController {
      const deviceInfo = await this.playbackSessionManager.getDeviceInfo(req, clientDeviceInfo)

      const newPlaybackSession = new PlaybackSession()
-      newPlaybackSession.setData(oldLibraryItem, null, 'web-share', deviceInfo, startTime)
+      newPlaybackSession.setData(libraryItem, null, 'web-share', deviceInfo, startTime)
      newPlaybackSession.audioTracks = publicTracks
      newPlaybackSession.playMethod = PlayMethod.DIRECTPLAY
      newPlaybackSession.shareSessionId = shareSessionId
      newPlaybackSession.mediaItemShareId = mediaItemShare.id
-      newPlaybackSession.coverAspectRatio = oldLibraryItem.librarySettings.coverAspectRatio
+      newPlaybackSession.coverAspectRatio = libraryItem.library.settings.coverAspectRatio

      mediaItemShare.playbackSession = newPlaybackSession.toJSONForClient()
      ShareManager.addOpenSharePlaybackSession(newPlaybackSession)
@@ -34,8 +34,13 @@ class AudioMetadataMangaer {
    return this.tasksQueued.some((t) => t.data.libraryItemId === libraryItemId) || this.tasksRunning.some((t) => t.data.libraryItemId === libraryItemId)
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns
+   */
  getMetadataObjectForApi(libraryItem) {
-    return ffmpegHelpers.getFFMetadataObject(libraryItem, libraryItem.media.includedAudioFiles.length)
+    return ffmpegHelpers.getFFMetadataObject(libraryItem.toOldJSONExpanded(), libraryItem.media.includedAudioFiles.length)
  }

  /**
@@ -79,6 +79,12 @@ class CoverManager {
    return imgType
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} coverFile - file object from req.files
+   * @returns {Promise<{error:string}|{cover:string}>}
+   */
  async uploadCover(libraryItem, coverFile) {
    const extname = Path.extname(coverFile.name.toLowerCase())
    if (!extname || !globals.SupportedImageTypes.includes(extname.slice(1))) {
@@ -110,14 +116,20 @@ class CoverManager {
    await this.removeOldCovers(coverDirPath, extname)
    await CacheManager.purgeCoverCache(libraryItem.id)

-    Logger.info(`[CoverManager] Uploaded libraryItem cover "${coverFullPath}" for "${libraryItem.media.metadata.title}"`)
+    Logger.info(`[CoverManager] Uploaded libraryItem cover "${coverFullPath}" for "${libraryItem.media.title}"`)

-    libraryItem.updateMediaCover(coverFullPath)
    return {
      cover: coverFullPath
    }
  }

+  /**
+   *
+   * @param {Object} libraryItem - old library item
+   * @param {string} url
+   * @param {boolean} [forceLibraryItemFolder=false]
+   * @returns {Promise<{error:string}|{cover:string}>}
+   */
  async downloadCoverFromUrl(libraryItem, url, forceLibraryItemFolder = false) {
    try {
      // Force save cover with library item is used for adding new podcasts
@@ -166,6 +178,12 @@ class CoverManager {
    }
  }

+  /**
+   *
+   * @param {string} coverPath
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns {Promise<{error:string}|{cover:string,updated:boolean}>}
+   */
  async validateCoverPath(coverPath, libraryItem) {
    // Invalid cover path
    if (!coverPath || coverPath.startsWith('http:') || coverPath.startsWith('https:')) {
@@ -235,7 +253,6 @@ class CoverManager {

    await CacheManager.purgeCoverCache(libraryItem.id)

-    libraryItem.updateMediaCover(coverPath)
    return {
      cover: coverPath,
      updated: true
@@ -181,7 +181,7 @@ class CronManager {
    // Get podcast library items to check
    const libraryItems = []
    for (const libraryItemId of libraryItemIds) {
-      const libraryItem = await Database.libraryItemModel.getOldById(libraryItemId)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItemId)
      if (!libraryItem) {
        Logger.error(`[CronManager] Library item ${libraryItemId} not found for episode check cron ${expression}`)
        podcastCron.libraryItemIds = podcastCron.libraryItemIds.filter((lid) => lid !== libraryItemId) // Filter it out
@@ -215,6 +215,10 @@ class CronManager {
    this.podcastCrons = this.podcastCrons.filter((pc) => pc.expression !== podcastCron.expression)
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem - this can be the old model
+   */
  checkUpdatePodcastCron(libraryItem) {
    // Remove from old cron by library item id
    const existingCron = this.podcastCrons.find((pc) => pc.libraryItemIds.includes(libraryItem.id))
@@ -230,7 +234,10 @@ class CronManager {
      const cronMatchingExpression = this.podcastCrons.find((pc) => pc.expression === libraryItem.media.autoDownloadSchedule)
      if (cronMatchingExpression) {
        cronMatchingExpression.libraryItemIds.push(libraryItem.id)
-        Logger.info(`[CronManager] Added podcast "${libraryItem.media.metadata.title}" to auto dl episode cron "${cronMatchingExpression.expression}"`)
+
+        // TODO: Update after old model removed
+        const podcastTitle = libraryItem.media.title || libraryItem.media.metadata?.title
+        Logger.info(`[CronManager] Added podcast "${podcastTitle}" to auto dl episode cron "${cronMatchingExpression.expression}"`)
      } else {
        this.startPodcastCron(libraryItem.media.autoDownloadSchedule, [libraryItem.id])
      }
@@ -39,7 +39,7 @@ class PlaybackSessionManager {

  /**
   *
-   * @param {import('../controllers/SessionController').RequestWithUser} req
+   * @param {import('../controllers/LibraryItemController').LibraryItemControllerRequest} req
   * @param {Object} [clientDeviceInfo]
   * @returns {Promise<DeviceInfo>}
   */
@@ -67,7 +67,7 @@ class PlaybackSessionManager {

  /**
   *
-   * @param {import('../controllers/SessionController').RequestWithUser} req
+   * @param {import('../controllers/LibraryItemController').LibraryItemControllerRequest} req
   * @param {import('express').Response} res
   * @param {string} [episodeId]
   */
@@ -279,7 +279,7 @@ class PlaybackSessionManager {
   *
   * @param {import('../models/User')} user
   * @param {DeviceInfo} deviceInfo
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
   * @param {string|null} episodeId
   * @param {{forceDirectPlay?:boolean, forceTranscode?:boolean, mediaPlayer:string, supportedMimeTypes?:string[]}} options
   * @returns {Promise<PlaybackSession>}
@@ -292,7 +292,7 @@ class PlaybackSessionManager {
      await this.closeSession(user, session, null)
    }

-    const shouldDirectPlay = options.forceDirectPlay || (!options.forceTranscode && libraryItem.media.checkCanDirectPlay(options, episodeId))
+    const shouldDirectPlay = options.forceDirectPlay || (!options.forceTranscode && libraryItem.media.checkCanDirectPlay(options.supportedMimeTypes, episodeId))
    const mediaPlayer = options.mediaPlayer || 'unknown'

    const mediaItemId = episodeId || libraryItem.media.id
@@ -300,7 +300,7 @@ class PlaybackSessionManager {
    let userStartTime = 0
    if (userProgress) {
      if (userProgress.isFinished) {
-        Logger.info(`[PlaybackSessionManager] Starting session for user "${user.username}" and resetting progress for finished item "${libraryItem.media.metadata.title}"`)
+        Logger.info(`[PlaybackSessionManager] Starting session for user "${user.username}" and resetting progress for finished item "${libraryItem.media.title}"`)
        // Keep userStartTime as 0 so the client restarts the media
      } else {
        userStartTime = Number.parseFloat(userProgress.currentTime) || 0
@@ -312,7 +312,7 @@ class PlaybackSessionManager {
    let audioTracks = []
    if (shouldDirectPlay) {
      Logger.debug(`[PlaybackSessionManager] "${user.username}" starting direct play session for item "${libraryItem.id}" with id ${newPlaybackSession.id} (Device: ${newPlaybackSession.deviceDescription})`)
-      audioTracks = libraryItem.getDirectPlayTracklist(episodeId)
+      audioTracks = libraryItem.getTrackList(episodeId)
      newPlaybackSession.playMethod = PlayMethod.DIRECTPLAY
    } else {
      Logger.debug(`[PlaybackSessionManager] "${user.username}" starting stream session for item "${libraryItem.id}" (Device: ${newPlaybackSession.deviceDescription})`)
@@ -52,11 +52,16 @@ class PodcastManager {
    }
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} episodesToDownload
+   * @param {*} isAutoDownload
+   */
  async downloadPodcastEpisodes(libraryItem, episodesToDownload, isAutoDownload) {
-    let index = Math.max(...libraryItem.media.episodes.filter((ep) => ep.index == null || isNaN(ep.index)).map((ep) => Number(ep.index))) + 1
    for (const ep of episodesToDownload) {
      const newPe = new PodcastEpisode()
-      newPe.setData(ep, index++)
+      newPe.setData(ep, null)
      newPe.libraryItemId = libraryItem.id
      newPe.podcastId = libraryItem.media.id
      const newPeDl = new PodcastEpisodeDownload()
@@ -263,16 +268,21 @@ class PodcastManager {
    return newAudioFile
  }

-  // Returns false if auto download episodes was disabled (disabled if reaches max failed checks)
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns {Promise<boolean>} - Returns false if auto download episodes was disabled (disabled if reaches max failed checks)
+   */
  async runEpisodeCheck(libraryItem) {
-    const lastEpisodeCheckDate = new Date(libraryItem.media.lastEpisodeCheck || 0)
-    const latestEpisodePublishedAt = libraryItem.media.latestEpisodePublished
-    Logger.info(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.metadata.title}" | Last check: ${lastEpisodeCheckDate} | ${latestEpisodePublishedAt ? `Latest episode pubDate: ${new Date(latestEpisodePublishedAt)}` : 'No latest episode'}`)
+    const lastEpisodeCheck = libraryItem.media.lastEpisodeCheck?.valueOf() || 0
+    const latestEpisodePublishedAt = libraryItem.media.getLatestEpisodePublishedAt()
+
+    Logger.info(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" | Last check: ${new Date(lastEpisodeCheck)} | ${latestEpisodePublishedAt ? `Latest episode pubDate: ${new Date(latestEpisodePublishedAt)}` : 'No latest episode'}`)

    // Use latest episode pubDate if exists OR fallback to using lastEpisodeCheckDate
    //    lastEpisodeCheckDate will be the current time when adding a new podcast
    const dateToCheckForEpisodesAfter = latestEpisodePublishedAt || lastEpisodeCheckDate
-    Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.metadata.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)
+    Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)

    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, dateToCheckForEpisodesAfter, libraryItem.media.maxNewEpisodesToDownload)
    Logger.debug(`[PodcastManager] runEpisodeCheck: ${newEpisodes?.length || 'N/A'} episodes found`)
@@ -283,36 +293,47 @@ class PodcastManager {
      if (!this.failedCheckMap[libraryItem.id]) this.failedCheckMap[libraryItem.id] = 0
      this.failedCheckMap[libraryItem.id]++
      if (this.failedCheckMap[libraryItem.id] >= this.MaxFailedEpisodeChecks) {
-        Logger.error(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.metadata.title}" - disabling auto download`)
+        Logger.error(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.title}" - disabling auto download`)
        libraryItem.media.autoDownloadEpisodes = false
        delete this.failedCheckMap[libraryItem.id]
      } else {
-        Logger.warn(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.metadata.title}"`)
+        Logger.warn(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.title}"`)
      }
    } else if (newEpisodes.length) {
      delete this.failedCheckMap[libraryItem.id]
-      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.metadata.title}" - starting download`)
+      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.title}" - starting download`)
      this.downloadPodcastEpisodes(libraryItem, newEpisodes, true)
    } else {
      delete this.failedCheckMap[libraryItem.id]
-      Logger.debug(`[PodcastManager] No new episodes for "${libraryItem.media.metadata.title}"`)
+      Logger.debug(`[PodcastManager] No new episodes for "${libraryItem.media.title}"`)
    }

-    libraryItem.media.lastEpisodeCheck = Date.now()
-    libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    libraryItem.media.lastEpisodeCheck = new Date()
+    await libraryItem.media.save()
+
+    libraryItem.changed('updatedAt', true)
+    await libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
+
    return libraryItem.media.autoDownloadEpisodes
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} podcastLibraryItem
+   * @param {number} dateToCheckForEpisodesAfter - Unix timestamp
+   * @param {number} maxNewEpisodes
+   * @returns
+   */
  async checkPodcastForNewEpisodes(podcastLibraryItem, dateToCheckForEpisodesAfter, maxNewEpisodes = 3) {
-    if (!podcastLibraryItem.media.metadata.feedUrl) {
-      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for ${podcastLibraryItem.media.metadata.title} (ID: ${podcastLibraryItem.id})`)
+    if (!podcastLibraryItem.media.feedURL) {
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`)
      return false
    }
-    const feed = await getPodcastFeed(podcastLibraryItem.media.metadata.feedUrl)
+    const feed = await getPodcastFeed(podcastLibraryItem.media.feedURL)
    if (!feed?.episodes) {
-      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload for ${podcastLibraryItem.media.metadata.title} (ID: ${podcastLibraryItem.id})`, feed)
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`, feed)
      return false
    }

@@ -326,21 +347,32 @@ class PodcastManager {
    return newEpisodes
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} maxEpisodesToDownload
+   * @returns
+   */
  async checkAndDownloadNewEpisodes(libraryItem, maxEpisodesToDownload) {
-    const lastEpisodeCheckDate = new Date(libraryItem.media.lastEpisodeCheck || 0)
-    Logger.info(`[PodcastManager] checkAndDownloadNewEpisodes for "${libraryItem.media.metadata.title}" - Last episode check: ${lastEpisodeCheckDate}`)
-    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, libraryItem.media.lastEpisodeCheck, maxEpisodesToDownload)
+    const lastEpisodeCheck = libraryItem.media.lastEpisodeCheck?.valueOf() || 0
+    const lastEpisodeCheckDate = lastEpisodeCheck > 0 ? libraryItem.media.lastEpisodeCheck : 'Never'
+    Logger.info(`[PodcastManager] checkAndDownloadNewEpisodes for "${libraryItem.media.title}" - Last episode check: ${lastEpisodeCheckDate}`)
+
+    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, lastEpisodeCheck, maxEpisodesToDownload)
    if (newEpisodes.length) {
-      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.metadata.title}" - starting download`)
+      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.title}" - starting download`)
      this.downloadPodcastEpisodes(libraryItem, newEpisodes, false)
    } else {
-      Logger.info(`[PodcastManager] No new episodes found for podcast "${libraryItem.media.metadata.title}"`)
+      Logger.info(`[PodcastManager] No new episodes found for podcast "${libraryItem.media.title}"`)
    }

-    libraryItem.media.lastEpisodeCheck = Date.now()
-    libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    libraryItem.media.lastEpisodeCheck = new Date()
+    await libraryItem.media.save()
+
+    libraryItem.changed('updatedAt', true)
+    await libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())

    return newEpisodes
  }
@@ -1,5 +1,7 @@
 const { DataTypes, Model } = require('sequelize')
 const Logger = require('../Logger')
+const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils')
+const parseNameString = require('../utils/parsers/parseNameString')

 /**
 * @typedef EBookFileObject
@@ -60,6 +62,13 @@ const Logger = require('../Logger')
 * @property {ChapterObject[]} chapters
 * @property {Object} metaTags
 * @property {string} mimeType
+ *
+ * @typedef AudioTrackProperties
+ * @property {string} title
+ * @property {string} contentUrl
+ * @property {number} startOffset
+ *
+ * @typedef {AudioFileObject & AudioTrackProperties} AudioTrack
 */

 class Book extends Model {
@@ -113,8 +122,12 @@ class Book extends Model {
    /** @type {Date} */
    this.createdAt

+    // Expanded properties
+
    /** @type {import('./Author')[]} - optional if expanded */
    this.authors
+    /** @type {import('./Series')[]} - optional if expanded */
+    this.series
  }

  static getOldBook(libraryItemExpanded) {
@@ -241,32 +254,6 @@ class Book extends Model {
    }
  }

-  getAbsMetadataJson() {
-    return {
-      tags: this.tags || [],
-      chapters: this.chapters?.map((c) => ({ ...c })) || [],
-      title: this.title,
-      subtitle: this.subtitle,
-      authors: this.authors.map((a) => a.name),
-      narrators: this.narrators,
-      series: this.series.map((se) => {
-        const sequence = se.bookSeries?.sequence || ''
-        if (!sequence) return se.name
-        return `${se.name} #${sequence}`
-      }),
-      genres: this.genres || [],
-      publishedYear: this.publishedYear,
-      publishedDate: this.publishedDate,
-      publisher: this.publisher,
-      description: this.description,
-      isbn: this.isbn,
-      asin: this.asin,
-      language: this.language,
-      explicit: !!this.explicit,
-      abridged: !!this.abridged
-    }
-  }
-
  /**
   * Initialize model
   * @param {import('../Database').sequelize} sequelize
@@ -343,18 +330,395 @@ class Book extends Model {
    }
    return this.authors.map((au) => au.name).join(', ')
  }
+
+  /**
+   * Comma separated array of author names in Last, First format
+   * Requires authors to be loaded
+   *
+   * @returns {string}
+   */
+  get authorNameLF() {
+    if (this.authors === undefined) {
+      Logger.error(`[Book] authorNameLF: Cannot get authorNameLF because authors are not loaded`)
+      return ''
+    }
+
+    // Last, First
+    if (!this.authors.length) return ''
+    return this.authors.map((au) => parseNameString.nameToLastFirst(au.name)).join(', ')
+  }
+
+  /**
+   * Comma separated array of series with sequence
+   * Requires series to be loaded
+   *
+   * @returns {string}
+   */
+  get seriesName() {
+    if (this.series === undefined) {
+      Logger.error(`[Book] seriesName: Cannot get seriesName because series are not loaded`)
+      return ''
+    }
+
+    if (!this.series.length) return ''
+    return this.series
+      .map((se) => {
+        const sequence = se.bookSeries?.sequence || ''
+        if (!sequence) return se.name
+        return `${se.name} #${sequence}`
+      })
+      .join(', ')
+  }
+
  get includedAudioFiles() {
    return this.audioFiles.filter((af) => !af.exclude)
  }
-  get trackList() {
+
+  get hasMediaFiles() {
+    return !!this.hasAudioTracks || !!this.ebookFile
+  }
+
+  get hasAudioTracks() {
+    return !!this.includedAudioFiles.length
+  }
+
+  /**
+   * Supported mime types are sent from the web client and are retrieved using the browser Audio player "canPlayType" function.
+   *
+   * @param {string[]} supportedMimeTypes
+   * @returns {boolean}
+   */
+  checkCanDirectPlay(supportedMimeTypes) {
+    if (!Array.isArray(supportedMimeTypes)) {
+      Logger.error(`[Book] checkCanDirectPlay: supportedMimeTypes is not an array`, supportedMimeTypes)
+      return false
+    }
+    return this.includedAudioFiles.every((af) => supportedMimeTypes.includes(af.mimeType))
+  }
+
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset, contentUrl and title
+   *
+   * @param {string} libraryItemId
+   * @returns {AudioTrack[]}
+   */
+  getTracklist(libraryItemId) {
    let startOffset = 0
    return this.includedAudioFiles.map((af) => {
      const track = structuredClone(af)
+      track.title = af.metadata.filename
      track.startOffset = startOffset
+      track.contentUrl = `${global.RouterBasePath}/api/items/${libraryItemId}/file/${track.ino}`
      startOffset += track.duration
      return track
    })
  }
+
+  /**
+   *
+   * @returns {ChapterObject[]}
+   */
+  getChapters() {
+    return structuredClone(this.chapters) || []
+  }
+
+  getPlaybackTitle() {
+    return this.title
+  }
+
+  getPlaybackAuthor() {
+    return this.authorName
+  }
+
+  getPlaybackDuration() {
+    return this.duration
+  }
+
+  /**
+   * Total file size of all audio files and ebook file
+   *
+   * @returns {number}
+   */
+  get size() {
+    let total = 0
+    this.audioFiles.forEach((af) => (total += af.metadata.size))
+    if (this.ebookFile) {
+      total += this.ebookFile.metadata.size
+    }
+    return total
+  }
+
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      chapters: this.chapters?.map((c) => ({ ...c })) || [],
+      title: this.title,
+      subtitle: this.subtitle,
+      authors: this.authors.map((a) => a.name),
+      narrators: this.narrators,
+      series: this.series.map((se) => {
+        const sequence = se.bookSeries?.sequence || ''
+        if (!sequence) return se.name
+        return `${se.name} #${sequence}`
+      }),
+      genres: this.genres || [],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: !!this.explicit,
+      abridged: !!this.abridged
+    }
+  }
+
+  /**
+   *
+   * @param {Object} payload - old book object
+   * @returns {Promise<boolean>}
+   */
+  async updateFromRequest(payload) {
+    if (!payload) return false
+
+    let hasUpdates = false
+
+    if (payload.metadata) {
+      const metadataStringKeys = ['title', 'subtitle', 'publishedYear', 'publishedDate', 'publisher', 'description', 'isbn', 'asin', 'language']
+      metadataStringKeys.forEach((key) => {
+        if (typeof payload.metadata[key] === 'string' && this[key] !== payload.metadata[key]) {
+          this[key] = payload.metadata[key] || null
+
+          if (key === 'title') {
+            this.titleIgnorePrefix = getTitleIgnorePrefix(this.title)
+          }
+
+          hasUpdates = true
+        }
+      })
+      if (payload.metadata.explicit !== undefined && this.explicit !== !!payload.metadata.explicit) {
+        this.explicit = !!payload.metadata.explicit
+        hasUpdates = true
+      }
+      if (payload.metadata.abridged !== undefined && this.abridged !== !!payload.metadata.abridged) {
+        this.abridged = !!payload.metadata.abridged
+        hasUpdates = true
+      }
+      const arrayOfStringsKeys = ['narrators', 'genres']
+      arrayOfStringsKeys.forEach((key) => {
+        if (Array.isArray(payload.metadata[key]) && !payload.metadata[key].some((item) => typeof item !== 'string') && JSON.stringify(this[key]) !== JSON.stringify(payload.metadata[key])) {
+          this[key] = payload.metadata[key]
+          this.changed(key, true)
+          hasUpdates = true
+        }
+      })
+    }
+
+    if (Array.isArray(payload.tags) && !payload.tags.some((tag) => typeof tag !== 'string') && JSON.stringify(this.tags) !== JSON.stringify(payload.tags)) {
+      this.tags = payload.tags
+      this.changed('tags', true)
+      hasUpdates = true
+    }
+
+    // TODO: Remove support for updating audioFiles, chapters and ebookFile here
+    const arrayOfObjectsKeys = ['audioFiles', 'chapters']
+    arrayOfObjectsKeys.forEach((key) => {
+      if (Array.isArray(payload[key]) && !payload[key].some((item) => typeof item !== 'object') && JSON.stringify(this[key]) !== JSON.stringify(payload[key])) {
+        this[key] = payload[key]
+        this.changed(key, true)
+        hasUpdates = true
+      }
+    })
+    if (payload.ebookFile && JSON.stringify(this.ebookFile) !== JSON.stringify(payload.ebookFile)) {
+      this.ebookFile = payload.ebookFile
+      this.changed('ebookFile', true)
+      hasUpdates = true
+    }
+
+    if (hasUpdates) {
+      Logger.debug(`[Book] "${this.title}" changed keys:`, this.changed())
+      await this.save()
+    }
+
+    if (Array.isArray(payload.metadata?.authors)) {
+      const authorsRemoved = this.authors.filter((au) => !payload.metadata.authors.some((a) => a.id === au.id))
+      const newAuthors = payload.metadata.authors.filter((a) => !this.authors.some((au) => au.id === a.id))
+
+      for (const author of authorsRemoved) {
+        await this.sequelize.models.bookAuthor.removeByIds(author.id, this.id)
+        Logger.debug(`[Book] "${this.title}" Removed author ${author.id}`)
+        hasUpdates = true
+      }
+      for (const author of newAuthors) {
+        await this.sequelize.models.bookAuthor.create({ bookId: this.id, authorId: author.id })
+        Logger.debug(`[Book] "${this.title}" Added author ${author.id}`)
+        hasUpdates = true
+      }
+    }
+
+    if (Array.isArray(payload.metadata?.series)) {
+      const seriesRemoved = this.series.filter((se) => !payload.metadata.series.some((s) => s.id === se.id))
+      const newSeries = payload.metadata.series.filter((s) => !this.series.some((se) => se.id === s.id))
+
+      for (const series of seriesRemoved) {
+        await this.sequelize.models.bookSeries.removeByIds(series.id, this.id)
+        Logger.debug(`[Book] "${this.title}" Removed series ${series.id}`)
+        hasUpdates = true
+      }
+      for (const series of newSeries) {
+        await this.sequelize.models.bookSeries.create({ bookId: this.id, seriesId: series.id, sequence: series.sequence })
+        Logger.debug(`[Book] "${this.title}" Added series ${series.id}`)
+        hasUpdates = true
+      }
+      for (const series of payload.metadata.series) {
+        const existingSeries = this.series.find((se) => se.id === series.id)
+        if (existingSeries && existingSeries.bookSeries.sequence !== series.sequence) {
+          await existingSeries.bookSeries.update({ sequence: series.sequence })
+          Logger.debug(`[Book] "${this.title}" Updated series ${series.id} sequence ${series.sequence}`)
+          hasUpdates = true
+        }
+      }
+    }
+
+    return hasUpdates
+  }
+
+  /**
+   * Old model kept metadata in a separate object
+   */
+  oldMetadataToJSON() {
+    const authors = this.authors.map((au) => ({ id: au.id, name: au.name }))
+    const series = this.series.map((se) => ({ id: se.id, name: se.name, sequence: se.bookSeries.sequence }))
+    return {
+      title: this.title,
+      subtitle: this.subtitle,
+      authors,
+      narrators: [...(this.narrators || [])],
+      series,
+      genres: [...(this.genres || [])],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: this.explicit,
+      abridged: this.abridged
+    }
+  }
+
+  oldMetadataToJSONMinified() {
+    return {
+      title: this.title,
+      titleIgnorePrefix: getTitlePrefixAtEnd(this.title),
+      subtitle: this.subtitle,
+      authorName: this.authorName,
+      authorNameLF: this.authorNameLF,
+      narratorName: (this.narrators || []).join(', '),
+      seriesName: this.seriesName,
+      genres: [...(this.genres || [])],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: this.explicit,
+      abridged: this.abridged
+    }
+  }
+
+  oldMetadataToJSONExpanded() {
+    const oldMetadataJSON = this.oldMetadataToJSON()
+    oldMetadataJSON.titleIgnorePrefix = getTitlePrefixAtEnd(this.title)
+    oldMetadataJSON.authorName = this.authorName
+    oldMetadataJSON.authorNameLF = this.authorNameLF
+    oldMetadataJSON.narratorName = (this.narrators || []).join(', ')
+    oldMetadataJSON.seriesName = this.seriesName
+    return oldMetadataJSON
+  }
+
+  /**
+   * The old model stored a minified series and authors array with the book object.
+   * Minified series is { id, name, sequence }
+   * Minified author is { id, name }
+   *
+   * @param {string} libraryItemId
+   */
+  toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Book] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSON(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      audioFiles: structuredClone(this.audioFiles),
+      chapters: structuredClone(this.chapters),
+      ebookFile: structuredClone(this.ebookFile)
+    }
+  }
+
+  toOldJSONMinified() {
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      metadata: this.oldMetadataToJSONMinified(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      numTracks: this.includedAudioFiles.length,
+      numAudioFiles: this.audioFiles?.length || 0,
+      numChapters: this.chapters?.length || 0,
+      duration: this.duration,
+      size: this.size,
+      ebookFormat: this.ebookFile?.ebookFormat
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Book] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      audioFiles: structuredClone(this.audioFiles),
+      chapters: structuredClone(this.chapters),
+      ebookFile: structuredClone(this.ebookFile),
+      duration: this.duration,
+      size: this.size,
+      tracks: this.getTracklist(libraryItemId)
+    }
+  }
 }

 module.exports = Book
@@ -112,15 +112,15 @@ class FeedEpisode extends Model {
  /**
   * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
   *
+   * @param {import('./Book').AudioTrack[]} trackList
   * @param {import('./Book')} book
   * @returns {boolean}
   */
-  static checkUseChapterTitlesForEpisodes(book) {
-    const tracks = book.trackList || []
+  static checkUseChapterTitlesForEpisodes(trackList, book) {
    const chapters = book.chapters || []
-    if (tracks.length !== chapters.length) return false
-    for (let i = 0; i < tracks.length; i++) {
-      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
+    if (trackList.length !== chapters.length) return false
+    for (let i = 0; i < trackList.length; i++) {
+      if (Math.abs(chapters[i].start - trackList[i].startOffset) >= 1) {
        return false
      }
    }
@@ -148,7 +148,7 @@ class FeedEpisode extends Model {
    const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`

    let title = Path.basename(audioTrack.metadata.filename, Path.extname(audioTrack.metadata.filename))
-    if (book.trackList.length == 1) {
+    if (book.includedAudioFiles.length == 1) {
      // If audiobook is a single file, use book title instead of chapter/file title
      title = book.title
    } else {
@@ -185,11 +185,12 @@ class FeedEpisode extends Model {
   * @returns {Promise<FeedEpisode[]>}
   */
  static async createFromAudiobookTracks(libraryItemExpanded, feed, slug, transaction) {
-    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
+    const trackList = libraryItemExpanded.getTrackList()
+    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(trackList, libraryItemExpanded.media)

    const feedEpisodeObjs = []
    let numExisting = 0
-    for (const track of libraryItemExpanded.media.trackList) {
+    for (const track of trackList) {
      // Check for existing episode by filepath
      const existingEpisode = feed.feedEpisodes?.find((episode) => {
        return episode.filePath === track.metadata.path
@@ -204,7 +205,7 @@ class FeedEpisode extends Model {

  /**
   *
-   * @param {import('./Book')[]} books
+   * @param {import('./Book').BookExpandedWithLibraryItem[]} books
   * @param {import('./Feed')} feed
   * @param {string} slug
   * @param {import('sequelize').Transaction} transaction
@@ -218,8 +219,9 @@ class FeedEpisode extends Model {
    const feedEpisodeObjs = []
    let numExisting = 0
    for (const book of books) {
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
-      for (const track of book.trackList) {
+      const trackList = book.libraryItem.getTrackList()
+      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(trackList, book)
+      for (const track of trackList) {
        // Check for existing episode by filepath
        const existingEpisode = feed.feedEpisodes?.find((episode) => {
          return episode.filePath === track.metadata.path
@@ -497,6 +497,57 @@ class LibraryItem extends Model {
    return libraryItem
  }

+  /**
+   *
+   * @param {import('sequelize').WhereOptions} where
+   * @param {import('sequelize').IncludeOptions} [include]
+   * @returns {Promise<LibraryItemExpanded>}
+   */
+  static async findOneExpanded(where, include = null) {
+    const libraryItem = await this.findOne({
+      where,
+      include
+    })
+    if (!libraryItem) {
+      Logger.error(`[LibraryItem] Library item not found`)
+      return null
+    }
+
+    if (libraryItem.mediaType === 'podcast') {
+      libraryItem.media = await libraryItem.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.podcastEpisode
+          }
+        ]
+      })
+    } else {
+      libraryItem.media = await libraryItem.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.author,
+            through: {
+              attributes: []
+            }
+          },
+          {
+            model: this.sequelize.models.series,
+            through: {
+              attributes: ['id', 'sequence']
+            }
+          }
+        ],
+        order: [
+          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+        ]
+      })
+    }
+
+    if (!libraryItem.media) return null
+    return libraryItem
+  }
+
  /**
   * Get old library item by id
   * @param {string} libraryItemId
@@ -865,54 +916,6 @@ class LibraryItem extends Model {
    return libraryItem.media.coverPath
  }

-  /**
-   *
-   * @param {import('sequelize').FindOptions} options
-   * @returns {Promise<Book|Podcast>}
-   */
-  getMedia(options) {
-    if (!this.mediaType) return Promise.resolve(null)
-    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaType)}`
-    return this[mixinMethodName](options)
-  }
-
-  /**
-   *
-   * @returns {Promise<Book|Podcast>}
-   */
-  getMediaExpanded() {
-    if (this.mediaType === 'podcast') {
-      return this.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.podcastEpisode
-          }
-        ]
-      })
-    } else {
-      return this.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ],
-        order: [
-          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
-          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
-        ]
-      })
-    }
-  }
-
  /**
   *
   * @returns {Promise}
@@ -1131,6 +1134,64 @@ class LibraryItem extends Model {
    })
  }

+  get isBook() {
+    return this.mediaType === 'book'
+  }
+  get isPodcast() {
+    return this.mediaType === 'podcast'
+  }
+  get hasAudioTracks() {
+    return this.media.hasAudioTracks()
+  }
+
+  /**
+   *
+   * @param {import('sequelize').FindOptions} options
+   * @returns {Promise<Book|Podcast>}
+   */
+  getMedia(options) {
+    if (!this.mediaType) return Promise.resolve(null)
+    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaType)}`
+    return this[mixinMethodName](options)
+  }
+
+  /**
+   *
+   * @returns {Promise<Book|Podcast>}
+   */
+  getMediaExpanded() {
+    if (this.mediaType === 'podcast') {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.podcastEpisode
+          }
+        ]
+      })
+    } else {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.author,
+            through: {
+              attributes: []
+            }
+          },
+          {
+            model: this.sequelize.models.series,
+            through: {
+              attributes: ['sequence']
+            }
+          }
+        ],
+        order: [
+          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+        ]
+      })
+    }
+  }
+
  /**
   * Check if book or podcast library item has audio tracks
   * Requires expanded library item
@@ -1142,12 +1203,149 @@ class LibraryItem extends Model {
      Logger.error(`[LibraryItem] hasAudioTracks: Library item "${this.id}" does not have media`)
      return false
    }
-    if (this.mediaType === 'book') {
+    if (this.isBook) {
      return this.media.audioFiles?.length > 0
    } else {
      return this.media.podcastEpisodes?.length > 0
    }
  }
+
+  /**
+   *
+   * @param {string} ino
+   * @returns {import('./Book').AudioFileObject}
+   */
+  getAudioFileWithIno(ino) {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] getAudioFileWithIno: Library item "${this.id}" does not have media`)
+      return null
+    }
+    if (this.isBook) {
+      return this.media.audioFiles.find((af) => af.ino === ino)
+    } else {
+      return this.media.podcastEpisodes.find((pe) => pe.audioFile?.ino === ino)?.audioFile
+    }
+  }
+
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset and contentUrl
+   * Podcasts must have an episodeId to get the track list
+   *
+   * @param {string} [episodeId]
+   * @returns {import('./Book').AudioTrack[]}
+   */
+  getTrackList(episodeId) {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] getTrackList: Library item "${this.id}" does not have media`)
+      return []
+    }
+    return this.media.getTracklist(this.id, episodeId)
+  }
+
+  /**
+   *
+   * @param {string} ino
+   * @returns {LibraryFile}
+   */
+  getLibraryFileWithIno(ino) {
+    const libraryFile = this.libraryFiles.find((lf) => lf.ino === ino)
+    if (!libraryFile) return null
+    return new LibraryFile(libraryFile)
+  }
+
+  getLibraryFiles() {
+    return this.libraryFiles.map((lf) => new LibraryFile(lf))
+  }
+
+  getLibraryFilesJson() {
+    return this.libraryFiles.map((lf) => new LibraryFile(lf).toJSON())
+  }
+
+  toOldJSON() {
+    if (!this.media) {
+      throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
+    }
+
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      lastScan: this.lastScan?.valueOf(),
+      scanVersion: this.lastScanVersion,
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSON(this.id),
+      // LibraryFile JSON includes a fileType property that may not be saved in libraryFiles column in the database
+      libraryFiles: this.getLibraryFilesJson()
+    }
+  }
+
+  toOldJSONMinified() {
+    if (!this.media) {
+      throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
+    }
+
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSONMinified(),
+      numFiles: this.libraryFiles.length,
+      size: this.size
+    }
+  }
+
+  toOldJSONExpanded() {
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      lastScan: this.lastScan?.valueOf(),
+      scanVersion: this.lastScanVersion,
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSONExpanded(this.id),
+      // LibraryFile JSON includes a fileType property that may not be saved in libraryFiles column in the database
+      libraryFiles: this.getLibraryFilesJson(),
+      size: this.size
+    }
+  }
 }

 module.exports = LibraryItem
@@ -76,42 +76,26 @@ class MediaItemShare extends Model {
  }

  /**
+   * Expanded book that includes library settings
   *
   * @param {string} mediaItemId
   * @param {string} mediaItemType
-   * @returns {Promise<import('../objects/LibraryItem')>}
+   * @returns {Promise<import('./LibraryItem').LibraryItemExpanded>}
   */
-  static async getMediaItemsOldLibraryItem(mediaItemId, mediaItemType) {
+  static async getMediaItemsLibraryItem(mediaItemId, mediaItemType) {
+    /** @type {typeof import('./LibraryItem')} */
+    const libraryItemModel = this.sequelize.models.libraryItem
+
    if (mediaItemType === 'book') {
-      const book = await this.sequelize.models.book.findByPk(mediaItemId, {
-        include: [
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          },
-          {
-            model: this.sequelize.models.libraryItem,
-            include: {
-              model: this.sequelize.models.library,
-              attributes: ['settings']
-            }
-          }
-        ]
-      })
-      const libraryItem = book.libraryItem
-      libraryItem.media = book
-      delete book.libraryItem
-      const oldLibraryItem = this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-      oldLibraryItem.librarySettings = libraryItem.library.settings
-      return oldLibraryItem
+      const libraryItem = await libraryItemModel.findOneExpanded(
+        { mediaId: mediaItemId },
+        {
+          model: this.sequelize.models.library,
+          attributes: ['settings']
+        }
+      )
+
+      return libraryItem
    }
    return null
  }
@@ -1,5 +1,6 @@
 const { DataTypes, Model, Op } = require('sequelize')
 const Logger = require('../Logger')
+const SocketAuthority = require('../SocketAuthority')

 class Playlist extends Model {
  constructor(values, options) {
@@ -163,6 +164,49 @@ class Playlist extends Model {
    return playlists
  }

+  /**
+   * Removes media items and re-orders playlists
+   *
+   * @param {string[]} mediaItemIds
+   */
+  static async removeMediaItemsFromPlaylists(mediaItemIds) {
+    if (!mediaItemIds?.length) return
+
+    const playlistsWithItem = await this.getPlaylistsForMediaItemIds(mediaItemIds)
+
+    if (!playlistsWithItem.length) return
+
+    for (const playlist of playlistsWithItem) {
+      let numMediaItems = playlist.playlistMediaItems.length
+
+      let order = 1
+      // Remove items in playlist and re-order
+      for (const playlistMediaItem of playlist.playlistMediaItems) {
+        if (mediaItemIds.includes(playlistMediaItem.mediaItemId)) {
+          await playlistMediaItem.destroy()
+          numMediaItems--
+        } else {
+          if (playlistMediaItem.order !== order) {
+            playlistMediaItem.update({
+              order
+            })
+          }
+          order++
+        }
+      }
+
+      // If playlist is now empty then remove it
+      const jsonExpanded = await playlist.getOldJsonExpanded()
+      if (!numMediaItems) {
+        Logger.info(`[ApiRouter] Playlist "${playlist.name}" has no more items - removing it`)
+        await playlist.destroy()
+        SocketAuthority.clientEmitter(playlist.userId, 'playlist_removed', jsonExpanded)
+      } else {
+        SocketAuthority.clientEmitter(playlist.userId, 'playlist_updated', jsonExpanded)
+      }
+    }
+  }
+
  /**
   * Initialize model
   * @param {import('../Database').sequelize} sequelize
@@ -1,4 +1,6 @@
 const { DataTypes, Model } = require('sequelize')
+const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils')
+const Logger = require('../Logger')

 /**
 * @typedef PodcastExpandedProperties
@@ -47,6 +49,8 @@ class Podcast extends Model {
    this.lastEpisodeCheck
    /** @type {number} */
    this.maxEpisodesToKeep
+    /** @type {number} */
+    this.maxNewEpisodesToDownload
    /** @type {string} */
    this.coverPath
    /** @type {string[]} */
@@ -57,6 +61,9 @@ class Podcast extends Model {
    this.createdAt
    /** @type {Date} */
    this.updatedAt
+
+    /** @type {import('./PodcastEpisode')[]} */
+    this.podcastEpisodes
  }

  static getOldPodcast(libraryItemExpanded) {
@@ -119,25 +126,6 @@ class Podcast extends Model {
    }
  }

-  getAbsMetadataJson() {
-    return {
-      tags: this.tags || [],
-      title: this.title,
-      author: this.author,
-      description: this.description,
-      releaseDate: this.releaseDate,
-      genres: this.genres || [],
-      feedURL: this.feedURL,
-      imageURL: this.imageURL,
-      itunesPageURL: this.itunesPageURL,
-      itunesId: this.itunesId,
-      itunesArtistId: this.itunesArtistId,
-      language: this.language,
-      explicit: !!this.explicit,
-      podcastType: this.podcastType
-    }
-  }
-
  /**
   * Initialize model
   * @param {import('../Database').sequelize} sequelize
@@ -179,6 +167,311 @@ class Podcast extends Model {
      }
    )
  }
+
+  get hasMediaFiles() {
+    return !!this.podcastEpisodes?.length
+  }
+
+  get hasAudioTracks() {
+    return this.hasMediaFiles
+  }
+
+  get size() {
+    if (!this.podcastEpisodes?.length) return 0
+    return this.podcastEpisodes.reduce((total, episode) => total + episode.size, 0)
+  }
+
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      title: this.title,
+      author: this.author,
+      description: this.description,
+      releaseDate: this.releaseDate,
+      genres: this.genres || [],
+      feedURL: this.feedURL,
+      imageURL: this.imageURL,
+      itunesPageURL: this.itunesPageURL,
+      itunesId: this.itunesId,
+      itunesArtistId: this.itunesArtistId,
+      language: this.language,
+      explicit: !!this.explicit,
+      podcastType: this.podcastType
+    }
+  }
+
+  /**
+   *
+   * @param {Object} payload - Old podcast object
+   * @returns {Promise<boolean>}
+   */
+  async updateFromRequest(payload) {
+    if (!payload) return false
+
+    let hasUpdates = false
+
+    if (payload.metadata) {
+      const stringKeys = ['title', 'author', 'releaseDate', 'feedUrl', 'imageUrl', 'description', 'itunesPageUrl', 'itunesId', 'itunesArtistId', 'language', 'type']
+      stringKeys.forEach((key) => {
+        let newKey = key
+        if (key === 'type') {
+          newKey = 'podcastType'
+        } else if (key === 'feedUrl') {
+          newKey = 'feedURL'
+        } else if (key === 'imageUrl') {
+          newKey = 'imageURL'
+        } else if (key === 'itunesPageUrl') {
+          newKey = 'itunesPageURL'
+        }
+        if (typeof payload.metadata[key] === 'string' && payload.metadata[key] !== this[newKey]) {
+          this[newKey] = payload.metadata[key]
+          if (key === 'title') {
+            this.titleIgnorePrefix = getTitleIgnorePrefix(this.title)
+          }
+
+          hasUpdates = true
+        }
+      })
+
+      if (payload.metadata.explicit !== undefined && payload.metadata.explicit !== this.explicit) {
+        this.explicit = !!payload.metadata.explicit
+        hasUpdates = true
+      }
+
+      if (Array.isArray(payload.metadata.genres) && !payload.metadata.genres.some((item) => typeof item !== 'string') && JSON.stringify(this.genres) !== JSON.stringify(payload.metadata.genres)) {
+        this.genres = payload.metadata.genres
+        this.changed('genres', true)
+        hasUpdates = true
+      }
+    }
+
+    if (Array.isArray(payload.tags) && !payload.tags.some((item) => typeof item !== 'string') && JSON.stringify(this.tags) !== JSON.stringify(payload.tags)) {
+      this.tags = payload.tags
+      this.changed('tags', true)
+      hasUpdates = true
+    }
+
+    if (payload.autoDownloadEpisodes !== undefined && payload.autoDownloadEpisodes !== this.autoDownloadEpisodes) {
+      this.autoDownloadEpisodes = !!payload.autoDownloadEpisodes
+      hasUpdates = true
+    }
+    if (typeof payload.autoDownloadSchedule === 'string' && payload.autoDownloadSchedule !== this.autoDownloadSchedule) {
+      this.autoDownloadSchedule = payload.autoDownloadSchedule
+      hasUpdates = true
+    }
+    if (typeof payload.lastEpisodeCheck === 'number' && payload.lastEpisodeCheck !== this.lastEpisodeCheck?.valueOf()) {
+      this.lastEpisodeCheck = payload.lastEpisodeCheck
+      hasUpdates = true
+    }
+
+    const numberKeys = ['maxEpisodesToKeep', 'maxNewEpisodesToDownload']
+    numberKeys.forEach((key) => {
+      if (typeof payload[key] === 'number' && payload[key] !== this[key]) {
+        this[key] = payload[key]
+        hasUpdates = true
+      }
+    })
+
+    if (hasUpdates) {
+      Logger.debug(`[Podcast] changed keys:`, this.changed())
+      await this.save()
+    }
+
+    return hasUpdates
+  }
+
+  checkCanDirectPlay(supportedMimeTypes, episodeId) {
+    if (!Array.isArray(supportedMimeTypes)) {
+      Logger.error(`[Podcast] checkCanDirectPlay: supportedMimeTypes is not an array`, supportedMimeTypes)
+      return false
+    }
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] checkCanDirectPlay: episode not found`, episodeId)
+      return false
+    }
+    return supportedMimeTypes.includes(episode.audioFile.mimeType)
+  }
+
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset and contentUrl
+   * Podcast episodes only have one track
+   *
+   * @param {string} libraryItemId
+   * @param {string} episodeId
+   * @returns {import('./Book').AudioTrack[]}
+   */
+  getTracklist(libraryItemId, episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getTracklist: episode not found`, episodeId)
+      return []
+    }
+
+    const audioTrack = episode.getAudioTrack(libraryItemId)
+    return [audioTrack]
+  }
+
+  /**
+   *
+   * @param {string} episodeId
+   * @returns {import('./PodcastEpisode').ChapterObject[]}
+   */
+  getChapters(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getChapters: episode not found`, episodeId)
+      return []
+    }
+
+    return structuredClone(episode.chapters) || []
+  }
+
+  getPlaybackTitle(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getPlaybackTitle: episode not found`, episodeId)
+      return ''
+    }
+
+    return episode.title
+  }
+
+  getPlaybackAuthor() {
+    return this.author
+  }
+
+  getPlaybackDuration(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getPlaybackDuration: episode not found`, episodeId)
+      return 0
+    }
+
+    return episode.duration
+  }
+
+  /**
+   *
+   * @returns {number} - Unix timestamp
+   */
+  getLatestEpisodePublishedAt() {
+    return this.podcastEpisodes.reduce((latest, episode) => {
+      if (episode.publishedAt?.valueOf() > latest) {
+        return episode.publishedAt.valueOf()
+      }
+      return latest
+    }, 0)
+  }
+
+  /**
+   * Used for checking if an rss feed episode is already in the podcast
+   *
+   * @param {Object} feedEpisode - object from rss feed
+   * @returns {boolean}
+   */
+  checkHasEpisodeByFeedEpisode(feedEpisode) {
+    const guid = feedEpisode.guid
+    const url = feedEpisode.enclosure.url
+    return this.podcastEpisodes.some((ep) => ep.checkMatchesGuidOrEnclosureUrl(guid, url))
+  }
+
+  /**
+   * Old model kept metadata in a separate object
+   */
+  oldMetadataToJSON() {
+    return {
+      title: this.title,
+      author: this.author,
+      description: this.description,
+      releaseDate: this.releaseDate,
+      genres: [...(this.genres || [])],
+      feedUrl: this.feedURL,
+      imageUrl: this.imageURL,
+      itunesPageUrl: this.itunesPageURL,
+      itunesId: this.itunesId,
+      itunesArtistId: this.itunesArtistId,
+      explicit: this.explicit,
+      language: this.language,
+      type: this.podcastType
+    }
+  }
+
+  oldMetadataToJSONExpanded() {
+    const oldMetadataJSON = this.oldMetadataToJSON()
+    oldMetadataJSON.titleIgnorePrefix = getTitlePrefixAtEnd(this.title)
+    return oldMetadataJSON
+  }
+
+  /**
+   * The old model stored episodes with the podcast object
+   *
+   * @param {string} libraryItemId
+   */
+  toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.podcastEpisodes) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because episodes are not provided`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSON(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      episodes: this.podcastEpisodes.map((episode) => episode.toOldJSON(libraryItemId)),
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload
+    }
+  }
+
+  toOldJSONMinified() {
+    return {
+      id: this.id,
+      // Minified metadata and expanded metadata are the same
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      numEpisodes: this.podcastEpisodes?.length || 0,
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
+      size: this.size
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.podcastEpisodes) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because episodes are not provided`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      episodes: this.podcastEpisodes.map((e) => e.toOldJSONExpanded(libraryItemId)),
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
+      size: this.size
+    }
+  }
 }

 module.exports = Podcast
@@ -53,42 +53,6 @@ class PodcastEpisode extends Model {
    this.updatedAt
  }

-  /**
-   * @param {string} libraryItemId
-   * @returns {oldPodcastEpisode}
-   */
-  getOldPodcastEpisode(libraryItemId = null) {
-    let enclosure = null
-    if (this.enclosureURL) {
-      enclosure = {
-        url: this.enclosureURL,
-        type: this.enclosureType,
-        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
-      }
-    }
-    return new oldPodcastEpisode({
-      libraryItemId: libraryItemId || null,
-      podcastId: this.podcastId,
-      id: this.id,
-      oldEpisodeId: this.extraData?.oldEpisodeId || null,
-      index: this.index,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      title: this.title,
-      subtitle: this.subtitle,
-      description: this.description,
-      enclosure,
-      guid: this.extraData?.guid || null,
-      pubDate: this.pubDate,
-      chapters: this.chapters,
-      audioFile: this.audioFile,
-      publishedAt: this.publishedAt?.valueOf() || null,
-      addedAt: this.createdAt.valueOf(),
-      updatedAt: this.updatedAt.valueOf()
-    })
-  }
-
  static createFromOld(oldEpisode) {
    const podcastEpisode = this.getFromOld(oldEpisode)
    return this.create(podcastEpisode)
@@ -171,20 +135,86 @@ class PodcastEpisode extends Model {
    PodcastEpisode.belongsTo(podcast)
  }

+  get size() {
+    return this.audioFile?.metadata.size || 0
+  }
+
+  get duration() {
+    return this.audioFile?.duration || 0
+  }
+
  /**
-   * AudioTrack object used in old model
+   * Used for matching the episode with an episode in the RSS feed
   *
-   * @returns {import('./Book').AudioFileObject|null}
+   * @param {string} guid
+   * @param {string} enclosureURL
+   * @returns {boolean}
   */
-  get track() {
-    if (!this.audioFile) return null
+  checkMatchesGuidOrEnclosureUrl(guid, enclosureURL) {
+    if (this.extraData?.guid && this.extraData.guid === guid) {
+      return true
+    }
+    if (this.enclosureURL && this.enclosureURL === enclosureURL) {
+      return true
+    }
+    return false
+  }
+
+  /**
+   * Used in client players
+   *
+   * @param {string} libraryItemId
+   * @returns {import('./Book').AudioTrack}
+   */
+  getAudioTrack(libraryItemId) {
    const track = structuredClone(this.audioFile)
    track.startOffset = 0
    track.title = this.audioFile.metadata.title
+    track.contentUrl = `${global.RouterBasePath}/api/items/${libraryItemId}/file/${track.ino}`
    return track
  }

+  /**
+   * @param {string} libraryItemId
+   * @returns {oldPodcastEpisode}
+   */
+  getOldPodcastEpisode(libraryItemId = null) {
+    let enclosure = null
+    if (this.enclosureURL) {
+      enclosure = {
+        url: this.enclosureURL,
+        type: this.enclosureType,
+        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
+      }
+    }
+    return new oldPodcastEpisode({
+      libraryItemId: libraryItemId || null,
+      podcastId: this.podcastId,
+      id: this.id,
+      oldEpisodeId: this.extraData?.oldEpisodeId || null,
+      index: this.index,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      title: this.title,
+      subtitle: this.subtitle,
+      description: this.description,
+      enclosure,
+      guid: this.extraData?.guid || null,
+      pubDate: this.pubDate,
+      chapters: this.chapters,
+      audioFile: this.audioFile,
+      publishedAt: this.publishedAt?.valueOf() || null,
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    })
+  }
+
  toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[PodcastEpisode] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+
    let enclosure = null
    if (this.enclosureURL) {
      enclosure = {
@@ -209,8 +239,8 @@ class PodcastEpisode extends Model {
      enclosure,
      guid: this.extraData?.guid || null,
      pubDate: this.pubDate,
-      chapters: this.chapters?.map((ch) => ({ ...ch })) || [],
-      audioFile: this.audioFile || null,
+      chapters: structuredClone(this.chapters),
+      audioFile: structuredClone(this.audioFile),
      publishedAt: this.publishedAt?.valueOf() || null,
      addedAt: this.createdAt.valueOf(),
      updatedAt: this.updatedAt.valueOf()
@@ -220,9 +250,9 @@ class PodcastEpisode extends Model {
  toOldJSONExpanded(libraryItemId) {
    const json = this.toOldJSON(libraryItemId)

-    json.audioTrack = this.track
-    json.size = this.audioFile?.metadata.size || 0
-    json.duration = this.audioFile?.duration || 0
+    json.audioTrack = this.getAudioTrack(libraryItemId)
+    json.size = this.size
+    json.duration = this.duration

    return json
  }
@@ -177,9 +177,6 @@ class LibraryItem {
  get hasAudioFiles() {
    return this.libraryFiles.some((lf) => lf.fileType === 'audio')
  }
-  get hasMediaEntities() {
-    return this.media.hasMediaEntities
-  }

  // Data comes from scandir library item data
  // TODO: Remove this function. Only used when creating a new podcast now
@@ -252,10 +249,6 @@ class LibraryItem {
    this.updatedAt = Date.now()
  }

-  getDirectPlayTracklist(episodeId) {
-    return this.media.getDirectPlayTracklist(episodeId)
-  }
-
  /**
   * Save metadata.json file
   * TODO: Move to new LibraryItem model
@@ -327,20 +320,5 @@ class LibraryItem {
    }
    return false
  }
-
-  /**
-   * Set the EBookFile from a LibraryFile
-   * If null then ebookFile will be removed from the book
-   * all ebook library files that are not primary are marked as supplementary
-   *
-   * @param {LibraryFile} [libraryFile]
-   */
-  setPrimaryEbook(ebookLibraryFile = null) {
-    const ebookLibraryFiles = this.libraryFiles.filter((lf) => lf.isEBookFile)
-    for (const libraryFile of ebookLibraryFiles) {
-      libraryFile.isSupplementary = ebookLibraryFile?.ino !== libraryFile.ino
-    }
-    this.media.setEbookFile(ebookLibraryFile)
-  }
 }
 module.exports = LibraryItem
@@ -1,8 +1,6 @@
 const date = require('../libs/dateAndTime')
 const uuidv4 = require('uuid').v4
 const serverVersion = require('../../package.json').version
-const BookMetadata = require('./metadata/BookMetadata')
-const PodcastMetadata = require('./metadata/PodcastMetadata')
 const DeviceInfo = require('./DeviceInfo')

 class PlaybackSession {
@@ -60,7 +58,7 @@ class PlaybackSession {
      bookId: this.bookId,
      episodeId: this.episodeId,
      mediaType: this.mediaType,
-      mediaMetadata: this.mediaMetadata?.toJSON() || null,
+      mediaMetadata: structuredClone(this.mediaMetadata),
      chapters: (this.chapters || []).map((c) => ({ ...c })),
      displayTitle: this.displayTitle,
      displayAuthor: this.displayAuthor,
@@ -82,7 +80,7 @@ class PlaybackSession {

  /**
   * Session data to send to clients
-   * @param {Object} [libraryItem] - old library item
+   * @param {import('../models/LibraryItem')} [libraryItem]
   * @returns
   */
  toJSONForClient(libraryItem) {
@@ -94,7 +92,7 @@ class PlaybackSession {
      bookId: this.bookId,
      episodeId: this.episodeId,
      mediaType: this.mediaType,
-      mediaMetadata: this.mediaMetadata?.toJSON() || null,
+      mediaMetadata: structuredClone(this.mediaMetadata),
      chapters: (this.chapters || []).map((c) => ({ ...c })),
      displayTitle: this.displayTitle,
      displayAuthor: this.displayAuthor,
@@ -112,7 +110,7 @@ class PlaybackSession {
      startedAt: this.startedAt,
      updatedAt: this.updatedAt,
      audioTracks: this.audioTracks.map((at) => at.toJSON?.() || { ...at }),
-      libraryItem: libraryItem?.toJSONExpanded() || null
+      libraryItem: libraryItem?.toOldJSONExpanded() || null
    }
  }

@@ -148,14 +146,7 @@ class PlaybackSession {
    this.serverVersion = session.serverVersion
    this.chapters = session.chapters || []

-    this.mediaMetadata = null
-    if (session.mediaMetadata) {
-      if (this.mediaType === 'book') {
-        this.mediaMetadata = new BookMetadata(session.mediaMetadata)
-      } else if (this.mediaType === 'podcast') {
-        this.mediaMetadata = new PodcastMetadata(session.mediaMetadata)
-      }
-    }
+    this.mediaMetadata = session.mediaMetadata
    this.displayTitle = session.displayTitle || ''
    this.displayAuthor = session.displayAuthor || ''
    this.coverPath = session.coverPath
@@ -205,6 +196,15 @@ class PlaybackSession {
    }
  }

+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} userId
+   * @param {*} mediaPlayer
+   * @param {*} deviceInfo
+   * @param {*} startTime
+   * @param {*} episodeId
+   */
  setData(libraryItem, userId, mediaPlayer, deviceInfo, startTime, episodeId = null) {
    this.id = uuidv4()
    this.userId = userId
@@ -213,13 +213,12 @@ class PlaybackSession {
    this.bookId = episodeId ? null : libraryItem.media.id
    this.episodeId = episodeId
    this.mediaType = libraryItem.mediaType
-    this.mediaMetadata = libraryItem.media.metadata.clone()
+    this.mediaMetadata = libraryItem.media.oldMetadataToJSON()
    this.chapters = libraryItem.media.getChapters(episodeId)
    this.displayTitle = libraryItem.media.getPlaybackTitle(episodeId)
    this.displayAuthor = libraryItem.media.getPlaybackAuthor()
    this.coverPath = libraryItem.media.coverPath
-
-    this.setDuration(libraryItem, episodeId)
+    this.duration = libraryItem.media.getPlaybackDuration(episodeId)

    this.mediaPlayer = mediaPlayer
    this.deviceInfo = deviceInfo || new DeviceInfo()
@@ -235,14 +234,6 @@ class PlaybackSession {
    this.updatedAt = Date.now()
  }

-  setDuration(libraryItem, episodeId) {
-    if (episodeId) {
-      this.duration = libraryItem.media.getEpisodeDuration(episodeId)
-    } else {
-      this.duration = libraryItem.media.duration
-    }
-  }
-
  addListeningTime(timeListened) {
    if (!timeListened || isNaN(timeListened)) return

@@ -6,8 +6,10 @@ const globals = require('../utils/globals')
 class PodcastEpisodeDownload {
  constructor() {
    this.id = null
+    /** @type {import('../objects/entities/PodcastEpisode')} */
    this.podcastEpisode = null
    this.url = null
+    /** @type {import('../models/LibraryItem')} */
    this.libraryItem = null
    this.libraryId = null

@@ -27,7 +29,7 @@ class PodcastEpisodeDownload {
      id: this.id,
      episodeDisplayTitle: this.podcastEpisode?.title ?? null,
      url: this.url,
-      libraryItemId: this.libraryItem?.id || null,
+      libraryItemId: this.libraryItemId,
      libraryId: this.libraryId || null,
      isFinished: this.isFinished,
      failed: this.failed,
@@ -35,8 +37,8 @@ class PodcastEpisodeDownload {
      startedAt: this.startedAt,
      createdAt: this.createdAt,
      finishedAt: this.finishedAt,
-      podcastTitle: this.libraryItem?.media.metadata.title ?? null,
-      podcastExplicit: !!this.libraryItem?.media.metadata.explicit,
+      podcastTitle: this.libraryItem?.media.title ?? null,
+      podcastExplicit: !!this.libraryItem?.media.explicit,
      season: this.podcastEpisode?.season ?? null,
      episode: this.podcastEpisode?.episode ?? null,
      episodeType: this.podcastEpisode?.episodeType ?? 'full',
@@ -80,9 +82,16 @@ class PodcastEpisodeDownload {
    return this.targetFilename
  }
  get libraryItemId() {
-    return this.libraryItem ? this.libraryItem.id : null
+    return this.libraryItem?.id || null
  }

+  /**
+   *
+   * @param {import('../objects/entities/PodcastEpisode')} podcastEpisode - old model
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} isAutoDownload
+   * @param {*} libraryId
+   */
  setData(podcastEpisode, libraryItem, isAutoDownload, libraryId) {
    this.id = uuidv4()
    this.podcastEpisode = podcastEpisode
@@ -18,6 +18,7 @@ class Stream extends EventEmitter {

    this.id = sessionId
    this.user = user
+    /** @type {import('../models/LibraryItem')} */
    this.libraryItem = libraryItem
    this.episodeId = episodeId

@@ -40,31 +41,25 @@ class Stream extends EventEmitter {
    this.furthestSegmentCreated = 0
  }

-  get isPodcast() {
-    return this.libraryItem.mediaType === 'podcast'
-  }
+  /**
+   * @returns {import('../models/PodcastEpisode') | null}
+   */
  get episode() {
-    if (!this.isPodcast) return null
-    return this.libraryItem.media.episodes.find((ep) => ep.id === this.episodeId)
-  }
-  get libraryItemId() {
-    return this.libraryItem.id
+    if (!this.libraryItem.isPodcast) return null
+    return this.libraryItem.media.podcastEpisodes.find((ep) => ep.id === this.episodeId)
  }
  get mediaTitle() {
-    if (this.episode) return this.episode.title || ''
-    return this.libraryItem.media.metadata.title || ''
+    return this.libraryItem.media.getPlaybackTitle(this.episodeId)
  }
  get totalDuration() {
-    if (this.episode) return this.episode.duration
-    return this.libraryItem.media.duration
+    return this.libraryItem.media.getPlaybackDuration(this.episodeId)
  }
  get tracks() {
-    if (this.episode) return this.episode.tracks
-    return this.libraryItem.media.tracks
+    return this.libraryItem.getTrackList(this.episodeId)
  }
  get tracksAudioFileType() {
    if (!this.tracks.length) return null
-    return this.tracks[0].metadata.format
+    return this.tracks[0].metadata.ext.slice(1)
  }
  get tracksMimeType() {
    if (!this.tracks.length) return null
@@ -116,8 +111,8 @@ class Stream extends EventEmitter {
    return {
      id: this.id,
      userId: this.user.id,
-      libraryItem: this.libraryItem.toJSONExpanded(),
-      episode: this.episode ? this.episode.toJSONExpanded() : null,
+      libraryItem: this.libraryItem.toOldJSONExpanded(),
+      episode: this.episode ? this.episode.toOldJSONExpanded(this.libraryItem.id) : null,
      segmentLength: this.segmentLength,
      playlistPath: this.playlistPath,
      clientPlaylistUri: this.clientPlaylistUri,
@@ -167,20 +167,5 @@ class PodcastEpisode {
    }
    return hasUpdates
  }
-
-  // Only checks container format
-  checkCanDirectPlay(payload) {
-    const supportedMimeTypes = payload.supportedMimeTypes || []
-    return supportedMimeTypes.includes(this.audioFile.mimeType)
-  }
-
-  getDirectPlayTracklist() {
-    return this.tracks
-  }
-
-  checkEqualsEnclosureUrl(url) {
-    if (!this.enclosure?.url) return false
-    return this.enclosure.url == url
-  }
 }
 module.exports = PodcastEpisode
@@ -33,8 +33,8 @@ class Book {
    this.metadata = new BookMetadata(book.metadata)
    this.coverPath = book.coverPath
    this.tags = [...book.tags]
-    this.audioFiles = book.audioFiles.map(f => new AudioFile(f))
-    this.chapters = book.chapters.map(c => ({ ...c }))
+    this.audioFiles = book.audioFiles.map((f) => new AudioFile(f))
+    this.chapters = book.chapters.map((c) => ({ ...c }))
    this.ebookFile = book.ebookFile ? new EBookFile(book.ebookFile) : null
    this.lastCoverSearch = book.lastCoverSearch || null
    this.lastCoverSearchQuery = book.lastCoverSearchQuery || null
@@ -47,8 +47,8 @@ class Book {
      metadata: this.metadata.toJSON(),
      coverPath: this.coverPath,
      tags: [...this.tags],
-      audioFiles: this.audioFiles.map(f => f.toJSON()),
-      chapters: this.chapters.map(c => ({ ...c })),
+      audioFiles: this.audioFiles.map((f) => f.toJSON()),
+      chapters: this.chapters.map((c) => ({ ...c })),
      ebookFile: this.ebookFile ? this.ebookFile.toJSON() : null
    }
  }
@@ -75,11 +75,11 @@ class Book {
      metadata: this.metadata.toJSONExpanded(),
      coverPath: this.coverPath,
      tags: [...this.tags],
-      audioFiles: this.audioFiles.map(f => f.toJSON()),
-      chapters: this.chapters.map(c => ({ ...c })),
+      audioFiles: this.audioFiles.map((f) => f.toJSON()),
+      chapters: this.chapters.map((c) => ({ ...c })),
      duration: this.duration,
      size: this.size,
-      tracks: this.tracks.map(t => t.toJSON()),
+      tracks: this.tracks.map((t) => t.toJSON()),
      ebookFile: this.ebookFile?.toJSON() || null
    }
  }
@@ -87,24 +87,21 @@ class Book {
  toJSONForMetadataFile() {
    return {
      tags: [...this.tags],
-      chapters: this.chapters.map(c => ({ ...c })),
+      chapters: this.chapters.map((c) => ({ ...c })),
      ...this.metadata.toJSONForMetadataFile()
    }
  }

  get size() {
    var total = 0
-    this.audioFiles.forEach((af) => total += af.metadata.size)
+    this.audioFiles.forEach((af) => (total += af.metadata.size))
    if (this.ebookFile) {
      total += this.ebookFile.metadata.size
    }
    return total
  }
-  get hasMediaEntities() {
-    return !!this.tracks.length || this.ebookFile
-  }
  get includedAudioFiles() {
-    return this.audioFiles.filter(af => !af.exclude)
+    return this.audioFiles.filter((af) => !af.exclude)
  }
  get tracks() {
    let startOffset = 0
@@ -117,7 +114,7 @@ class Book {
  }
  get duration() {
    let total = 0
-    this.tracks.forEach((track) => total += track.duration)
+    this.tracks.forEach((track) => (total += track.duration))
    return total
  }
  get numTracks() {
@@ -129,8 +126,6 @@ class Book {

  update(payload) {
    const json = this.toJSON()
-    delete json.audiobooks // do not update media entities here
-    delete json.ebooks

    let hasUpdates = false
    for (const key in json) {
@@ -149,126 +144,11 @@ class Book {
    return hasUpdates
  }

-  updateChapters(chapters) {
-    var hasUpdates = this.chapters.length !== chapters.length
-    if (hasUpdates) {
-      this.chapters = chapters.map(ch => ({
-        id: ch.id,
-        start: ch.start,
-        end: ch.end,
-        title: ch.title
-      }))
-    } else {
-      for (let i = 0; i < this.chapters.length; i++) {
-        const currChapter = this.chapters[i]
-        const newChapter = chapters[i]
-        if (!hasUpdates && (currChapter.title !== newChapter.title || currChapter.start !== newChapter.start || currChapter.end !== newChapter.end)) {
-          hasUpdates = true
-        }
-        this.chapters[i].title = newChapter.title
-        this.chapters[i].start = newChapter.start
-        this.chapters[i].end = newChapter.end
-      }
-    }
-    return hasUpdates
-  }
-
  updateCover(coverPath) {
    coverPath = filePathToPOSIX(coverPath)
    if (this.coverPath === coverPath) return false
    this.coverPath = coverPath
    return true
  }
-
-  removeFileWithInode(inode) {
-    if (this.audioFiles.some(af => af.ino === inode)) {
-      this.audioFiles = this.audioFiles.filter(af => af.ino !== inode)
-      return true
-    }
-    if (this.ebookFile && this.ebookFile.ino === inode) {
-      this.ebookFile = null
-      return true
-    }
-    return false
-  }
-
-  /**
-   * Get audio file or ebook file from inode
-   * @param {string} inode 
-   * @returns {(AudioFile|EBookFile|null)}
-   */
-  findFileWithInode(inode) {
-    const audioFile = this.audioFiles.find(af => af.ino === inode)
-    if (audioFile) return audioFile
-    if (this.ebookFile && this.ebookFile.ino === inode) return this.ebookFile
-    return null
-  }
-
-  /**
-   * Set the EBookFile from a LibraryFile
-   * If null then ebookFile will be removed from the book
-   * 
-   * @param {LibraryFile} [libraryFile] 
-   */
-  setEbookFile(libraryFile = null) {
-    if (!libraryFile) {
-      this.ebookFile = null
-    } else {
-      const ebookFile = new EBookFile()
-      ebookFile.setData(libraryFile)
-      this.ebookFile = ebookFile
-    }
-  }
-
-  addAudioFile(audioFile) {
-    this.audioFiles.push(audioFile)
-  }
-
-  updateAudioTracks(orderedFileData) {
-    let index = 1
-    this.audioFiles = orderedFileData.map((fileData) => {
-      const audioFile = this.audioFiles.find(af => af.ino === fileData.ino)
-      audioFile.manuallyVerified = true
-      audioFile.error = null
-      if (fileData.exclude !== undefined) {
-        audioFile.exclude = !!fileData.exclude
-      }
-      if (audioFile.exclude) {
-        audioFile.index = -1
-      } else {
-        audioFile.index = index++
-      }
-      return audioFile
-    })
-
-    this.rebuildTracks()
-  }
-
-  rebuildTracks() {
-    Logger.debug(`[Book] Tracks being rebuilt...!`)
-    this.audioFiles.sort((a, b) => a.index - b.index)
-  }
-
-  // Only checks container format
-  checkCanDirectPlay(payload) {
-    var supportedMimeTypes = payload.supportedMimeTypes || []
-    return !this.tracks.some((t) => !supportedMimeTypes.includes(t.mimeType))
-  }
-
-  getDirectPlayTracklist() {
-    return this.tracks
-  }
-
-  getPlaybackTitle() {
-    return this.metadata.title
-  }
-
-  getPlaybackAuthor() {
-    return this.metadata.authorName
-  }
-
-  getChapters() {
-    return this.chapters?.map(ch => ({ ...ch })) || []
-  }
 }
 module.exports = Book
@@ -124,9 +124,6 @@ class Podcast {
    this.episodes.forEach((ep) => (total += ep.size))
    return total
  }
-  get hasMediaEntities() {
-    return !!this.episodes.length
-  }
  get duration() {
    let total = 0
    this.episodes.forEach((ep) => (total += ep.duration))
@@ -181,20 +178,6 @@ class Podcast {
    return true
  }

-  removeFileWithInode(inode) {
-    const hasEpisode = this.episodes.some((ep) => ep.audioFile.ino === inode)
-    if (hasEpisode) {
-      this.episodes = this.episodes.filter((ep) => ep.audioFile.ino !== inode)
-    }
-    return hasEpisode
-  }
-
-  findFileWithInode(inode) {
-    var episode = this.episodes.find((ep) => ep.audioFile.ino === inode)
-    if (episode) return episode.audioFile
-    return null
-  }
-
  setData(mediaData) {
    this.metadata = new PodcastMetadata()
    if (mediaData.metadata) {
@@ -210,24 +193,6 @@ class Podcast {
  checkHasEpisode(episodeId) {
    return this.episodes.some((ep) => ep.id === episodeId)
  }
-  checkHasEpisodeByFeedEpisode(feedEpisode) {
-    const guid = feedEpisode.guid
-    const url = feedEpisode.enclosure.url
-    return this.episodes.some((ep) => (ep.guid && ep.guid === guid) || ep.checkEqualsEnclosureUrl(url))
-  }
-
-  // Only checks container format
-  checkCanDirectPlay(payload, episodeId) {
-    var episode = this.episodes.find((ep) => ep.id === episodeId)
-    if (!episode) return false
-    return episode.checkCanDirectPlay(payload)
-  }
-
-  getDirectPlayTracklist(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id === episodeId)
-    if (!episode) return false
-    return episode.getDirectPlayTracklist()
-  }

  addPodcastEpisode(podcastEpisode) {
    this.episodes.push(podcastEpisode)
@@ -241,22 +206,6 @@ class Podcast {
    return episode
  }

-  getPlaybackTitle(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id == episodeId)
-    if (!episode) return this.metadata.title
-    return episode.title
-  }
-
-  getPlaybackAuthor() {
-    return this.metadata.author
-  }
-
-  getEpisodeDuration(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id == episodeId)
-    if (!episode) return 0
-    return episode.duration
-  }
-
  getEpisode(episodeId) {
    if (!episodeId) return null

@@ -265,9 +214,5 @@ class Podcast {

    return this.episodes.find((ep) => ep.id == episodeId)
  }
-
-  getChapters(episodeId) {
-    return this.getEpisode(episodeId)?.chapters?.map((ch) => ({ ...ch })) || []
-  }
 }
 module.exports = Podcast
@@ -159,11 +159,6 @@ class BookMetadata {
  getSeries(seriesId) {
    return this.series.find((se) => se.id == seriesId)
  }
-  getSeriesSequence(seriesId) {
-    const series = this.series.find((se) => se.id == seriesId)
-    if (!series) return null
-    return series.sequence || ''
-  }

  update(payload) {
    const json = this.toJSON()
@@ -361,36 +361,7 @@ class ApiRouter {
    }

    // remove item from playlists
-    const playlistsWithItem = await Database.playlistModel.getPlaylistsForMediaItemIds(mediaItemIds)
-    for (const playlist of playlistsWithItem) {
-      let numMediaItems = playlist.playlistMediaItems.length
-
-      let order = 1
-      // Remove items in playlist and re-order
-      for (const playlistMediaItem of playlist.playlistMediaItems) {
-        if (mediaItemIds.includes(playlistMediaItem.mediaItemId)) {
-          await playlistMediaItem.destroy()
-          numMediaItems--
-        } else {
-          if (playlistMediaItem.order !== order) {
-            playlistMediaItem.update({
-              order
-            })
-          }
-          order++
-        }
-      }
-
-      // If playlist is now empty then remove it
-      const jsonExpanded = await playlist.getOldJsonExpanded()
-      if (!numMediaItems) {
-        Logger.info(`[ApiRouter] Playlist "${playlist.name}" has no more items - removing it`)
-        await playlist.destroy()
-        SocketAuthority.clientEmitter(playlist.userId, 'playlist_removed', jsonExpanded)
-      } else {
-        SocketAuthority.clientEmitter(playlist.userId, 'playlist_updated', jsonExpanded)
-      }
-    }
+    await Database.playlistModel.removeMediaItemsFromPlaylists(mediaItemIds)

    // Close rss feed - remove from db and emit socket event
    await RssFeedManager.closeFeedForEntityId(libraryItemId)
@@ -202,12 +202,12 @@ class AudioFileScanner {

  /**
   *
-   * @param {AudioFile} audioFile
+   * @param {string} audioFilePath
   * @returns {object}
   */
-  probeAudioFile(audioFile) {
-    Logger.debug(`[AudioFileScanner] Running ffprobe for audio file at "${audioFile.metadata.path}"`)
-    return prober.rawProbe(audioFile.metadata.path)
+  probeAudioFile(audioFilePath) {
+    Logger.debug(`[AudioFileScanner] Running ffprobe for audio file at "${audioFilePath}"`)
+    return prober.rawProbe(audioFilePath)
  }

  /**
@@ -97,6 +97,11 @@ async function resizeImage(filePath, outputPath, width, height) {
 }
 module.exports.resizeImage = resizeImage

+/**
+ *
+ * @param {import('../objects/PodcastEpisodeDownload')} podcastEpisodeDownload
+ * @returns
+ */
 module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
  return new Promise(async (resolve) => {
    const response = await axios({
@@ -118,21 +123,22 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
    ffmpeg.addOption('-loglevel debug') // Debug logs printed on error
    ffmpeg.outputOptions('-c:a', 'copy', '-map', '0:a', '-metadata', 'podcast=1')

-    const podcastMetadata = podcastEpisodeDownload.libraryItem.media.metadata
+    /** @type {import('../models/Podcast')} */
+    const podcast = podcastEpisodeDownload.libraryItem.media
    const podcastEpisode = podcastEpisodeDownload.podcastEpisode
    const finalSizeInBytes = Number(podcastEpisode.enclosure?.length || 0)

    const taggings = {
-      album: podcastMetadata.title,
-      'album-sort': podcastMetadata.title,
-      artist: podcastMetadata.author,
-      'artist-sort': podcastMetadata.author,
+      album: podcast.title,
+      'album-sort': podcast.title,
+      artist: podcast.author,
+      'artist-sort': podcast.author,
      comment: podcastEpisode.description,
      subtitle: podcastEpisode.subtitle,
      disc: podcastEpisode.season,
-      genre: podcastMetadata.genres.length ? podcastMetadata.genres.join(';') : null,
-      language: podcastMetadata.language,
-      MVNM: podcastMetadata.title,
+      genre: podcast.genres.length ? podcast.genres.join(';') : null,
+      language: podcast.language,
+      MVNM: podcast.title,
      MVIN: podcastEpisode.episode,
      track: podcastEpisode.episode,
      'series-part': podcastEpisode.episode,
@@ -141,9 +147,9 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
      year: podcastEpisode.pubYear,
      date: podcastEpisode.pubDate,
      releasedate: podcastEpisode.pubDate,
-      'itunes-id': podcastMetadata.itunesId,
-      'podcast-type': podcastMetadata.type,
-      'episode-type': podcastMetadata.episodeType
+      'itunes-id': podcast.itunesId,
+      'podcast-type': podcast.podcastType,
+      'episode-type': podcastEpisode.episodeType
    }

    for (const tag in taggings) {
@@ -82,11 +82,11 @@ describe('LibraryItemController', () => {
    })

    it('should remove authors and series with no books on library item delete', async () => {
-      const oldLibraryItem = await Database.libraryItemModel.getOldById(libraryItem1Id)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)

      const fakeReq = {
        query: {},
-        libraryItem: oldLibraryItem
+        libraryItem
      }
      const fakeRes = {
        sendStatus: sinon.spy()
@@ -156,7 +156,7 @@ describe('LibraryItemController', () => {
    })

    it('should remove authors and series with no books on library item update media', async () => {
-      const oldLibraryItem = await Database.libraryItemModel.getOldById(libraryItem1Id)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)

      // Update library item 1 remove all authors and series
      const fakeReq = {
@@ -167,7 +167,7 @@ describe('LibraryItemController', () => {
            series: []
          }
        },
-        libraryItem: oldLibraryItem
+        libraryItem
      }
      const fakeRes = {
        json: sinon.spy()
Author	SHA1	Message	Date
advplyr	69d1744496	Update podcasts to new library item model	2025-01-03 16:48:24 -06:00
advplyr	0357dc90d4	Update libraryItem.updatedAt on media update	2025-01-03 14:07:27 -06:00
advplyr	6cd874dffc	Merge pull request #3787 from advplyr/fix-remove-episode-from-playlist Fix remove episode from playlist	2025-01-03 13:04:18 -06:00
advplyr	6467a92de6	Remove media progress when deleting podcast episode audio file	2025-01-03 12:12:56 -06:00
advplyr	63466ec48b	Fix deleting episode library file removes episode from playlist #3784	2025-01-03 12:06:20 -06:00
advplyr	de7296eaab	Merge pull request #3785 from advplyr/playback-session-use-new-library-item Update PlaybackSession to use new library item model	2025-01-03 11:20:33 -06:00
advplyr	c251f1899d	Update PlaybackSession to use new library item model	2025-01-03 11:16:03 -06:00
advplyr	d205c6f734	Merge pull request #3779 from advplyr/refactor-library-item Refactor LibraryItem to use new model	2025-01-02 17:30:22 -06:00
advplyr	5e8678f1cc	Remove unused	2025-01-02 17:25:10 -06:00
advplyr	12c6f2e9a5	Update updateMedia endpoint to use new model	2025-01-02 17:21:07 -06:00
advplyr	5cd14108f9	Remove req.oldLibraryItem usage	2025-01-02 15:54:10 -06:00
advplyr	eb853d9f09	Fix LibraryItemController unit test	2025-01-02 15:51:21 -06:00
advplyr	4787e7fdb5	Updates to LibraryItemController to use new model	2025-01-02 15:42:52 -06:00
advplyr	dd0ebdf2d8	Implementing toOld functions for LibraryItem/Book/Podcast	2025-01-02 12:49:58 -06:00