diff --git a/client/components/app/BookShelfCategorized.vue b/client/components/app/BookShelfCategorized.vue
index ca070e18..5b902fb0 100644
--- a/client/components/app/BookShelfCategorized.vue
+++ b/client/components/app/BookShelfCategorized.vue
@@ -16,7 +16,7 @@
- selectEntity(payload, index)">
+ selectEntity(payload, index)">
{{ $strings[shelf.labelStringKey] }}
selectEntity(payload, index)">
@@ -36,7 +36,7 @@
- selectEntity(payload, index)" />
+ selectEntity(payload, index)" />
@@ -286,7 +286,8 @@ export default {
}
if (user.mediaProgress.length) {
const mediaProgressToHide = user.mediaProgress.filter((mp) => mp.hideFromContinueListening)
- this.removeItemsFromContinueListening(mediaProgressToHide)
+ this.removeItemsFromContinueListeningReading(mediaProgressToHide, 'continue-listening')
+ this.removeItemsFromContinueListeningReading(mediaProgressToHide, 'continue-reading')
}
},
libraryItemAdded(libraryItem) {
@@ -357,8 +358,8 @@ export default {
}
})
},
- removeItemsFromContinueListening(mediaProgressItems) {
- const continueListeningShelf = this.shelves.find((s) => s.id === 'continue-listening')
+ removeItemsFromContinueListeningReading(mediaProgressItems, categoryId) {
+ const continueListeningShelf = this.shelves.find((s) => s.id === categoryId)
if (continueListeningShelf) {
if (continueListeningShelf.type === 'book') {
continueListeningShelf.entities = continueListeningShelf.entities.filter((ent) => {
@@ -373,17 +374,6 @@ export default {
})
}
}
- // this.shelves.forEach((shelf) => {
- // if (shelf.id == 'continue-listening') {
- // if (shelf.type == 'book') {
- // // Filter out books from continue listening shelf
- // shelf.entities = shelf.entities.filter((ent) => {
- // if (mediaProgressItems.some(mp => mp.libraryItemId === ent.id)) return false
- // return true
- // })
- // }
- // }
- // })
},
authorUpdated(author) {
this.shelves.forEach((shelf) => {
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 578c1e9b..c4f7f9a9 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -329,6 +329,9 @@ export default {
if (this.episodeProgress) return this.episodeProgress
return this.store.getters['user/getUserMediaProgress'](this.libraryItemId)
},
+ isEBookOnly() {
+ return !this.numTracks && this.ebookFormat
+ },
useEBookProgress() {
if (!this.userProgress || this.userProgress.progress) return false
return this.userProgress.ebookProgress > 0
@@ -445,6 +448,7 @@ export default {
}
]
if (this.continueListeningShelf) {
+
items.push({
func: 'removeFromContinueListening',
text: this.$strings.ButtonRemoveFromContinueListening
@@ -512,7 +516,7 @@ export default {
if (this.continueListeningShelf) {
items.push({
func: 'removeFromContinueListening',
- text: this.$strings.ButtonRemoveFromContinueListening
+ text: this.isEBookOnly ? this.$strings.ButtonRemoveFromContinueReading : this.$strings.ButtonRemoveFromContinueListening
})
}
if (!this.isPodcast) {
diff --git a/client/strings/de.json b/client/strings/de.json
index 7d5f685e..0a0e7f08 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Alles löschen",
"ButtonRemoveAllLibraryItems": "Lösche alle Bibliothekseinträge",
"ButtonRemoveFromContinueListening": "Lösche den Eintrag aus der Fortsetzungsliste",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Lösche die Serie aus der Serienfortsetzungsliste",
"ButtonReScan": "Neu scannen",
"ButtonReset": "Zurücksetzen",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index e69c891d..e9c9e9f1 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Remove All",
"ButtonRemoveAllLibraryItems": "Remove All Library Items",
"ButtonRemoveFromContinueListening": "Remove from Continue Listening",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Remove Series from Continue Series",
"ButtonReScan": "Re-Scan",
"ButtonReset": "Reset",
diff --git a/client/strings/es.json b/client/strings/es.json
index 948f8308..bf7f9594 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Remover Todos",
"ButtonRemoveAllLibraryItems": "Remover Todos los Elementos de la Biblioteca",
"ButtonRemoveFromContinueListening": "Remover de Continuar Escuchando",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Remover Serie de Continuar Series",
"ButtonReScan": "Re-Escanear",
"ButtonReset": "Reiniciar",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index e6a1e448..cbb6d2da 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Supprimer tout",
"ButtonRemoveAllLibraryItems": "Supprimer tous les articles de la bibliothèque",
"ButtonRemoveFromContinueListening": "Ne plus continuer à écouter",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Ne plus continuer à écouter la série",
"ButtonReScan": "Nouvelle analyse",
"ButtonReset": "Réinitialiser",
diff --git a/client/strings/gu.json b/client/strings/gu.json
index 98e5488e..6f3049bb 100644
--- a/client/strings/gu.json
+++ b/client/strings/gu.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "બધું કાઢી નાખો",
"ButtonRemoveAllLibraryItems": "બધું પુસ્તકાલય વસ્તુઓ કાઢી નાખો",
"ButtonRemoveFromContinueListening": "સાંભળતી પુસ્તકો માંથી કાઢી નાખો",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "સાંભળતી સિરીઝ માંથી કાઢી નાખો",
"ButtonReScan": "ફરીથી સ્કેન કરો",
"ButtonReset": "રીસેટ કરો",
diff --git a/client/strings/hi.json b/client/strings/hi.json
index 5cb063ee..0b94ff05 100644
--- a/client/strings/hi.json
+++ b/client/strings/hi.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "सभी हटाएं",
"ButtonRemoveAllLibraryItems": "पुस्तकालय की सभी आइटम हटाएं",
"ButtonRemoveFromContinueListening": "सुनना जारी रखें से हटाएं",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "इस सीरीज को कंटिन्यू सीरीज से हटा दें",
"ButtonReScan": "पुन: स्कैन करें",
"ButtonReset": "रीसेट करें",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 39990e3a..5ab28217 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Ukloni sve",
"ButtonRemoveAllLibraryItems": "Ukloni sve stvari iz biblioteke",
"ButtonRemoveFromContinueListening": "Ukloni iz Nastavi slušati",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Ukloni seriju iz Nastavi seriju",
"ButtonReScan": "Skeniraj ponovno",
"ButtonReset": "Poništi",
diff --git a/client/strings/it.json b/client/strings/it.json
index dcaa68bd..5d8ec9d6 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Rimuovi Tutto",
"ButtonRemoveAllLibraryItems": "Rimuovi tutto il contenuto della libreria",
"ButtonRemoveFromContinueListening": "Rimuovi per proseguire l'ascolto",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Rimuovi la Serie per Continuarla",
"ButtonReScan": "Ri-scansiona",
"ButtonReset": "Reset",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index c6646a74..b043f56e 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Alles verwijderen",
"ButtonRemoveAllLibraryItems": "Verwijder volledige bibliotheekinhoud",
"ButtonRemoveFromContinueListening": "Vewijder uit Verder luisteren",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Verwijder serie uit Serie vervolgen",
"ButtonReScan": "Nieuwe scan",
"ButtonReset": "Reset",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 377bebef..fa2f1a10 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Usuń wszystko",
"ButtonRemoveAllLibraryItems": "Usuń wszystkie elementy z biblioteki",
"ButtonRemoveFromContinueListening": "Usuń z listy odtwarzania",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Usuń serię z listy odtwarzania",
"ButtonReScan": "Ponowne skanowanie",
"ButtonReset": "Resetowanie",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index b62b8cd8..3b7e7fa4 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "Удалить всё",
"ButtonRemoveAllLibraryItems": "Удалить все элементы библиотеки",
"ButtonRemoveFromContinueListening": "Удалить из Продолжить слушать",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "Удалить серию из Продолжить серию",
"ButtonReScan": "Пересканировать",
"ButtonReset": "Сбросить",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 90367c23..425f8ae1 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -55,6 +55,7 @@
"ButtonRemoveAll": "移除所有",
"ButtonRemoveAllLibraryItems": "移除所有媒体库项目",
"ButtonRemoveFromContinueListening": "从继续收听中删除",
+ "ButtonRemoveFromContinueReading": "Remove from Continue Reading",
"ButtonRemoveSeriesFromContinueSeries": "从继续收听系列中删除",
"ButtonReScan": "重新扫描",
"ButtonReset": "重置",