From 755e70b4a9bd03e3b8b3043253ed25056a307aa0 Mon Sep 17 00:00:00 2001 From: advplyr Date: Thu, 17 Mar 2022 09:04:10 -0500 Subject: [PATCH] Fix db migration --- server/objects/mediaTypes/Book.js | 13 ++----------- server/utils/dbMigration.js | 7 ++++--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js index 3eefc3d9..054f98dc 100644 --- a/server/objects/mediaTypes/Book.js +++ b/server/objects/mediaTypes/Book.js @@ -54,7 +54,6 @@ class Book { tags: [...this.tags], audiobooks: this.audiobooks.map(ab => ab.toJSONMinified()), ebooks: this.ebooks.map(eb => eb.toJSONMinified()), - duration: this.duration, size: this.size } } @@ -66,22 +65,14 @@ class Book { tags: [...this.tags], audiobooks: this.audiobooks.map(ab => ab.toJSONExpanded()), ebooks: this.ebooks.map(eb => eb.toJSONExpanded()), - duration: this.duration, size: this.size, } } - get tracks() { - return this.audioFiles.filter(af => !af.exclude && !af.invalid) - } - get duration() { - var total = 0 - this.tracks.forEach((track) => total += track.duration) - return total - } get size() { var total = 0 - this.audioFiles.forEach((af) => total += af.metadata.size) + this.audiobooks.forEach((ab) => total += ab.size) + this.ebooks.forEach((eb) => total += eb.size) return total } get hasMediaEntities() { diff --git a/server/utils/dbMigration.js b/server/utils/dbMigration.js index f0cd84ce..846bf06d 100644 --- a/server/utils/dbMigration.js +++ b/server/utils/dbMigration.js @@ -3,12 +3,13 @@ const fs = require('fs-extra') const njodb = require("njodb") const { SupportedEbookTypes } = require('./globals') +const { getId } = require('./index') +const Logger = require('../Logger') + const LegacyAudiobook = require('../objects/legacy/Audiobook') const UserAudiobookData = require('../objects/legacy/UserAudiobookData') const LibraryItem = require('../objects/LibraryItem') - -const Logger = require('../Logger') const Book = require('../objects/mediaTypes/Book') const BookMetadata = require('../objects/metadata/BookMetadata') @@ -64,7 +65,7 @@ function makeAuthorsFromOldAb(authorsList) { var newAuthor = new Author() newAuthor.setData({ name: authorName }) authorsToAdd.push(newAuthor) - Logger.info(`>>> Created new author named "${authorName}"`) + Logger.debug(`>>> Created new author named "${authorName}"`) return newAuthor.toJSONMinimal() }) }