groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-02-28 21:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Adjust discover/search changes for API compatibility

Browse source
This commit is contained in:
Kevin Gatera 2026-02-23 19:06:33 -05:00
parent f1a2e56054
commit c0319ebbac
2 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
server/utils/queries/libraryItemsBookFilters.js
View file

@ -890,14 +890,12 @@ module.exports = {
const discoverWhere = [
{
[Sequelize.Op.and]: [
Sequelize.where(
Sequelize.literal(
`(SELECT COUNT(*) FROM mediaProgresses mp WHERE mp.mediaItemId = book.id AND mp.userId = :userId AND (mp.isFinished = 1 OR mp.currentTime > 0))`
),
0
)
],
'$mediaProgresses.isFinished$': {
[Sequelize.Op.or]: [null, 0]
},
'$mediaProgresses.currentTime$': {
[Sequelize.Op.or]: [null, 0]
},
[Sequelize.Op.or]: [
Sequelize.where(Sequelize.literal(`(SELECT COUNT(*) FROM bookSeries bs where bs.bookId = book.id)`), 0),
{
@ -916,16 +914,20 @@ module.exports = {
where: {
libraryId
}
},
{
model: Database.mediaProgressModel,
where: {
userId: user.id
},
required: false
}
]
// Step 2a: Count with lightweight includes only
const count = await Database.bookModel.count({
where: discoverWhere,
replacements: {
userId: user.id,
...userPermissionBookWhere.replacements
},
replacements: userPermissionBookWhere.replacements,
include: baseDiscoverInclude,
distinct: true,
col: 'id',
@ -936,10 +938,7 @@ module.exports = {
const randomSelection = await Database.bookModel.findAll({
attributes: ['id'],
where: discoverWhere,
replacements: {
userId: user.id,
...userPermissionBookWhere.replacements
},
replacements: userPermissionBookWhere.replacements,
include: baseDiscoverInclude,
subQuery: false,
distinct: true,
@ -1167,7 +1166,7 @@ module.exports = {
libraryItem.media = book
itemMatches.push({
libraryItem: libraryItem.toOldJSONMinified()
libraryItem: libraryItem.toOldJSONExpanded()
})
}

4
server/utils/queries/libraryItemsPodcastFilters.js
View file

@ -410,7 +410,7 @@ module.exports = {
libraryItem.media = podcast
libraryItem.media.podcastEpisodes = []
itemMatches.push({
libraryItem: libraryItem.toOldJSONMinified()
libraryItem: libraryItem.toOldJSONExpanded()
})
}
@ -444,7 +444,7 @@ module.exports = {
libraryItem.media = episode.podcast
libraryItem.media.podcastEpisodes = []
const oldPodcastEpisodeJson = episode.toOldJSONExpanded(libraryItem.id)
const libraryItemJson = libraryItem.toOldJSONMinified()
const libraryItemJson = libraryItem.toOldJSONExpanded()
libraryItemJson.recentEpisode = oldPodcastEpisodeJson
episodeMatches.push({
libraryItem: libraryItemJson