mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2026-11-20 07:31:34 +01:00
Merge pull request #5710 from mikiher/fix-parallel-quick-match-race
Fix parallel quick match crash on duplicate bookSeries/bookAuthor links
This commit is contained in:
2 files changed
+166
-21
No files matched your search
+46
-21
@@ -260,16 +260,21 @@ class Scanner {
|
||||
// Update filter data
|
||||
Database.addAuthorToFilterData(libraryItem.libraryId, author.name, author.id)
|
||||
}
|
||||
await Database.bookAuthorModel
|
||||
.create({
|
||||
let bookAuthorCreated = true
|
||||
try {
|
||||
await Database.bookAuthorModel.create({
|
||||
authorId: author.id,
|
||||
bookId: libraryItem.media.id
|
||||
})
|
||||
.then(() => {
|
||||
Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added author "${author.name}" to "${libraryItem.media.title}"`)
|
||||
libraryItem.media.authors.push(author)
|
||||
hasAuthorUpdates = true
|
||||
})
|
||||
} catch (error) {
|
||||
if (error.name !== 'SequelizeUniqueConstraintError') throw error
|
||||
bookAuthorCreated = false
|
||||
}
|
||||
libraryItem.media.authors.push(author)
|
||||
hasAuthorUpdates = true
|
||||
if (bookAuthorCreated) {
|
||||
Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added author "${author.name}" to "${libraryItem.media.title}"`)
|
||||
}
|
||||
}
|
||||
const authorsRemoved = libraryItem.media.authors.filter((a) => !matchData.author.find((ma) => ma.toLowerCase() === a.name.toLowerCase()))
|
||||
if (authorsRemoved.length) {
|
||||
@@ -306,23 +311,43 @@ class Scanner {
|
||||
} else {
|
||||
let seriesItem = await Database.seriesModel.getByNameAndLibrary(seriesMatchItem.series, libraryItem.libraryId)
|
||||
if (!seriesItem) {
|
||||
seriesItem = await Database.seriesModel.create({
|
||||
name: seriesMatchItem.series,
|
||||
nameIgnorePrefix: getTitleIgnorePrefix(seriesMatchItem.series),
|
||||
libraryId: libraryItem.libraryId
|
||||
})
|
||||
// Update filter data
|
||||
Database.addSeriesToFilterData(libraryItem.libraryId, seriesItem.name, seriesItem.id)
|
||||
SocketAuthority.emitter('series_added', seriesItem.toOldJSON())
|
||||
let seriesCreated = false
|
||||
try {
|
||||
seriesItem = await Database.seriesModel.create({
|
||||
name: seriesMatchItem.series,
|
||||
nameIgnorePrefix: getTitleIgnorePrefix(seriesMatchItem.series),
|
||||
libraryId: libraryItem.libraryId
|
||||
})
|
||||
seriesCreated = true
|
||||
} catch (error) {
|
||||
if (error.name !== 'SequelizeUniqueConstraintError') throw error
|
||||
seriesItem = await Database.seriesModel.findOne({
|
||||
where: { name: seriesMatchItem.series, libraryId: libraryItem.libraryId }
|
||||
})
|
||||
if (!seriesItem) throw error
|
||||
}
|
||||
if (seriesCreated) {
|
||||
// Update filter data
|
||||
Database.addSeriesToFilterData(libraryItem.libraryId, seriesItem.name, seriesItem.id)
|
||||
SocketAuthority.emitter('series_added', seriesItem.toOldJSON())
|
||||
}
|
||||
}
|
||||
let bookSeries
|
||||
try {
|
||||
bookSeries = await Database.bookSeriesModel.create({
|
||||
seriesId: seriesItem.id,
|
||||
bookId: libraryItem.media.id,
|
||||
sequence: seriesMatchItem.sequence
|
||||
})
|
||||
Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added series "${seriesItem.name}" to "${libraryItem.media.title}"`)
|
||||
} catch (error) {
|
||||
if (error.name !== 'SequelizeUniqueConstraintError') throw error
|
||||
bookSeries = await Database.bookSeriesModel.findOne({
|
||||
where: { seriesId: seriesItem.id, bookId: libraryItem.media.id }
|
||||
})
|
||||
}
|
||||
const bookSeries = await Database.bookSeriesModel.create({
|
||||
seriesId: seriesItem.id,
|
||||
bookId: libraryItem.media.id,
|
||||
sequence: seriesMatchItem.sequence
|
||||
})
|
||||
seriesItem.bookSeries = bookSeries
|
||||
libraryItem.media.series.push(seriesItem)
|
||||
Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added series "${seriesItem.name}" to "${libraryItem.media.title}"`)
|
||||
hasSeriesUpdates = true
|
||||
}
|
||||
const seriesRemoved = libraryItem.media.series.filter((s) => !matchData.series.find((ms) => ms.series.toLowerCase() === s.name.toLowerCase()))
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
const { expect } = require('chai')
|
||||
const { Sequelize } = require('sequelize')
|
||||
const sinon = require('sinon')
|
||||
|
||||
const Database = require('../../../server/Database')
|
||||
const Logger = require('../../../server/Logger')
|
||||
const Scanner = require('../../../server/scanner/Scanner')
|
||||
|
||||
describe('Scanner.quickMatchBookBuildUpdatePayload', () => {
|
||||
/** @type {import('../../../server/models/Library')} */
|
||||
let library
|
||||
/** @type {import('../../../server/models/LibraryItem')} */
|
||||
let libraryItem
|
||||
/** @type {import('../../../server/models/Book')} */
|
||||
let book
|
||||
|
||||
const apiRouterCtx = {
|
||||
checkRemoveAuthorsWithNoBooks: sinon.stub().resolves(),
|
||||
checkRemoveEmptySeries: sinon.stub().resolves()
|
||||
}
|
||||
|
||||
beforeEach(async () => {
|
||||
global.ServerSettings = {}
|
||||
Database.sequelize = new Sequelize({ dialect: 'sqlite', storage: ':memory:', logging: false })
|
||||
Database.sequelize.uppercaseFirst = (str) => (str ? `${str[0].toUpperCase()}${str.substr(1)}` : '')
|
||||
await Database.buildModels()
|
||||
|
||||
sinon.stub(Logger, 'info')
|
||||
sinon.stub(Logger, 'debug')
|
||||
sinon.stub(Logger, 'warn')
|
||||
sinon.stub(Logger, 'error')
|
||||
|
||||
library = await Database.libraryModel.create({ name: 'Test Library', mediaType: 'book' })
|
||||
const libraryFolder = await Database.libraryFolderModel.create({ path: '/test', libraryId: library.id })
|
||||
book = await Database.bookModel.create({ title: 'Test Book', audioFiles: [], tags: [], narrators: [], genres: [], chapters: [] })
|
||||
libraryItem = await Database.libraryItemModel.create({
|
||||
libraryFiles: [],
|
||||
mediaId: book.id,
|
||||
mediaType: 'book',
|
||||
libraryId: library.id,
|
||||
libraryFolderId: libraryFolder.id
|
||||
})
|
||||
libraryItem.media = book
|
||||
// Stale in-memory associations: DB may already have links from a concurrent quick match
|
||||
book.authors = []
|
||||
book.series = []
|
||||
})
|
||||
|
||||
afterEach(async () => {
|
||||
sinon.restore()
|
||||
await Database.sequelize.sync({ force: true })
|
||||
})
|
||||
|
||||
it('does not throw when bookSeries link already exists from a concurrent quick match', async () => {
|
||||
const series = await Database.seriesModel.create({ name: 'Crescent City', libraryId: library.id })
|
||||
await Database.bookSeriesModel.create({ bookId: book.id, seriesId: series.id, sequence: '3' })
|
||||
|
||||
const result = await Scanner.quickMatchBookBuildUpdatePayload(
|
||||
apiRouterCtx,
|
||||
libraryItem,
|
||||
{
|
||||
series: [{ series: 'Crescent City', sequence: '3' }]
|
||||
},
|
||||
{}
|
||||
)
|
||||
|
||||
expect(result.hasSeriesUpdates).to.be.true
|
||||
expect(libraryItem.media.series).to.have.lengthOf(1)
|
||||
expect(libraryItem.media.series[0].id).to.equal(series.id)
|
||||
expect(libraryItem.media.series[0].bookSeries).to.exist
|
||||
expect(libraryItem.media.series[0].bookSeries.sequence).to.equal('3')
|
||||
|
||||
const links = await Database.bookSeriesModel.findAll({ where: { bookId: book.id, seriesId: series.id } })
|
||||
expect(links).to.have.lengthOf(1)
|
||||
})
|
||||
|
||||
it('reuses an existing series when create hits the name unique constraint', async () => {
|
||||
const series = await Database.seriesModel.create({ name: 'Crescent City', libraryId: library.id })
|
||||
sinon.stub(Database.seriesModel, 'getByNameAndLibrary').resolves(null)
|
||||
|
||||
const result = await Scanner.quickMatchBookBuildUpdatePayload(
|
||||
apiRouterCtx,
|
||||
libraryItem,
|
||||
{
|
||||
series: [{ series: 'Crescent City', sequence: '3' }]
|
||||
},
|
||||
{}
|
||||
)
|
||||
|
||||
expect(result.hasSeriesUpdates).to.be.true
|
||||
expect(libraryItem.media.series).to.have.lengthOf(1)
|
||||
expect(libraryItem.media.series[0].id).to.equal(series.id)
|
||||
|
||||
const seriesRows = await Database.seriesModel.findAll({ where: { libraryId: library.id, name: 'Crescent City' } })
|
||||
expect(seriesRows).to.have.lengthOf(1)
|
||||
const links = await Database.bookSeriesModel.findAll({ where: { bookId: book.id, seriesId: series.id } })
|
||||
expect(links).to.have.lengthOf(1)
|
||||
})
|
||||
|
||||
it('does not throw when bookAuthor link already exists from a concurrent quick match', async () => {
|
||||
const author = await Database.authorModel.create({ name: 'Sarah Maas', libraryId: library.id })
|
||||
await Database.bookAuthorModel.create({ bookId: book.id, authorId: author.id })
|
||||
|
||||
const result = await Scanner.quickMatchBookBuildUpdatePayload(
|
||||
apiRouterCtx,
|
||||
libraryItem,
|
||||
{
|
||||
author: ['Sarah Maas']
|
||||
},
|
||||
{}
|
||||
)
|
||||
|
||||
expect(result.hasAuthorUpdates).to.be.true
|
||||
expect(libraryItem.media.authors).to.have.lengthOf(1)
|
||||
expect(libraryItem.media.authors[0].id).to.equal(author.id)
|
||||
|
||||
const links = await Database.bookAuthorModel.findAll({ where: { bookId: book.id, authorId: author.id } })
|
||||
expect(links).to.have.lengthOf(1)
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user