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

Merge c084766a24 into 1d0b7e383a

Browse source
This commit is contained in:
sir-wilhelm 2026-02-26 08:41:08 +01:00 • committed by GitHub
commit cbdf998132
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/components/controls/LibraryFilterSelect.vue
View file

@ -389,7 +389,7 @@ export default {
return this.filterData.publishedDecades || []
},
progress() {
return [
const items = [
{
id: 'finished',
name: this.$strings.LabelFinished
@ -398,6 +398,15 @@ export default {
id: 'in-progress',
name: this.$strings.LabelInProgress
},
]
// only add "started series" filter in series view
if (this.isSeries) {
items.push({
id: 'started-series',
name: this.$strings.LabelStarted
})
}
items.push(
{
id: 'not-started',
name: this.$strings.LabelNotStarted
@ -406,7 +415,8 @@ export default {
id: 'not-finished',
name: this.$strings.LabelNotFinished
}
]
)
return items
},
tracks() {
return [

3
server/utils/queries/seriesFilters.js
View file

@ -83,6 +83,9 @@ module.exports = {
const progQuery = 'SELECT count(*) FROM books b, bookSeries bs LEFT OUTER JOIN mediaProgresses mp ON mp.mediaItemId = b.id AND mp.userId = :userId WHERE bs.seriesId = series.id AND bs.bookId = b.id AND (mp.isFinished = 1 OR mp.currentTime > 0)'
seriesWhere.push(Sequelize.where(Sequelize.literal(`(${progQuery})`), 0))
userPermissionBookWhere.replacements.userId = user.id
} else if (filterValue === 'started-series') {
attrQuery = 'SELECT count(*) FROM books b, bookSeries bs LEFT OUTER JOIN mediaProgresses mp ON mp.mediaItemId = b.id AND mp.userId = :userId WHERE bs.seriesId = series.id AND bs.bookId = b.id AND (mp.isFinished = 1 OR mp.currentTime > 0 OR mp.ebookProgress > 0)'
userPermissionBookWhere.replacements.userId = user.id
} else if (filterValue === 'in-progress') {
attrQuery = 'SELECT count(*) FROM books b, bookSeries bs LEFT OUTER JOIN mediaProgresses mp ON mp.mediaItemId = b.id AND mp.userId = :userId WHERE bs.seriesId = series.id AND bs.bookId = b.id AND (mp.currentTime > 0 OR mp.ebookProgress > 0) AND mp.isFinished = 0'
userPermissionBookWhere.replacements.userId = user.id