Update db migration for duration, size, lastFirst, and ignore prefix columns

server/models/Author.js

@@ -45,6 +45,7 @@ module.exports = (sequelize) => {
       return {
         id: oldAuthor.id,
         name: oldAuthor.name,
+        lastFirst: oldAuthor.lastFirst,
         asin: oldAuthor.asin,
         description: oldAuthor.description,
         imagePath: oldAuthor.imagePath,
@@ -68,6 +69,7 @@ module.exports = (sequelize) => {
       primaryKey: true
     },
     name: DataTypes.STRING,
+    lastFirst: DataTypes.STRING,
     asin: DataTypes.STRING,
     description: DataTypes.TEXT,
     imagePath: DataTypes.STRING

server/models/Book.js

@@ -5,19 +5,52 @@ module.exports = (sequelize) => {
   class Book extends Model {
     static getOldBook(libraryItemExpanded) {
       const bookExpanded = libraryItemExpanded.media
-      const authors = bookExpanded.authors.map(au => {
-        return {
-          id: au.id,
-          name: au.name
-        }
-      })
-      const series = bookExpanded.series.map(se => {
-        return {
-          id: se.id,
-          name: se.name,
-          sequence: se.bookSeries.sequence
-        }
-      })
+      let authors = []
+      if (bookExpanded.authors?.length) {
+        authors = bookExpanded.authors.map(au => {
+          return {
+            id: au.id,
+            name: au.name
+          }
+        })
+      } else if (bookExpanded.bookAuthors?.length) {
+        authors = bookExpanded.bookAuthors.map(ba => {
+          if (ba.author) {
+            return {
+              id: ba.author.id,
+              name: ba.author.name
+            }
+          } else {
+            Logger.error(`[Book] Invalid bookExpanded bookAuthors: no author`, ba)
+            return null
+          }
+        }).filter(a => a)
+      }
+
+      let series = []
+      if (bookExpanded.series?.length) {
+        series = bookExpanded.series.map(se => {
+          return {
+            id: se.id,
+            name: se.name,
+            sequence: se.bookSeries.sequence
+          }
+        })
+      } else if (bookExpanded.bookSeries?.length) {
+        series = bookExpanded.bookSeries.map(bs => {
+          if (bs.series) {
+            return {
+              id: bs.series.id,
+              name: bs.series.name,
+              sequence: bs.sequence
+            }
+          } else {
+            Logger.error(`[Book] Invalid bookExpanded bookSeries: no series`, bs)
+            return null
+          }
+        }).filter(s => s)
+      }
+
       return {
         id: bookExpanded.id,
         libraryItemId: libraryItemExpanded.id,
@@ -66,6 +99,7 @@ module.exports = (sequelize) => {
       return {
         id: oldBook.id,
         title: oldBook.metadata.title,
+        titleIgnorePrefix: oldBook.metadata.titleIgnorePrefix,
         subtitle: oldBook.metadata.subtitle,
         publishedYear: oldBook.metadata.publishedYear,
         publishedDate: oldBook.metadata.publishedDate,
@@ -79,6 +113,7 @@ module.exports = (sequelize) => {
         narrators: oldBook.metadata.narrators,
         ebookFile: oldBook.ebookFile?.toJSON() || null,
         coverPath: oldBook.coverPath,
+        duration: oldBook.duration,
         audioFiles: oldBook.audioFiles?.map(af => af.toJSON()) || [],
         chapters: oldBook.chapters,
         tags: oldBook.tags,
@@ -94,6 +129,7 @@ module.exports = (sequelize) => {
       primaryKey: true
     },
     title: DataTypes.STRING,
+    titleIgnorePrefix: DataTypes.STRING,
     subtitle: DataTypes.STRING,
     publishedYear: DataTypes.STRING,
     publishedDate: DataTypes.STRING,
@@ -105,6 +141,7 @@ module.exports = (sequelize) => {
     explicit: DataTypes.BOOLEAN,
     abridged: DataTypes.BOOLEAN,
     coverPath: DataTypes.STRING,
+    duration: DataTypes.FLOAT,
 
     narrators: DataTypes.JSON,
     audioFiles: DataTypes.JSON,

server/models/LibraryItem.js

@@ -1,6 +1,7 @@
 const { DataTypes, Model } = require('sequelize')
 const Logger = require('../Logger')
 const oldLibraryItem = require('../objects/LibraryItem')
+const libraryFilters = require('../utils/queries/libraryFilters')
 const { areEquivalent } = require('../utils/index')
 
 module.exports = (sequelize) => {
@@ -374,6 +375,7 @@ module.exports = (sequelize) => {
         mtime: oldLibraryItem.mtimeMs,
         ctime: oldLibraryItem.ctimeMs,
         birthtime: oldLibraryItem.birthtimeMs,
+        size: oldLibraryItem.size,
         lastScan: oldLibraryItem.lastScan,
         lastScanVersion: oldLibraryItem.scanVersion,
         libraryId: oldLibraryItem.libraryId,
@@ -392,6 +394,14 @@ module.exports = (sequelize) => {
       })
     }
 
+    static async getByFilterAndSort(libraryId, userId, { filterBy, sortBy, sortDesc, limit, offset }) {
+      const { libraryItems, count } = await libraryFilters.getFilteredLibraryItems(libraryId, filterBy, sortBy, sortDesc, limit, offset, userId)
+      return {
+        libraryItems: libraryItems.map(ti => this.getOldLibraryItem(ti)),
+        count
+      }
+    }
+
     getMedia(options) {
       if (!this.mediaType) return Promise.resolve(null)
       const mixinMethodName = `get${sequelize.uppercaseFirst(this.mediaType)}`
@@ -416,6 +426,7 @@ module.exports = (sequelize) => {
     mtime: DataTypes.DATE(6),
     ctime: DataTypes.DATE(6),
     birthtime: DataTypes.DATE(6),
+    size: DataTypes.BIGINT,
     lastScan: DataTypes.DATE,
     lastScanVersion: DataTypes.STRING,
     libraryFiles: DataTypes.JSON,

server/models/MediaProgress.js

@@ -17,7 +17,7 @@ module.exports = (sequelize) => {
         mediaItemId: this.mediaItemId,
         mediaItemType: this.mediaItemType,
         duration: this.duration,
-        progress: this.extraData?.progress || null,
+        progress: this.extraData?.progress || 0,
         currentTime: this.currentTime,
         isFinished: !!this.isFinished,
         hideFromContinueListening: !!this.hideFromContinueListening,

server/models/Podcast.js

@@ -39,6 +39,7 @@ module.exports = (sequelize) => {
       return {
         id: oldPodcast.id,
         title: oldPodcastMetadata.title,
+        titleIgnorePrefix: oldPodcastMetadata.titleIgnorePrefix,
         author: oldPodcastMetadata.author,
         releaseDate: oldPodcastMetadata.releaseDate,
         feedURL: oldPodcastMetadata.feedUrl,
@@ -69,6 +70,7 @@ module.exports = (sequelize) => {
       primaryKey: true
     },
     title: DataTypes.STRING,
+    titleIgnorePrefix: DataTypes.STRING,
     author: DataTypes.STRING,
     releaseDate: DataTypes.STRING,
     feedURL: DataTypes.STRING,

server/models/Series.js

@@ -43,6 +43,7 @@ module.exports = (sequelize) => {
       return {
         id: oldSeries.id,
         name: oldSeries.name,
+        nameIgnorePrefix: oldSeries.nameIgnorePrefix,
         description: oldSeries.description,
         libraryId: oldSeries.libraryId
       }
@@ -64,6 +65,7 @@ module.exports = (sequelize) => {
       primaryKey: true
     },
     name: DataTypes.STRING,
+    nameIgnorePrefix: DataTypes.STRING,
     description: DataTypes.TEXT
   }, {
     sequelize,