diff --git a/client/components/cards/BookMatchCard.vue b/client/components/cards/BookMatchCard.vue index 09b963c50..acf79802d 100644 --- a/client/components/cards/BookMatchCard.vue +++ b/client/components/cards/BookMatchCard.vue @@ -18,6 +18,10 @@

{{ $getString('LabelByAuthor', [book.author]) }}

{{ $strings.LabelNarrators }}: {{ book.narrator }}

+
+ {{ bookRatingValue >= i ? 'star' : bookRatingValue >= i - 0.5 ? 'star_half' : 'star_border' }} + {{ bookRatingValue.toFixed(1) }} +

{{ $strings.LabelDuration }}: {{ $elapsedPrettyExtended(bookDuration, false) }} {{ bookDurationComparison }}

@@ -74,6 +78,9 @@ export default { bookCovers() { return this.book.covers || [] }, + serverSettings() { + return this.$store.state.serverSettings + }, bookDuration() { return (this.book.duration || 0) * 60 }, @@ -88,7 +95,19 @@ export default { return this.$getString('LabelDurationComparisonShorter', [this.$elapsedPrettyExtended(differenceInMinutes * 60, false, false)]) } return this.$strings.LabelDurationComparisonExactMatch - } + }, + bookRatingValue() { + if (!this.book.rating) return 0 + if (typeof this.book.rating === 'string') { + const num = Number(this.book.rating) + return isNaN(num) ? 0 : num + } + if (typeof this.book.rating === 'object' && this.book.rating.average) { + return Number(this.book.rating.average) || 0 + } + const num = Number(this.book.rating) + return isNaN(num) ? 0 : num + }, }, methods: { selectMatch() { diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue index 51f657dbc..ed8a2160f 100644 --- a/client/components/cards/LazyBookCard.vue +++ b/client/components/cards/LazyBookCard.vue @@ -349,6 +349,12 @@ export default { if (this.mediaMetadata.publishedYear) return this.$getString('LabelPublishedDate', [this.mediaMetadata.publishedYear]) return '\u00A0' } + if (this.orderBy === 'media.metadata.rating') { + if (this.mediaMetadata.rating && !isNaN(this.mediaMetadata.rating) && this.mediaMetadata.rating > 0) { + return `Rating: ${Number(this.mediaMetadata.rating).toFixed(1)}` + } + return '\u00A0' + } if (this.orderBy === 'progress') { if (!this.userProgressLastUpdated) return '\u00A0' return this.$getString('LabelLastProgressDate', [this.$formatDatetime(this.userProgressLastUpdated, this.dateFormat, this.timeFormat)]) diff --git a/client/components/controls/LibrarySortSelect.vue b/client/components/controls/LibrarySortSelect.vue index a0734d6a4..57c1165e7 100644 --- a/client/components/controls/LibrarySortSelect.vue +++ b/client/components/controls/LibrarySortSelect.vue @@ -110,6 +110,10 @@ export default { text: this.$strings.LabelPublishYear, value: 'media.metadata.publishedYear' }, + { + text: this.$strings.LabelRating, + value: 'media.metadata.rating' + }, { text: this.$strings.LabelAddedAt, value: 'addedAt' diff --git a/client/components/modals/item/tabs/Match.vue b/client/components/modals/item/tabs/Match.vue index a1fc41091..0205c5dc3 100644 --- a/client/components/modals/item/tabs/Match.vue +++ b/client/components/modals/item/tabs/Match.vue @@ -174,6 +174,16 @@
+
+ +
+ +

+ {{ $strings.LabelCurrently }} {{ Number(mediaMetadata.rating).toFixed(1) }} +

+
+
+
@@ -270,6 +280,7 @@ export default { explicit: true, asin: true, isbn: true, + rating: true, abridged: true, // Podcast specific itunesPageUrl: true, @@ -325,6 +336,9 @@ export default { bookCoverAspectRatio() { return this.$store.getters['libraries/getBookCoverAspectRatio'] }, + serverSettings() { + return this.$store.state.serverSettings + }, filterData() { return this.$store.state.libraries.filterData || {} }, @@ -464,6 +478,7 @@ export default { explicit: true, asin: true, isbn: true, + rating: true, abridged: true, // Podcast specific itunesPageUrl: true, @@ -559,6 +574,11 @@ export default { if (match.narrator && !Array.isArray(match.narrator)) { match.narrator = match.narrator.split(',').map((g) => g.trim()) } + if (match.rating && typeof match.rating === 'object' && match.rating.average) { + match.rating = Number(match.rating.average) || null + } else if (match.rating !== undefined && match.rating !== null) { + match.rating = Number(match.rating) || null + } } console.log('Select Match', match) @@ -570,7 +590,7 @@ export default { updatePayload.metadata = {} for (const key in this.selectedMatchUsage) { - if (this.selectedMatchUsage[key] && this.selectedMatch[key]) { + if (this.selectedMatchUsage[key] && this.selectedMatch[key] !== undefined && this.selectedMatch[key] !== null) { if (key === 'series') { if (!Array.isArray(this.selectedMatch[key])) { console.error('Invalid series in selectedMatch', this.selectedMatch[key]) @@ -609,6 +629,13 @@ export default { updatePayload.tags = this.selectedMatch[key] } else if (key === 'itunesId') { updatePayload.metadata.itunesId = Number(this.selectedMatch[key]) + } else if (key === 'rating') { + const ratingValue = Number(this.selectedMatch[key]) + if (!isNaN(ratingValue) && ratingValue > 0) { + updatePayload.metadata.rating = ratingValue + } else if (ratingValue === 0 || isNaN(ratingValue)) { + updatePayload.metadata.rating = undefined + } } else { updatePayload.metadata[key] = this.selectedMatch[key] } diff --git a/client/components/ui/TextInputWithLabel.vue b/client/components/ui/TextInputWithLabel.vue index 81c5516b1..32757713f 100644 --- a/client/components/ui/TextInputWithLabel.vue +++ b/client/components/ui/TextInputWithLabel.vue @@ -6,7 +6,7 @@ {{ note }} - +
@@ -22,6 +22,8 @@ export default { default: 'text' }, min: [String, Number], + max: [String, Number], + step: [String, Number], readonly: Boolean, disabled: Boolean, inputClass: String, diff --git a/client/components/widgets/BookDetailsEdit.vue b/client/components/widgets/BookDetailsEdit.vue index db3b86ed6..4bd85264c 100644 --- a/client/components/widgets/BookDetailsEdit.vue +++ b/client/components/widgets/BookDetailsEdit.vue @@ -47,6 +47,9 @@
+
+ +
@@ -93,6 +96,7 @@ export default { language: null, isbn: null, asin: null, + rating: null, genres: [], explicit: false, abridged: false @@ -187,6 +191,7 @@ export default { if (this.$refs.descriptionInput) this.$refs.descriptionInput.blur() if (this.$refs.isbnInput) this.$refs.isbnInput.blur() if (this.$refs.asinInput) this.$refs.asinInput.blur() + if (this.$refs.ratingInput) this.$refs.ratingInput.blur() if (this.$refs.publisherInput) this.$refs.publisherInput.blur() if (this.$refs.languageInput) this.$refs.languageInput.blur() @@ -242,6 +247,10 @@ export default { for (const key in this.details) { var newValue = this.details[key] var oldValue = this.mediaMetadata[key] + // Convert rating 0 to null + if (key === 'rating' && newValue === 0) { + newValue = null + } // Key cleared out or key first populated if ((!newValue && oldValue) || (newValue && !oldValue)) { metadata[key] = newValue @@ -254,6 +263,11 @@ export default { if (!this.objectArrayEqual(newValue, oldValue)) { metadata[key] = newValue.map((v) => ({ ...v })) } + } else if (key === 'rating') { + // Always check rating changes, even if null + if (newValue != oldValue) { + metadata[key] = newValue + } } else if (newValue && newValue != oldValue) { // Intentional != metadata[key] = newValue @@ -283,6 +297,12 @@ export default { this.details.language = this.mediaMetadata.language || null this.details.isbn = this.mediaMetadata.isbn || null this.details.asin = this.mediaMetadata.asin || null + if (this.mediaMetadata.rating) { + const ratingValue = typeof this.mediaMetadata.rating === 'object' && this.mediaMetadata.rating.average ? this.mediaMetadata.rating.average : Number(this.mediaMetadata.rating) + this.details.rating = !isNaN(ratingValue) && ratingValue > 0 ? ratingValue : null + } else { + this.details.rating = null + } this.details.explicit = !!this.mediaMetadata.explicit this.details.abridged = !!this.mediaMetadata.abridged this.newTags = [...(this.media.tags || [])] diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue index 7fb84d468..2e2287dd8 100644 --- a/client/pages/config/index.vue +++ b/client/pages/config/index.vue @@ -130,6 +130,16 @@
+
+ + +
+

{{ $strings.LabelExample }}: {{ dateExample }}

diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue index 1d8f0f20b..1ee142d4d 100644 --- a/client/pages/item/_id/index.vue +++ b/client/pages/item/_id/index.vue @@ -45,6 +45,11 @@

by Unknown

+
+ {{ ratingValue >= i ? 'star' : ratingValue >= i - 0.5 ? 'star_half' : 'star_border' }} + {{ ratingValue.toFixed(1) }} +
+