Skip to content

Sort Listen Again randomly (toggable via setting) #4131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Sort Listen Again randomly (toggable via setting) #4131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9df238
sort randomly
Vito0912 Mar 17, 2025
dbf1f88
frontend code
Vito0912 Mar 18, 2025
dd5da33
added backend logic
Vito0912 Mar 18, 2025
25eefa9
added setting
Vito0912 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions client/components/modals/libraries/LibrarySettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@
</ui-tooltip>
</div>
</div>
<div class="p-2 w-full md:w-1/2">
<div class="flex items-center">
<ui-toggle-switch v-model="listenAgainOrdered" size="sm" @input="formUpdated" />
<ui-tooltip :text="$strings.LabelListenAgainOrderedHelp">
<p class="pl-4 text-sm">
{{ $strings.LabelListenAgainOrdered }}
<span class="material-symbols icon-text text-sm">info</span>
</p>
</ui-tooltip>
</div>
</div>
<div v-if="isPodcastLibrary" class="p-2 w-full md:w-1/2">
<ui-dropdown :label="$strings.LabelPodcastSearchRegion" v-model="podcastSearchRegion" :items="$podcastSearchRegionOptions" small class="max-w-72" menu-max-height="200px" @input="formUpdated" />
</div>
Expand Down Expand Up @@ -115,7 +126,8 @@ export default {
onlyShowLaterBooksInContinueSeries: false,
podcastSearchRegion: 'us',
markAsFinishedWhen: 'timeRemaining',
markAsFinishedValue: 10
markAsFinishedValue: 10,
listenAgainOrdered: false
}
},
computed: {
Expand Down Expand Up @@ -177,7 +189,8 @@ export default {
onlyShowLaterBooksInContinueSeries: !!this.onlyShowLaterBooksInContinueSeries,
podcastSearchRegion: this.podcastSearchRegion,
markAsFinishedTimeRemaining: markAsFinishedTimeRemaining,
markAsFinishedPercentComplete: markAsFinishedPercentComplete
markAsFinishedPercentComplete: markAsFinishedPercentComplete,
listenAgainOrdered: !!this.listenAgainOrdered
}
}
},
Expand All @@ -199,6 +212,7 @@ export default {
this.markAsFinishedWhen = 'timeRemaining'
}
this.markAsFinishedValue = this.librarySettings.markAsFinishedTimeRemaining || this.librarySettings.markAsFinishedPercentComplete || 10
this.listenAgainOrdered = !!this.librarySettings.listenAgainOrdered
}
},
mounted() {
Expand Down
2 changes: 2 additions & 0 deletions client/strings/en-us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@
"LabelLimit": "Limit",
"LabelLineSpacing": "Line spacing",
"LabelListenAgain": "Listen Again",
"LabelListenAgainOrdered": "Sort listen again by finish date",
"LabelListenAgainOrderedHelp": "If enabled, the listen again section in the shelf view will be sorted by the finish date instead of random order.",
"LabelLogLevelDebug": "Debug",
"LabelLogLevelInfo": "Info",
"LabelLogLevelWarn": "Warn",
Expand Down
7 changes: 5 additions & 2 deletions server/models/Library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const Logger = require('../Logger')
* @property {string[]} metadataPrecedence
* @property {number} markAsFinishedTimeRemaining Time remaining in seconds to mark as finished. (defaults to 10s)
* @property {number} markAsFinishedPercentComplete Percent complete to mark as finished (0-100). If this is set it will be used over markAsFinishedTimeRemaining.
* @property {boolean} listenAgainOrdered Order listen again items by progress or random
*/

class Library extends Model {
Expand Down Expand Up @@ -61,7 +62,8 @@ class Library extends Model {
autoScanCronExpression: null,
podcastSearchRegion: 'us',
markAsFinishedPercentComplete: null,
markAsFinishedTimeRemaining: 10
markAsFinishedTimeRemaining: 10,
listenAgainOrdered: false
}
} else {
return {
Expand All @@ -76,7 +78,8 @@ class Library extends Model {
onlyShowLaterBooksInContinueSeries: false,
metadataPrecedence: this.defaultMetadataPrecedence,
markAsFinishedPercentComplete: null,
markAsFinishedTimeRemaining: 10
markAsFinishedTimeRemaining: 10,
listenAgainOrdered: false
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions server/utils/queries/libraryFilters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ module.exports = {
* @returns {Promise<{ items:oldLibraryItem[], count:number }>}
*/
async getMediaFinished(library, user, include, limit) {
const sortBy = library.settings.listenAgainOrdered ? 'progress' : 'random'
if (library.isBook) {
const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(library.id, user, 'progress', 'finished', 'progress', true, false, include, limit, 0)
const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(library.id, user, 'progress', 'finished', sortBy, true, false, include, limit, 0)
return {
items: libraryItems.map((li) => {
const oldLibraryItem = li.toOldJSONMinified()
Expand All @@ -179,7 +180,7 @@ module.exports = {
count
}
} else {
const { libraryItems, count } = await libraryItemsPodcastFilters.getFilteredPodcastEpisodes(library.id, user, 'progress', 'finished', 'progress', true, limit, 0)
const { libraryItems, count } = await libraryItemsPodcastFilters.getFilteredPodcastEpisodes(library.id, user, 'progress', 'finished', sortBy, true, limit, 0)
return {
count,
items: libraryItems.map((li) => {
Expand Down
Loading