From ae9efe63596493be6413650586725b881a24e6d2 Mon Sep 17 00:00:00 2001
From: Greg Lorenzen <gregorylorenzen@gmail.com>
Date: Thu, 31 Oct 2024 15:30:51 +0000
Subject: [PATCH 001/143] Add keyboard focus to MultiSelectQueryInput edit and
 close

---
 client/components/ui/MultiSelectQueryInput.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/components/ui/MultiSelectQueryInput.vue b/client/components/ui/MultiSelectQueryInput.vue
index 099ee709..6b33acf3 100644
--- a/client/components/ui/MultiSelectQueryInput.vue
+++ b/client/components/ui/MultiSelectQueryInput.vue
@@ -5,9 +5,9 @@
       <form @submit.prevent="submitForm">
         <div ref="inputWrapper" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-0.5" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
           <div v-for="item in selected" :key="item.id" class="rounded-full px-2 py-0.5 m-0.5 text-xs bg-bg flex flex-nowrap whitespace-nowrap items-center justify-center relative min-w-12">
-            <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 opacity-0 hover:opacity-100 px-1 bg-bg bg-opacity-75 flex items-center justify-end cursor-pointer">
-              <span v-if="showEdit" class="material-symbols text-base text-white hover:text-warning mr-1" @click.stop="editItem(item)">edit</span>
-              <span class="material-symbols text-white hover:text-error" style="font-size: 1.1rem" @click.stop="removeItem(item.id)">close</span>
+            <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 opacity-0 hover:opacity-100 px-1 bg-bg bg-opacity-75 flex items-center justify-end cursor-pointer" :class="{ 'opacity-100': inputFocused }">
+              <span v-if="showEdit" class="material-symbols text-base text-white hover:text-warning focus:text-warning mr-1" @click.stop="editItem(item)" @keydown.enter.stop="editItem(item)" tabindex="0">edit</span>
+              <span class="material-symbols text-white hover:text-error focus:text-error" style="font-size: 1.1rem" @click.stop="removeItem(item.id)" @keydown.enter.stop="removeItem(item.id)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</span>
             </div>
             {{ item[textKey] }}
           </div>
@@ -65,6 +65,7 @@ export default {
       currentSearch: null,
       typingTimeout: null,
       isFocused: false,
+      inputFocused: false,
       menu: null,
       items: []
     }
@@ -114,6 +115,9 @@ export default {
     getIsSelected(itemValue) {
       return !!this.selected.find((i) => i.id === itemValue)
     },
+    setInputFocused(focused) {
+      this.inputFocused = focused
+    },
     search() {
       if (!this.textInput) return
       this.currentSearch = this.textInput

From e55db0afdca634b4a0b9e4fafbb9bdf519c6b029 Mon Sep 17 00:00:00 2001
From: Greg Lorenzen <gregorylorenzen@gmail.com>
Date: Thu, 31 Oct 2024 15:44:19 +0000
Subject: [PATCH 002/143] Add focus and enter key support to the add button in
 MultiSelectQueryInput

---
 client/components/ui/MultiSelectQueryInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/ui/MultiSelectQueryInput.vue b/client/components/ui/MultiSelectQueryInput.vue
index 6b33acf3..d0bdcef2 100644
--- a/client/components/ui/MultiSelectQueryInput.vue
+++ b/client/components/ui/MultiSelectQueryInput.vue
@@ -12,7 +12,7 @@
             {{ item[textKey] }}
           </div>
           <div v-if="showEdit && !disabled" class="rounded-full cursor-pointer w-6 h-6 mx-0.5 bg-bg flex items-center justify-center">
-            <span class="material-symbols text-white hover:text-success pt-px pr-px" style="font-size: 1.1rem" @click.stop="addItem">add</span>
+            <span class="material-symbols text-white hover:text-success focus:text-success pt-px pr-px" style="font-size: 1.1rem" @click.stop="addItem" @keydown.enter.stop="addItem" tabindex="0">add</span>
           </div>
           <input v-show="!readonly" ref="input" v-model="textInput" :disabled="disabled" class="h-full bg-primary focus:outline-none px-1 w-6" @keydown="keydownInput" @focus="inputFocus" @blur="inputBlur" @paste="inputPaste" />
         </div>

From a0b3960ee416ffd641e257b487171cc3a54817ab Mon Sep 17 00:00:00 2001
From: Greg Lorenzen <gregorylorenzen@gmail.com>
Date: Thu, 31 Oct 2024 16:29:48 +0000
Subject: [PATCH 003/143] Fix enter key and focus for edit modal

---
 client/components/ui/MultiSelectQueryInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/ui/MultiSelectQueryInput.vue b/client/components/ui/MultiSelectQueryInput.vue
index d0bdcef2..fe7187ee 100644
--- a/client/components/ui/MultiSelectQueryInput.vue
+++ b/client/components/ui/MultiSelectQueryInput.vue
@@ -6,7 +6,7 @@
         <div ref="inputWrapper" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-0.5" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
           <div v-for="item in selected" :key="item.id" class="rounded-full px-2 py-0.5 m-0.5 text-xs bg-bg flex flex-nowrap whitespace-nowrap items-center justify-center relative min-w-12">
             <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 opacity-0 hover:opacity-100 px-1 bg-bg bg-opacity-75 flex items-center justify-end cursor-pointer" :class="{ 'opacity-100': inputFocused }">
-              <span v-if="showEdit" class="material-symbols text-base text-white hover:text-warning focus:text-warning mr-1" @click.stop="editItem(item)" @keydown.enter.stop="editItem(item)" tabindex="0">edit</span>
+              <span v-if="showEdit" class="material-symbols text-base text-white hover:text-warning focus:text-warning mr-1" @click.stop="editItem(item)" @keydown.enter.stop.prevent="editItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">edit</span>
               <span class="material-symbols text-white hover:text-error focus:text-error" style="font-size: 1.1rem" @click.stop="removeItem(item.id)" @keydown.enter.stop="removeItem(item.id)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</span>
             </div>
             {{ item[textKey] }}

From 0812e189f74cb0cf176acf7924fb3b91a419a093 Mon Sep 17 00:00:00 2001
From: Greg Lorenzen <gregorylorenzen@gmail.com>
Date: Thu, 7 Nov 2024 03:38:30 +0000
Subject: [PATCH 004/143] Add keyboard input to MultiSelect component

---
 client/components/ui/MultiSelect.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/components/ui/MultiSelect.vue b/client/components/ui/MultiSelect.vue
index 37018262..da4bcc13 100644
--- a/client/components/ui/MultiSelect.vue
+++ b/client/components/ui/MultiSelect.vue
@@ -5,9 +5,9 @@
       <form @submit.prevent="submitForm">
         <div ref="inputWrapper" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-1" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
           <div v-for="item in selected" :key="item" class="rounded-full px-2 py-1 mx-0.5 my-0.5 text-xs bg-bg flex flex-nowrap break-all items-center relative">
-            <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 px-1 bg-bg bg-opacity-75 flex items-center justify-end opacity-0 hover:opacity-100">
+            <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 px-1 bg-bg bg-opacity-75 flex items-center justify-end opacity-0 hover:opacity-100" :class="{ 'opacity-100': inputFocused }">
               <span v-if="showEdit" class="material-symbols text-white hover:text-warning cursor-pointer" style="font-size: 1.1rem" @click.stop="editItem(item)">edit</span>
-              <span class="material-symbols text-white hover:text-error cursor-pointer" style="font-size: 1.1rem" @click.stop="removeItem(item)">close</span>
+              <span class="material-symbols text-white hover:text-error focus:text-error cursor-pointer" style="font-size: 1.1rem" @click.stop="removeItem(item)" @keydown.enter.stop.prevent="removeItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</span>
             </div>
             {{ item }}
           </div>
@@ -66,7 +66,8 @@ export default {
       typingTimeout: null,
       isFocused: false,
       menu: null,
-      filteredItems: null
+      filteredItems: null,
+      inputFocused: false
     }
   },
   watch: {
@@ -129,6 +130,9 @@ export default {
       }, 100)
       this.setInputWidth()
     },
+    setInputFocused(focused) {
+      this.inputFocused = focused
+    },
     setInputWidth() {
       setTimeout(() => {
         var value = this.$refs.input.value

From 835490a9fcecf0ea608179071dad2fc5d2b17b3b Mon Sep 17 00:00:00 2001
From: Jaume <jaume@nualart.cat>
Date: Sat, 7 Dec 2024 01:45:41 +0100
Subject: [PATCH 005/143] Catalan translation added

new file
client/strings/ca.json
---
 client/strings/ca.json | 1029 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1029 insertions(+)
 create mode 100644 client/strings/ca.json

diff --git a/client/strings/ca.json b/client/strings/ca.json
new file mode 100644
index 00000000..8dde850b
--- /dev/null
+++ b/client/strings/ca.json
@@ -0,0 +1,1029 @@
+{
+  "ButtonAdd": "Afegeix",
+  "ButtonAddChapters": "Afegeix",
+  "ButtonAddDevice": "Afegeix Dispositiu",
+  "ButtonAddLibrary": "Crea Biblioteca",
+  "ButtonAddPodcasts": "Afegeix Podcasts",
+  "ButtonAddUser": "Crea Usuari",
+  "ButtonAddYourFirstLibrary": "Crea la teva Primera Biblioteca",
+  "ButtonApply": "Aplica",
+  "ButtonApplyChapters": "Aplica Capítols",
+  "ButtonAuthors": "Autors",
+  "ButtonBack": "Enrere",
+  "ButtonBrowseForFolder": "Cerca Carpeta",
+  "ButtonCancel": "Cancel·la",
+  "ButtonCancelEncode": "Cancel·la Codificador",
+  "ButtonChangeRootPassword": "Canvia Contrasenya Root",
+  "ButtonCheckAndDownloadNewEpisodes": "Verifica i Descarrega Nous Episodis",
+  "ButtonChooseAFolder": "Tria una Carpeta",
+  "ButtonChooseFiles": "Tria un Fitxer",
+  "ButtonClearFilter": "Elimina Filtres",
+  "ButtonCloseFeed": "Tanca Font",
+  "ButtonCloseSession": "Tanca la sessió oberta",
+  "ButtonCollections": "Col·leccions",
+  "ButtonConfigureScanner": "Configura Escàner",
+  "ButtonCreate": "Crea",
+  "ButtonCreateBackup": "Crea Còpia de Seguretat",
+  "ButtonDelete": "Elimina",
+  "ButtonDownloadQueue": "Cua",
+  "ButtonEdit": "Edita",
+  "ButtonEditChapters": "Edita Capítol",
+  "ButtonEditPodcast": "Edita Podcast",
+  "ButtonEnable": "Habilita",
+  "ButtonFireAndFail": "Executat i fallat",
+  "ButtonFireOnTest": "Activa esdeveniment de prova",
+  "ButtonForceReScan": "Força Re-escaneig",
+  "ButtonFullPath": "Ruta Completa",
+  "ButtonHide": "Amaga",
+  "ButtonHome": "Inici",
+  "ButtonIssues": "Problemes",
+  "ButtonJumpBackward": "Retrocedeix",
+  "ButtonJumpForward": "Avança",
+  "ButtonLatest": "Últims",
+  "ButtonLibrary": "Biblioteca",
+  "ButtonLogout": "Tanca Sessió",
+  "ButtonLookup": "Cerca",
+  "ButtonManageTracks": "Gestiona Pistes d'Àudio",
+  "ButtonMapChapterTitles": "Assigna Títols als Capítols",
+  "ButtonMatchAllAuthors": "Troba Tots els Autors",
+  "ButtonMatchBooks": "Troba Llibres",
+  "ButtonNevermind": "Oblida-ho",
+  "ButtonNext": "Següent",
+  "ButtonNextChapter": "Següent Capítol",
+  "ButtonNextItemInQueue": "Següent element a la cua",
+  "ButtonOk": "D'acord",
+  "ButtonOpenFeed": "Obre Font",
+  "ButtonOpenManager": "Obre Editor",
+  "ButtonPause": "Pausa",
+  "ButtonPlay": "Reprodueix",
+  "ButtonPlayAll": "Reprodueix tot",
+  "ButtonPlaying": "Reproduint",
+  "ButtonPlaylists": "Llistes de reproducció",
+  "ButtonPrevious": "Anterior",
+  "ButtonPreviousChapter": "Capítol Anterior",
+  "ButtonProbeAudioFile": "Examina fitxer d'àudio",
+  "ButtonPurgeAllCache": "Esborra Tot el Cache",
+  "ButtonPurgeItemsCache": "Esborra Cache d'Elements",
+  "ButtonQueueAddItem": "Afegeix a la Cua",
+  "ButtonQueueRemoveItem": "Elimina de la Cua",
+  "ButtonQuickEmbed": "Inserció Ràpida",
+  "ButtonQuickEmbedMetadata": "Afegeix Metadades Ràpidament",
+  "ButtonQuickMatch": "Troba Ràpidament",
+  "ButtonReScan": "Re-escaneja",
+  "ButtonRead": "Llegeix",
+  "ButtonReadLess": "Llegeix menys",
+  "ButtonReadMore": "Llegeix més",
+  "ButtonRefresh": "Refresca",
+  "ButtonRemove": "Elimina",
+  "ButtonRemoveAll": "Elimina Tot",
+  "ButtonRemoveAllLibraryItems": "Elimina Tots els Elements de la Biblioteca",
+  "ButtonRemoveFromContinueListening": "Elimina de Continuar Escoltant",
+  "ButtonRemoveFromContinueReading": "Elimina de Continuar Llegint",
+  "ButtonRemoveSeriesFromContinueSeries": "Elimina Sèrie de Continuar Sèries",
+  "ButtonReset": "Restableix",
+  "ButtonResetToDefault": "Restaura Valors per Defecte",
+  "ButtonRestore": "Restaura",
+  "ButtonSave": "Desa",
+  "ButtonSaveAndClose": "Desa i Tanca",
+  "ButtonSaveTracklist": "Desa Pistes",
+  "ButtonScan": "Escaneja",
+  "ButtonScanLibrary": "Escaneja Biblioteca",
+  "ButtonSearch": "Cerca",
+  "ButtonSelectFolderPath": "Selecciona Ruta de Carpeta",
+  "ButtonSeries": "Sèries",
+  "ButtonSetChaptersFromTracks": "Selecciona Capítols Segons les Pistes",
+  "ButtonShare": "Comparteix",
+  "ButtonShiftTimes": "Desplaça Temps",
+  "ButtonShow": "Mostra",
+  "ButtonStartM4BEncode": "Inicia Codificació M4B",
+  "ButtonStartMetadataEmbed": "Inicia Inserció de Metadades",
+  "ButtonStats": "Estadístiques",
+  "ButtonSubmit": "Envia",
+  "ButtonTest": "Prova",
+  "ButtonUnlinkOpenId": "Desvincula OpenID",
+  "ButtonUpload": "Carrega",
+  "ButtonUploadBackup": "Carrega Còpia de Seguretat",
+  "ButtonUploadCover": "Carrega Portada",
+  "ButtonUploadOPMLFile": "Carrega Fitxer OPML",
+  "ButtonUserDelete": "Elimina Usuari {0}",
+  "ButtonUserEdit": "Edita Usuari {0}",
+  "ButtonViewAll": "Mostra-ho Tot",
+  "ButtonYes": "Sí",
+  "ErrorUploadFetchMetadataAPI": "Error obtenint metadades",
+  "ErrorUploadFetchMetadataNoResults": "No s'han pogut obtenir metadades - Intenta actualitzar el títol i/o autor",
+  "ErrorUploadLacksTitle": "S'ha de tenir un títol",
+  "HeaderAccount": "Compte",
+  "HeaderAddCustomMetadataProvider": "Afegeix un proveïdor de metadades personalitzat",
+  "HeaderAdvanced": "Avançat",
+  "HeaderAppriseNotificationSettings": "Configuració de Notificacions Apprise",
+  "HeaderAudioTracks": "Pistes d'àudio",
+  "HeaderAudiobookTools": "Eines de Gestió d'Arxius d'Audiollibre",
+  "HeaderAuthentication": "Autenticació",
+  "HeaderBackups": "Còpies de Seguretat",
+  "HeaderChangePassword": "Canvia Contrasenya",
+  "HeaderChapters": "Capítols",
+  "HeaderChooseAFolder": "Tria una Carpeta",
+  "HeaderCollection": "Col·lecció",
+  "HeaderCollectionItems": "Elements a la Col·lecció",
+  "HeaderCover": "Portada",
+  "HeaderCurrentDownloads": "Descàrregues Actuals",
+  "HeaderCustomMessageOnLogin": "Missatge Personalitzat a l'Iniciar Sessió",
+  "HeaderCustomMetadataProviders": "Proveïdors de Metadades Personalitzats",
+  "HeaderDetails": "Detalls",
+  "HeaderDownloadQueue": "Cua de Descàrregues",
+  "HeaderEbookFiles": "Fitxers de Llibres Digitals",
+  "HeaderEmail": "Correu electrònic",
+  "HeaderEmailSettings": "Configuració de Correu Electrònic",
+  "HeaderEpisodes": "Episodis",
+  "HeaderEreaderDevices": "Dispositius Ereader",
+  "HeaderEreaderSettings": "Configuració del Lector",
+  "HeaderFiles": "Element",
+  "HeaderFindChapters": "Cerca Capítol",
+  "HeaderIgnoredFiles": "Ignora Element",
+  "HeaderItemFiles": "Carpetes d'Elements",
+  "HeaderItemMetadataUtils": "Utilitats de Metadades d'Elements",
+  "HeaderLastListeningSession": "Últimes Sessions",
+  "HeaderLatestEpisodes": "Últims Episodis",
+  "HeaderLibraries": "Biblioteques",
+  "HeaderLibraryFiles": "Fitxers de Biblioteca",
+  "HeaderLibraryStats": "Estadístiques de Biblioteca",
+  "HeaderListeningSessions": "Sessió",
+  "HeaderListeningStats": "Estadístiques de Temps Escoltat",
+  "HeaderLogin": "Inicia Sessió",
+  "HeaderLogs": "Registres",
+  "HeaderManageGenres": "Gestiona Gèneres",
+  "HeaderManageTags": "Gestiona Etiquetes",
+  "HeaderMapDetails": "Assigna Detalls",
+  "HeaderMatch": "Troba",
+  "HeaderMetadataOrderOfPrecedence": "Ordre de Precedència de Metadades",
+  "HeaderMetadataToEmbed": "Metadades a Inserir",
+  "HeaderNewAccount": "Nou Compte",
+  "HeaderNewLibrary": "Nova Biblioteca",
+  "HeaderNotificationCreate": "Crea Notificació",
+  "HeaderNotificationUpdate": "Actualització de Notificació",
+  "HeaderNotifications": "Notificacions",
+  "HeaderOpenIDConnectAuthentication": "Autenticació OpenID Connect",
+  "HeaderOpenListeningSessions": "Sessions públiques d'escolta",
+  "HeaderOpenRSSFeed": "Obre Font RSS",
+  "HeaderOtherFiles": "Altres Fitxers",
+  "HeaderPasswordAuthentication": "Autenticació per Contrasenya",
+  "HeaderPermissions": "Permisos",
+  "HeaderPlayerQueue": "Cua del Reproductor",
+  "HeaderPlayerSettings": "Configuració del Reproductor",
+  "HeaderPlaylist": "Llista de Reproducció",
+  "HeaderPlaylistItems": "Elements de la Llista de Reproducció",
+  "HeaderPodcastsToAdd": "Podcasts a afegir",
+  "HeaderPreviewCover": "Previsualització de la Portada",
+  "HeaderRSSFeedGeneral": "Detalls RSS",
+  "HeaderRSSFeedIsOpen": "La Font RSS està oberta",
+  "HeaderRSSFeeds": "Fonts RSS",
+  "HeaderRemoveEpisode": "Elimina Episodi",
+  "HeaderRemoveEpisodes": "Elimina {0} Episodis",
+  "HeaderSavedMediaProgress": "Desa el Progrés del Multimèdia",
+  "HeaderSchedule": "Horari",
+  "HeaderScheduleEpisodeDownloads": "Programa Descàrregues Automàtiques d'Episodis",
+  "HeaderScheduleLibraryScans": "Programa Escaneig Automàtic de Biblioteca",
+  "HeaderSession": "Sessió",
+  "HeaderSetBackupSchedule": "Programa Còpies de Seguretat",
+  "HeaderSettings": "Configuració",
+  "HeaderSettingsDisplay": "Interfície",
+  "HeaderSettingsExperimental": "Funcions Experimentals",
+  "HeaderSettingsGeneral": "General",
+  "HeaderSettingsScanner": "Escàner",
+  "HeaderSleepTimer": "Temporitzador de son",
+  "HeaderStatsLargestItems": "Elements més Grans",
+  "HeaderStatsLongestItems": "Elements més Llargs (h)",
+  "HeaderStatsMinutesListeningChart": "Minuts Escoltant (Últims 7 dies)",
+  "HeaderStatsRecentSessions": "Sessions Recents",
+  "HeaderStatsTop10Authors": "Top 10 Autors",
+  "HeaderStatsTop5Genres": "Top 5 Gèneres",
+  "HeaderTableOfContents": "Taula de Continguts",
+  "HeaderTools": "Eines",
+  "HeaderUpdateAccount": "Actualitza Compte",
+  "HeaderUpdateAuthor": "Actualitza Autor",
+  "HeaderUpdateDetails": "Actualitza Detalls",
+  "HeaderUpdateLibrary": "Actualitza Biblioteca",
+  "HeaderUsers": "Usuaris",
+  "HeaderYearReview": "Revisió de l'Any {0}",
+  "HeaderYourStats": "Les teves Estadístiques",
+  "LabelAbridged": "Resumit",
+  "LabelAbridgedChecked": "Resumit (comprovat)",
+  "LabelAbridgedUnchecked": "Sense resumir (no comprovat)",
+  "LabelAccessibleBy": "Accessible per",
+  "LabelAccountType": "Tipus de Compte",
+  "LabelAccountTypeAdmin": "Administrador",
+  "LabelAccountTypeGuest": "Convidat",
+  "LabelAccountTypeUser": "Usuari",
+  "LabelActivity": "Activitat",
+  "LabelAddToCollection": "Afegit a la Col·lecció",
+  "LabelAddToCollectionBatch": "S'han Afegit {0} Llibres a la Col·lecció",
+  "LabelAddToPlaylist": "Afegit a la llista de reproducció",
+  "LabelAddToPlaylistBatch": "S'han Afegit {0} Elements a la Llista de Reproducció",
+  "LabelAddedAt": "Afegit",
+  "LabelAddedDate": "{0} Afegit",
+  "LabelAdminUsersOnly": "Només usuaris administradors",
+  "LabelAll": "Tots",
+  "LabelAllUsers": "Tots els Usuaris",
+  "LabelAllUsersExcludingGuests": "Tots els usuaris excepte convidats",
+  "LabelAllUsersIncludingGuests": "Tots els usuaris i convidats",
+  "LabelAlreadyInYourLibrary": "Ja existeix a la Biblioteca",
+  "LabelApiToken": "Token de l'API",
+  "LabelAppend": "Adjuntar",
+  "LabelAudioBitrate": "Taxa de bits d'àudio (per exemple, 128k)",
+  "LabelAudioChannels": "Canals d'àudio (1 o 2)",
+  "LabelAudioCodec": "Còdec d'àudio",
+  "LabelAuthor": "Autor",
+  "LabelAuthorFirstLast": "Autor (Nom Cognom)",
+  "LabelAuthorLastFirst": "Autor (Cognom, Nom)",
+  "LabelAuthors": "Autors",
+  "LabelAutoDownloadEpisodes": "Descarregar episodis automàticament",
+  "LabelAutoFetchMetadata": "Actualitzar Metadades Automàticament",
+  "LabelAutoFetchMetadataHelp": "Obtén metadades de títol, autor i sèrie per agilitzar la càrrega. És possible que calgui revisar metadades addicionals després de la càrrega.",
+  "LabelAutoLaunch": "Inici automàtic",
+  "LabelAutoLaunchDescription": "Redirigir automàticament al proveïdor d'autenticació quan s'accedeix a la pàgina d'inici de sessió (ruta d'excepció manual <code>/login?autoLaunch=0</code>)",
+  "LabelAutoRegister": "Registre automàtic",
+  "LabelAutoRegisterDescription": "Crear usuaris automàticament en iniciar sessió",
+  "LabelBackToUser": "Torna a Usuari",
+  "LabelBackupAudioFiles": "Còpia de seguretat d'arxius d'àudio",
+  "LabelBackupLocation": "Ubicació de la Còpia de Seguretat",
+  "LabelBackupsEnableAutomaticBackups": "Habilitar Còpies de Seguretat Automàtiques",
+  "LabelBackupsEnableAutomaticBackupsHelp": "Còpies de seguretat desades a /metadata/backups",
+  "LabelBackupsMaxBackupSize": "Mida màxima de la còpia de seguretat (en GB) (0 per il·limitat)",
+  "LabelBackupsMaxBackupSizeHelp": "Com a protecció contra una configuració incorrecta, les còpies de seguretat fallaran si superen la mida configurada.",
+  "LabelBackupsNumberToKeep": "Nombre de còpies de seguretat a conservar",
+  "LabelBackupsNumberToKeepHelp": "Només s'eliminarà una còpia de seguretat alhora. Si té més còpies desades, haurà d'eliminar-les manualment.",
+  "LabelBitrate": "Taxa de bits",
+  "LabelBonus": "Bonus",
+  "LabelBooks": "Llibres",
+  "LabelButtonText": "Text del botó",
+  "LabelByAuthor": "per {0}",
+  "LabelChangePassword": "Canviar Contrasenya",
+  "LabelChannels": "Canals",
+  "LabelChapterCount": "{0} capítols",
+  "LabelChapterTitle": "Títol del Capítol",
+  "LabelChapters": "Capítols",
+  "LabelChaptersFound": "Capítol Trobat",
+  "LabelClickForMoreInfo": "Fes clic per a més informació",
+  "LabelClickToUseCurrentValue": "Fes clic per utilitzar el valor actual",
+  "LabelClosePlayer": "Tancar reproductor",
+  "LabelCodec": "Còdec",
+  "LabelCollapseSeries": "Contraure sèrie",
+  "LabelCollapseSubSeries": "Contraure la subsèrie",
+  "LabelCollection": "Col·lecció",
+  "LabelCollections": "Col·leccions",
+  "LabelComplete": "Complet",
+  "LabelConfirmPassword": "Confirmar Contrasenya",
+  "LabelContinueListening": "Continuar escoltant",
+  "LabelContinueReading": "Continuar llegint",
+  "LabelContinueSeries": "Continuar sèries",
+  "LabelCover": "Portada",
+  "LabelCoverImageURL": "URL de la Imatge de Portada",
+  "LabelCreatedAt": "Creat",
+  "LabelCronExpression": "Expressió de Cron",
+  "LabelCurrent": "Actual",
+  "LabelCurrently": "En aquest moment:",
+  "LabelCustomCronExpression": "Expressió de Cron Personalitzada:",
+  "LabelDatetime": "Hora i Data",
+  "LabelDays": "Dies",
+  "LabelDeleteFromFileSystemCheckbox": "Eliminar arxius del sistema (desmarcar per eliminar només de la base de dades)",
+  "LabelDescription": "Descripció",
+  "LabelDeselectAll": "Desseleccionar Tots",
+  "LabelDevice": "Dispositiu",
+  "LabelDeviceInfo": "Informació del Dispositiu",
+  "LabelDeviceIsAvailableTo": "El dispositiu està disponible per a...",
+  "LabelDirectory": "Directori",
+  "LabelDiscFromFilename": "Disc a partir del Nom de l'Arxiu",
+  "LabelDiscFromMetadata": "Disc a partir de Metadades",
+  "LabelDiscover": "Descobrir",
+  "LabelDownload": "Descarregar",
+  "LabelDownloadNEpisodes": "Descarregar {0} episodis",
+  "LabelDuration": "Duració",
+  "LabelDurationComparisonExactMatch": "(coincidència exacta)",
+  "LabelDurationComparisonLonger": "({0} més llarg)",
+  "LabelDurationComparisonShorter": "({0} més curt)",
+  "LabelDurationFound": "Duració Trobada:",
+  "LabelEbook": "Llibre electrònic",
+  "LabelEbooks": "Llibres electrònics",
+  "LabelEdit": "Editar",
+  "LabelEmail": "Correu electrònic",
+  "LabelEmailSettingsFromAddress": "Remitent",
+  "LabelEmailSettingsRejectUnauthorized": "Rebutja certificats no autoritzats",
+  "LabelEmailSettingsRejectUnauthorizedHelp": "Desactivar la validació de certificats SSL pot exposar la teva connexió a riscos de seguretat, com atacs de tipus man-in-the-middle. Desactiva aquesta opció només si coneixes les implicacions i confies en el servidor de correu al qual et connectes.",
+  "LabelEmailSettingsSecure": "Seguretat",
+  "LabelEmailSettingsSecureHelp": "Si està activat, es farà servir TLS per connectar-se al servidor. Si està desactivat, es farà servir TLS si el servidor admet l'extensió STARTTLS. En la majoria dels casos, pots deixar aquesta opció activada si et connectes al port 465. Desactiva-la en el cas d'usar els ports 587 o 25. (de nodemailer.com/smtp/#authentication)",
+  "LabelEmailSettingsTestAddress": "Provar Adreça",
+  "LabelEmbeddedCover": "Portada Integrada",
+  "LabelEnable": "Habilitar",
+  "LabelEncodingBackupLocation": "Es guardarà una còpia de seguretat dels teus arxius d'àudio originals a:",
+  "LabelEncodingChaptersNotEmbedded": "Els capítols no s'incrusten en els audiollibres multipista.",
+  "LabelEncodingClearItemCache": "Assegura't de purgar periòdicament la memòria cau.",
+  "LabelEncodingFinishedM4B": "El M4B acabat es col·locarà a la teva carpeta d'audiollibres a:",
+  "LabelEncodingInfoEmbedded": "Les metadades s'integraran a les pistes d'àudio dins de la carpeta d'audiollibres.",
+  "LabelEncodingStartedNavigation": "Un cop iniciada la tasca, pots sortir d'aquesta pàgina.",
+  "LabelEncodingTimeWarning": "La codificació pot trigar fins a 30 minuts.",
+  "LabelEncodingWarningAdvancedSettings": "Advertència: No actualitzis aquesta configuració tret que estiguis familiaritzat amb les opcions de codificació d'ffmpeg.",
+  "LabelEncodingWatcherDisabled": "Si has desactivat la supervisió dels arxius, hauràs de tornar a escanejar aquest audiollibre més endavant.",
+  "LabelEnd": "Fi",
+  "LabelEndOfChapter": "Fi del capítol",
+  "LabelEpisode": "Episodi",
+  "LabelEpisodeNotLinkedToRssFeed": "Episodi no enllaçat al feed RSS",
+  "LabelEpisodeNumber": "Episodi #{0}",
+  "LabelEpisodeTitle": "Títol de l'Episodi",
+  "LabelEpisodeType": "Tipus d'Episodi",
+  "LabelEpisodeUrlFromRssFeed": "URL de l'episodi del feed RSS",
+  "LabelEpisodes": "Episodis",
+  "LabelEpisodic": "Episodis",
+  "LabelExample": "Exemple",
+  "LabelExpandSeries": "Ampliar sèrie",
+  "LabelExpandSubSeries": "Expandir la subsèrie",
+  "LabelExplicit": "Explícit",
+  "LabelExplicitChecked": "Explícit (marcat)",
+  "LabelExplicitUnchecked": "No Explícit (sense marcar)",
+  "LabelExportOPML": "Exportar OPML",
+  "LabelFeedURL": "Font de URL",
+  "LabelFetchingMetadata": "Obtenció de metadades",
+  "LabelFile": "Arxiu",
+  "LabelFileBirthtime": "Arxiu creat a",
+  "LabelFileBornDate": "Creat {0}",
+  "LabelFileModified": "Arxiu modificat",
+  "LabelFileModifiedDate": "Modificat {0}",
+  "LabelFilename": "Nom de l'arxiu",
+  "LabelFilterByUser": "Filtrar per Usuari",
+  "LabelFindEpisodes": "Cercar Episodi",
+  "LabelFinished": "Acabat",
+  "LabelFolder": "Carpeta",
+  "LabelFolders": "Carpetes",
+  "LabelFontBold": "Negreta",
+  "LabelFontBoldness": "Nivell de negreta en font",
+  "LabelFontFamily": "Família tipogràfica",
+  "LabelFontItalic": "Cursiva",
+  "LabelFontScale": "Mida de la font",
+  "LabelFontStrikethrough": "Ratllat",
+  "LabelFormat": "Format",
+  "LabelFull": "Complet",
+  "LabelGenre": "Gènere",
+  "LabelGenres": "Gèneres",
+  "LabelHardDeleteFile": "Eliminar Definitivament",
+  "LabelHasEbook": "Té un llibre electrònic",
+  "LabelHasSupplementaryEbook": "Té un llibre electrònic complementari",
+  "LabelHideSubtitles": "Amagar subtítols",
+  "LabelHighestPriority": "Prioritat més alta",
+  "LabelHost": "Amfitrió",
+  "LabelHour": "Hora",
+  "LabelHours": "Hores",
+  "LabelIcon": "Icona",
+  "LabelImageURLFromTheWeb": "URL de la imatge",
+  "LabelInProgress": "En procés",
+  "LabelIncludeInTracklist": "Incloure a la Llista de Pistes",
+  "LabelIncomplete": "Incomplet",
+  "LabelInterval": "Interval",
+  "LabelIntervalCustomDailyWeekly": "Personalitzar diari/setmanal",
+  "LabelIntervalEvery12Hours": "Cada 12 Hores",
+  "LabelIntervalEvery15Minutes": "Cada 15 minuts",
+  "LabelIntervalEvery2Hours": "Cada 2 Hores",
+  "LabelIntervalEvery30Minutes": "Cada 30 minuts",
+  "LabelIntervalEvery6Hours": "Cada 6 Hores",
+  "LabelIntervalEveryDay": "Cada Dia",
+  "LabelIntervalEveryHour": "Cada Hora",
+  "LabelInvert": "Invertir",
+  "LabelItem": "Element",
+  "LabelJumpBackwardAmount": "Quantitat de salts cap enrere",
+  "LabelJumpForwardAmount": "Quantitat de salts cap endavant",
+  "LabelLanguage": "Idioma",
+  "LabelLanguageDefaultServer": "Idioma Predeterminat del Servidor",
+  "LabelLanguages": "Idiomes",
+  "LabelLastBookAdded": "Últim Llibre Afegit",
+  "LabelLastBookUpdated": "Últim Llibre Actualitzat",
+  "LabelLastSeen": "Última Vegada Vist",
+  "LabelLastTime": "Última Vegada",
+  "LabelLastUpdate": "Última Actualització",
+  "LabelLayout": "Distribució",
+  "LabelLayoutSinglePage": "Pàgina única",
+  "LabelLayoutSplitPage": "Dues Pàgines",
+  "LabelLess": "Menys",
+  "LabelLibrariesAccessibleToUser": "Biblioteques Disponibles per a l'Usuari",
+  "LabelLibrary": "Biblioteca",
+  "LabelLibraryFilterSublistEmpty": "Sense {0}",
+  "LabelLibraryItem": "Element de Biblioteca",
+  "LabelLibraryName": "Nom de Biblioteca",
+  "LabelLimit": "Límits",
+  "LabelLineSpacing": "Interlineat",
+  "LabelListenAgain": "Escoltar de nou",
+  "LabelLogLevelDebug": "Depurar",
+  "LabelLogLevelInfo": "Informació",
+  "LabelLogLevelWarn": "Advertència",
+  "LabelLookForNewEpisodesAfterDate": "Cercar nous episodis a partir d'aquesta data",
+  "LabelLowestPriority": "Menor prioritat",
+  "LabelMatchExistingUsersBy": "Emparellar els usuaris existents per",
+  "LabelMatchExistingUsersByDescription": "S'utilitza per connectar usuaris existents. Un cop connectats, els usuaris seran emparellats per un identificador únic del seu proveïdor de SSO",
+  "LabelMaxEpisodesToDownload": "Nombre màxim d'episodis per descarregar. Usa 0 per descarregar una quantitat il·limitada.",
+  "LabelMaxEpisodesToDownloadPerCheck": "Nombre màxim de nous episodis que es descarregaran per comprovació",
+  "LabelMaxEpisodesToKeep": "Nombre màxim d'episodis que es mantindran",
+  "LabelMaxEpisodesToKeepHelp": "El valor 0 no estableix un límit màxim. Després de descarregar automàticament un nou episodi, això eliminarà l'episodi més antic si té més de X episodis. Això només eliminarà 1 episodi per nova descàrrega.",
+  "LabelMediaPlayer": "Reproductor de Mitjans",
+  "LabelMediaType": "Tipus de multimèdia",
+  "LabelMetaTag": "Metaetiqueta",
+  "LabelMetaTags": "Metaetiquetes",
+  "LabelMetadataOrderOfPrecedenceDescription": "Les fonts de metadades de major prioritat prevaldran sobre les de menor prioritat",
+  "LabelMetadataProvider": "Proveïdor de Metadades",
+  "LabelMinute": "Minut",
+  "LabelMinutes": "Minuts",
+  "LabelMissing": "Absent",
+  "LabelMissingEbook": "No té ebook",
+  "LabelMissingSupplementaryEbook": "No té ebook complementari",
+  "LabelMobileRedirectURIs": "URI de redirecció mòbil permeses",
+  "LabelMobileRedirectURIsDescription": "Aquesta és una llista blanca d'URI de redirecció vàlides per a aplicacions mòbils. El predeterminat és <code> audiobookshelf</code>, que pots eliminar o complementar amb URI addicionals per a la integració d'aplicacions de tercers. Usant un asterisc (<code> *</code>) com a única entrada que permet qualsevol URI.",
+  "LabelMore": "Més",
+  "LabelMoreInfo": "Més informació",
+  "LabelName": "Nom",
+  "LabelNarrator": "Narrador",
+  "LabelNarrators": "Narradors",
+  "LabelNew": "Nou",
+  "LabelNewPassword": "Nova Contrasenya",
+  "LabelNewestAuthors": "Autors més recents",
+  "LabelNewestEpisodes": "Episodis més recents",
+  "LabelNextBackupDate": "Data del Següent Respatller",
+  "LabelNextScheduledRun": "Proper Execució Programada",
+  "LabelNoCustomMetadataProviders": "Sense proveïdors de metadades personalitzats",
+  "LabelNoEpisodesSelected": "Cap Episodi Seleccionat",
+  "LabelNotFinished": "No acabat",
+  "LabelNotStarted": "Sense iniciar",
+  "LabelNotes": "Notes",
+  "LabelNotificationAppriseURL": "URL(s) d'Apprise",
+  "LabelNotificationAvailableVariables": "Variables Disponibles",
+  "LabelNotificationBodyTemplate": "Plantilla de Cos",
+  "LabelNotificationEvent": "Esdeveniment de Notificació",
+  "LabelNotificationTitleTemplate": "Plantilla de Títol",
+  "LabelNotificationsMaxFailedAttempts": "Màxim d'Intents Fallits",
+  "LabelNotificationsMaxFailedAttemptsHelp": "Les notificacions es desactivaran després de fallar aquest nombre de vegades",
+  "LabelNotificationsMaxQueueSize": "Mida màxima de la cua de notificacions",
+  "LabelNotificationsMaxQueueSizeHelp": "Les notificacions estan limitades a 1 per segon. Les notificacions seran ignorades si arriben al número màxim de cua per prevenir spam d'esdeveniments.",
+  "LabelNumberOfBooks": "Nombre de Llibres",
+  "LabelNumberOfEpisodes": "Nombre d'Episodis",
+  "LabelOpenIDAdvancedPermsClaimDescription": "Nom de la notificació de OpenID que conté permisos avançats per accions d'usuari dins l'aplicació que s'aplicaran a rols que no siguin d'administrador (<b>si estan configurats</b>). Si el reclam no apareix en la resposta, es denegarà l'accés a ABS. Si manca una sola opció, es tractarà com a <code>falsa</code>. Assegura't que la notificació del proveïdor d'identitats coincideixi amb l'estructura esperada:",
+  "LabelOpenIDClaims": "Deixa les següents opcions buides per desactivar l'assignació avançada de grups i permisos, el que assignaria automàticament al grup 'Usuari'.",
+  "LabelOpenIDGroupClaimDescription": "Nom de la declaració OpenID que conté una llista de grups de l'usuari. Comunament coneguts com <code>grups</code>. <b>Si es configura</b>, l'aplicació assignarà automàticament rols basats en la pertinença a grups de l'usuari, sempre que aquests grups es denominen 'admin', 'user' o 'guest' en la notificació. La sol·licitud ha de contenir una llista, i si un usuari pertany a diversos grups, l'aplicació assignarà el rol corresponent al major nivell d'accés. Si cap grup coincideix, es denegarà l'accés.",
+  "LabelOverwrite": "Sobreescriure",
+  "LabelPaginationPageXOfY": "Pàgina {0} de {1}",
+  "LabelPassword": "Contrasenya",
+  "LabelPath": "Ruta de carpeta",
+  "LabelPermanent": "Permanent",
+  "LabelPermissionsAccessAllLibraries": "Pot Accedir a Totes les Biblioteques",
+  "LabelPermissionsAccessAllTags": "Pot Accedir a Totes les Etiquetes",
+  "LabelPermissionsAccessExplicitContent": "Pot Accedir a Contingut Explícit",
+  "LabelPermissionsCreateEreader": "Pot Crear un Gestor de Projectes",
+  "LabelPermissionsDelete": "Pot Eliminar",
+  "LabelPermissionsDownload": "Pot Descarregar",
+  "LabelPermissionsUpdate": "Pot Actualitzar",
+  "LabelPermissionsUpload": "Pot Pujar",
+  "LabelPersonalYearReview": "Revisió del teu any ({0})",
+  "LabelPhotoPathURL": "Ruta/URL de la Foto",
+  "LabelPlayMethod": "Mètode de Reproducció",
+  "LabelPlayerChapterNumberMarker": "{0} de {1}",
+  "LabelPlaylists": "Llistes de Reproducció",
+  "LabelPodcast": "Podcast",
+  "LabelPodcastSearchRegion": "Regió de Cerca de Podcasts",
+  "LabelPodcastType": "Tipus de Podcast",
+  "LabelPodcasts": "Podcasts",
+  "LabelPort": "Port",
+  "LabelPrefixesToIgnore": "Prefixos per Ignorar (no distingeix entre majúscules i minúscules.)",
+  "LabelPreventIndexing": "Evita que la teva font sigui indexada pels directoris de podcasts d'iTunes i Google",
+  "LabelPrimaryEbook": "Ebook Principal",
+  "LabelProgress": "Progrés",
+  "LabelProvider": "Proveïdor",
+  "LabelProviderAuthorizationValue": "Valor de l'encapçalament d'autorització",
+  "LabelPubDate": "Data de Publicació",
+  "LabelPublishYear": "Any de Publicació",
+  "LabelPublishedDate": "Publicat {0}",
+  "LabelPublishedDecade": "Dècada de Publicació",
+  "LabelPublishedDecades": "Dècades Publicades",
+  "LabelPublisher": "Editor",
+  "LabelPublishers": "Editors",
+  "LabelRSSFeedCustomOwnerEmail": "Correu Electrònic Personalitzat del Propietari",
+  "LabelRSSFeedCustomOwnerName": "Nom Personalitzat del Propietari",
+  "LabelRSSFeedOpen": "Font RSS Oberta",
+  "LabelRSSFeedPreventIndexing": "Evitar l'indexació",
+  "LabelRSSFeedSlug": "Font RSS Slug",
+  "LabelRSSFeedURL": "URL de la Font RSS",
+  "LabelRandomly": "Aleatòriament",
+  "LabelReAddSeriesToContinueListening": "Reafegir la sèrie per continuar escoltant-la",
+  "LabelRead": "Llegit",
+  "LabelReadAgain": "Tornar a llegir",
+  "LabelReadEbookWithoutProgress": "Llegir Ebook sense guardar progrés",
+  "LabelRecentSeries": "Sèries Recents",
+  "LabelRecentlyAdded": "Afegit Recentment",
+  "LabelRecommended": "Recomanats",
+  "LabelRedo": "Refer",
+  "LabelRegion": "Regió",
+  "LabelReleaseDate": "Data d'Estrena",
+  "LabelRemoveAllMetadataAbs": "Eliminar tots els fitxers metadata.abs",
+  "LabelRemoveAllMetadataJson": "Eliminar tots els fitxers metadata.json",
+  "LabelRemoveCover": "Eliminar Coberta",
+  "LabelRemoveMetadataFile": "Eliminar fitxers de metadades en carpetes d'elements de biblioteca",
+  "LabelRemoveMetadataFileHelp": "Elimina tots els fitxers metadata.json i metadata.abs de les teves carpetes {0}.",
+  "LabelRowsPerPage": "Files per Pàgina",
+  "LabelSearchTerm": "Cercar Terme",
+  "LabelSearchTitle": "Cercar Títol",
+  "LabelSearchTitleOrASIN": "Cercar Títol o ASIN",
+  "LabelSeason": "Temporada",
+  "LabelSeasonNumber": "Temporada #{0}",
+  "LabelSelectAll": "Seleccionar tot",
+  "LabelSelectAllEpisodes": "Seleccionar tots els episodis",
+  "LabelSelectEpisodesShowing": "Seleccionar els {0} episodis visibles",
+  "LabelSelectUsers": "Seleccionar usuaris",
+  "LabelSendEbookToDevice": "Enviar Ebook a...",
+  "LabelSequence": "Seqüència",
+  "LabelSerial": "Serial",
+  "LabelSeries": "Sèries",
+  "LabelSeriesName": "Nom de la Sèrie",
+  "LabelSeriesProgress": "Progrés de la Sèrie",
+  "LabelServerLogLevel": "Nivell de registre del servidor",
+  "LabelServerYearReview": "Resum de l'any del servidor ({0})",
+  "LabelSetEbookAsPrimary": "Establir com a principal",
+  "LabelSetEbookAsSupplementary": "Establir com a suplementari",
+  "LabelSettingsAudiobooksOnly": "Només Audiollibres",
+  "LabelSettingsAudiobooksOnlyHelp": "Activant aquesta opció s'ignoraran els fitxers d'ebook, excepte si estan dins d'una carpeta d'audiollibre, en aquest cas es marcaran com ebooks suplementaris",
+  "LabelSettingsBookshelfViewHelp": "Disseny esqueomorf amb prestatgeries de fusta",
+  "LabelSettingsChromecastSupport": "Compatibilitat amb Chromecast",
+  "LabelSettingsDateFormat": "Format de Data",
+  "LabelSettingsDisableWatcher": "Desactivar Watcher",
+  "LabelSettingsDisableWatcherForLibrary": "Desactivar Watcher de Carpetes per a aquesta biblioteca",
+  "LabelSettingsDisableWatcherHelp": "Desactiva la funció d'afegir/actualitzar elements automàticament quan es detectin canvis en els fitxers. *Requereix reiniciar el servidor",
+  "LabelSettingsEnableWatcher": "Habilitar Watcher",
+  "LabelSettingsEnableWatcherForLibrary": "Habilitar Watcher per a la carpeta d'aquesta biblioteca",
+  "LabelSettingsEnableWatcherHelp": "Permet afegir/actualitzar elements automàticament quan es detectin canvis en els fitxers. *Requereix reiniciar el servidor",
+  "LabelSettingsEpubsAllowScriptedContent": "Permetre scripts en epubs",
+  "LabelSettingsEpubsAllowScriptedContentHelp": "Permetre que els fitxers epub executin scripts. Es recomana mantenir aquesta opció desactivada tret que confiïs en l'origen dels fitxers epub.",
+  "LabelSettingsExperimentalFeatures": "Funcions Experimentals",
+  "LabelSettingsExperimentalFeaturesHelp": "Funcions en desenvolupament que es beneficiarien dels teus comentaris i experiències de prova. Feu clic aquí per obrir una conversa a Github.",
+  "LabelShowAll": "Mostra-ho tot",
+  "LabelShowSeconds": "Mostra segons",
+  "LabelShowSubtitles": "Mostra subtítols",
+  "LabelSize": "Mida",
+  "LabelSleepTimer": "Temporitzador de repòs",
+  "LabelSlug": "Slug",
+  "LabelStart": "Inicia",
+  "LabelStartTime": "Hora d'inici",
+  "LabelStarted": "Iniciat",
+  "LabelStartedAt": "Iniciat a",
+  "LabelStatsAudioTracks": "Pistes d'àudio",
+  "LabelStatsAuthors": "Autors",
+  "LabelStatsBestDay": "Millor dia",
+  "LabelStatsDailyAverage": "Mitjana diària",
+  "LabelStatsDays": "Dies",
+  "LabelStatsDaysListened": "Dies escoltats",
+  "LabelStatsHours": "Hores",
+  "LabelStatsInARow": "seguits",
+  "LabelStatsItemsFinished": "Elements acabats",
+  "LabelStatsItemsInLibrary": "Elements a la biblioteca",
+  "LabelStatsMinutes": "minuts",
+  "LabelStatsMinutesListening": "Minuts escoltant",
+  "LabelStatsOverallDays": "Total de dies",
+  "LabelStatsOverallHours": "Total d'hores",
+  "LabelStatsWeekListening": "Temps escoltat aquesta setmana",
+  "LabelSubtitle": "Subtítol",
+  "LabelSupportedFileTypes": "Tipus de fitxers compatibles",
+  "LabelTag": "Etiqueta",
+  "LabelTags": "Etiquetes",
+  "LabelTagsAccessibleToUser": "Etiquetes accessibles per a l'usuari",
+  "LabelTagsNotAccessibleToUser": "Etiquetes no accessibles per a l'usuari",
+  "LabelTasks": "Tasques en execució",
+  "LabelTextEditorBulletedList": "Llista amb punts",
+  "LabelTextEditorLink": "Enllaça",
+  "LabelTextEditorNumberedList": "Llista numerada",
+  "LabelTextEditorUnlink": "Desenllaça",
+  "LabelTheme": "Tema",
+  "LabelThemeDark": "Fosc",
+  "LabelThemeLight": "Clar",
+  "LabelTimeBase": "Temps base",
+  "LabelTimeDurationXHours": "{0} hores",
+  "LabelTimeDurationXMinutes": "{0} minuts",
+  "LabelTimeDurationXSeconds": "{0} segons",
+  "LabelTimeInMinutes": "Temps en minuts",
+  "LabelTimeLeft": "Queden {0}",
+  "LabelTimeListened": "Temps escoltat",
+  "LabelTimeListenedToday": "Temps escoltat avui",
+  "LabelTimeRemaining": "{0} restant",
+  "LabelTimeToShift": "Temps per canviar en segons",
+  "LabelTitle": "Títol",
+  "LabelToolsEmbedMetadata": "Incrusta metadades",
+  "LabelToolsEmbedMetadataDescription": "Incrusta metadades en els fitxers d'àudio, incloent la portada i capítols.",
+  "LabelToolsM4bEncoder": "Codificador M4B",
+  "LabelToolsMakeM4b": "Crea fitxer d'audiollibre M4B",
+  "LabelToolsMakeM4bDescription": "Genera un fitxer d'audiollibre .M4B amb metadades, imatges de portada i capítols incrustats.",
+  "LabelToolsSplitM4b": "Divideix M4B en fitxers MP3",
+  "LabelToolsSplitM4bDescription": "Divideix un M4B en fitxers MP3 i incrusta metadades, imatges de portada i capítols.",
+  "LabelTotalDuration": "Duració total",
+  "LabelTotalTimeListened": "Temps total escoltat",
+  "LabelTrackFromFilename": "Pista des del nom del fitxer",
+  "LabelTrackFromMetadata": "Pista des de metadades",
+  "LabelTracks": "Pistes",
+  "LabelTracksMultiTrack": "Diverses pistes",
+  "LabelTracksNone": "Cap pista",
+  "LabelTracksSingleTrack": "Una pista",
+  "LabelTrailer": "Tràiler",
+  "LabelType": "Tipus",
+  "LabelUnabridged": "No abreujat",
+  "LabelUndo": "Desfés",
+  "LabelUnknown": "Desconegut",
+  "LabelUnknownPublishDate": "Data de publicació desconeguda",
+  "LabelUpdateCover": "Actualitza portada",
+  "LabelUpdateCoverHelp": "Permet sobreescriure les portades existents dels llibres seleccionats quan es trobi una coincidència.",
+  "LabelUpdateDetails": "Actualitza detalls",
+  "LabelUpdateDetailsHelp": "Permet sobreescriure els detalls existents dels llibres seleccionats quan es trobin coincidències.",
+  "LabelUpdatedAt": "Actualitzat a",
+  "LabelUploaderDragAndDrop": "Arrossega i deixa anar fitxers o carpetes",
+  "LabelUploaderDragAndDropFilesOnly": "Arrossega i deixa anar fitxers",
+  "LabelUploaderDropFiles": "Deixa anar els fitxers",
+  "LabelUploaderItemFetchMetadataHelp": "Cerca títol, autor i sèries automàticament",
+  "LabelUseAdvancedOptions": "Utilitza opcions avançades",
+  "LabelUseChapterTrack": "Utilitza pista per capítol",
+  "LabelUseFullTrack": "Utilitza pista completa",
+  "LabelUseZeroForUnlimited": "Utilitza 0 per il·limitat",
+  "LabelUser": "Usuari",
+  "LabelUsername": "Nom d'usuari",
+  "LabelValue": "Valor",
+  "LabelVersion": "Versió",
+  "LabelViewBookmarks": "Mostra marcadors",
+  "LabelViewChapters": "Mostra capítols",
+  "LabelViewPlayerSettings": "Mostra els ajustaments del reproductor",
+  "LabelViewQueue": "Mostra cua del reproductor",
+  "LabelVolume": "Volum",
+  "LabelWebRedirectURLsDescription": "Autoritza aquestes URL al teu proveïdor OAuth per permetre redirecció a l'aplicació web després d'iniciar sessió:",
+  "LabelWebRedirectURLsSubfolder": "Subcarpeta per a URL de redirecció",
+  "LabelWeekdaysToRun": "Executar en dies de la setmana",
+  "LabelXBooks": "{0} llibres",
+  "LabelXItems": "{0} elements",
+  "LabelYearReviewHide": "Oculta resum de l'any",
+  "LabelYearReviewShow": "Mostra resum de l'any",
+  "LabelYourAudiobookDuration": "Duració del teu audiollibre",
+  "LabelYourBookmarks": "Els teus marcadors",
+  "LabelYourPlaylists": "Les teves llistes",
+  "LabelYourProgress": "El teu progrés",
+  "MessageAddToPlayerQueue": "Afegeix a la cua del reproductor",
+  "MessageAppriseDescription": "Per utilitzar aquesta funció, hauràs de tenir l'<a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">API d'Apprise</a> en funcionament o una API que gestioni resultats similars. <br/>La URL de l'API d'Apprise ha de tenir la mateixa ruta d'arxius que on s'envien les notificacions. Per exemple: si la teva API és a <code>http://192.168.1.1:8337</code>, llavors posaries <code>http://192.168.1.1:8337/notify</code>.",
+  "MessageBackupsDescription": "Les còpies de seguretat inclouen: usuaris, progrés dels usuaris, detalls dels elements de la biblioteca, configuració del servidor i imatges a <code>/metadata/items</code> i <code>/metadata/authors</code>. Les còpies de seguretat <strong>NO</strong> inclouen cap fitxer guardat a la carpeta de la teva biblioteca.",
+  "MessageBackupsLocationEditNote": "Nota: Actualitzar la ubicació de la còpia de seguretat no mourà ni modificarà les còpies existents",
+  "MessageBackupsLocationNoEditNote": "Nota: La ubicació de la còpia de seguretat es defineix mitjançant una variable d'entorn i no es pot modificar aquí.",
+  "MessageBackupsLocationPathEmpty": "La ruta de la còpia de seguretat no pot estar buida",
+  "MessageBatchQuickMatchDescription": "La funció \"Troba Ràpid\" intentarà afegir portades i metadades que falten als elements seleccionats. Activa l'opció següent perquè \"Troba Ràpid\" pugui sobreescriure portades i/o metadades existents.",
+  "MessageBookshelfNoCollections": "No tens cap col·lecció",
+  "MessageBookshelfNoRSSFeeds": "Cap font RSS està oberta",
+  "MessageBookshelfNoResultsForFilter": "Cap resultat per al filtre \"{0}: {1}\"",
+  "MessageBookshelfNoResultsForQuery": "Cap resultat per a la consulta",
+  "MessageBookshelfNoSeries": "No tens cap sèrie",
+  "MessageChapterEndIsAfter": "El final del capítol és després del final del teu audiollibre",
+  "MessageChapterErrorFirstNotZero": "El primer capítol ha de començar a 0",
+  "MessageChapterErrorStartGteDuration": "El temps d'inici no és vàlid: ha de ser inferior a la durada de l'audiollibre",
+  "MessageChapterErrorStartLtPrev": "El temps d'inici no és vàlid: ha de ser igual o més gran que el temps d'inici del capítol anterior",
+  "MessageChapterStartIsAfter": "L'inici del capítol és després del final del teu audiollibre",
+  "MessageCheckingCron": "Comprovant cron...",
+  "MessageConfirmCloseFeed": "Estàs segur que vols tancar aquesta font?",
+  "MessageConfirmDeleteBackup": "Estàs segur que vols eliminar la còpia de seguretat {0}?",
+  "MessageConfirmDeleteDevice": "Estàs segur que vols eliminar el lector electrònic \"{0}\"?",
+  "MessageConfirmDeleteFile": "Això eliminarà el fitxer del teu sistema. Estàs segur?",
+  "MessageConfirmDeleteLibrary": "Estàs segur que vols eliminar permanentment la biblioteca \"{0}\"?",
+  "MessageConfirmDeleteLibraryItem": "Això eliminarà l'element de la base de dades i del sistema. Estàs segur?",
+  "MessageConfirmDeleteLibraryItems": "Això eliminarà {0} element(s) de la base de dades i del sistema. Estàs segur?",
+  "MessageConfirmDeleteMetadataProvider": "Estàs segur que vols eliminar el proveïdor de metadades personalitzat \"{0}\"?",
+  "MessageConfirmDeleteNotification": "Estàs segur que vols eliminar aquesta notificació?",
+  "MessageConfirmDeleteSession": "Estàs segur que vols eliminar aquesta sessió?",
+  "MessageConfirmEmbedMetadataInAudioFiles": "Estàs segur que vols incrustar metadades a {0} fitxer(s) d'àudio?",
+  "MessageConfirmForceReScan": "Estàs segur que vols forçar un reescaneig?",
+  "MessageConfirmMarkAllEpisodesFinished": "Estàs segur que vols marcar tots els episodis com a acabats?",
+  "MessageConfirmMarkAllEpisodesNotFinished": "Estàs segur que vols marcar tots els episodis com a no acabats?",
+  "MessageConfirmMarkItemFinished": "Estàs segur que vols marcar \"{0}\" com a acabat?",
+  "MessageConfirmMarkItemNotFinished": "Estàs segur que vols marcar \"{0}\" com a no acabat?",
+  "MessageConfirmMarkSeriesFinished": "Estàs segur que vols marcar tots els llibres d'aquesta sèrie com a acabats?",
+  "MessageConfirmMarkSeriesNotFinished": "Estàs segur que vols marcar tots els llibres d'aquesta sèrie com a no acabats?",
+  "MessageConfirmNotificationTestTrigger": "Vols activar aquesta notificació amb dades de prova?",
+  "MessageConfirmPurgeCache": "Esborrar la memòria cau eliminarà tot el directori localitzat a <code>/metadata/cache</code>. <br /><br />Estàs segur que vols eliminar-lo?",
+  "MessageConfirmPurgeItemsCache": "Esborrar la memòria cau dels elements eliminarà el directori <code>/metadata/cache/items</code>.<br />Estàs segur?",
+  "MessageConfirmQuickEmbed": "Advertència! La integració ràpida no fa còpies de seguretat dels teus fitxers d'àudio. Assegura't d'haver-ne fet una còpia abans. <br><br>Vols continuar?",
+  "MessageConfirmQuickMatchEpisodes": "El reconeixement ràpid sobreescriurà els detalls si es troba una coincidència. Estàs segur?",
+  "MessageConfirmReScanLibraryItems": "Estàs segur que vols reescanejar {0} element(s)?",
+  "MessageConfirmRemoveAllChapters": "Estàs segur que vols eliminar tots els capítols?",
+  "MessageConfirmRemoveAuthor": "Estàs segur que vols eliminar l'autor \"{0}\"?",
+  "MessageConfirmRemoveCollection": "Estàs segur que vols eliminar la col·lecció \"{0}\"?",
+  "MessageConfirmRemoveEpisode": "Estàs segur que vols eliminar l'episodi \"{0}\"?",
+  "MessageConfirmRemoveEpisodes": "Estàs segur que vols eliminar {0} episodis?",
+  "MessageConfirmRemoveListeningSessions": "Estàs segur que vols eliminar {0} sessions d'escolta?",
+  "MessageConfirmRemoveMetadataFiles": "Estàs segur que vols eliminar tots els fitxers de metadades.{0} de les carpetes dels elements de la teva biblioteca?",
+  "MessageConfirmRemoveNarrator": "Estàs segur que vols eliminar el narrador \"{0}\"?",
+  "MessageConfirmRemovePlaylist": "Estàs segur que vols eliminar la llista de reproducció \"{0}\"?",
+  "MessageConfirmRenameGenre": "Estàs segur que vols canviar el gènere \"{0}\" a \"{1}\" per a tots els elements?",
+  "MessageConfirmRenameGenreMergeNote": "Nota: Aquest gènere ja existeix, i es fusionarà.",
+  "MessageConfirmRenameGenreWarning": "Advertència! Ja existeix un gènere similar \"{0}\".",
+  "MessageConfirmRenameTag": "Estàs segur que vols canviar l'etiqueta \"{0}\" a \"{1}\" per a tots els elements?",
+  "MessageConfirmRenameTagMergeNote": "Nota: Aquesta etiqueta ja existeix, i es fusionarà.",
+  "MessageConfirmRenameTagWarning": "Advertència! Ja existeix una etiqueta similar \"{0}\".",
+  "MessageConfirmResetProgress": "Estàs segur que vols reiniciar el teu progrés?",
+  "MessageConfirmSendEbookToDevice": "Estàs segur que vols enviar {0} ebook(s) \"{1}\" al dispositiu \"{2}\"?",
+  "MessageConfirmUnlinkOpenId": "Estàs segur que vols desvincular aquest usuari d'OpenID?",
+  "MessageDownloadingEpisode": "Descarregant capítol",
+  "MessageDragFilesIntoTrackOrder": "Arrossega els fitxers en l'ordre correcte de les pistes",
+  "MessageEmbedFailed": "Error en incrustar!",
+  "MessageEmbedFinished": "Incrustació acabada!",
+  "MessageEmbedQueue": "En cua per incrustar metadades ({0} en cua)",
+  "MessageMarkAsFinished": "Marcar com acabat",
+  "MessageMarkAsNotFinished": "Marcar com no acabat",
+  "MessageMatchBooksDescription": "S'intentarà fer coincidir els llibres de la biblioteca amb un llibre del proveïdor de cerca seleccionat, i s'ompliran els detalls buits i la portada. No sobreescriu els detalls.",
+  "MessageNoAudioTracks": "Sense pistes d'àudio",
+  "MessageNoAuthors": "Sense autors",
+  "MessageNoBackups": "Sense còpies de seguretat",
+  "MessageNoBookmarks": "Sense marcadors",
+  "MessageNoChapters": "Sense capítols",
+  "MessageNoCollections": "Sense col·leccions",
+  "MessageNoCoversFound": "Cap portada trobada",
+  "MessageNoDescription": "Sense descripció",
+  "MessageNoDevices": "Sense dispositius",
+  "MessageNoDownloadsInProgress": "No hi ha descàrregues en curs",
+  "MessageNoDownloadsQueued": "Sense cua de descàrrega",
+  "MessageNoEpisodeMatchesFound": "No s'han trobat episodis que coincideixin",
+  "MessageNoEpisodes": "Sense episodis",
+  "MessageNoFoldersAvailable": "No hi ha carpetes disponibles",
+  "MessageNoGenres": "Sense gèneres",
+  "MessageNoIssues": "Sense problemes",
+  "MessageNoItems": "Sense elements",
+  "MessageNoItemsFound": "Cap element trobat",
+  "MessageNoListeningSessions": "Sense sessions escoltades",
+  "MessageNoLogs": "Sense registres",
+  "MessageNoMediaProgress": "Sense progrés multimèdia",
+  "MessageNoNotifications": "Sense notificacions",
+  "MessageNoPodcastFeed": "Podcast no vàlid: sense font",
+  "MessageNoPodcastsFound": "Cap podcast trobat",
+  "MessageNoResults": "Sense resultats",
+  "MessageNoSearchResultsFor": "No hi ha resultats per a la cerca \"{0}\"",
+  "MessageNoSeries": "Sense sèries",
+  "MessageNoTags": "Sense etiquetes",
+  "MessageNoTasksRunning": "Sense tasques en execució",
+  "MessageNoUpdatesWereNecessary": "No calien actualitzacions",
+  "MessageNoUserPlaylists": "No tens cap llista de reproducció",
+  "MessageNotYetImplemented": "Encara no implementat",
+  "MessageOpmlPreviewNote": "Nota: Aquesta és una vista prèvia de l'arxiu OPML analitzat. El títol real del podcast s'obtindrà del canal RSS.",
+  "MessageOr": "o",
+  "MessagePauseChapter": "Pausar la reproducció del capítol",
+  "MessagePlayChapter": "Escoltar l'inici del capítol",
+  "MessagePlaylistCreateFromCollection": "Crear una llista de reproducció a partir d'una col·lecció",
+  "MessagePleaseWait": "Espera si us plau...",
+  "MessagePodcastHasNoRSSFeedForMatching": "El podcast no té una URL de font RSS que es pugui utilitzar",
+  "MessagePodcastSearchField": "Introdueix el terme de cerca o la URL de la font RSS",
+  "MessageQuickEmbedInProgress": "Integració ràpida en procés",
+  "MessageQuickEmbedQueue": "En cua per a inserció ràpida ({0} en cua)",
+  "MessageQuickMatchAllEpisodes": "Combina ràpidament tots els episodis",
+  "MessageQuickMatchDescription": "Omple detalls d'elements buits i portades amb els primers resultats de '{0}'. No sobreescriu els detalls tret que l'opció \"Preferir metadades trobades\" del servidor estigui habilitada.",
+  "MessageRemoveChapter": "Eliminar capítols",
+  "MessageRemoveEpisodes": "Eliminar {0} episodi(s)",
+  "MessageRemoveFromPlayerQueue": "Eliminar de la cua del reproductor",
+  "MessageRemoveUserWarning": "Estàs segur que vols eliminar l'usuari \"{0}\"?",
+  "MessageReportBugsAndContribute": "Informa d'errors, sol·licita funcions i contribueix a",
+  "MessageResetChaptersConfirm": "Estàs segur que vols desfer els canvis i revertir els capítols al seu estat original?",
+  "MessageRestoreBackupConfirm": "Estàs segur que vols restaurar la còpia de seguretat creada a",
+  "MessageRestoreBackupWarning": "Restaurar sobreescriurà tota la base de dades situada a /config i les imatges de portades a /metadata/items i /metadata/authors.<br /><br />La còpia de seguretat no modifica cap fitxer a les carpetes de la teva biblioteca. Si has activat l'opció del servidor per guardar portades i metadades a les carpetes de la biblioteca, aquests fitxers no es guarden ni sobreescriuen.<br /><br />Tots els clients que utilitzin el teu servidor s'actualitzaran automàticament.",
+  "MessageSearchResultsFor": "Resultats de la cerca de",
+  "MessageSelected": "{0} seleccionat(s)",
+  "MessageServerCouldNotBeReached": "No es va poder establir la connexió amb el servidor",
+  "MessageSetChaptersFromTracksDescription": "Establir capítols utilitzant cada fitxer d'àudio com un capítol i el títol del capítol com el nom del fitxer d'àudio",
+  "MessageShareExpirationWillBe": "La caducitat serà <strong>{0}</strong>",
+  "MessageShareExpiresIn": "Caduca en {0}",
+  "MessageShareURLWillBe": "La URL per compartir serà <strong>{0}</strong>",
+  "MessageStartPlaybackAtTime": "Començar la reproducció per a \"{0}\" a {1}?",
+  "MessageTaskAudioFileNotWritable": "El fitxer d'àudio \"{0}\" no es pot escriure",
+  "MessageTaskCanceledByUser": "Tasca cancel·lada per l'usuari",
+  "MessageTaskDownloadingEpisodeDescription": "Descarregant l'episodi \"{0}\"",
+  "MessageTaskEmbeddingMetadata": "Inserint metadades",
+  "MessageTaskEmbeddingMetadataDescription": "Inserint metadades en l'audiollibre \"{0}\"",
+  "MessageTaskEncodingM4b": "Codificant M4B",
+  "MessageTaskEncodingM4bDescription": "Codificant l'audiollibre \"{0}\" en un únic fitxer M4B",
+  "MessageTaskFailed": "Fallada",
+  "MessageTaskFailedToBackupAudioFile": "Error en fer una còpia de seguretat del fitxer d'àudio \"{0}\"",
+  "MessageTaskFailedToCreateCacheDirectory": "Error en crear el directori de la memòria cau",
+  "MessageTaskFailedToEmbedMetadataInFile": "Error en incrustar metadades en el fitxer \"{0}\"",
+  "MessageTaskFailedToMergeAudioFiles": "Error en fusionar fitxers d'àudio",
+  "MessageTaskFailedToMoveM4bFile": "Error en moure el fitxer M4B",
+  "MessageTaskFailedToWriteMetadataFile": "Error en escriure el fitxer de metadades",
+  "MessageTaskMatchingBooksInLibrary": "Coincidint llibres a la biblioteca \"{0}\"",
+  "MessageTaskNoFilesToScan": "Sense fitxers per escanejar",
+  "MessageTaskOpmlImport": "Importar OPML",
+  "MessageTaskOpmlImportDescription": "Creant podcasts a partir de {0} fonts RSS",
+  "MessageTaskOpmlImportFeed": "Importació de feed OPML",
+  "MessageTaskOpmlImportFeedDescription": "Importació del feed RSS \"{0}\"",
+  "MessageTaskOpmlImportFeedFailed": "No es pot obtenir el podcast",
+  "MessageTaskOpmlImportFeedPodcastDescription": "Creant el podcast \"{0}\"",
+  "MessageTaskOpmlImportFeedPodcastExists": "El podcast ja existeix a la ruta",
+  "MessageTaskOpmlImportFeedPodcastFailed": "Error en crear el podcast",
+  "MessageTaskOpmlImportFinished": "Afegit {0} podcasts",
+  "MessageTaskOpmlParseFailed": "No s'ha pogut analitzar el fitxer OPML",
+  "MessageTaskOpmlParseFastFail": "No s'ha trobat l'etiqueta <opml> o <outline> al fitxer OPML",
+  "MessageTaskOpmlParseNoneFound": "No s'han trobat fonts al fitxer OPML",
+  "MessageTaskScanItemsAdded": "{0} afegit",
+  "MessageTaskScanItemsMissing": "{0} faltant",
+  "MessageTaskScanItemsUpdated": "{0} actualitzat",
+  "MessageTaskScanNoChangesNeeded": "No calen canvis",
+  "MessageTaskScanningFileChanges": "Escanejant canvis al fitxer en \"{0}\"",
+  "MessageTaskScanningLibrary": "Escanejant la biblioteca \"{0}\"",
+  "MessageTaskTargetDirectoryNotWritable": "El directori de destinació no es pot escriure",
+  "MessageThinking": "Pensant...",
+  "MessageUploaderItemFailed": "Error en pujar",
+  "MessageUploaderItemSuccess": "Pujada amb èxit!",
+  "MessageUploading": "Pujant...",
+  "MessageValidCronExpression": "Expressió de cron vàlida",
+  "MessageWatcherIsDisabledGlobally": "El watcher està desactivat globalment a la configuració del servidor",
+  "MessageXLibraryIsEmpty": "La biblioteca {0} està buida!",
+  "MessageYourAudiobookDurationIsLonger": "La durada del teu audiollibre és més llarga que la durada trobada",
+  "MessageYourAudiobookDurationIsShorter": "La durada del teu audiollibre és més curta que la durada trobada",
+  "NoteChangeRootPassword": "L'usuari Root és l'únic usuari que pot no tenir una contrasenya",
+  "NoteChapterEditorTimes": "Nota: El temps d'inici del primer capítol ha de romandre a 0:00, i el temps d'inici de l'últim capítol no pot superar la durada de l'audiollibre.",
+  "NoteFolderPicker": "Nota: Les carpetes ja assignades no es mostraran",
+  "NoteRSSFeedPodcastAppsHttps": "Advertència: La majoria d'aplicacions de podcast requereixen que la URL de la font RSS utilitzi HTTPS",
+  "NoteRSSFeedPodcastAppsPubDate": "Advertència: Un o més dels teus episodis no tenen data de publicació. Algunes aplicacions de podcast ho requereixen.",
+  "NoteUploaderFoldersWithMediaFiles": "Les carpetes amb fitxers multimèdia es gestionaran com a elements separats a la biblioteca.",
+  "NoteUploaderOnlyAudioFiles": "Si només puges fitxers d'àudio, cada fitxer es gestionarà com un audiollibre separat.",
+  "NoteUploaderUnsupportedFiles": "Els fitxers no compatibles seran ignorats. Si selecciona o arrossega una carpeta, els fitxers que no estiguin dins d'una subcarpeta seran ignorats.",
+  "NotificationOnBackupCompletedDescription": "S'activa quan es completa una còpia de seguretat",
+  "NotificationOnBackupFailedDescription": "S'activa quan falla una còpia de seguretat",
+  "NotificationOnEpisodeDownloadedDescription": "S'activa quan es descarrega automàticament un episodi d'un podcast",
+  "NotificationOnTestDescription": "Esdeveniment per provar el sistema de notificacions",
+  "PlaceholderNewCollection": "Nou nom de la col·lecció",
+  "PlaceholderNewFolderPath": "Nova ruta de carpeta",
+  "PlaceholderNewPlaylist": "Nou nom de la llista de reproducció",
+  "PlaceholderSearch": "Cerca...",
+  "PlaceholderSearchEpisode": "Cerca d'episodis...",
+  "StatsAuthorsAdded": "autors afegits",
+  "StatsBooksAdded": "llibres afegits",
+  "StatsBooksAdditional": "Algunes addicions inclouen…",
+  "StatsBooksFinished": "llibres acabats",
+  "StatsBooksFinishedThisYear": "Alguns llibres acabats aquest any…",
+  "StatsBooksListenedTo": "llibres escoltats",
+  "StatsCollectionGrewTo": "La teva col·lecció de llibres ha crescut fins a…",
+  "StatsSessions": "sessions",
+  "StatsSpentListening": "dedicat a escoltar",
+  "StatsTopAuthor": "AUTOR DESTACAT",
+  "StatsTopAuthors": "AUTORS DESTACATS",
+  "StatsTopGenre": "GÈNERE PRINCIPAL",
+  "StatsTopGenres": "GÈNERES PRINCIPALS",
+  "StatsTopMonth": "DESTACAT DEL MES",
+  "StatsTopNarrator": "NARRADOR DESTACAT",
+  "StatsTopNarrators": "NARRADORS DESTACATS",
+  "StatsTotalDuration": "Amb una durada total de…",
+  "StatsYearInReview": "RESUM DE L'ANY",
+  "ToastAccountUpdateSuccess": "Compte actualitzat",
+  "ToastAppriseUrlRequired": "Cal introduir una URL de Apprise",
+  "ToastAsinRequired": "ASIN requerit",
+  "ToastAuthorImageRemoveSuccess": "S'ha eliminat la imatge de l'autor",
+  "ToastAuthorNotFound": "No s'ha trobat l'autor \"{0}\"",
+  "ToastAuthorRemoveSuccess": "Autor eliminat",
+  "ToastAuthorSearchNotFound": "No s'ha trobat l'autor",
+  "ToastAuthorUpdateMerged": "Autor combinat",
+  "ToastAuthorUpdateSuccess": "Autor actualitzat",
+  "ToastAuthorUpdateSuccessNoImageFound": "Autor actualitzat (Imatge no trobada)",
+  "ToastBackupAppliedSuccess": "Còpia de seguretat aplicada",
+  "ToastBackupCreateFailed": "Error en crear la còpia de seguretat",
+  "ToastBackupCreateSuccess": "Còpia de seguretat creada",
+  "ToastBackupDeleteFailed": "Error en eliminar la còpia de seguretat",
+  "ToastBackupDeleteSuccess": "Còpia de seguretat eliminada",
+  "ToastBackupInvalidMaxKeep": "Nombre no vàlid de còpies de seguretat a conservar",
+  "ToastBackupInvalidMaxSize": "Mida màxima de còpia de seguretat no vàlida",
+  "ToastBackupRestoreFailed": "Error en restaurar la còpia de seguretat",
+  "ToastBackupUploadFailed": "Error en carregar la còpia de seguretat",
+  "ToastBackupUploadSuccess": "Còpia de seguretat carregada",
+  "ToastBatchDeleteFailed": "Error en l'eliminació per lots",
+  "ToastBatchDeleteSuccess": "Eliminació per lots correcte",
+  "ToastBatchQuickMatchFailed": "Error en la sincronització ràpida per lots!",
+  "ToastBatchQuickMatchStarted": "S'ha iniciat la sincronització ràpida per lots de {0} llibres!",
+  "ToastBatchUpdateFailed": "Error en l'actualització massiva",
+  "ToastBatchUpdateSuccess": "Actualització massiva completada",
+  "ToastBookmarkCreateFailed": "Error en crear marcador",
+  "ToastBookmarkCreateSuccess": "Marcador afegit",
+  "ToastBookmarkRemoveSuccess": "Marcador eliminat",
+  "ToastBookmarkUpdateSuccess": "Marcador actualitzat",
+  "ToastCachePurgeFailed": "Error en purgar la memòria cau",
+  "ToastCachePurgeSuccess": "Memòria cau purgada amb èxit",
+  "ToastChaptersHaveErrors": "Els capítols tenen errors",
+  "ToastChaptersMustHaveTitles": "Els capítols han de tenir un títol",
+  "ToastChaptersRemoved": "Capítols eliminats",
+  "ToastChaptersUpdated": "Capítols actualitzats",
+  "ToastCollectionItemsAddFailed": "Error en afegir elements a la col·lecció",
+  "ToastCollectionItemsAddSuccess": "Elements afegits a la col·lecció",
+  "ToastCollectionItemsRemoveSuccess": "Elements eliminats de la col·lecció",
+  "ToastCollectionRemoveSuccess": "Col·lecció eliminada",
+  "ToastCollectionUpdateSuccess": "Col·lecció actualitzada",
+  "ToastCoverUpdateFailed": "Error en actualitzar la portada",
+  "ToastDeleteFileFailed": "Error en eliminar l'arxiu",
+  "ToastDeleteFileSuccess": "Arxiu eliminat",
+  "ToastDeviceAddFailed": "Error en afegir el dispositiu",
+  "ToastDeviceNameAlreadyExists": "Ja existeix un dispositiu amb aquest nom",
+  "ToastDeviceTestEmailFailed": "Error en enviar el correu de prova",
+  "ToastDeviceTestEmailSuccess": "Correu de prova enviat",
+  "ToastEmailSettingsUpdateSuccess": "Configuració de correu electrònic actualitzada",
+  "ToastEncodeCancelFailed": "No s'ha pogut cancel·lar la codificació",
+  "ToastEncodeCancelSucces": "Codificació cancel·lada",
+  "ToastEpisodeDownloadQueueClearFailed": "No s'ha pogut buidar la cua de descàrregues",
+  "ToastEpisodeDownloadQueueClearSuccess": "Cua de descàrregues buidada",
+  "ToastEpisodeUpdateSuccess": "{0} episodi(s) actualitzat(s)",
+  "ToastErrorCannotShare": "No es pot compartir de manera nativa en aquest dispositiu",
+  "ToastFailedToLoadData": "Error en carregar les dades",
+  "ToastFailedToMatch": "Error en emparellar",
+  "ToastFailedToShare": "Error en compartir",
+  "ToastFailedToUpdate": "Error en actualitzar",
+  "ToastInvalidImageUrl": "URL de la imatge no vàlida",
+  "ToastInvalidMaxEpisodesToDownload": "Nombre màxim d'episodis per descarregar no vàlid",
+  "ToastInvalidUrl": "URL no vàlida",
+  "ToastItemCoverUpdateSuccess": "Portada de l'element actualitzada",
+  "ToastItemDeletedFailed": "Error en eliminar l'element",
+  "ToastItemDeletedSuccess": "Element eliminat",
+  "ToastItemDetailsUpdateSuccess": "Detalls de l'element actualitzats",
+  "ToastItemMarkedAsFinishedFailed": "Error en marcar com a acabat",
+  "ToastItemMarkedAsFinishedSuccess": "Element marcat com a acabat",
+  "ToastItemMarkedAsNotFinishedFailed": "Error en marcar com a no acabat",
+  "ToastItemMarkedAsNotFinishedSuccess": "Element marcat com a no acabat",
+  "ToastItemUpdateSuccess": "Element actualitzat",
+  "ToastLibraryCreateFailed": "Error en crear la biblioteca",
+  "ToastLibraryCreateSuccess": "Biblioteca \"{0}\" creada",
+  "ToastLibraryDeleteFailed": "Error en eliminar la biblioteca",
+  "ToastLibraryDeleteSuccess": "Biblioteca eliminada",
+  "ToastLibraryScanFailedToStart": "Error en iniciar l'escaneig",
+  "ToastLibraryScanStarted": "S'ha iniciat l'escaneig de la biblioteca",
+  "ToastLibraryUpdateSuccess": "Biblioteca \"{0}\" actualitzada",
+  "ToastMatchAllAuthorsFailed": "No coincideix amb tots els autors",
+  "ToastMetadataFilesRemovedError": "Error en eliminar metadades de {0} arxius",
+  "ToastMetadataFilesRemovedNoneFound": "No s'han trobat metadades en {0} arxius",
+  "ToastMetadataFilesRemovedNoneRemoved": "Cap metadada eliminada en {0} arxius",
+  "ToastMetadataFilesRemovedSuccess": "{0} metadades eliminades en {1} arxius",
+  "ToastMustHaveAtLeastOnePath": "Ha de tenir almenys una ruta",
+  "ToastNameEmailRequired": "El nom i el correu electrònic són obligatoris",
+  "ToastNameRequired": "Nom obligatori",
+  "ToastNewEpisodesFound": "{0} episodi(s) nou(s) trobat(s)",
+  "ToastNewUserCreatedFailed": "Error en crear el compte: \"{0}\"",
+  "ToastNewUserCreatedSuccess": "Nou compte creat",
+  "ToastNewUserLibraryError": "Ha de seleccionar almenys una biblioteca",
+  "ToastNewUserPasswordError": "Necessites una contrasenya, només el root pot estar sense contrasenya",
+  "ToastNewUserTagError": "Selecciona almenys una etiqueta",
+  "ToastNewUserUsernameError": "Introdueix un nom d'usuari",
+  "ToastNoNewEpisodesFound": "No s'han trobat nous episodis",
+  "ToastNoUpdatesNecessary": "No cal actualitzar",
+  "ToastNotificationCreateFailed": "Error en crear la notificació",
+  "ToastNotificationDeleteFailed": "Error en eliminar la notificació",
+  "ToastNotificationFailedMaximum": "El nombre màxim d'intents fallits ha de ser ≥ 0",
+  "ToastNotificationQueueMaximum": "La cua de notificació màxima ha de ser ≥ 0",
+  "ToastNotificationSettingsUpdateSuccess": "Configuració de notificació actualitzada",
+  "ToastNotificationTestTriggerFailed": "No s'ha pogut activar la notificació de prova",
+  "ToastNotificationTestTriggerSuccess": "Notificació de prova activada",
+  "ToastNotificationUpdateSuccess": "Notificació actualitzada",
+  "ToastPlaylistCreateFailed": "Error en crear la llista de reproducció",
+  "ToastPlaylistCreateSuccess": "Llista de reproducció creada",
+  "ToastPlaylistRemoveSuccess": "Llista de reproducció eliminada",
+  "ToastPlaylistUpdateSuccess": "Llista de reproducció actualitzada",
+  "ToastPodcastCreateFailed": "Error en crear el podcast",
+  "ToastPodcastCreateSuccess": "Podcast creat",
+  "ToastPodcastGetFeedFailed": "No s'ha pogut obtenir el podcast",
+  "ToastPodcastNoEpisodesInFeed": "No s'han trobat episodis en el feed RSS",
+  "ToastPodcastNoRssFeed": "El podcast no té un feed RSS",
+  "ToastProgressIsNotBeingSynced": "El progrés no s'està sincronitzant, reinicia la reproducció",
+  "ToastProviderCreatedFailed": "Error en afegir el proveïdor",
+  "ToastProviderCreatedSuccess": "Nou proveïdor afegit",
+  "ToastProviderNameAndUrlRequired": "Nom i URL obligatoris",
+  "ToastProviderRemoveSuccess": "Proveïdor eliminat",
+  "ToastRSSFeedCloseFailed": "Error en tancar el feed RSS",
+  "ToastRSSFeedCloseSuccess": "Feed RSS tancat",
+  "ToastRemoveFailed": "Error en eliminar",
+  "ToastRemoveItemFromCollectionFailed": "Error en eliminar l'element de la col·lecció",
+  "ToastRemoveItemFromCollectionSuccess": "Element eliminat de la col·lecció",
+  "ToastRemoveItemsWithIssuesFailed": "Error en eliminar elements incorrectes de la biblioteca",
+  "ToastRemoveItemsWithIssuesSuccess": "S'han eliminat els elements incorrectes de la biblioteca",
+  "ToastRenameFailed": "Error en canviar el nom",
+  "ToastRescanFailed": "Error en reescanejar per a {0}",
+  "ToastRescanRemoved": "Element reescanejat eliminat",
+  "ToastRescanUpToDate": "Reescaneig completat, l'element ja estava actualitzat",
+  "ToastRescanUpdated": "Reescaneig completat, l'element ha estat actualitzat",
+  "ToastScanFailed": "No s'ha pogut escanejar l'element de la biblioteca",
+  "ToastSelectAtLeastOneUser": "Selecciona almenys un usuari",
+  "ToastSendEbookToDeviceFailed": "Error en enviar l'ebook al dispositiu",
+  "ToastSendEbookToDeviceSuccess": "Ebook enviat al dispositiu \"{0}\"",
+  "ToastSeriesUpdateFailed": "Error en actualitzar la sèrie",
+  "ToastSeriesUpdateSuccess": "Sèrie actualitzada",
+  "ToastServerSettingsUpdateSuccess": "Configuració del servidor actualitzada",
+  "ToastSessionCloseFailed": "Error en tancar la sessió",
+  "ToastSessionDeleteFailed": "Error en eliminar la sessió",
+  "ToastSessionDeleteSuccess": "Sessió eliminada",
+  "ToastSleepTimerDone": "Temporitzador d'apagada activat... zZzzZz",
+  "ToastSlugMustChange": "L'slug conté caràcters no vàlids",
+  "ToastSlugRequired": "Slug obligatori",
+  "ToastSocketConnected": "Socket connectat",
+  "ToastSocketDisconnected": "Socket desconnectat",
+  "ToastSocketFailedToConnect": "Error en connectar al Socket",
+  "ToastSortingPrefixesEmptyError": "Cal tenir almenys 1 prefix per ordenar",
+  "ToastSortingPrefixesUpdateSuccess": "Prefixos d'ordenació actualitzats ({0} elements)",
+  "ToastTitleRequired": "Títol obligatori",
+  "ToastUnknownError": "Error desconegut",
+  "ToastUnlinkOpenIdFailed": "Error en desvincular l'usuari d'OpenID",
+  "ToastUnlinkOpenIdSuccess": "Usuari desvinculat d'OpenID",
+  "ToastUserDeleteFailed": "Error en eliminar l'usuari",
+  "ToastUserDeleteSuccess": "Usuari eliminat",
+  "ToastUserPasswordChangeSuccess": "Contrasenya canviada correctament",
+  "ToastUserPasswordMismatch": "Les contrasenyes no coincideixen",
+  "ToastUserPasswordMustChange": "La nova contrasenya no pot ser igual a l'anterior",
+  "ToastUserRootRequireName": "Cal introduir un nom d'usuari root"
+}
+
+

From 7486d6345dd03357a6e069bd789cdaad5da785c2 Mon Sep 17 00:00:00 2001
From: Vito0912 <86927734+Vito0912@users.noreply.github.com>
Date: Sat, 7 Dec 2024 09:34:06 +0100
Subject: [PATCH 006/143] Resolved a server crash when a playback session
 lacked associated media metadata.

---
 server/utils/queries/userStats.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/utils/queries/userStats.js b/server/utils/queries/userStats.js
index 76b69ed7..fbba7129 100644
--- a/server/utils/queries/userStats.js
+++ b/server/utils/queries/userStats.js
@@ -127,20 +127,20 @@ module.exports = {
           bookListeningMap[ls.displayTitle] += listeningSessionListeningTime
         }
 
-        const authors = ls.mediaMetadata.authors || []
+        const authors = ls.mediaMetadata?.authors || []
         authors.forEach((au) => {
           if (!authorListeningMap[au.name]) authorListeningMap[au.name] = 0
           authorListeningMap[au.name] += listeningSessionListeningTime
         })
 
-        const narrators = ls.mediaMetadata.narrators || []
+        const narrators = ls.mediaMetadata?.narrators || []
         narrators.forEach((narrator) => {
           if (!narratorListeningMap[narrator]) narratorListeningMap[narrator] = 0
           narratorListeningMap[narrator] += listeningSessionListeningTime
         })
 
         // Filter out bad genres like "audiobook" and "audio book"
-        const genres = (ls.mediaMetadata.genres || []).filter((g) => g && !g.toLowerCase().includes('audiobook') && !g.toLowerCase().includes('audio book'))
+        const genres = (ls.mediaMetadata?.genres || []).filter((g) => g && !g.toLowerCase().includes('audiobook') && !g.toLowerCase().includes('audio book'))
         genres.forEach((genre) => {
           if (!genreListeningMap[genre]) genreListeningMap[genre] = 0
           genreListeningMap[genre] += listeningSessionListeningTime

From 9b8e059efe68bb21500f2b84de36f54d5750ba97 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sat, 7 Dec 2024 19:27:37 +0200
Subject: [PATCH 007/143] Remove serverAddress from Feeds and FeedEpisodes URLs

---
 .../modals/rssfeed/OpenCloseModal.vue         |   9 +-
 .../modals/rssfeed/ViewFeedModal.vue          |   7 +-
 client/pages/config/rss-feeds.vue             |   2 +-
 server/Server.js                              |   4 +
 server/managers/RssFeedManager.js             |   2 +-
 .../v2.17.5-remove-host-from-feed-urls.js     |  74 +++++++
 server/objects/Feed.js                        |  30 +--
 server/objects/FeedEpisode.js                 |  16 +-
 server/objects/FeedMeta.js                    |  32 ++-
 ...v2.17.5-remove-host-from-feed-urls.test.js | 202 ++++++++++++++++++
 10 files changed, 331 insertions(+), 47 deletions(-)
 create mode 100644 server/migrations/v2.17.5-remove-host-from-feed-urls.js
 create mode 100644 test/server/migrations/v2.17.5-remove-host-from-feed-urls.test.js

diff --git a/client/components/modals/rssfeed/OpenCloseModal.vue b/client/components/modals/rssfeed/OpenCloseModal.vue
index 53542cf5..4eff9401 100644
--- a/client/components/modals/rssfeed/OpenCloseModal.vue
+++ b/client/components/modals/rssfeed/OpenCloseModal.vue
@@ -10,9 +10,9 @@
         <p class="text-lg font-semibold mb-4">{{ $strings.HeaderRSSFeedIsOpen }}</p>
 
         <div class="w-full relative">
-          <ui-text-input v-model="currentFeed.feedUrl" readonly />
+          <ui-text-input :value="feedUrl" readonly />
 
-          <span class="material-symbols absolute right-2 bottom-2 p-0.5 text-base transition-transform duration-100 text-gray-300 hover:text-white transform hover:scale-125 cursor-pointer" @click="copyToClipboard(currentFeed.feedUrl)">content_copy</span>
+          <span class="material-symbols absolute right-2 bottom-2 p-0.5 text-base transition-transform duration-100 text-gray-300 hover:text-white transform hover:scale-125 cursor-pointer" @click="copyToClipboard(feedUrl)">content_copy</span>
         </div>
 
         <div v-if="currentFeed.meta" class="mt-5">
@@ -111,8 +111,11 @@ export default {
     userIsAdminOrUp() {
       return this.$store.getters['user/getIsAdminOrUp']
     },
+    feedUrl() {
+      return this.currentFeed ? `${window.origin}${this.$config.routerBasePath}${this.currentFeed.feedUrl}` : ''
+    },
     demoFeedUrl() {
-      return `${window.origin}/feed/${this.newFeedSlug}`
+      return `${window.origin}${this.$config.routerBasePath}/feed/${this.newFeedSlug}`
     },
     isHttp() {
       return window.origin.startsWith('http://')
diff --git a/client/components/modals/rssfeed/ViewFeedModal.vue b/client/components/modals/rssfeed/ViewFeedModal.vue
index cd06350b..70412517 100644
--- a/client/components/modals/rssfeed/ViewFeedModal.vue
+++ b/client/components/modals/rssfeed/ViewFeedModal.vue
@@ -5,8 +5,8 @@
         <p class="text-lg font-semibold mb-4">{{ $strings.HeaderRSSFeedGeneral }}</p>
 
         <div class="w-full relative">
-          <ui-text-input v-model="feed.feedUrl" readonly />
-          <span class="material-symbols absolute right-2 bottom-2 p-0.5 text-base transition-transform duration-100 text-gray-300 hover:text-white transform hover:scale-125 cursor-pointer" @click="copyToClipboard(feed.feedUrl)">content_copy</span>
+          <ui-text-input :value="feedUrl" readonly />
+          <span class="material-symbols absolute right-2 bottom-2 p-0.5 text-base transition-transform duration-100 text-gray-300 hover:text-white transform hover:scale-125 cursor-pointer" @click="copyToClipboard(feedUrl)">content_copy</span>
         </div>
 
         <div v-if="feed.meta" class="mt-5">
@@ -70,6 +70,9 @@ export default {
     },
     _feed() {
       return this.feed || {}
+    },
+    feedUrl() {
+      return this.feed ? `${window.origin}${this.$config.routerBasePath}${this.feed.feedUrl}` : ''
     }
   },
   methods: {
diff --git a/client/pages/config/rss-feeds.vue b/client/pages/config/rss-feeds.vue
index 68117a85..039e9a0d 100644
--- a/client/pages/config/rss-feeds.vue
+++ b/client/pages/config/rss-feeds.vue
@@ -126,7 +126,7 @@ export default {
     },
     coverUrl(feed) {
       if (!feed.coverPath) return `${this.$config.routerBasePath}/Logo.png`
-      return `${feed.feedUrl}/cover`
+      return `${this.$config.routerBasePath}${feed.feedUrl}/cover`
     },
     async loadFeeds() {
       const data = await this.$axios.$get(`/api/feeds`).catch((err) => {
diff --git a/server/Server.js b/server/Server.js
index cd96733e..dfcb474a 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -253,6 +253,10 @@ class Server {
     // if RouterBasePath is set, modify all requests to include the base path
     if (global.RouterBasePath) {
       app.use((req, res, next) => {
+        const host = req.get('host')
+        const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http'
+        const prefix = req.url.startsWith(global.RouterBasePath) ? global.RouterBasePath : ''
+        req.originalHostPrefix = `${protocol}://${host}${prefix}`
         if (!req.url.startsWith(global.RouterBasePath)) {
           req.url = `${global.RouterBasePath}${req.url}`
         }
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 7716440d..8984a39b 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -162,7 +162,7 @@ class RssFeedManager {
       }
     }
 
-    const xml = feed.buildXml()
+    const xml = feed.buildXml(req.originalHostPrefix)
     res.set('Content-Type', 'text/xml')
     res.send(xml)
   }
diff --git a/server/migrations/v2.17.5-remove-host-from-feed-urls.js b/server/migrations/v2.17.5-remove-host-from-feed-urls.js
new file mode 100644
index 00000000..e08877f2
--- /dev/null
+++ b/server/migrations/v2.17.5-remove-host-from-feed-urls.js
@@ -0,0 +1,74 @@
+/**
+ * @typedef MigrationContext
+ * @property {import('sequelize').QueryInterface} queryInterface - a suquelize QueryInterface object.
+ * @property {import('../Logger')} logger - a Logger object.
+ *
+ * @typedef MigrationOptions
+ * @property {MigrationContext} context - an object containing the migration context.
+ */
+
+const migrationVersion = '2.17.5'
+const migrationName = `${migrationVersion}-remove-host-from-feed-urls`
+const loggerPrefix = `[${migrationVersion} migration]`
+
+/**
+ * This upward migration removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables.
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function up({ context: { queryInterface, logger } }) {
+  // Upwards migration script
+  logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
+
+  logger.info(`${loggerPrefix} Removing serverAddress from Feeds table URLs`)
+  await queryInterface.sequelize.query(`
+    UPDATE Feeds
+    SET feedUrl = REPLACE(feedUrl, COALESCE(serverAddress, ''), ''),
+        imageUrl = REPLACE(imageUrl, COALESCE(serverAddress, ''), ''),
+        siteUrl = REPLACE(siteUrl, COALESCE(serverAddress, ''), '');
+  `)
+  logger.info(`${loggerPrefix} Removed serverAddress from Feeds table URLs`)
+
+  logger.info(`${loggerPrefix} Removing serverAddress from FeedEpisodes table URLs`)
+  await queryInterface.sequelize.query(`
+    UPDATE FeedEpisodes
+      SET siteUrl = REPLACE(siteUrl, (SELECT COALESCE(serverAddress, '') FROM Feeds WHERE Feeds.id = FeedEpisodes.feedId), ''),
+          enclosureUrl = REPLACE(enclosureUrl, (SELECT COALESCE(serverAddress, '') FROM Feeds WHERE Feeds.id = FeedEpisodes.feedId), '');
+  `)
+  logger.info(`${loggerPrefix} Removed serverAddress from FeedEpisodes table URLs`)
+
+  logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
+}
+
+/**
+ * This downward migration script adds the host (serverAddress) back to URL columns in the feeds and feedEpisodes tables.
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function down({ context: { queryInterface, logger } }) {
+  // Downward migration script
+  logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
+
+  logger.info(`${loggerPrefix} Adding serverAddress back to Feeds table URLs`)
+  await queryInterface.sequelize.query(`
+    UPDATE Feeds
+    SET feedUrl = COALESCE(serverAddress, '') || feedUrl,
+        imageUrl = COALESCE(serverAddress, '') || imageUrl,
+        siteUrl = COALESCE(serverAddress, '') || siteUrl;
+  `)
+  logger.info(`${loggerPrefix} Added serverAddress back to Feeds table URLs`)
+
+  logger.info(`${loggerPrefix} Adding serverAddress back to FeedEpisodes table URLs`)
+  await queryInterface.sequelize.query(`
+    UPDATE FeedEpisodes
+      SET siteUrl = (SELECT COALESCE(serverAddress, '') || FeedEpisodes.siteUrl FROM Feeds WHERE Feeds.id = FeedEpisodes.feedId),
+          enclosureUrl = (SELECT COALESCE(serverAddress, '') || FeedEpisodes.enclosureUrl FROM Feeds WHERE Feeds.id = FeedEpisodes.feedId);
+  `)
+  logger.info(`${loggerPrefix} Added serverAddress back to FeedEpisodes table URLs`)
+
+  logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
+}
+
+module.exports = { up, down }
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index 74a220e3..da76067d 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -109,7 +109,7 @@ class Feed {
     const mediaMetadata = media.metadata
     const isPodcast = libraryItem.mediaType === 'podcast'
 
-    const feedUrl = `${serverAddress}/feed/${slug}`
+    const feedUrl = `/feed/${slug}`
     const author = isPodcast ? mediaMetadata.author : mediaMetadata.authorName
 
     this.id = uuidv4()
@@ -128,9 +128,9 @@ class Feed {
     this.meta.title = mediaMetadata.title
     this.meta.description = mediaMetadata.description
     this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `${serverAddress}/feed/${slug}/cover${coverFileExtension}` : `${serverAddress}/Logo.png`
+    this.meta.imageUrl = media.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.feedUrl = feedUrl
-    this.meta.link = `${serverAddress}/item/${libraryItem.id}`
+    this.meta.link = `/item/${libraryItem.id}`
     this.meta.explicit = !!mediaMetadata.explicit
     this.meta.type = mediaMetadata.type
     this.meta.language = mediaMetadata.language
@@ -176,7 +176,7 @@ class Feed {
     this.meta.title = mediaMetadata.title
     this.meta.description = mediaMetadata.description
     this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `${this.serverAddress}/feed/${this.slug}/cover${coverFileExtension}` : `${this.serverAddress}/Logo.png`
+    this.meta.imageUrl = media.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.explicit = !!mediaMetadata.explicit
     this.meta.type = mediaMetadata.type
     this.meta.language = mediaMetadata.language
@@ -206,7 +206,7 @@ class Feed {
   }
 
   setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `${serverAddress}/feed/${slug}`
+    const feedUrl = `/feed/${slug}`
 
     const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
     const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
@@ -227,9 +227,9 @@ class Feed {
     this.meta.title = collectionExpanded.name
     this.meta.description = collectionExpanded.description || ''
     this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `${serverAddress}/feed/${slug}/cover${coverFileExtension}` : `${serverAddress}/Logo.png`
+    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.feedUrl = feedUrl
-    this.meta.link = `${serverAddress}/collection/${collectionExpanded.id}`
+    this.meta.link = `/collection/${collectionExpanded.id}`
     this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
     this.meta.preventIndexing = preventIndexing
     this.meta.ownerName = ownerName
@@ -272,7 +272,7 @@ class Feed {
     this.meta.title = collectionExpanded.name
     this.meta.description = collectionExpanded.description || ''
     this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `${this.serverAddress}/feed/${this.slug}/cover${coverFileExtension}` : `${this.serverAddress}/Logo.png`
+    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
 
     this.episodes = []
@@ -301,7 +301,7 @@ class Feed {
   }
 
   setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `${serverAddress}/feed/${slug}`
+    const feedUrl = `/feed/${slug}`
 
     let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
     // Sort series items by series sequence
@@ -326,9 +326,9 @@ class Feed {
     this.meta.title = seriesExpanded.name
     this.meta.description = seriesExpanded.description || ''
     this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `${serverAddress}/feed/${slug}/cover${coverFileExtension}` : `${serverAddress}/Logo.png`
+    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.feedUrl = feedUrl
-    this.meta.link = `${serverAddress}/library/${libraryId}/series/${seriesExpanded.id}`
+    this.meta.link = `/library/${libraryId}/series/${seriesExpanded.id}`
     this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
     this.meta.preventIndexing = preventIndexing
     this.meta.ownerName = ownerName
@@ -374,7 +374,7 @@ class Feed {
     this.meta.title = seriesExpanded.name
     this.meta.description = seriesExpanded.description || ''
     this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `${this.serverAddress}/feed/${this.slug}/cover${coverFileExtension}` : `${this.serverAddress}/Logo.png`
+    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
     this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
 
     this.episodes = []
@@ -402,12 +402,12 @@ class Feed {
     this.xml = null
   }
 
-  buildXml() {
+  buildXml(originalHostPrefix) {
     if (this.xml) return this.xml
 
-    var rssfeed = new RSS(this.meta.getRSSData())
+    var rssfeed = new RSS(this.meta.getRSSData(originalHostPrefix))
     this.episodes.forEach((ep) => {
-      rssfeed.item(ep.getRSSData())
+      rssfeed.item(ep.getRSSData(originalHostPrefix))
     })
     this.xml = rssfeed.xml()
     return this.xml
diff --git a/server/objects/FeedEpisode.js b/server/objects/FeedEpisode.js
index 6d9f36a0..13d590ff 100644
--- a/server/objects/FeedEpisode.js
+++ b/server/objects/FeedEpisode.js
@@ -79,7 +79,7 @@ class FeedEpisode {
     this.title = episode.title
     this.description = episode.description || ''
     this.enclosure = {
-      url: `${serverAddress}${contentUrl}`,
+      url: `${contentUrl}`,
       type: episode.audioTrack.mimeType,
       size: episode.size
     }
@@ -136,7 +136,7 @@ class FeedEpisode {
     this.title = title
     this.description = mediaMetadata.description || ''
     this.enclosure = {
-      url: `${serverAddress}${contentUrl}`,
+      url: `${contentUrl}`,
       type: audioTrack.mimeType,
       size: audioTrack.metadata.size
     }
@@ -151,15 +151,19 @@ class FeedEpisode {
     this.fullPath = audioTrack.metadata.path
   }
 
-  getRSSData() {
+  getRSSData(hostPrefix) {
     return {
       title: this.title,
       description: this.description || '',
-      url: this.link,
-      guid: this.enclosure.url,
+      url: `${hostPrefix}${this.link}`,
+      guid: `${hostPrefix}${this.enclosure.url}`,
       author: this.author,
       date: this.pubDate,
-      enclosure: this.enclosure,
+      enclosure: {
+        url: `${hostPrefix}${this.enclosure.url}`,
+        type: this.enclosure.type,
+        size: this.enclosure.size
+      },
       custom_elements: [
         { 'itunes:author': this.author },
         { 'itunes:duration': secondsToTimestamp(this.duration) },
diff --git a/server/objects/FeedMeta.js b/server/objects/FeedMeta.js
index 307e12bc..e439fe8f 100644
--- a/server/objects/FeedMeta.js
+++ b/server/objects/FeedMeta.js
@@ -60,42 +60,36 @@ class FeedMeta {
     }
   }
 
-  getRSSData() {
-    const blockTags = [
-      { 'itunes:block': 'yes' },
-      { 'googleplay:block': 'yes' }
-    ]
+  getRSSData(hostPrefix) {
+    const blockTags = [{ 'itunes:block': 'yes' }, { 'googleplay:block': 'yes' }]
     return {
       title: this.title,
       description: this.description || '',
       generator: 'Audiobookshelf',
-      feed_url: this.feedUrl,
-      site_url: this.link,
-      image_url: this.imageUrl,
+      feed_url: `${hostPrefix}${this.feedUrl}`,
+      site_url: `${hostPrefix}${this.link}`,
+      image_url: `${hostPrefix}${this.imageUrl}`,
       custom_namespaces: {
-        'itunes': 'http://www.itunes.com/dtds/podcast-1.0.dtd',
-        'psc': 'http://podlove.org/simple-chapters',
-        'podcast': 'https://podcastindex.org/namespace/1.0',
-        'googleplay': 'http://www.google.com/schemas/play-podcasts/1.0'
+        itunes: 'http://www.itunes.com/dtds/podcast-1.0.dtd',
+        psc: 'http://podlove.org/simple-chapters',
+        podcast: 'https://podcastindex.org/namespace/1.0',
+        googleplay: 'http://www.google.com/schemas/play-podcasts/1.0'
       },
       custom_elements: [
-        { 'language': this.language || 'en' },
-        { 'author': this.author || 'advplyr' },
+        { language: this.language || 'en' },
+        { author: this.author || 'advplyr' },
         { 'itunes:author': this.author || 'advplyr' },
         { 'itunes:summary': this.description || '' },
         { 'itunes:type': this.type },
         {
           'itunes:image': {
             _attr: {
-              href: this.imageUrl
+              href: `${hostPrefix}${this.imageUrl}`
             }
           }
         },
         {
-          'itunes:owner': [
-            { 'itunes:name': this.ownerName || this.author || '' },
-            { 'itunes:email': this.ownerEmail || '' }
-          ]
+          'itunes:owner': [{ 'itunes:name': this.ownerName || this.author || '' }, { 'itunes:email': this.ownerEmail || '' }]
         },
         { 'itunes:explicit': !!this.explicit },
         ...(this.preventIndexing ? blockTags : [])
diff --git a/test/server/migrations/v2.17.5-remove-host-from-feed-urls.test.js b/test/server/migrations/v2.17.5-remove-host-from-feed-urls.test.js
new file mode 100644
index 00000000..786ed6ae
--- /dev/null
+++ b/test/server/migrations/v2.17.5-remove-host-from-feed-urls.test.js
@@ -0,0 +1,202 @@
+const { expect } = require('chai')
+const sinon = require('sinon')
+const { up, down } = require('../../../server/migrations/v2.17.5-remove-host-from-feed-urls')
+const { Sequelize, DataTypes } = require('sequelize')
+const Logger = require('../../../server/Logger')
+
+const defineModels = (sequelize) => {
+  const Feeds = sequelize.define('Feeds', {
+    id: { type: DataTypes.UUID, primaryKey: true, defaultValue: DataTypes.UUIDV4 },
+    feedUrl: { type: DataTypes.STRING },
+    imageUrl: { type: DataTypes.STRING },
+    siteUrl: { type: DataTypes.STRING },
+    serverAddress: { type: DataTypes.STRING }
+  })
+
+  const FeedEpisodes = sequelize.define('FeedEpisodes', {
+    id: { type: DataTypes.UUID, primaryKey: true, defaultValue: DataTypes.UUIDV4 },
+    feedId: { type: DataTypes.UUID },
+    siteUrl: { type: DataTypes.STRING },
+    enclosureUrl: { type: DataTypes.STRING }
+  })
+
+  return { Feeds, FeedEpisodes }
+}
+
+describe('Migration v2.17.4-use-subfolder-for-oidc-redirect-uris', () => {
+  let queryInterface, logger, context
+  let sequelize
+  let Feeds, FeedEpisodes
+  const feed1Id = '00000000-0000-4000-a000-000000000001'
+  const feed2Id = '00000000-0000-4000-a000-000000000002'
+  const feedEpisode1Id = '00000000-4000-a000-0000-000000000011'
+  const feedEpisode2Id = '00000000-4000-a000-0000-000000000012'
+  const feedEpisode3Id = '00000000-4000-a000-0000-000000000021'
+
+  before(async () => {
+    sequelize = new Sequelize({ dialect: 'sqlite', storage: ':memory:', logging: false })
+    queryInterface = sequelize.getQueryInterface()
+    ;({ Feeds, FeedEpisodes } = defineModels(sequelize))
+    await sequelize.sync()
+  })
+
+  after(async () => {
+    await sequelize.close()
+  })
+
+  beforeEach(async () => {
+    // Reset tables before each test
+    await Feeds.destroy({ where: {}, truncate: true })
+    await FeedEpisodes.destroy({ where: {}, truncate: true })
+
+    logger = {
+      info: sinon.stub(),
+      error: sinon.stub()
+    }
+    context = { queryInterface, logger }
+  })
+
+  describe('up', () => {
+    it('should remove serverAddress from URLs in Feeds and FeedEpisodes tables', async () => {
+      await Feeds.bulkCreate([
+        { id: feed1Id, feedUrl: 'http://server1.com/feed1', imageUrl: 'http://server1.com/img1', siteUrl: 'http://server1.com/site1', serverAddress: 'http://server1.com' },
+        { id: feed2Id, feedUrl: 'http://server2.com/feed2', imageUrl: 'http://server2.com/img2', siteUrl: 'http://server2.com/site2', serverAddress: 'http://server2.com' }
+      ])
+
+      await FeedEpisodes.bulkCreate([
+        { id: feedEpisode1Id, feedId: feed1Id, siteUrl: 'http://server1.com/episode11', enclosureUrl: 'http://server1.com/enclosure11' },
+        { id: feedEpisode2Id, feedId: feed1Id, siteUrl: 'http://server1.com/episode12', enclosureUrl: 'http://server1.com/enclosure12' },
+        { id: feedEpisode3Id, feedId: feed2Id, siteUrl: 'http://server2.com/episode21', enclosureUrl: 'http://server2.com/enclosure21' }
+      ])
+
+      await up({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(logger.info.calledWith('[2.17.5 migration] UPGRADE BEGIN: 2.17.5-remove-host-from-feed-urls')).to.be.true
+      expect(logger.info.calledWith('[2.17.5 migration] Removing serverAddress from Feeds table URLs')).to.be.true
+
+      expect(feeds[0].feedUrl).to.equal('/feed1')
+      expect(feeds[0].imageUrl).to.equal('/img1')
+      expect(feeds[0].siteUrl).to.equal('/site1')
+      expect(feeds[1].feedUrl).to.equal('/feed2')
+      expect(feeds[1].imageUrl).to.equal('/img2')
+      expect(feeds[1].siteUrl).to.equal('/site2')
+
+      expect(logger.info.calledWith('[2.17.5 migration] Removed serverAddress from Feeds table URLs')).to.be.true
+      expect(logger.info.calledWith('[2.17.5 migration] Removing serverAddress from FeedEpisodes table URLs')).to.be.true
+
+      expect(feedEpisodes[0].siteUrl).to.equal('/episode11')
+      expect(feedEpisodes[0].enclosureUrl).to.equal('/enclosure11')
+      expect(feedEpisodes[1].siteUrl).to.equal('/episode12')
+      expect(feedEpisodes[1].enclosureUrl).to.equal('/enclosure12')
+      expect(feedEpisodes[2].siteUrl).to.equal('/episode21')
+      expect(feedEpisodes[2].enclosureUrl).to.equal('/enclosure21')
+
+      expect(logger.info.calledWith('[2.17.5 migration] Removed serverAddress from FeedEpisodes table URLs')).to.be.true
+      expect(logger.info.calledWith('[2.17.5 migration] UPGRADE END: 2.17.5-remove-host-from-feed-urls')).to.be.true
+    })
+
+    it('should handle null URLs in Feeds and FeedEpisodes tables', async () => {
+      await Feeds.bulkCreate([{ id: feed1Id, feedUrl: 'http://server1.com/feed1', imageUrl: null, siteUrl: 'http://server1.com/site1', serverAddress: 'http://server1.com' }])
+
+      await FeedEpisodes.bulkCreate([{ id: feedEpisode1Id, feedId: feed1Id, siteUrl: null, enclosureUrl: 'http://server1.com/enclosure11' }])
+
+      await up({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(feeds[0].feedUrl).to.equal('/feed1')
+      expect(feeds[0].imageUrl).to.be.null
+      expect(feeds[0].siteUrl).to.equal('/site1')
+      expect(feedEpisodes[0].siteUrl).to.be.null
+      expect(feedEpisodes[0].enclosureUrl).to.equal('/enclosure11')
+    })
+
+    it('should handle null serverAddress in Feeds table', async () => {
+      await Feeds.bulkCreate([{ id: feed1Id, feedUrl: 'http://server1.com/feed1', imageUrl: 'http://server1.com/img1', siteUrl: 'http://server1.com/site1', serverAddress: null }])
+      await FeedEpisodes.bulkCreate([{ id: feedEpisode1Id, feedId: feed1Id, siteUrl: 'http://server1.com/episode11', enclosureUrl: 'http://server1.com/enclosure11' }])
+
+      await up({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(feeds[0].feedUrl).to.equal('http://server1.com/feed1')
+      expect(feeds[0].imageUrl).to.equal('http://server1.com/img1')
+      expect(feeds[0].siteUrl).to.equal('http://server1.com/site1')
+      expect(feedEpisodes[0].siteUrl).to.equal('http://server1.com/episode11')
+      expect(feedEpisodes[0].enclosureUrl).to.equal('http://server1.com/enclosure11')
+    })
+  })
+
+  describe('down', () => {
+    it('should add serverAddress back to URLs in Feeds and FeedEpisodes tables', async () => {
+      await Feeds.bulkCreate([
+        { id: feed1Id, feedUrl: '/feed1', imageUrl: '/img1', siteUrl: '/site1', serverAddress: 'http://server1.com' },
+        { id: feed2Id, feedUrl: '/feed2', imageUrl: '/img2', siteUrl: '/site2', serverAddress: 'http://server2.com' }
+      ])
+
+      await FeedEpisodes.bulkCreate([
+        { id: feedEpisode1Id, feedId: feed1Id, siteUrl: '/episode11', enclosureUrl: '/enclosure11' },
+        { id: feedEpisode2Id, feedId: feed1Id, siteUrl: '/episode12', enclosureUrl: '/enclosure12' },
+        { id: feedEpisode3Id, feedId: feed2Id, siteUrl: '/episode21', enclosureUrl: '/enclosure21' }
+      ])
+
+      await down({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(logger.info.calledWith('[2.17.5 migration] DOWNGRADE BEGIN: 2.17.5-remove-host-from-feed-urls')).to.be.true
+      expect(logger.info.calledWith('[2.17.5 migration] Adding serverAddress back to Feeds table URLs')).to.be.true
+
+      expect(feeds[0].feedUrl).to.equal('http://server1.com/feed1')
+      expect(feeds[0].imageUrl).to.equal('http://server1.com/img1')
+      expect(feeds[0].siteUrl).to.equal('http://server1.com/site1')
+      expect(feeds[1].feedUrl).to.equal('http://server2.com/feed2')
+      expect(feeds[1].imageUrl).to.equal('http://server2.com/img2')
+      expect(feeds[1].siteUrl).to.equal('http://server2.com/site2')
+
+      expect(logger.info.calledWith('[2.17.5 migration] Added serverAddress back to Feeds table URLs')).to.be.true
+      expect(logger.info.calledWith('[2.17.5 migration] Adding serverAddress back to FeedEpisodes table URLs')).to.be.true
+
+      expect(feedEpisodes[0].siteUrl).to.equal('http://server1.com/episode11')
+      expect(feedEpisodes[0].enclosureUrl).to.equal('http://server1.com/enclosure11')
+      expect(feedEpisodes[1].siteUrl).to.equal('http://server1.com/episode12')
+      expect(feedEpisodes[1].enclosureUrl).to.equal('http://server1.com/enclosure12')
+      expect(feedEpisodes[2].siteUrl).to.equal('http://server2.com/episode21')
+      expect(feedEpisodes[2].enclosureUrl).to.equal('http://server2.com/enclosure21')
+
+      expect(logger.info.calledWith('[2.17.5 migration] DOWNGRADE END: 2.17.5-remove-host-from-feed-urls')).to.be.true
+    })
+
+    it('should handle null URLs in Feeds and FeedEpisodes tables', async () => {
+      await Feeds.bulkCreate([{ id: feed1Id, feedUrl: '/feed1', imageUrl: null, siteUrl: '/site1', serverAddress: 'http://server1.com' }])
+      await FeedEpisodes.bulkCreate([{ id: feedEpisode1Id, feedId: feed1Id, siteUrl: null, enclosureUrl: '/enclosure11' }])
+
+      await down({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(feeds[0].feedUrl).to.equal('http://server1.com/feed1')
+      expect(feeds[0].imageUrl).to.be.null
+      expect(feeds[0].siteUrl).to.equal('http://server1.com/site1')
+      expect(feedEpisodes[0].siteUrl).to.be.null
+      expect(feedEpisodes[0].enclosureUrl).to.equal('http://server1.com/enclosure11')
+    })
+
+    it('should handle null serverAddress in Feeds table', async () => {
+      await Feeds.bulkCreate([{ id: feed1Id, feedUrl: '/feed1', imageUrl: '/img1', siteUrl: '/site1', serverAddress: null }])
+      await FeedEpisodes.bulkCreate([{ id: feedEpisode1Id, feedId: feed1Id, siteUrl: '/episode11', enclosureUrl: '/enclosure11' }])
+
+      await down({ context })
+      const feeds = await Feeds.findAll({ raw: true })
+      const feedEpisodes = await FeedEpisodes.findAll({ raw: true })
+
+      expect(feeds[0].feedUrl).to.equal('/feed1')
+      expect(feeds[0].imageUrl).to.equal('/img1')
+      expect(feeds[0].siteUrl).to.equal('/site1')
+      expect(feedEpisodes[0].siteUrl).to.equal('/episode11')
+      expect(feedEpisodes[0].enclosureUrl).to.equal('/enclosure11')
+    })
+  })
+})

From 6fa11934be0e7c5b28c423f495377980a7e9fb63 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 7 Dec 2024 15:15:47 -0600
Subject: [PATCH 008/143] Add:Catalan language option

---
 client/plugins/i18n.js | 1 +
 client/strings/ca.json | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/plugins/i18n.js b/client/plugins/i18n.js
index 0ec5ccce..12d2b44b 100644
--- a/client/plugins/i18n.js
+++ b/client/plugins/i18n.js
@@ -7,6 +7,7 @@ const defaultCode = 'en-us'
 const languageCodeMap = {
   bg: { label: 'Български', dateFnsLocale: 'bg' },
   bn: { label: 'বাংলা', dateFnsLocale: 'bn' },
+  ca: { label: 'Català', dateFnsLocale: 'ca' },
   cs: { label: 'Čeština', dateFnsLocale: 'cs' },
   da: { label: 'Dansk', dateFnsLocale: 'da' },
   de: { label: 'Deutsch', dateFnsLocale: 'de' },
diff --git a/client/strings/ca.json b/client/strings/ca.json
index 8dde850b..f7e85ae2 100644
--- a/client/strings/ca.json
+++ b/client/strings/ca.json
@@ -1025,5 +1025,3 @@
   "ToastUserPasswordMustChange": "La nova contrasenya no pot ser igual a l'anterior",
   "ToastUserRootRequireName": "Cal introduir un nom d'usuari root"
 }
-
-

From 61729881cb0bfca2f7a22da06597713acbc043b2 Mon Sep 17 00:00:00 2001
From: Nicholas Wallace <nicholaslwallace@gmail.com>
Date: Sat, 7 Dec 2024 16:52:31 -0700
Subject: [PATCH 009/143] Change: no compression when downloading library item
 as zip file

---
 server/utils/zipHelpers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/utils/zipHelpers.js b/server/utils/zipHelpers.js
index c1617272..44b65296 100644
--- a/server/utils/zipHelpers.js
+++ b/server/utils/zipHelpers.js
@@ -7,7 +7,7 @@ module.exports.zipDirectoryPipe = (path, filename, res) => {
     res.attachment(filename)
 
     const archive = archiver('zip', {
-      zlib: { level: 9 } // Sets the compression level.
+      zlib: { level: 0 } // Sets the compression level.
     })
 
     // listen for all archive data to be written
@@ -49,4 +49,4 @@ module.exports.zipDirectoryPipe = (path, filename, res) => {
 
     archive.finalize()
   })
-}
\ No newline at end of file
+}

From a8ab8badd5c42e1794715a370b6a8ae60c6b8652 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sun, 8 Dec 2024 09:23:39 +0200
Subject: [PATCH 010/143] always set req.originalHostPrefix

---
 server/Server.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index dfcb474a..79598275 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -251,18 +251,17 @@ class Server {
 
     const router = express.Router()
     // if RouterBasePath is set, modify all requests to include the base path
-    if (global.RouterBasePath) {
-      app.use((req, res, next) => {
-        const host = req.get('host')
-        const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http'
-        const prefix = req.url.startsWith(global.RouterBasePath) ? global.RouterBasePath : ''
-        req.originalHostPrefix = `${protocol}://${host}${prefix}`
-        if (!req.url.startsWith(global.RouterBasePath)) {
-          req.url = `${global.RouterBasePath}${req.url}`
-        }
-        next()
-      })
-    }
+    app.use((req, res, next) => {
+      const urlStartsWithRouterBasePath = req.url.startsWith(global.RouterBasePath)
+      const host = req.get('host')
+      const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http'
+      const prefix = urlStartsWithRouterBasePath ? global.RouterBasePath : ''
+      req.originalHostPrefix = `${protocol}://${host}${prefix}`
+      if (!urlStartsWithRouterBasePath) {
+        req.url = `${global.RouterBasePath}${req.url}`
+      }
+      next()
+    })
     app.use(global.RouterBasePath, router)
     app.disable('x-powered-by')
 

From b38ce4173144a9d33330ac3b59fbf7faf8320292 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sun, 8 Dec 2024 09:48:58 +0200
Subject: [PATCH 011/143] Remove xml cache from Feed object

---
 server/objects/Feed.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index da76067d..ac50b899 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -29,9 +29,6 @@ class Feed {
     this.createdAt = null
     this.updatedAt = null
 
-    // Cached xml
-    this.xml = null
-
     if (feed) {
       this.construct(feed)
     }
@@ -202,7 +199,6 @@ class Feed {
     }
 
     this.updatedAt = Date.now()
-    this.xml = null
   }
 
   setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
@@ -297,7 +293,6 @@ class Feed {
     })
 
     this.updatedAt = Date.now()
-    this.xml = null
   }
 
   setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
@@ -399,18 +394,14 @@ class Feed {
     })
 
     this.updatedAt = Date.now()
-    this.xml = null
   }
 
   buildXml(originalHostPrefix) {
-    if (this.xml) return this.xml
-
     var rssfeed = new RSS(this.meta.getRSSData(originalHostPrefix))
     this.episodes.forEach((ep) => {
       rssfeed.item(ep.getRSSData(originalHostPrefix))
     })
-    this.xml = rssfeed.xml()
-    return this.xml
+    return rssfeed.xml()
   }
 
   getAuthorsStringFromLibraryItems(libraryItems) {

From 5646466aa371cc03f12496cd0a1d28de34839734 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 8 Dec 2024 08:05:33 -0600
Subject: [PATCH 012/143] Update JSDocs for feeds endpoints

---
 server/managers/RssFeedManager.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 8984a39b..583f0bb6 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -1,3 +1,4 @@
+const { Request, Response } = require('express')
 const Path = require('path')
 
 const Logger = require('../Logger')
@@ -77,6 +78,12 @@ class RssFeedManager {
     return Database.feedModel.findByPkOld(id)
   }
 
+  /**
+   * GET: /feed/:slug
+   *
+   * @param {Request} req
+   * @param {Response} res
+   */
   async getFeed(req, res) {
     const feed = await this.findFeedBySlug(req.params.slug)
     if (!feed) {
@@ -167,6 +174,12 @@ class RssFeedManager {
     res.send(xml)
   }
 
+  /**
+   * GET: /feed/:slug/item/:episodeId/*
+   *
+   * @param {Request} req
+   * @param {Response} res
+   */
   async getFeedItem(req, res) {
     const feed = await this.findFeedBySlug(req.params.slug)
     if (!feed) {
@@ -183,6 +196,12 @@ class RssFeedManager {
     res.sendFile(episodePath)
   }
 
+  /**
+   * GET: /feed/:slug/cover*
+   *
+   * @param {Request} req
+   * @param {Response} res
+   */
   async getFeedCover(req, res) {
     const feed = await this.findFeedBySlug(req.params.slug)
     if (!feed) {

From f7b7b85673fb8a5ac1a9b9c09e1bb686aa7d2f90 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 8 Dec 2024 08:19:23 -0600
Subject: [PATCH 013/143] Add v2.17.5 migration to changelog

---
 server/migrations/changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/migrations/changelog.md b/server/migrations/changelog.md
index f46cd4ae..f4992432 100644
--- a/server/migrations/changelog.md
+++ b/server/migrations/changelog.md
@@ -10,3 +10,4 @@ Please add a record of every database migration that you create to this file. Th
 | v2.17.0        | v2.17.0-uuid-replacement                     | Changes the data type of columns with UUIDv4 to UUID matching the associated model                            |
 | v2.17.3        | v2.17.3-fk-constraints                       | Changes the foreign key constraints for tables due to sequelize bug dropping constraints in v2.17.0 migration |
 | v2.17.4        | v2.17.4-use-subfolder-for-oidc-redirect-uris | Save subfolder to OIDC redirect URIs to support existing installations                                        |
+| v2.17.5        | v2.17.5-remove-host-from-feed-urls           | removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables                        |

From 57906540fef30b2b8801e4abbf38ca12d7307f9f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 8 Dec 2024 08:57:45 -0600
Subject: [PATCH 014/143] Add:Server setting to allow iframe & update UI to
 differentiate web client settings #3684

---
 client/pages/config/index.vue             | 47 ++++++++++++++---------
 client/store/index.js                     | 11 +++---
 client/strings/en-us.json                 |  2 +
 server/Server.js                          |  3 +-
 server/controllers/MiscController.js      |  5 ++-
 server/objects/settings/ServerSettings.js |  8 ++++
 6 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index 1f0d61eb..bbb75b93 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -42,11 +42,6 @@
             </div>
           </div>
 
-          <div class="flex items-center py-2 mb-2">
-            <ui-toggle-switch labeledBy="settings-chromecast-support" v-model="newServerSettings.chromecastEnabled" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('chromecastEnabled', val)" />
-            <p class="pl-4" id="settings-chromecast-support">{{ $strings.LabelSettingsChromecastSupport }}</p>
-          </div>
-
           <div class="pt-4">
             <h2 class="font-semibold">{{ $strings.HeaderSettingsScanner }}</h2>
           </div>
@@ -94,6 +89,20 @@
               </p>
             </ui-tooltip>
           </div>
+
+          <div class="pt-4">
+            <h2 class="font-semibold">{{ $strings.HeaderSettingsWebClient }}</h2>
+          </div>
+
+          <div class="flex items-center py-2">
+            <ui-toggle-switch labeledBy="settings-chromecast-support" v-model="newServerSettings.chromecastEnabled" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('chromecastEnabled', val)" />
+            <p class="pl-4" id="settings-chromecast-support">{{ $strings.LabelSettingsChromecastSupport }}</p>
+          </div>
+
+          <div class="flex items-center py-2 mb-2">
+            <ui-toggle-switch labeledBy="settings-allow-iframe" v-model="newServerSettings.allowIframe" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('allowIframe', val)" />
+            <p class="pl-4" id="settings-allow-iframe">{{ $strings.LabelSettingsAllowIframe }}</p>
+          </div>
         </div>
 
         <div class="flex-1">
@@ -324,21 +333,21 @@ export default {
     },
     updateServerSettings(payload) {
       this.updatingServerSettings = true
-      this.$store
-        .dispatch('updateServerSettings', payload)
-        .then(() => {
-          this.updatingServerSettings = false
+      this.$store.dispatch('updateServerSettings', payload).then((response) => {
+        this.updatingServerSettings = false
 
-          if (payload.language) {
-            // Updating language after save allows for re-rendering
-            this.$setLanguageCode(payload.language)
-          }
-        })
-        .catch((error) => {
-          console.error('Failed to update server settings', error)
-          this.updatingServerSettings = false
-          this.$toast.error(this.$strings.ToastFailedToUpdate)
-        })
+        if (response.error) {
+          console.error('Failed to update server settins', response.error)
+          this.$toast.error(response.error)
+          this.initServerSettings()
+          return
+        }
+
+        if (payload.language) {
+          // Updating language after save allows for re-rendering
+          this.$setLanguageCode(payload.language)
+        }
+      })
     },
     initServerSettings() {
       this.newServerSettings = this.serverSettings ? { ...this.serverSettings } : {}
diff --git a/client/store/index.js b/client/store/index.js
index acd03eb4..2f2201b6 100644
--- a/client/store/index.js
+++ b/client/store/index.js
@@ -72,16 +72,17 @@ export const actions = {
     return this.$axios
       .$patch('/api/settings', updatePayload)
       .then((result) => {
-        if (result.success) {
+        if (result.serverSettings) {
           commit('setServerSettings', result.serverSettings)
-          return true
-        } else {
-          return false
         }
+        return result
       })
       .catch((error) => {
         console.error('Failed to update server settings', error)
-        return false
+        const errorMsg = error.response?.data || 'Unknown error'
+        return {
+          error: errorMsg
+        }
       })
   },
   checkForUpdate({ commit }) {
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 75069cd3..805e8f48 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Experimental Features",
   "HeaderSettingsGeneral": "General",
   "HeaderSettingsScanner": "Scanner",
+  "HeaderSettingsWebClient": "Web Client",
   "HeaderSleepTimer": "Sleep Timer",
   "HeaderStatsLargestItems": "Largest Items",
   "HeaderStatsLongestItems": "Longest Items (hrs)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Server Year in Review ({0})",
   "LabelSetEbookAsPrimary": "Set as primary",
   "LabelSetEbookAsSupplementary": "Set as supplementary",
+  "LabelSettingsAllowIframe": "Allow embedding in an iframe",
   "LabelSettingsAudiobooksOnly": "Audiobooks only",
   "LabelSettingsAudiobooksOnlyHelp": "Enabling this setting will ignore ebook files unless they are inside an audiobook folder in which case they will be set as supplementary ebooks",
   "LabelSettingsBookshelfViewHelp": "Skeumorphic design with wooden shelves",
diff --git a/server/Server.js b/server/Server.js
index 79598275..2f1220d8 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -53,7 +53,6 @@ class Server {
     global.RouterBasePath = ROUTER_BASE_PATH
     global.XAccel = process.env.USE_X_ACCEL
     global.AllowCors = process.env.ALLOW_CORS === '1'
-    global.AllowIframe = process.env.ALLOW_IFRAME === '1'
     global.DisableSsrfRequestFilter = process.env.DISABLE_SSRF_REQUEST_FILTER === '1'
 
     if (!fs.pathExistsSync(global.ConfigPath)) {
@@ -195,7 +194,7 @@ class Server {
     const app = express()
 
     app.use((req, res, next) => {
-      if (!global.AllowIframe) {
+      if (!global.ServerSettings.allowIframe) {
         // Prevent clickjacking by disallowing iframes
         res.setHeader('Content-Security-Policy', "frame-ancestors 'self'")
       }
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index 2a87f2fe..b35619b7 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -126,6 +126,10 @@ class MiscController {
     if (!isObject(settingsUpdate)) {
       return res.status(400).send('Invalid settings update object')
     }
+    if (settingsUpdate.allowIframe == false && process.env.ALLOW_IFRAME === '1') {
+      Logger.warn('Cannot disable iframe when ALLOW_IFRAME is enabled in environment')
+      return res.status(400).send('Cannot disable iframe when ALLOW_IFRAME is enabled in environment')
+    }
 
     const madeUpdates = Database.serverSettings.update(settingsUpdate)
     if (madeUpdates) {
@@ -137,7 +141,6 @@ class MiscController {
       }
     }
     return res.json({
-      success: true,
       serverSettings: Database.serverSettings.toJSONForBrowser()
     })
   }
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index ff28027f..29913e44 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -24,6 +24,7 @@ class ServerSettings {
     // Security/Rate limits
     this.rateLimitLoginRequests = 10
     this.rateLimitLoginWindow = 10 * 60 * 1000 // 10 Minutes
+    this.allowIframe = false
 
     // Backups
     this.backupPath = Path.join(global.MetadataPath, 'backups')
@@ -99,6 +100,7 @@ class ServerSettings {
 
     this.rateLimitLoginRequests = !isNaN(settings.rateLimitLoginRequests) ? Number(settings.rateLimitLoginRequests) : 10
     this.rateLimitLoginWindow = !isNaN(settings.rateLimitLoginWindow) ? Number(settings.rateLimitLoginWindow) : 10 * 60 * 1000 // 10 Minutes
+    this.allowIframe = !!settings.allowIframe
 
     this.backupPath = settings.backupPath || Path.join(global.MetadataPath, 'backups')
     this.backupSchedule = settings.backupSchedule || false
@@ -190,6 +192,11 @@ class ServerSettings {
       Logger.info(`[ServerSettings] Using backup path from environment variable ${process.env.BACKUP_PATH}`)
       this.backupPath = process.env.BACKUP_PATH
     }
+
+    if (process.env.ALLOW_IFRAME === '1' && !this.allowIframe) {
+      Logger.info(`[ServerSettings] Using allowIframe from environment variable`)
+      this.allowIframe = true
+    }
   }
 
   toJSON() {
@@ -207,6 +214,7 @@ class ServerSettings {
       metadataFileFormat: this.metadataFileFormat,
       rateLimitLoginRequests: this.rateLimitLoginRequests,
       rateLimitLoginWindow: this.rateLimitLoginWindow,
+      allowIframe: this.allowIframe,
       backupPath: this.backupPath,
       backupSchedule: this.backupSchedule,
       backupsToKeep: this.backupsToKeep,

From 5f72e30e63884c731e520849be60f224d30a2278 Mon Sep 17 00:00:00 2001
From: Clara Papke <clara.papke@pm.me>
Date: Fri, 6 Dec 2024 16:56:14 +0000
Subject: [PATCH 015/143] Translated using Weblate (German)

Currently translated at 100.0% (1074 of 1074 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/de/
---
 client/strings/de.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/de.json b/client/strings/de.json
index 865065aa..d3a10ead 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -679,6 +679,8 @@
   "LabelViewPlayerSettings": "Zeige player Einstellungen",
   "LabelViewQueue": "Player-Warteschlange anzeigen",
   "LabelVolume": "Lautstärke",
+  "LabelWebRedirectURLsDescription": "Autorisieren Sie diese URLs bei ihrem OAuth-Anbieter, um die Weiterleitung zurück zur Webanwendung nach dem Login zu ermöglichen:",
+  "LabelWebRedirectURLsSubfolder": "Unterordner für Weiterleitung-URLs",
   "LabelWeekdaysToRun": "Wochentage für die Ausführung",
   "LabelXBooks": "{0} Bücher",
   "LabelXItems": "{0} Medien",

From e6d754113e95f780a3b18dd5be555da164048c76 Mon Sep 17 00:00:00 2001
From: Bezruchenko Simon <worcposj44@gmail.com>
Date: Fri, 6 Dec 2024 10:34:22 +0000
Subject: [PATCH 016/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1074 of 1074 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/uk/
---
 client/strings/uk.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/uk.json b/client/strings/uk.json
index 448bbf4c..f2342636 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -679,6 +679,8 @@
   "LabelViewPlayerSettings": "Переглянути налаштування програвача",
   "LabelViewQueue": "Переглянути чергу відтворення",
   "LabelVolume": "Гучність",
+  "LabelWebRedirectURLsDescription": "Авторизуйте ці URL у вашому OAuth постачальнику, щоб дозволити редирекцію назад до веб-додатку після входу:",
+  "LabelWebRedirectURLsSubfolder": "Підпапка для Redirect URL",
   "LabelWeekdaysToRun": "Виконувати у дні",
   "LabelXBooks": "{0} книг",
   "LabelXItems": "{0} елементів",

From 8aaf62f2433aca7689e675a9c63b556ee19728e5 Mon Sep 17 00:00:00 2001
From: thehijacker <thehijacker@gmail.com>
Date: Fri, 6 Dec 2024 10:03:47 +0000
Subject: [PATCH 017/143] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1074 of 1074 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sl/
---
 client/strings/sl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/sl.json b/client/strings/sl.json
index e80ac8b2..58500f9f 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -679,6 +679,8 @@
   "LabelViewPlayerSettings": "Ogled nastavitev predvajalnika",
   "LabelViewQueue": "Ogled čakalno vrsto predvajalnika",
   "LabelVolume": "Glasnost",
+  "LabelWebRedirectURLsDescription": "Avtorizirajte URL-je pri svojem ponudniku OAuth ter s tem omogočite preusmeritev nazaj v spletno aplikacijo po prijavi:",
+  "LabelWebRedirectURLsSubfolder": "Podmapa za URL-je preusmeritve",
   "LabelWeekdaysToRun": "Delovni dnevi predvajanja",
   "LabelXBooks": "{0} knjig",
   "LabelXItems": "{0} elementov",

From 190a1000d9b5909b5bcd953f32f39fa8f261ecb9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 8 Dec 2024 09:03:05 -0600
Subject: [PATCH 018/143] Version bump v2.17.5

---
 client/package-lock.json | 4 ++--
 client/package.json      | 2 +-
 package-lock.json        | 4 ++--
 package.json             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index e4e3236c..807976bd 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.4",
+  "version": "2.17.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.17.4",
+      "version": "2.17.5",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",
diff --git a/client/package.json b/client/package.json
index ea191901..6f9d9d44 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.4",
+  "version": "2.17.5",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
diff --git a/package-lock.json b/package-lock.json
index 10db84ea..efa917dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.4",
+  "version": "2.17.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.17.4",
+      "version": "2.17.5",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",
diff --git a/package.json b/package.json
index c122240a..2e9c9709 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.4",
+  "version": "2.17.5",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

From 4610e58337eb3953a7c6efd533c6d0ae36722d45 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 9 Dec 2024 17:24:21 -0600
Subject: [PATCH 019/143] Update:Home shelf labels use h2 tag, play & edit
 buttons overlaying item page updated to button tag with aria-label for
 accessibility #3699

---
 client/components/app/BookShelfCategorized.vue | 2 +-
 client/pages/item/_id/index.vue                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/components/app/BookShelfCategorized.vue b/client/components/app/BookShelfCategorized.vue
index a977dd21..94b2e4ba 100644
--- a/client/components/app/BookShelfCategorized.vue
+++ b/client/components/app/BookShelfCategorized.vue
@@ -17,7 +17,7 @@
     <div v-else-if="isAlternativeBookshelfView" class="w-full mb-24e">
       <template v-for="(shelf, index) in supportedShelves">
         <widgets-item-slider :shelf-id="shelf.id" :key="index + '.'" :items="shelf.entities" :continue-listening-shelf="shelf.id === 'continue-listening' || shelf.id === 'continue-reading'" :type="shelf.type" class="bookshelf-row pl-8e my-6e" @selectEntity="(payload) => selectEntity(payload, index)">
-          <p class="font-semibold text-gray-100">{{ $strings[shelf.labelStringKey] }}</p>
+          <h2 class="font-semibold text-gray-100">{{ $strings[shelf.labelStringKey] }}</h2>
         </widgets-item-slider>
       </template>
     </div>
diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue
index 1baf521c..2e7e601c 100644
--- a/client/pages/item/_id/index.vue
+++ b/client/pages/item/_id/index.vue
@@ -12,12 +12,12 @@
             <!-- Item Cover Overlay -->
             <div class="absolute top-0 left-0 w-full h-full z-10 opacity-0 group-hover:opacity-100 pointer-events-none">
               <div v-show="showPlayButton && !isStreaming" class="h-full flex items-center justify-center pointer-events-none">
-                <div class="hover:text-white text-gray-200 hover:scale-110 transform duration-200 pointer-events-auto cursor-pointer" @click.stop.prevent="playItem">
+                <button class="hover:text-white text-gray-200 hover:scale-110 transform duration-200 pointer-events-auto cursor-pointer" :aria-label="$strings.ButtonPlay" @click.stop.prevent="playItem">
                   <span class="material-symbols fill text-4xl">play_arrow</span>
-                </div>
+                </button>
               </div>
 
-              <span class="absolute bottom-2.5 right-2.5 z-10 material-symbols text-lg cursor-pointer text-white text-opacity-75 hover:text-opacity-100 hover:scale-110 transform duration-200 pointer-events-auto" @click="showEditCover">edit</span>
+              <button class="absolute bottom-2.5 right-2.5 z-10 material-symbols text-lg cursor-pointer text-white text-opacity-75 hover:text-opacity-100 hover:scale-110 transform duration-200 pointer-events-auto" :aria-label="$strings.ButtonEdit" @click="showEditCover">edit</button>
             </div>
           </div>
         </div>
@@ -87,7 +87,7 @@
             </ui-btn>
 
             <ui-btn v-else-if="isMissing || isInvalid" color="error" :padding-x="4" small class="flex items-center h-9 mr-2">
-              <span v-show="!isStreaming" class="material-symbols text-2xl -ml-2 pr-1 text-white">error</span>
+              <span class="material-symbols text-2xl -ml-2 pr-1 text-white">error</span>
               {{ isMissing ? $strings.LabelMissing : $strings.LabelIncomplete }}
             </ui-btn>
 

From c5c3aab130ccf67316d61300b131752a41fb187f Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 10 Dec 2024 17:19:47 -0600
Subject: [PATCH 020/143] Update:Accessibility for buttons on item page,
 context menu dropdown, library filter/sort #3699

---
 .../controls/LibraryFilterSelect.vue          | 30 ++++++++++---------
 .../components/controls/LibrarySortSelect.vue | 10 +++----
 client/components/ui/ContextMenuDropdown.vue  | 16 +++++-----
 client/components/ui/IconBtn.vue              |  5 ++--
 client/components/ui/LibrariesDropdown.vue    |  6 ++--
 client/components/ui/ReadIconBtn.vue          |  2 +-
 client/pages/item/_id/index.vue               |  8 ++---
 client/strings/en-us.json                     |  2 ++
 8 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/client/components/controls/LibraryFilterSelect.vue b/client/components/controls/LibraryFilterSelect.vue
index 2d9ced5a..c600d80f 100644
--- a/client/components/controls/LibraryFilterSelect.vue
+++ b/client/components/controls/LibraryFilterSelect.vue
@@ -1,28 +1,30 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full bg-bg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
-      <span class="flex items-center justify-between">
-        <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-      </span>
+    <div class="relative h-7">
+      <button type="button" class="relative w-full h-full bg-bg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
+        <span class="flex items-center justify-between">
+          <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
+        </span>
+      </button>
       <span v-if="selected === 'all'" class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
         <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
           <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
         </svg>
       </span>
-      <div v-else class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer text-gray-400 hover:text-gray-200" @mousedown.stop @mouseup.stop @click.stop.prevent="clearSelected">
+      <button v-else :aria-label="$strings.ButtonClearFilter" class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer text-gray-400 hover:text-gray-200" @mousedown.stop @mouseup.stop @click.stop.prevent="clearSelected">
         <span class="material-symbols" style="font-size: 1.1rem">close</span>
-      </div>
-    </button>
+      </button>
+    </div>
 
     <div v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm libraryFilterMenu">
-      <ul v-show="!sublist" class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
+      <ul v-show="!sublist" class="h-full w-full" role="menu">
         <template v-for="item in selectItems">
-          <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item)">
+          <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" :aria-haspopup="item.sublist ? '' : 'menu'" @click="clickedOption(item)">
             <div class="flex items-center justify-between">
               <span class="font-normal ml-3 block truncate text-sm">{{ item.text }}</span>
             </div>
             <div v-if="item.sublist" class="absolute right-1 top-0 bottom-0 h-full flex items-center">
-              <span class="material-symbols text-2xl">arrow_right</span>
+              <span class="material-symbols text-2xl" :aria-label="$strings.LabelMore">arrow_right</span>
             </div>
             <!-- selected checkmark icon -->
             <div v-if="item.value === selected" class="absolute inset-y-0 right-2 h-full flex items-center pointer-events-none">
@@ -31,8 +33,8 @@
           </li>
         </template>
       </ul>
-      <ul v-show="sublist" class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
-        <li class="text-gray-50 select-none relative py-2 pl-9 cursor-pointer hover:bg-white/5" role="option" @click="sublist = null">
+      <ul v-show="sublist" class="h-full w-full" role="menu">
+        <li class="text-gray-50 select-none relative py-2 pl-9 cursor-pointer hover:bg-white/5" role="menuitem" @click="sublist = null">
           <div class="absolute left-1 top-0 bottom-0 h-full flex items-center">
             <span class="material-symbols text-2xl">arrow_left</span>
           </div>
@@ -40,13 +42,13 @@
             <span class="font-normal block truncate">{{ $strings.ButtonBack }}</span>
           </div>
         </li>
-        <li v-if="!sublistItems.length" class="text-gray-400 select-none relative px-2" role="option">
+        <li v-if="!sublistItems.length" class="text-gray-400 select-none relative px-2" role="menuitem">
           <div class="flex items-center justify-center">
             <span class="font-normal block truncate py-2">{{ $getString('LabelLibraryFilterSublistEmpty', [selectedSublistText]) }}</span>
           </div>
         </li>
         <template v-for="item in sublistItems">
-          <li :key="item.value" class="select-none relative px-2 cursor-pointer hover:bg-white/5" :class="`${sublist}.${item.value}` === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedSublistOption(item.value)">
+          <li :key="item.value" class="select-none relative px-2 cursor-pointer hover:bg-white/5" :class="`${sublist}.${item.value}` === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedSublistOption(item.value)">
             <div class="flex items-center">
               <span class="font-normal truncate py-2 text-xs">{{ item.text }}</span>
             </div>
diff --git a/client/components/controls/LibrarySortSelect.vue b/client/components/controls/LibrarySortSelect.vue
index 0524f54c..8a297f0d 100644
--- a/client/components/controls/LibrarySortSelect.vue
+++ b/client/components/controls/LibrarySortSelect.vue
@@ -1,20 +1,20 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full bg-fg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
+    <button type="button" class="relative w-full h-full bg-fg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
       <span class="flex items-center justify-between">
         <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-        <span class="material-symbols text-lg text-yellow-400">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+        <span class="material-symbols text-lg text-yellow-400" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
       </span>
     </button>
 
-    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-96 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="listbox" aria-labelledby="listbox-label">
+    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-96 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="menu">
       <template v-for="item in selectItems">
-        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item.value)">
+        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedOption(item.value)">
           <div class="flex items-center">
             <span class="font-normal ml-3 block truncate">{{ item.text }}</span>
           </div>
           <span v-if="item.value === selected" class="text-yellow-400 absolute inset-y-0 right-0 flex items-center pr-4">
-            <span class="material-symbols text-xl">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+            <span class="material-symbols text-xl" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
           </span>
         </li>
       </template>
diff --git a/client/components/ui/ContextMenuDropdown.vue b/client/components/ui/ContextMenuDropdown.vue
index e6dce4fb..52a5c2e2 100644
--- a/client/components/ui/ContextMenuDropdown.vue
+++ b/client/components/ui/ContextMenuDropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative h-9 w-9" v-click-outside="clickOutsideObj">
     <slot :disabled="disabled" :showMenu="showMenu" :clickShowMenu="clickShowMenu" :processing="processing">
-      <button v-if="!processing" type="button" :disabled="disabled" class="relative h-full w-full flex items-center justify-center shadow-sm pl-3 pr-3 text-left focus:outline-none cursor-pointer text-gray-100 hover:text-gray-200 rounded-full hover:bg-white/5" aria-haspopup="listbox" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
+      <button v-if="!processing" type="button" :disabled="disabled" class="relative h-full w-full flex items-center justify-center shadow-sm pl-3 pr-3 text-left focus:outline-none cursor-pointer text-gray-100 hover:text-gray-200 rounded-full hover:bg-white/5" :aria-label="$strings.LabelMore" aria-haspopup="menu" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
         <span class="material-symbols text-2xl" :class="iconClass">&#xe5d4;</span>
       </button>
       <div v-else class="h-full w-full flex items-center justify-center">
@@ -10,12 +10,12 @@
     </slot>
 
     <transition name="menu">
-      <div v-show="showMenu" ref="menuWrapper" class="absolute right-0 mt-1 z-10 bg-bg border border-black-200 shadow-lg rounded-md py-1 focus:outline-none sm:text-sm" :style="{ width: menuWidth + 'px' }">
+      <div v-show="showMenu" ref="menuWrapper" role="menu" class="absolute right-0 mt-1 z-10 bg-bg border border-black-200 shadow-lg rounded-md py-1 focus:outline-none sm:text-sm" :style="{ width: menuWidth + 'px' }">
         <template v-for="(item, index) in items">
           <template v-if="item.subitems">
-            <div :key="index" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-default" :class="{ 'bg-white/5': mouseoverItemIndex == index }" @mouseover="mouseoverItem(index)" @mouseleave="mouseleaveItem(index)" @click.stop>
+            <button :key="index" role="menuitem" aria-haspopup="menu" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-default w-full" :class="{ 'bg-white/5': mouseoverItemIndex == index }" @mouseover="mouseoverItem(index)" @mouseleave="mouseleaveItem(index)" @click.stop>
               <p>{{ item.text }}</p>
-            </div>
+            </button>
             <div
               v-if="mouseoverItemIndex === index"
               :key="`subitems-${index}`"
@@ -25,14 +25,14 @@
               :class="openSubMenuLeft ? 'rounded-l-md' : 'rounded-r-md'"
               :style="{ left: submenuLeftPos + 'px', top: index * 28 + 'px', width: submenuWidth + 'px' }"
             >
-              <div v-for="(subitem, subitemindex) in item.subitems" :key="`subitem-${subitemindex}`" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer" @click.stop="clickAction(subitem.action, subitem.data)">
+              <button v-for="(subitem, subitemindex) in item.subitems" :key="`subitem-${subitemindex}`" role="menuitem" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer w-full" @click.stop="clickAction(subitem.action, subitem.data)">
                 <p>{{ subitem.text }}</p>
-              </div>
+              </button>
             </div>
           </template>
-          <div v-else :key="index" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer" @click.stop="clickAction(item.action)">
+          <button v-else :key="index" role="menuitem" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer w-full" @click.stop="clickAction(item.action)">
             <p class="text-left">{{ item.text }}</p>
-          </div>
+          </button>
         </template>
       </div>
     </transition>
diff --git a/client/components/ui/IconBtn.vue b/client/components/ui/IconBtn.vue
index 05039b8d..2b0dcd65 100644
--- a/client/components/ui/IconBtn.vue
+++ b/client/components/ui/IconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="icon-btn rounded-md flex items-center justify-center relative" @mousedown.prevent :disabled="disabled || loading" :class="className" @click="clickBtn">
+  <button :aria-label="ariaLabel" class="icon-btn rounded-md flex items-center justify-center relative" @mousedown.prevent :disabled="disabled || loading" :class="className" @click="clickBtn">
     <div v-if="loading" class="text-white absolute top-0 left-0 w-full h-full flex items-center justify-center text-opacity-100">
       <svg class="animate-spin" style="width: 24px; height: 24px" viewBox="0 0 24 24">
         <path fill="currentColor" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
@@ -28,7 +28,8 @@ export default {
     size: {
       type: Number,
       default: 9
-    }
+    },
+    ariaLabel: String
   },
   data() {
     return {}
diff --git a/client/components/ui/LibrariesDropdown.vue b/client/components/ui/LibrariesDropdown.vue
index 7fea2dcb..a3eeaaf2 100644
--- a/client/components/ui/LibrariesDropdown.vue
+++ b/client/components/ui/LibrariesDropdown.vue
@@ -4,7 +4,7 @@
       type="button"
       :disabled="disabled"
       class="w-10 sm:w-full relative h-full border border-white border-opacity-10 hover:border-opacity-20 rounded shadow-sm px-2 text-left text-sm cursor-pointer bg-black bg-opacity-20 text-gray-400 hover:text-gray-200"
-      aria-haspopup="listbox"
+      aria-haspopup="menu"
       :aria-expanded="showMenu"
       :aria-label="$strings.ButtonLibrary + ': ' + currentLibrary.name"
       @click.stop.prevent="clickShowMenu"
@@ -16,9 +16,9 @@
     </button>
 
     <transition name="menu">
-      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full min-w-48 bg-primary border border-black-200 shadow-lg rounded-b-md py-1 overflow-auto focus:outline-none sm:text-sm librariesDropdownMenu" tabindex="-1" role="listbox">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full min-w-48 bg-primary border border-black-200 shadow-lg rounded-b-md py-1 overflow-auto focus:outline-none sm:text-sm librariesDropdownMenu" tabindex="-1" role="menu">
         <template v-for="library in librariesFiltered">
-          <li :key="library.id" class="text-gray-400 hover:text-white relative py-2 cursor-pointer hover:bg-black-400" role="option" tabindex="0" @keydown.enter="selectLibrary(library)" @click="selectLibrary(library)">
+          <li :key="library.id" class="text-gray-400 hover:text-white relative py-2 cursor-pointer hover:bg-black-400" role="menuitem" tabindex="0" @keydown.enter="selectLibrary(library)" @click="selectLibrary(library)">
             <div class="flex items-center px-2">
               <ui-library-icon :icon="library.icon" class="mr-1.5" />
               <span class="font-normal block truncate font-sans text-sm">{{ library.name }}</span>
diff --git a/client/components/ui/ReadIconBtn.vue b/client/components/ui/ReadIconBtn.vue
index ddbd3541..0d47fd78 100644
--- a/client/components/ui/ReadIconBtn.vue
+++ b/client/components/ui/ReadIconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
+  <button :aria-label="isReady ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
     <div class="w-5 h-5 text-white relative">
       <svg v-if="isRead" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgb(63, 181, 68)">
         <path d="M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z" />
diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue
index 2e7e601c..139794e5 100644
--- a/client/pages/item/_id/index.vue
+++ b/client/pages/item/_id/index.vue
@@ -96,12 +96,12 @@
             </ui-tooltip>
 
             <ui-btn v-if="showReadButton" color="info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
-              <span class="material-symbols text-2xl -ml-2 pr-2 text-white">auto_stories</span>
+              <span class="material-symbols text-2xl -ml-2 pr-2 text-white" aria-hidden="true">auto_stories</span>
               {{ $strings.ButtonRead }}
             </ui-btn>
 
             <ui-tooltip v-if="userCanUpdate" :text="$strings.LabelEdit" direction="top">
-              <ui-icon-btn icon="&#xe3c9;" outlined class="mx-0.5" @click="editClick" />
+              <ui-icon-btn icon="&#xe3c9;" outlined class="mx-0.5" :aria-label="$strings.LabelEdit" @click="editClick" />
             </ui-tooltip>
 
             <ui-tooltip v-if="!isPodcast" :text="userIsFinished ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" direction="top">
@@ -110,12 +110,12 @@
 
             <!-- Only admin or root user can download new episodes -->
             <ui-tooltip v-if="isPodcast && userIsAdminOrUp" :text="$strings.LabelFindEpisodes" direction="top">
-              <ui-icon-btn icon="search" class="mx-0.5" :loading="fetchingRSSFeed" outlined @click="findEpisodesClick" />
+              <ui-icon-btn icon="search" class="mx-0.5" :aria-label="$strings.LabelFindEpisodes" :loading="fetchingRSSFeed" outlined @click="findEpisodesClick" />
             </ui-tooltip>
 
             <ui-context-menu-dropdown v-if="contextMenuItems.length" :items="contextMenuItems" :menu-width="148" @action="contextMenuAction">
               <template #default="{ showMenu, clickShowMenu, disabled }">
-                <button type="button" :disabled="disabled" class="mx-0.5 icon-btn bg-primary border border-gray-600 w-9 h-9 rounded-md flex items-center justify-center relative" aria-haspopup="listbox" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
+                <button type="button" :disabled="disabled" class="mx-0.5 icon-btn bg-primary border border-gray-600 w-9 h-9 rounded-md flex items-center justify-center relative" aria-haspopup="listbox" :aria-expanded="showMenu" :aria-label="$strings.LabelMore" @click.stop.prevent="clickShowMenu">
                   <span class="material-symbols text-2xl">&#xe5d3;</span>
                 </button>
               </template>
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 805e8f48..f6a42bea 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -594,6 +594,8 @@
   "LabelSize": "Size",
   "LabelSleepTimer": "Sleep timer",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "Ascending",
+  "LabelSortDescending": "Descending",
   "LabelStart": "Start",
   "LabelStartTime": "Start Time",
   "LabelStarted": "Started",

From f97389cb2bae89540c81066b666f26e8e041ece9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 11 Dec 2024 17:24:48 -0600
Subject: [PATCH 021/143] More accessibility updates: adding roles for
 toolbars, bookshelf cards, author sort #2268 #3699

---
 client/components/app/Appbar.vue               |  2 +-
 client/components/app/BookShelfToolbar.vue     |  2 +-
 client/components/app/SideRail.vue             |  4 ++--
 client/components/cards/LazyBookCard.vue       |  2 +-
 client/components/cards/LazyCollectionCard.vue |  2 +-
 client/components/cards/LazyPlaylistCard.vue   |  2 +-
 client/components/cards/LazySeriesCard.vue     |  2 +-
 client/components/controls/GlobalSearch.vue    |  6 +++---
 client/components/controls/SortSelect.vue      | 10 +++++-----
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/components/app/Appbar.vue b/client/components/app/Appbar.vue
index 19b8fe3c..bb452526 100644
--- a/client/components/app/Appbar.vue
+++ b/client/components/app/Appbar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="w-full h-16 bg-primary relative">
-    <div id="appbar" class="absolute top-0 bottom-0 left-0 w-full h-full px-2 md:px-6 py-1 z-60">
+    <div id="appbar" role="toolbar" aria-label="Appbar" class="absolute top-0 bottom-0 left-0 w-full h-full px-2 md:px-6 py-1 z-60">
       <div class="flex h-full items-center">
         <nuxt-link to="/">
           <img src="~static/icon.svg" :alt="$strings.ButtonHome" class="w-8 min-w-8 h-8 mr-2 sm:w-10 sm:min-w-10 sm:h-10 sm:mr-4" />
diff --git a/client/components/app/BookShelfToolbar.vue b/client/components/app/BookShelfToolbar.vue
index 04354c80..6b5a3cd3 100644
--- a/client/components/app/BookShelfToolbar.vue
+++ b/client/components/app/BookShelfToolbar.vue
@@ -43,7 +43,7 @@
         <p class="text-sm">{{ $strings.ButtonAdd }}</p>
       </nuxt-link>
     </div>
-    <div id="toolbar" class="absolute top-10 md:top-0 left-0 w-full h-10 md:h-full z-40 flex items-center justify-end md:justify-start px-2 md:px-8">
+    <div id="toolbar" role="toolbar" aria-label="Library Toolbar" class="absolute top-10 md:top-0 left-0 w-full h-10 md:h-full z-40 flex items-center justify-end md:justify-start px-2 md:px-8">
       <!-- Series books page -->
       <template v-if="selectedSeries">
         <p class="pl-2 text-base md:text-lg">
diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue
index dbbc4d26..2c6fd5a2 100644
--- a/client/components/app/SideRail.vue
+++ b/client/components/app/SideRail.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="w-20 bg-bg h-full fixed left-0 box-shadow-side z-50" style="min-width: 80px" :style="{ top: offsetTop + 'px' }">
+  <div role="toolbar" aria-orientation="vertical" aria-label="Library Sidebar" class="w-20 bg-bg h-full fixed left-0 box-shadow-side z-50" style="min-width: 80px" :style="{ top: offsetTop + 'px' }">
     <!-- ugly little workaround to cover up the shadow overlapping the bookshelf toolbar -->
     <div v-if="isShowingBookshelfToolbar" class="absolute top-0 -right-4 w-4 bg-bg h-10 pointer-events-none" />
 
-    <div id="siderail-buttons-container" :class="{ 'player-open': streamLibraryItem }" class="w-full overflow-y-auto overflow-x-hidden">
+    <div id="siderail-buttons-container" role="navigation" aria-label="Library Navigation" :class="{ 'player-open': streamLibraryItem }" class="w-full overflow-y-auto overflow-x-hidden">
       <nuxt-link :to="`/library/${currentLibraryId}`" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
         <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 09424b3c..d3abd0fb 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`book-card-${index}`" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`book-card-${index}`" role="button" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div :id="`cover-area-${index}`" class="relative w-full top-0 left-0 rounded overflow-hidden z-10 bg-primary box-shadow-book" :style="{ height: coverHeight + 'px ' }">
       <!-- When cover image does not fill -->
       <div cy-id="coverBg" v-show="showCoverBg" class="absolute top-0 left-0 w-full h-full overflow-hidden rounded-sm bg-primary">
diff --git a/client/components/cards/LazyCollectionCard.vue b/client/components/cards/LazyCollectionCard.vue
index 2c12ede4..0bb7ac6b 100644
--- a/client/components/cards/LazyCollectionCard.vue
+++ b/client/components/cards/LazyCollectionCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`collection-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`collection-card-${index}`" role="button" :style="{ width: cardWidth + 'px' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden">
diff --git a/client/components/cards/LazyPlaylistCard.vue b/client/components/cards/LazyPlaylistCard.vue
index a2a2f461..b49ef4b9 100644
--- a/client/components/cards/LazyPlaylistCard.vue
+++ b/client/components/cards/LazyPlaylistCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`playlist-card-${index}`" :style="{ width: cardWidth + 'px', fontSize: sizeMultiplier + 'rem' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`playlist-card-${index}`" role="button" :style="{ width: cardWidth + 'px', fontSize: sizeMultiplier + 'rem' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden">
diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 177ec5f3..25c61794 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div cy-id="card" ref="card" :id="`series-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div cy-id="card" ref="card" role="button" :id="`series-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div cy-id="covers-area" class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden z-0">
diff --git a/client/components/controls/GlobalSearch.vue b/client/components/controls/GlobalSearch.vue
index 58796fde..7691bbfc 100644
--- a/client/components/controls/GlobalSearch.vue
+++ b/client/components/controls/GlobalSearch.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="">
     <div class="w-full relative sm:w-80">
-      <form @submit.prevent="submitSearch">
+      <form role="search" @submit.prevent="submitSearch">
         <ui-text-input ref="input" v-model="search" :placeholder="$strings.PlaceholderSearch" @input="inputUpdate" @focus="focussed" @blur="blurred" class="w-full h-8 text-sm" />
       </form>
-      <div class="absolute top-0 right-0 bottom-0 h-full flex items-center px-2 text-gray-400 cursor-pointer" @click="clickClear">
+      <button :aria-hidden="!search" class="absolute top-0 right-0 bottom-0 h-full flex items-center px-2 text-gray-400 cursor-pointer" @click="clickClear">
         <span v-if="!search" class="material-symbols" style="font-size: 1.2rem">&#xe8b6;</span>
         <span v-else class="material-symbols" style="font-size: 1.2rem">close</span>
-      </div>
+      </button>
     </div>
     <div v-show="showMenu && (lastSearch || isTyping)" class="absolute z-40 -mt-px w-full max-w-64 sm:max-w-80 sm:w-80 bg-bg border border-black-200 shadow-lg rounded-md py-1 px-2 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm globalSearchMenu" @mousedown.stop.prevent>
       <ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
diff --git a/client/components/controls/SortSelect.vue b/client/components/controls/SortSelect.vue
index bd16dd87..967cf071 100644
--- a/client/components/controls/SortSelect.vue
+++ b/client/components/controls/SortSelect.vue
@@ -1,20 +1,20 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
+    <button type="button" class="relative w-full h-full border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
       <span class="flex items-center justify-between">
         <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-        <span class="material-symbols text-lg text-yellow-400">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+        <span class="material-symbols text-lg text-yellow-400" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
       </span>
     </button>
 
-    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="listbox" aria-labelledby="listbox-label">
+    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="menu">
       <template v-for="item in items">
-        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item.value)">
+        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedOption(item.value)">
           <div class="flex items-center">
             <span class="font-normal ml-3 block truncate">{{ item.text }}</span>
           </div>
           <span v-if="item.value === selected" class="text-yellow-400 absolute inset-y-0 right-0 flex items-center pr-4">
-            <span class="material-symbols text-xl">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+            <span class="material-symbols text-xl" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
           </span>
         </li>
       </template>

From eab86f90a885e96fee07daebda68e510dc87dd64 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 12 Dec 2024 15:16:49 -0600
Subject: [PATCH 022/143] Accessibility update for config side nav and modal,
 set focus on modal content on open

---
 client/components/app/ConfigSideNav.vue          | 4 ++--
 client/components/modals/Modal.vue               | 7 +++++--
 client/components/modals/changelog/ViewModal.vue | 4 ++--
 client/components/ui/ReadIconBtn.vue             | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/components/app/ConfigSideNav.vue b/client/components/app/ConfigSideNav.vue
index 108dc42d..b42a560e 100644
--- a/client/components/app/ConfigSideNav.vue
+++ b/client/components/app/ConfigSideNav.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div class="w-44 fixed left-0 top-16 bg-bg bg-opacity-100 md:bg-opacity-70 shadow-lg border-r border-white border-opacity-5 py-3 transform transition-transform mb-12 overflow-y-auto" :class="wrapperClass + ' ' + (streamLibraryItem ? 'h-[calc(100%-270px)]' : 'h-[calc(100%-110px)]')" v-click-outside="clickOutside">
+  <div role="toolbar" aria-orientation="vertical" aria-label="Config Sidebar">
+    <div role="navigation" aria-label="Config Navigation" class="w-44 fixed left-0 top-16 bg-bg bg-opacity-100 md:bg-opacity-70 shadow-lg border-r border-white border-opacity-5 py-3 transform transition-transform mb-12 overflow-y-auto" :class="wrapperClass + ' ' + (streamLibraryItem ? 'h-[calc(100%-270px)]' : 'h-[calc(100%-110px)]')" v-click-outside="clickOutside">
       <div v-show="isMobilePortrait" class="flex items-center justify-end pb-2 px-4 mb-1" @click="closeDrawer">
         <span class="material-symbols text-2xl">arrow_back</span>
       </div>
diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue
index ca00c7c5..05ead913 100644
--- a/client/components/modals/Modal.vue
+++ b/client/components/modals/Modal.vue
@@ -1,12 +1,12 @@
 <template>
-  <div ref="wrapper" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary items-center justify-center opacity-0 hidden" :class="`z-${zIndex} bg-opacity-${bgOpacity}`">
+  <div ref="wrapper" role="dialog" aria-modal="true" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary items-center justify-center opacity-0 hidden" :class="`z-${zIndex} bg-opacity-${bgOpacity}`">
     <div class="absolute top-0 left-0 right-0 w-full h-36 bg-gradient-to-t from-transparent via-black-500 to-black-700 opacity-90 pointer-events-none" />
 
     <button class="absolute top-4 right-4 landscape:top-4 landscape:right-4 md:portrait:top-5 md:portrait:right-5 lg:top-5 lg:right-5 inline-flex text-gray-200 hover:text-white" aria-label="Close modal" @click="clickClose">
       <span class="material-symbols text-2xl landscape:text-2xl md:portrait:text-4xl lg:text-4xl">close</span>
     </button>
     <slot name="outer" />
-    <div ref="content" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white" aria-modal="true" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
+    <div ref="content" tabindex="0" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
       <slot />
       <div v-if="processing" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full bg-black bg-opacity-60 rounded-lg flex items-center justify-center">
         <ui-loading-indicator />
@@ -126,6 +126,9 @@ export default {
 
       this.$eventBus.$on('modal-hotkey', this.hotkey)
       this.$store.commit('setOpenModal', this.name)
+
+      // Set focus to the modal content
+      this.content.focus()
     },
     setHide() {
       if (this.content) this.content.style.transform = 'scale(0)'
diff --git a/client/components/modals/changelog/ViewModal.vue b/client/components/modals/changelog/ViewModal.vue
index 6ff0e067..855fb6f8 100644
--- a/client/components/modals/changelog/ViewModal.vue
+++ b/client/components/modals/changelog/ViewModal.vue
@@ -2,7 +2,7 @@
   <modals-modal v-model="show" name="changelog" :width="800" :height="'unset'">
     <template #outer>
       <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
-        <p class="text-3xl text-white truncate">Changelog</p>
+        <h1 class="text-3xl text-white truncate">Changelog</h1>
       </div>
     </template>
     <div class="px-8 py-6 w-full rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-y-scroll" style="max-height: 80vh">
@@ -13,7 +13,7 @@
           </p>
           <div class="custom-text" v-html="getChangelog(release)" />
         </div>
-        <div v-if="release !== releasesToShow[releasesToShow.length - 1]" class="border-b border-black-300 my-8" />
+        <div v-if="release !== releasesToShow[releasesToShow.length - 1]" :key="`${release.name}-divider`" class="border-b border-black-300 my-8" />
       </template>
     </div>
   </modals-modal>
diff --git a/client/components/ui/ReadIconBtn.vue b/client/components/ui/ReadIconBtn.vue
index 0d47fd78..a6d46354 100644
--- a/client/components/ui/ReadIconBtn.vue
+++ b/client/components/ui/ReadIconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button :aria-label="isReady ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
+  <button :aria-label="isRead ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
     <div class="w-5 h-5 text-white relative">
       <svg v-if="isRead" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgb(63, 181, 68)">
         <path d="M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z" />

From e616b538775010f7ed6104f68cd2649c511fb1b2 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 12 Dec 2024 16:51:36 -0600
Subject: [PATCH 023/143] Accessibility update for book & series cards, home
 page shelf scroll #2268 #3699

---
 client/components/app/BookShelfRow.vue        | 10 +++++-----
 client/components/cards/AuthorCard.vue        |  4 ++--
 client/components/cards/LazyBookCard.vue      | 20 +++++++++----------
 client/components/cards/LazySeriesCard.vue    | 12 +++++------
 client/components/covers/GroupCover.vue       |  2 ++
 client/components/widgets/CoverSizeWidget.vue |  2 +-
 client/components/widgets/ItemSlider.vue      |  4 ++--
 client/strings/en-us.json                     |  2 ++
 8 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/client/components/app/BookShelfRow.vue b/client/components/app/BookShelfRow.vue
index 50fa140a..6e19b9dc 100644
--- a/client/components/app/BookShelfRow.vue
+++ b/client/components/app/BookShelfRow.vue
@@ -37,18 +37,18 @@
     <div class="relative">
       <div class="relative text-center categoryPlacard transform z-30 top-0 left-4e md:left-8e w-44e rounded-md">
         <div class="w-full h-full shinyBlack flex items-center justify-center rounded-sm border" :style="{ padding: `0em 0.5em` }">
-          <p :style="{ fontSize: 0.9 + 'em' }">{{ $strings[shelf.labelStringKey] }}</p>
+          <h2 :style="{ fontSize: 0.9 + 'em' }">{{ $strings[shelf.labelStringKey] }}</h2>
         </div>
       </div>
 
       <div class="bookshelfDividerCategorized h-6e w-full absolute top-0 left-0 right-0 z-20"></div>
     </div>
-    <div v-show="canScrollLeft && !isScrolling" class="hidden sm:flex absolute top-0 left-0 w-32 pr-8 bg-black book-shelf-arrow-left items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollLeft">
+    <button v-show="canScrollLeft && !isScrolling" :aria-label="$strings.ButtonScrollLeft" class="hidden sm:flex absolute top-0 left-0 w-32 pr-8 bg-black book-shelf-arrow-left items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollLeft">
       <span class="material-symbols text-white" :style="{ fontSize: 3.75 + 'em' }">chevron_left</span>
-    </div>
-    <div v-show="canScrollRight && !isScrolling" class="hidden sm:flex absolute top-0 right-0 w-32 pl-8 bg-black book-shelf-arrow-right items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollRight">
+    </button>
+    <button v-show="canScrollRight && !isScrolling" :aria-label="$strings.ButtonScrollRight" class="hidden sm:flex absolute top-0 right-0 w-32 pl-8 bg-black book-shelf-arrow-right items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollRight">
       <span class="material-symbols text-white" :style="{ fontSize: 3.75 + 'em' }">chevron_right</span>
-    </div>
+    </button>
   </div>
 </template>
 
diff --git a/client/components/cards/AuthorCard.vue b/client/components/cards/AuthorCard.vue
index 597aca99..1dafa83b 100644
--- a/client/components/cards/AuthorCard.vue
+++ b/client/components/cards/AuthorCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
+  <article class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
     <nuxt-link :to="`/author/${author?.id}`">
       <div cy-id="card" @mouseover="mouseover" @mouseleave="mouseleave">
         <div cy-id="imageArea" :style="{ height: cardHeight + 'px' }" class="bg-primary box-shadow-book rounded-md relative overflow-hidden">
@@ -34,7 +34,7 @@
         </div>
       </div>
     </nuxt-link>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index d3abd0fb..cffa45a5 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`book-card-${index}`" role="button" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <article ref="card" :id="`book-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div :id="`cover-area-${index}`" class="relative w-full top-0 left-0 rounded overflow-hidden z-10 bg-primary box-shadow-book" :style="{ height: coverHeight + 'px ' }">
       <!-- When cover image does not fill -->
       <div cy-id="coverBg" v-show="showCoverBg" class="absolute top-0 left-0 w-full h-full overflow-hidden rounded-sm bg-primary">
@@ -14,21 +14,21 @@
       </div>
 
       <div class="w-full h-full absolute top-0 left-0 rounded overflow-hidden z-10">
-        <div cy-id="titleImageNotReady" v-show="libraryItem && !imageReady" class="absolute top-0 left-0 w-full h-full flex items-center justify-center" :style="{ padding: 0.5 + 'em' }">
+        <div cy-id="titleImageNotReady" v-show="libraryItem && !imageReady" aria-hidden="true" class="absolute top-0 left-0 w-full h-full flex items-center justify-center" :style="{ padding: 0.5 + 'em' }">
           <p :style="{ fontSize: 0.8 + 'em' }" class="text-gray-300 text-center">{{ title }}</p>
         </div>
 
         <!-- Cover Image -->
-        <img cy-id="coverImage" v-show="libraryItem" ref="cover" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
+        <img cy-id="coverImage" v-show="libraryItem" :alt="`${displayTitle}, ${$strings.LabelCover}`" ref="cover" aria-hidden="true" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
 
         <!-- Placeholder Cover Title & Author -->
         <div cy-id="placeholderTitle" v-if="!hasCover" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full flex items-center justify-center" :style="{ padding: placeholderCoverPadding + 'em' }">
           <div>
-            <p cy-id="placeholderTitleText" class="text-center" style="color: rgb(247 223 187)" :style="{ fontSize: titleFontSize + 'em' }">{{ titleCleaned }}</p>
+            <p cy-id="placeholderTitleText" aria-hidden="true" class="text-center" style="color: rgb(247 223 187)" :style="{ fontSize: titleFontSize + 'em' }">{{ titleCleaned }}</p>
           </div>
         </div>
         <div cy-id="placeholderAuthor" v-if="!hasCover" class="absolute left-0 right-0 w-full flex items-center justify-center" :style="{ padding: placeholderCoverPadding + 'em', bottom: authorBottom + 'em' }">
-          <p cy-id="placeholderAuthorText" class="text-center" style="color: rgb(247 223 187); opacity: 0.75" :style="{ fontSize: authorFontSize + 'em' }">{{ authorCleaned }}</p>
+          <p cy-id="placeholderAuthorText" aria-hidden="true" class="text-center" style="color: rgb(247 223 187); opacity: 0.75" :style="{ fontSize: authorFontSize + 'em' }">{{ authorCleaned }}</p>
         </div>
 
         <div v-if="seriesSequenceList" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md z-20 text-right" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', padding: `${0.1}em ${0.25}em` }" style="background-color: #78350f">
@@ -93,11 +93,11 @@
 
         <!-- rss feed icon -->
         <div cy-id="rssFeed" v-if="rssFeed && !isSelectionMode && !isHovering" class="absolute text-success top-0 left-0 z-10" :style="{ padding: 0.375 + 'em' }">
-          <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">rss_feed</span>
+          <span class="material-symbols" aria-hidden="true" :style="{ fontSize: 1.5 + 'em' }">rss_feed</span>
         </div>
         <!-- media item shared icon -->
         <div cy-id="mediaItemShare" v-if="mediaItemShare && !isSelectionMode && !isHovering" class="absolute text-success left-0 z-10" :style="{ padding: 0.375 + 'em', top: rssFeed ? '2em' : '0px' }">
-          <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">public</span>
+          <span class="material-symbols" aria-hidden="true" :style="{ fontSize: 1.5 + 'em' }">public</span>
         </div>
 
         <!-- Series sequence -->
@@ -114,7 +114,7 @@
 
         <!-- Podcast Num Episodes -->
         <div cy-id="numEpisodes" v-else-if="!numEpisodesIncomplete && numEpisodes && !isHovering && !isSelectionMode" class="absolute rounded-full bg-black bg-opacity-90 box-shadow-md z-10 flex items-center justify-center" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', width: 1.25 + 'em', height: 1.25 + 'em' }">
-          <p :style="{ fontSize: 0.8 + 'em' }">{{ numEpisodes }}</p>
+          <p :style="{ fontSize: 0.8 + 'em' }" role="status" :aria-label="$strings.LabelNumberOfEpisodes">{{ numEpisodes }}</p>
         </div>
 
         <!-- Podcast Num Episodes -->
@@ -128,7 +128,7 @@
     <div cy-id="detailBottom" :id="`description-area-${index}`" v-if="isAlternativeBookshelfView || isAuthorBookshelfView" dir="auto" class="relative mt-2e mb-2e left-0 z-50 w-full">
       <div :style="{ fontSize: 0.9 + 'em' }">
         <ui-tooltip v-if="displayTitle" :text="displayTitle" :disabled="!displayTitleTruncated" direction="bottom" :delayOnShow="500" class="flex items-center">
-          <p cy-id="title" ref="displayTitle" class="truncate">{{ displayTitle }}</p>
+          <p cy-id="title" ref="displayTitle" aria-hidden="true" class="truncate">{{ displayTitle }}</p>
           <widgets-explicit-indicator cy-id="explicitIndicator" v-if="isExplicit" />
         </ui-tooltip>
       </div>
@@ -138,7 +138,7 @@
       <p cy-id="line2" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displayLineTwo || '&nbsp;' }}</p>
       <p cy-id="line3" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 25c61794..57d2a4f8 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div cy-id="card" ref="card" role="button" :id="`series-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <article cy-id="card" ref="card" :id="`series-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div cy-id="covers-area" class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden z-0">
@@ -7,12 +7,12 @@
       </div>
 
       <div cy-id="seriesLengthMarker" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md z-20" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', padding: `0.1em 0.25em` }" style="background-color: #cd9d49dd">
-        <p :style="{ fontSize: 0.8 + 'em' }">{{ books.length }}</p>
+        <p :style="{ fontSize: 0.8 + 'em' }" role="status" :aria-label="$strings.LabelNumberOfBooks">{{ books.length }}</p>
       </div>
 
       <div cy-id="seriesProgressBar" v-if="seriesPercentInProgress > 0" class="absolute bottom-0 left-0 h-1e shadow-sm max-w-full z-10 rounded-b w-full" :class="isSeriesFinished ? 'bg-success' : 'bg-yellow-400'" :style="{ width: seriesPercentInProgress * 100 + '%' }" />
 
-      <div cy-id="hoveringDisplayTitle" v-if="hasValidCovers" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'" :style="{ padding: '1em' }">
+      <div cy-id="hoveringDisplayTitle" v-if="hasValidCovers" aria-hidden="true" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'" :style="{ padding: '1em' }">
         <p :style="{ fontSize: 1.2 + 'em' }">{{ displayTitle }}</p>
       </div>
 
@@ -21,14 +21,14 @@
 
     <div cy-id="standardBottomText" v-if="!isAlternativeBookshelfView" class="categoryPlacard absolute z-10 left-0 right-0 mx-auto -bottom-6e h-6e rounded-md text-center" :style="{ width: Math.min(200, cardWidth) + 'px' }">
       <div class="w-full h-full shinyBlack flex items-center justify-center rounded-sm border" :style="{ padding: `0em 0.5em` }">
-        <p cy-id="standardBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+        <p cy-id="standardBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       </div>
     </div>
     <div cy-id="detailBottomText" v-else class="relative z-30 left-0 right-0 mx-auto py-1e rounded-md text-center">
-      <p cy-id="detailBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+      <p cy-id="detailBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       <p cy-id="detailBottomSortLine" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/covers/GroupCover.vue b/client/components/covers/GroupCover.vue
index 2c7872e9..4f213721 100644
--- a/client/components/covers/GroupCover.vue
+++ b/client/components/covers/GroupCover.vue
@@ -121,6 +121,8 @@ export default {
 
       var img = document.createElement('img')
       img.src = src
+      img.alt = `${this.name}, ${this.$strings.LabelCover}`
+      img.ariaHidden = true
       img.className = 'absolute top-0 left-0 w-full h-full'
       img.style.objectFit = showCoverBg ? 'contain' : 'cover'
 
diff --git a/client/components/widgets/CoverSizeWidget.vue b/client/components/widgets/CoverSizeWidget.vue
index 42e60971..0841e4a0 100644
--- a/client/components/widgets/CoverSizeWidget.vue
+++ b/client/components/widgets/CoverSizeWidget.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="rounded-full py-1 bg-primary px-2 border border-black-100 text-center flex items-center box-shadow-md" @mousedown.prevent @mouseup.prevent>
+    <div aria-hidden="true" class="rounded-full py-1 bg-primary px-2 border border-black-100 text-center flex items-center box-shadow-md" @mousedown.prevent @mouseup.prevent>
       <span class="material-symbols" :class="selectedSizeIndex === 0 ? 'text-gray-400' : 'hover:text-yellow-300 cursor-pointer'" style="font-size: 0.9rem" @mousedown.prevent @click="decreaseSize" aria-label="Decrease Cover Size" role="button">&#xe15b;</span>
       <p class="px-2 font-mono" style="font-size: 1rem">{{ bookCoverWidth }}</p>
       <span class="material-symbols" :class="selectedSizeIndex === availableSizes.length - 1 ? 'text-gray-400' : 'hover:text-yellow-300 cursor-pointer'" style="font-size: 0.9rem" @mousedown.prevent @click="increaseSize" aria-label="Increase Cover Size" role="button">&#xe145;</span>
diff --git a/client/components/widgets/ItemSlider.vue b/client/components/widgets/ItemSlider.vue
index fd14a202..92639cc6 100644
--- a/client/components/widgets/ItemSlider.vue
+++ b/client/components/widgets/ItemSlider.vue
@@ -3,10 +3,10 @@
     <div class="flex items-center py-3e">
       <slot />
       <div class="flex-grow" />
-      <button cy-id="leftScrollButton" v-if="isScrollable" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollLeft ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollLeft">
+      <button cy-id="leftScrollButton" v-if="isScrollable" :aria-label="$strings.ButtonScrollLeft" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollLeft ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollLeft">
         <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">chevron_left</span>
       </button>
-      <button cy-id="rightScrollButton" v-if="isScrollable" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollRight ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollRight">
+      <button cy-id="rightScrollButton" v-if="isScrollable" :aria-label="$strings.ButtonScrollRight" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollRight ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollRight">
         <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">chevron_right</span>
       </button>
     </div>
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index f6a42bea..a029fadb 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Save Tracklist",
   "ButtonScan": "Scan",
   "ButtonScanLibrary": "Scan Library",
+  "ButtonScrollLeft": "Scroll Left",
+  "ButtonScrollRight": "Scroll Right",
   "ButtonSearch": "Search",
   "ButtonSelectFolderPath": "Select Folder Path",
   "ButtonSeries": "Series",

From 329bbea04326474508d5e42b11e0b804aeb7b173 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 13 Dec 2024 16:06:00 -0600
Subject: [PATCH 024/143] Fix:Downloading podcast episode when file extension
 is mp3 but enclosure type is not mp3 #3711

---
 server/managers/PodcastManager.js        |  9 ++++++++-
 server/objects/PodcastEpisodeDownload.js | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index 0a32e3ca..456927c8 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -25,7 +25,9 @@ const LibraryItem = require('../objects/LibraryItem')
 
 class PodcastManager {
   constructor() {
+    /** @type {PodcastEpisodeDownload[]} */
     this.downloadQueue = []
+    /** @type {PodcastEpisodeDownload} */
     this.currentDownload = null
 
     this.failedCheckMap = {}
@@ -63,6 +65,11 @@ class PodcastManager {
     }
   }
 
+  /**
+   *
+   * @param {PodcastEpisodeDownload} podcastEpisodeDownload
+   * @returns
+   */
   async startPodcastEpisodeDownload(podcastEpisodeDownload) {
     if (this.currentDownload) {
       this.downloadQueue.push(podcastEpisodeDownload)
@@ -106,7 +113,7 @@ class PodcastManager {
     }
 
     let success = false
-    if (this.currentDownload.urlFileExtension === 'mp3') {
+    if (this.currentDownload.isMp3) {
       // Download episode and tag it
       success = await ffmpegHelpers.downloadPodcastEpisode(this.currentDownload).catch((error) => {
         Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
diff --git a/server/objects/PodcastEpisodeDownload.js b/server/objects/PodcastEpisodeDownload.js
index 86a85801..eb9f059a 100644
--- a/server/objects/PodcastEpisodeDownload.js
+++ b/server/objects/PodcastEpisodeDownload.js
@@ -53,6 +53,20 @@ class PodcastEpisodeDownload {
     if (globals.SupportedAudioTypes.includes(extname)) return extname
     return 'mp3'
   }
+  get enclosureType() {
+    const enclosureType = this.podcastEpisode?.enclosure?.type
+    return typeof enclosureType === 'string' ? enclosureType : null
+  }
+  /**
+   * RSS feed may have an episode with file extension of mp3 but the specified enclosure type is not mpeg.
+   * @see https://github.com/advplyr/audiobookshelf/issues/3711
+   *
+   * @returns {boolean}
+   */
+  get isMp3() {
+    if (this.enclosureType && !this.enclosureType.includes('mpeg')) return false
+    return this.fileExtension === 'mp3'
+  }
 
   get targetFilename() {
     const appendage = this.appendEpisodeId ? ` (${this.podcastEpisode.id})` : ''

From c4610e61028c9a64c44e6fe6831ad23c8415e580 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 13 Dec 2024 16:22:32 -0600
Subject: [PATCH 025/143] Update:Remove outline for focused modal content

---
 client/components/modals/Modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue
index 05ead913..38237745 100644
--- a/client/components/modals/Modal.vue
+++ b/client/components/modals/Modal.vue
@@ -6,7 +6,7 @@
       <span class="material-symbols text-2xl landscape:text-2xl md:portrait:text-4xl lg:text-4xl">close</span>
     </button>
     <slot name="outer" />
-    <div ref="content" tabindex="0" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
+    <div ref="content" tabindex="0" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white outline-none" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
       <slot />
       <div v-if="processing" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full bg-black bg-opacity-60 rounded-lg flex items-center justify-center">
         <ui-loading-indicator />

From 9bd1f9e3d570401a6f5146bdd2384ade7a0c26e8 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 14 Dec 2024 16:55:56 -0600
Subject: [PATCH 026/143] Refactor Feed model to create new feed for library
 item

---
 server/controllers/RSSFeedController.js |  29 ++--
 server/managers/RssFeedManager.js       |  43 ++++--
 server/models/Book.js                   |  29 ++++
 server/models/Feed.js                   | 144 +++++++++++++++++-
 server/models/FeedEpisode.js            | 188 +++++++++++++++++++++---
 server/models/LibraryItem.js            |  21 +++
 server/objects/Feed.js                  |  58 --------
 7 files changed, 400 insertions(+), 112 deletions(-)

diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index 2e07c10e..b16820aa 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -38,38 +38,43 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForItem(req, res) {
-    const options = req.body || {}
+    const reqBody = req.body || {}
 
-    const item = await Database.libraryItemModel.getOldById(req.params.itemId)
-    if (!item) return res.sendStatus(404)
+    const itemExpanded = await Database.libraryItemModel.getExpandedById(req.params.itemId)
+    if (!itemExpanded) return res.sendStatus(404)
 
     // Check user can access this library item
-    if (!req.user.checkCanAccessLibraryItem(item)) {
-      Logger.error(`[RSSFeedController] User "${req.user.username}" attempted to open an RSS feed for item "${item.media.metadata.title}" that they don\'t have access to`)
+    if (!req.user.checkCanAccessLibraryItem(itemExpanded)) {
+      Logger.error(`[RSSFeedController] User "${req.user.username}" attempted to open an RSS feed for item "${itemExpanded.media.title}" that they don\'t have access to`)
       return res.sendStatus(403)
     }
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check item has audio tracks
-    if (!item.media.numTracks) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed for item "${item.media.metadata.title}" because it has no audio tracks`)
+    if (!itemExpanded.hasAudioTracks()) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed for item "${itemExpanded.media.title}" because it has no audio tracks`)
       return res.status(400).send('Item has no audio tracks')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const feed = await this.rssFeedManager.openFeedForItem(req.user.id, item, req.body)
+    const feed = await this.rssFeedManager.openFeedForItem(req.user.id, itemExpanded, reqBody)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for item "${itemExpanded.media.title}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 583f0bb6..3feb87d0 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -223,25 +223,42 @@ class RssFeedManager {
 
   /**
    *
-   * @param {string} userId
-   * @param {*} libraryItem
    * @param {*} options
-   * @returns
+   * @returns {import('../models/Feed').FeedOptions}
+   */
+  getFeedOptionsFromReqOptions(options) {
+    const metadataDetails = options.metadataDetails || {}
+
+    if (metadataDetails.preventIndexing !== false) {
+      metadataDetails.preventIndexing = true
+    }
+
+    return {
+      preventIndexing: metadataDetails.preventIndexing,
+      ownerName: metadataDetails.ownerName && typeof metadataDetails.ownerName === 'string' ? metadataDetails.ownerName : null,
+      ownerEmail: metadataDetails.ownerEmail && typeof metadataDetails.ownerEmail === 'string' ? metadataDetails.ownerEmail : null
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} options
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForItem(userId, libraryItem, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromItem(userId, slug, libraryItem, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
+    Logger.info(`[RssFeedManager] Creating RSS feed for item ${libraryItem.id} "${libraryItem.media.title}"`)
+    const feedExpanded = await Database.feedModel.createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
+    }
+    return feedExpanded
   }
 
   /**
diff --git a/server/models/Book.js b/server/models/Book.js
index a8ccf73d..71a55033 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -106,6 +106,9 @@ class Book extends Model {
     this.updatedAt
     /** @type {Date} */
     this.createdAt
+
+    /** @type {import('./Author')[]} - optional if expanded */
+    this.authors
   }
 
   static getOldBook(libraryItemExpanded) {
@@ -320,6 +323,32 @@ class Book extends Model {
       }
     )
   }
+
+  /**
+   * Comma separated array of author names
+   * Requires authors to be loaded
+   *
+   * @returns {string}
+   */
+  get authorName() {
+    if (this.authors === undefined) {
+      Logger.error(`[Book] authorName: Cannot get authorName because authors are not loaded`)
+      return ''
+    }
+    return this.authors.map((au) => au.name).join(', ')
+  }
+  get includedAudioFiles() {
+    return this.audioFiles.filter((af) => !af.exclude)
+  }
+  get trackList() {
+    let startOffset = 0
+    return this.includedAudioFiles.map((af) => {
+      const track = structuredClone(af)
+      track.startOffset = startOffset
+      startOffset += track.duration
+      return track
+    })
+  }
 }
 
 module.exports = Book
diff --git a/server/models/Feed.js b/server/models/Feed.js
index 4f51e66d..ff25a612 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -1,7 +1,22 @@
+const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
 const oldFeed = require('../objects/Feed')
 const areEquivalent = require('../utils/areEquivalent')
 
+/**
+ * @typedef FeedOptions
+ * @property {boolean} preventIndexing
+ * @property {string} ownerName
+ * @property {string} ownerEmail
+ */
+
+/**
+ * @typedef FeedExpandedProperties
+ * @property {import('./FeedEpisode')} feedEpisodes
+ *
+ * @typedef {Feed & FeedExpandedProperties} FeedExpanded
+ */
+
 class Feed extends Model {
   constructor(values, options) {
     super(values, options)
@@ -50,6 +65,9 @@ class Feed extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    /** @type {import('./FeedEpisode')[]} - only set if expanded */
+    this.feedEpisodes
   }
 
   static async getOldFeeds() {
@@ -67,7 +85,15 @@ class Feed extends Model {
    * @returns {oldFeed}
    */
   static getOldFeed(feedExpanded) {
-    const episodes = feedExpanded.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
+    const episodes = feedExpanded.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode()) || []
+
+    // Sort episodes by pubDate. Newest to oldest for episodic, oldest to newest for serial
+    if (feedExpanded.podcastType === 'episodic') {
+      episodes.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate))
+    } else {
+      episodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
+    }
+
     return new oldFeed({
       id: feedExpanded.id,
       slug: feedExpanded.slug,
@@ -92,7 +118,7 @@ class Feed extends Model {
       },
       serverAddress: feedExpanded.serverAddress,
       feedUrl: feedExpanded.feedURL,
-      episodes: episodes || [],
+      episodes,
       createdAt: feedExpanded.createdAt.valueOf(),
       updatedAt: feedExpanded.updatedAt.valueOf()
     })
@@ -250,10 +276,62 @@ class Feed extends Model {
     }
   }
 
-  getEntity(options) {
-    if (!this.entityType) return Promise.resolve(null)
-    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.entityType)}`
-    return this[mixinMethodName](options)
+  /**
+   *
+   * @param {string} userId
+   * @param {string} slug
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) {
+    const media = libraryItem.media
+
+    const feedObj = {
+      slug,
+      entityType: 'libraryItem',
+      entityId: libraryItem.id,
+      entityUpdatedAt: libraryItem.updatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: media.coverPath ? `/feed/${slug}/cover${Path.extname(media.coverPath)}` : `/Logo.png`,
+      siteURL: `/item/${libraryItem.id}`,
+      title: media.title,
+      description: media.description,
+      author: libraryItem.mediaType === 'podcast' ? media.author : media.authorName,
+      podcastType: libraryItem.mediaType === 'podcast' ? media.podcastType : 'serial',
+      language: media.language,
+      preventIndexing: feedOptions.preventIndexing,
+      ownerName: feedOptions.ownerName,
+      ownerEmail: feedOptions.ownerEmail,
+      explicit: media.explicit,
+      coverPath: media.coverPath,
+      userId
+    }
+
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
+
+      if (libraryItem.mediaType === 'podcast') {
+        feed.feedEpisodes = await feedEpisodeModel.createFromPodcastEpisodes(libraryItem, feed, slug, transaction)
+      } else {
+        feed.feedEpisodes = await feedEpisodeModel.createFromAudiobookTracks(libraryItem, feed, slug, transaction)
+      }
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for library item ${libraryItem.id}`, error)
+      await transaction.rollback()
+      return null
+    }
   }
 
   /**
@@ -369,6 +447,60 @@ class Feed extends Model {
       }
     })
   }
+
+  getEntity(options) {
+    if (!this.entityType) return Promise.resolve(null)
+    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.entityType)}`
+    return this[mixinMethodName](options)
+  }
+
+  toOldJSON() {
+    const episodes = this.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
+    return {
+      id: this.id,
+      slug: this.slug,
+      userId: this.userId,
+      entityType: this.entityType,
+      entityId: this.entityId,
+      entityUpdatedAt: this.entityUpdatedAt?.valueOf() || null,
+      coverPath: this.coverPath || null,
+      meta: {
+        title: this.title,
+        description: this.description,
+        author: this.author,
+        imageUrl: this.imageURL,
+        feedUrl: this.feedURL,
+        link: this.siteURL,
+        explicit: this.explicit,
+        type: this.podcastType,
+        language: this.language,
+        preventIndexing: this.preventIndexing,
+        ownerName: this.ownerName,
+        ownerEmail: this.ownerEmail
+      },
+      serverAddress: this.serverAddress,
+      feedUrl: this.feedURL,
+      episodes: episodes || [],
+      createdAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    }
+  }
+
+  toOldJSONMinified() {
+    return {
+      id: this.id,
+      entityType: this.entityType,
+      entityId: this.entityId,
+      feedUrl: this.feedURL,
+      meta: {
+        title: this.title,
+        description: this.description,
+        preventIndexing: this.preventIndexing,
+        ownerName: this.ownerName,
+        ownerEmail: this.ownerEmail
+      }
+    }
+  }
 }
 
 module.exports = Feed
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 442cc165..0a90f97d 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -1,4 +1,8 @@
+const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
+const uuidv4 = require('uuid').v4
+const Logger = require('../Logger')
+const date = require('../libs/dateAndTime')
 
 class FeedEpisode extends Model {
   constructor(values, options) {
@@ -40,29 +44,6 @@ class FeedEpisode extends Model {
     this.updatedAt
   }
 
-  getOldEpisode() {
-    const enclosure = {
-      url: this.enclosureURL,
-      size: this.enclosureSize,
-      type: this.enclosureType
-    }
-    return {
-      id: this.id,
-      title: this.title,
-      description: this.description,
-      enclosure,
-      pubDate: this.pubDate,
-      link: this.siteURL,
-      author: this.author,
-      explicit: this.explicit,
-      duration: this.duration,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      fullPath: this.filePath
-    }
-  }
-
   /**
    * Create feed episode from old model
    *
@@ -96,6 +77,144 @@ class FeedEpisode extends Model {
     }
   }
 
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('./PodcastEpisode')} episode
+   */
+  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
+    return {
+      title: episode.title,
+      author: feed.author,
+      description: episode.description,
+      siteURL: feed.siteURL,
+      enclosureURL: `/feed/${slug}/item/${episode.id}/media${Path.extname(episode.audioFile.metadata.filename)}`,
+      enclosureType: episode.audioFile.mimeType,
+      enclosureSize: episode.audioFile.metadata.size,
+      pubDate: episode.pubDate,
+      season: episode.season,
+      episode: episode.episode,
+      episodeType: episode.episodeType,
+      duration: episode.audioFile.duration,
+      filePath: episode.audioFile.metadata.path,
+      explicit: libraryItemExpanded.media.explicit,
+      feedId: feed.id
+    }
+  }
+
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
+   */
+  static async createFromPodcastEpisodes(libraryItemExpanded, feed, slug, transaction) {
+    const feedEpisodeObjs = []
+
+    // Sort podcastEpisodes by pubDate. episodic is newest to oldest. serial is oldest to newest.
+    if (feed.podcastType === 'episodic') {
+      libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate))
+    } else {
+      libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
+    }
+
+    for (const episode of libraryItemExpanded.media.podcastEpisodes) {
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode))
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
+  }
+
+  /**
+   * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @returns {boolean}
+   */
+  static checkUseChapterTitlesForEpisodes(libraryItemExpanded) {
+    const tracks = libraryItemExpanded.media.trackList || []
+    const chapters = libraryItemExpanded.media.chapters || []
+    if (tracks.length !== chapters.length) return false
+    for (let i = 0; i < tracks.length; i++) {
+      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
+        return false
+      }
+    }
+    return true
+  }
+
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('./Book').AudioFileObject} audioTrack
+   * @param {boolean} useChapterTitles
+   * @param {string} [pubDateOverride]
+   */
+  static getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded, feed, slug, audioTrack, useChapterTitles, pubDateOverride = null) {
+    // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
+    let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
+    let episodeId = uuidv4()
+
+    // e.g. Track 1 will have a pub date before Track 2
+    const audiobookPubDate = pubDateOverride || date.format(new Date(libraryItemExpanded.createdAt.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
+
+    const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`
+    const media = libraryItemExpanded.media
+
+    let title = audioTrack.title
+    if (media.trackList.length == 1) {
+      // If audiobook is a single file, use book title instead of chapter/file title
+      title = media.title
+    } else {
+      if (useChapterTitles) {
+        // If audio track start and chapter start are within 1 seconds of eachother then use the chapter title
+        const matchingChapter = media.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
+        if (matchingChapter?.title) title = matchingChapter.title
+      }
+    }
+
+    return {
+      id: episodeId,
+      title,
+      author: feed.author,
+      description: media.description || '',
+      siteURL: feed.siteURL,
+      enclosureURL: contentUrl,
+      enclosureType: audioTrack.mimeType,
+      enclosureSize: audioTrack.metadata.size,
+      pubDate: audiobookPubDate,
+      duration: audioTrack.duration,
+      filePath: audioTrack.metadata.path,
+      explicit: media.explicit,
+      feedId: feed.id
+    }
+  }
+
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
+   */
+  static async createFromAudiobookTracks(libraryItemExpanded, feed, slug, transaction) {
+    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded)
+
+    const feedEpisodeObjs = []
+    for (const track of libraryItemExpanded.media.trackList) {
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded, feed, slug, track, useChapterTitles))
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
@@ -136,6 +255,29 @@ class FeedEpisode extends Model {
     })
     FeedEpisode.belongsTo(feed)
   }
+
+  getOldEpisode() {
+    const enclosure = {
+      url: this.enclosureURL,
+      size: this.enclosureSize,
+      type: this.enclosureType
+    }
+    return {
+      id: this.id,
+      title: this.title,
+      description: this.description,
+      enclosure,
+      pubDate: this.pubDate,
+      link: this.siteURL,
+      author: this.author,
+      explicit: this.explicit,
+      duration: this.duration,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      fullPath: this.filePath
+    }
+  }
 }
 
 module.exports = FeedEpisode
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 10395c49..0c8df302 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -73,6 +73,9 @@ class LibraryItem extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    /** @type {Book.BookExpanded|Podcast.PodcastExpanded} - only set when expanded */
+    this.media
   }
 
   /**
@@ -1124,6 +1127,24 @@ class LibraryItem extends Model {
       }
     })
   }
+
+  /**
+   * Check if book or podcast library item has audio tracks
+   * Requires expanded library item
+   *
+   * @returns {boolean}
+   */
+  hasAudioTracks() {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] hasAudioTracks: Library item "${this.id}" does not have media`)
+      return false
+    }
+    if (this.mediaType === 'book') {
+      return this.media.audioFiles?.length > 0
+    } else {
+      return this.media.podcastEpisodes?.length > 0
+    }
+  }
 }
 
 module.exports = LibraryItem
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index ac50b899..dd086bb0 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -101,64 +101,6 @@ class Feed {
     return true
   }
 
-  setFromItem(userId, slug, libraryItem, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-    const isPodcast = libraryItem.mediaType === 'podcast'
-
-    const feedUrl = `/feed/${slug}`
-    const author = isPodcast ? mediaMetadata.author : mediaMetadata.authorName
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'libraryItem'
-    this.entityId = libraryItem.id
-    this.entityUpdatedAt = libraryItem.updatedAt
-    this.coverPath = media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(media.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = mediaMetadata.title
-    this.meta.description = mediaMetadata.description
-    this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/item/${libraryItem.id}`
-    this.meta.explicit = !!mediaMetadata.explicit
-    this.meta.type = mediaMetadata.type
-    this.meta.language = mediaMetadata.language
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-    if (isPodcast) {
-      // PODCAST EPISODES
-      media.episodes.forEach((episode) => {
-        if (episode.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = episode.updatedAt
-
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromPodcastEpisode(libraryItem, serverAddress, slug, episode, this.meta)
-        this.episodes.push(feedEpisode)
-      })
-    } else {
-      // AUDIOBOOK EPISODES
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItem)
-      media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromAudiobookTrack(libraryItem, serverAddress, slug, audioTrack, this.meta, useChapterTitles)
-        this.episodes.push(feedEpisode)
-      })
-    }
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
   updateFromItem(libraryItem) {
     const media = libraryItem.media
     const mediaMetadata = media.metadata

From d576625cb76ed35cc0bfe7dc0910b88ae262a0d4 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 10:53:31 -0600
Subject: [PATCH 027/143] Refactor Feed model to create new feed for collection

---
 server/controllers/RSSFeedController.js | 22 ++++----
 server/managers/RssFeedManager.js       | 22 ++++----
 server/models/Book.js                   |  6 +++
 server/models/Collection.js             | 34 +++++++++++++
 server/models/Feed.js                   | 68 ++++++++++++++++++++++++-
 server/models/FeedEpisode.js            | 57 +++++++++++++++------
 server/objects/Feed.js                  | 55 --------------------
 7 files changed, 171 insertions(+), 93 deletions(-)

diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index b16820aa..65c823a4 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -87,35 +87,39 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForCollection(req, res) {
-    const options = req.body || {}
+    const reqBody = req.body || {}
 
     const collection = await Database.collectionModel.findByPk(req.params.collectionId)
     if (!collection) return res.sendStatus(404)
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const collectionExpanded = await collection.getOldJsonExpanded()
-    const collectionItemsWithTracks = collectionExpanded.books.filter((li) => li.media.tracks.length)
+    collection.books = await collection.getBooksExpandedWithLibraryItem()
 
     // Check collection has audio tracks
-    if (!collectionItemsWithTracks.length) {
+    if (!collection.books.some((book) => book.includedAudioFiles.length)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed for collection "${collection.name}" because it has no audio tracks`)
       return res.status(400).send('Collection has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForCollection(req.user.id, collectionExpanded, req.body)
+    const feed = await this.rssFeedManager.openFeedForCollection(req.user.id, collection, reqBody)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for collection "${collection.name}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 3feb87d0..032aa4f2 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -264,24 +264,22 @@ class RssFeedManager {
   /**
    *
    * @param {string} userId
-   * @param {*} collectionExpanded
+   * @param {import('../models/Collection')} collectionExpanded
    * @param {*} options
-   * @returns
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForCollection(userId, collectionExpanded, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
+    Logger.info(`[RssFeedManager] Creating RSS feed for collection "${collectionExpanded.name}"`)
+    const feedExpanded = await Database.feedModel.createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
+    }
+    return feedExpanded
   }
 
   /**
diff --git a/server/models/Book.js b/server/models/Book.js
index 71a55033..f7341db9 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -29,6 +29,12 @@ const Logger = require('../Logger')
  * @property {SeriesExpanded[]} series
  *
  * @typedef {Book & BookExpandedProperties} BookExpanded
+ *
+ * Collections use BookExpandedWithLibraryItem
+ * @typedef BookExpandedWithLibraryItemProperties
+ * @property {import('./LibraryItem')} libraryItem
+ *
+ * @typedef {BookExpanded & BookExpandedWithLibraryItemProperties} BookExpandedWithLibraryItem
  */
 
 /**
diff --git a/server/models/Collection.js b/server/models/Collection.js
index a001dc5b..0fb622dd 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -1,6 +1,7 @@
 const { DataTypes, Model, Sequelize } = require('sequelize')
 
 const oldCollection = require('../objects/Collection')
+const Logger = require('../Logger')
 
 class Collection extends Model {
   constructor(values, options) {
@@ -18,6 +19,11 @@ class Collection extends Model {
     this.updatedAt
     /** @type {Date} */
     this.createdAt
+
+    // Expanded properties
+
+    /** @type {import('./Book').BookExpandedWithLibraryItem[]} - only set when expanded */
+    this.books
   }
 
   /**
@@ -219,6 +225,34 @@ class Collection extends Model {
     Collection.belongsTo(library)
   }
 
+  /**
+   * Get all books in collection expanded with library item
+   *
+   * @returns {Promise<import('./Book').BookExpandedWithLibraryItem[]>}
+   */
+  getBooksExpandedWithLibraryItem() {
+    return this.getBooks({
+      include: [
+        {
+          model: this.sequelize.models.libraryItem
+        },
+        {
+          model: this.sequelize.models.author,
+          through: {
+            attributes: []
+          }
+        },
+        {
+          model: this.sequelize.models.series,
+          through: {
+            attributes: ['sequence']
+          }
+        }
+      ],
+      order: [Sequelize.literal('`collectionBook.order` ASC')]
+    })
+  }
+
   /**
    * Get old collection toJSONExpanded, items filtered for user permissions
    *
diff --git a/server/models/Feed.js b/server/models/Feed.js
index ff25a612..f22c1ac3 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -279,8 +279,8 @@ class Feed extends Model {
   /**
    *
    * @param {string} userId
-   * @param {string} slug
    * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} slug
    * @param {string} serverAddress
    * @param {FeedOptions} feedOptions
    *
@@ -334,6 +334,72 @@ class Feed extends Model {
     }
   }
 
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Collection')} collectionExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) {
+    const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
+    const libraryItemMostRecentlyUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent.libraryItem.updatedAt ? book : mostRecent
+    }).libraryItem.updatedAt
+
+    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
+
+    const allBookAuthorNames = booksWithTracks.reduce((authorNames, book) => {
+      const bookAuthorsToAdd = book.authors.filter((author) => !authorNames.includes(author.name)).map((author) => author.name)
+      return authorNames.concat(bookAuthorsToAdd)
+    }, [])
+    let author = allBookAuthorNames.slice(0, 3).join(', ')
+    if (allBookAuthorNames.length > 3) {
+      author += ' & more'
+    }
+
+    const feedObj = {
+      slug,
+      entityType: 'collection',
+      entityId: collectionExpanded.id,
+      entityUpdatedAt: libraryItemMostRecentlyUpdatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,
+      siteURL: `/collection/${collectionExpanded.id}`,
+      title: collectionExpanded.name,
+      description: collectionExpanded.description || '',
+      author,
+      podcastType: 'serial',
+      preventIndexing: feedOptions.preventIndexing,
+      ownerName: feedOptions.ownerName,
+      ownerEmail: feedOptions.ownerEmail,
+      explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
+      coverPath: firstBookWithCover?.coverPath || null,
+      userId
+    }
+
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
+      feed.feedEpisodes = await feedEpisodeModel.createFromCollectionBooks(collectionExpanded, feed, slug, transaction)
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for collection ${collectionExpanded.id}`, error)
+      await transaction.rollback()
+      return null
+    }
+  }
+
   /**
    * Initialize model
    *
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 0a90f97d..c92ee9cc 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -132,12 +132,12 @@ class FeedEpisode extends Model {
   /**
    * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
    *
-   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Book')} book
    * @returns {boolean}
    */
-  static checkUseChapterTitlesForEpisodes(libraryItemExpanded) {
-    const tracks = libraryItemExpanded.media.trackList || []
-    const chapters = libraryItemExpanded.media.chapters || []
+  static checkUseChapterTitlesForEpisodes(book) {
+    const tracks = book.trackList || []
+    const chapters = book.chapters || []
     if (tracks.length !== chapters.length) return false
     for (let i = 0; i < tracks.length; i++) {
       if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
@@ -149,32 +149,31 @@ class FeedEpisode extends Model {
 
   /**
    *
-   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Book')} book
+   * @param {Date} pubDateStart
    * @param {import('./Feed')} feed
    * @param {string} slug
    * @param {import('./Book').AudioFileObject} audioTrack
    * @param {boolean} useChapterTitles
-   * @param {string} [pubDateOverride]
    */
-  static getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded, feed, slug, audioTrack, useChapterTitles, pubDateOverride = null) {
+  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles) {
     // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
     let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
     let episodeId = uuidv4()
 
     // e.g. Track 1 will have a pub date before Track 2
-    const audiobookPubDate = pubDateOverride || date.format(new Date(libraryItemExpanded.createdAt.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
+    const audiobookPubDate = date.format(new Date(pubDateStart.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
 
     const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`
-    const media = libraryItemExpanded.media
 
     let title = audioTrack.title
-    if (media.trackList.length == 1) {
+    if (book.trackList.length == 1) {
       // If audiobook is a single file, use book title instead of chapter/file title
-      title = media.title
+      title = book.title
     } else {
       if (useChapterTitles) {
         // If audio track start and chapter start are within 1 seconds of eachother then use the chapter title
-        const matchingChapter = media.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
+        const matchingChapter = book.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
         if (matchingChapter?.title) title = matchingChapter.title
       }
     }
@@ -183,7 +182,7 @@ class FeedEpisode extends Model {
       id: episodeId,
       title,
       author: feed.author,
-      description: media.description || '',
+      description: book.description || '',
       siteURL: feed.siteURL,
       enclosureURL: contentUrl,
       enclosureType: audioTrack.mimeType,
@@ -191,7 +190,7 @@ class FeedEpisode extends Model {
       pubDate: audiobookPubDate,
       duration: audioTrack.duration,
       filePath: audioTrack.metadata.path,
-      explicit: media.explicit,
+      explicit: book.explicit,
       feedId: feed.id
     }
   }
@@ -205,11 +204,37 @@ class FeedEpisode extends Model {
    * @returns {Promise<FeedEpisode[]>}
    */
   static async createFromAudiobookTracks(libraryItemExpanded, feed, slug, transaction) {
-    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded)
+    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
 
     const feedEpisodeObjs = []
     for (const track of libraryItemExpanded.media.trackList) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded, feed, slug, track, useChapterTitles))
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles))
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
+  }
+
+  /**
+   *
+   * @param {import('./Collection')} collectionExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
+   */
+  static async createFromCollectionBooks(collectionExpanded, feed, slug, transaction) {
+    const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
+
+    const earliestLibraryItemCreatedAt = collectionExpanded.books.reduce((earliest, book) => {
+      return book.libraryItem.createdAt < earliest.libraryItem.createdAt ? book : earliest
+    }).libraryItem.createdAt
+
+    const feedEpisodeObjs = []
+    for (const book of booksWithTracks) {
+      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
+      for (const track of book.trackList) {
+        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
+      }
     }
     Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
     return this.bulkCreate(feedEpisodeObjs, { transaction })
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index dd086bb0..378ef3ee 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -143,61 +143,6 @@ class Feed {
     this.updatedAt = Date.now()
   }
 
-  setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `/feed/${slug}`
-
-    const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'collection'
-    this.entityId = collectionExpanded.id
-    this.entityUpdatedAt = collectionExpanded.lastUpdate // This will be set to the most recently updated library item
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = collectionExpanded.name
-    this.meta.description = collectionExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/collection/${collectionExpanded.id}`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, serverAddress, slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
   updateFromCollection(collectionExpanded) {
     const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
     const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)

From e50bd939581bf2eab5764fbaf8916a10dd5cacb1 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 11:44:07 -0600
Subject: [PATCH 028/143] Refactor Feed model to create new feed for series

---
 server/controllers/RSSFeedController.js | 26 +++++-----
 server/managers/RssFeedManager.js       | 22 ++++----
 server/models/Feed.js                   | 68 ++++++++++++++++++++++++-
 server/models/FeedEpisode.js            | 10 ++--
 server/models/Series.js                 | 36 ++++++++++++-
 server/objects/Feed.js                  | 59 ---------------------
 6 files changed, 130 insertions(+), 91 deletions(-)

diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index 65c823a4..57e02c5c 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -132,37 +132,39 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForSeries(req, res) {
-    const options = req.body || {}
+    const reqBody = req.body || {}
 
     const series = await Database.seriesModel.findByPk(req.params.seriesId)
     if (!series) return res.sendStatus(404)
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const seriesJson = series.toOldJSON()
-
-    // Get books in series that have audio tracks
-    seriesJson.books = (await libraryItemsBookFilters.getLibraryItemsForSeries(series)).filter((li) => li.media.numTracks)
+    series.books = await series.getBooksExpandedWithLibraryItem()
 
     // Check series has audio tracks
-    if (!seriesJson.books.length) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed for series "${seriesJson.name}" because it has no audio tracks`)
+    if (!series.books.some((book) => book.includedAudioFiles.length)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed for series "${series.name}" because it has no audio tracks`)
       return res.status(400).send('Series has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForSeries(req.user.id, seriesJson, req.body)
+    const feed = await this.rssFeedManager.openFeedForSeries(req.user.id, series, req.body)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for series "${series.name}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 032aa4f2..8d5b5e40 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -285,24 +285,22 @@ class RssFeedManager {
   /**
    *
    * @param {string} userId
-   * @param {*} seriesExpanded
+   * @param {import('../models/Series')} seriesExpanded
    * @param {*} options
-   * @returns
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForSeries(userId, seriesExpanded, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
+    Logger.info(`[RssFeedManager] Creating RSS feed for series "${seriesExpanded.name}"`)
+    const feedExpanded = await Database.feedModel.createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
+    }
+    return feedExpanded
   }
 
   async handleCloseFeed(feed) {
diff --git a/server/models/Feed.js b/server/models/Feed.js
index f22c1ac3..fa1b0f00 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -388,7 +388,73 @@ class Feed extends Model {
     const transaction = await this.sequelize.transaction()
     try {
       const feed = await this.create(feedObj, { transaction })
-      feed.feedEpisodes = await feedEpisodeModel.createFromCollectionBooks(collectionExpanded, feed, slug, transaction)
+      feed.feedEpisodes = await feedEpisodeModel.createFromBooks(booksWithTracks, feed, slug, transaction)
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for collection ${collectionExpanded.id}`, error)
+      await transaction.rollback()
+      return null
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Series')} seriesExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) {
+    const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
+    const libraryItemMostRecentlyUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent.libraryItem.updatedAt ? book : mostRecent
+    }).libraryItem.updatedAt
+
+    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
+
+    const allBookAuthorNames = booksWithTracks.reduce((authorNames, book) => {
+      const bookAuthorsToAdd = book.authors.filter((author) => !authorNames.includes(author.name)).map((author) => author.name)
+      return authorNames.concat(bookAuthorsToAdd)
+    }, [])
+    let author = allBookAuthorNames.slice(0, 3).join(', ')
+    if (allBookAuthorNames.length > 3) {
+      author += ' & more'
+    }
+
+    const feedObj = {
+      slug,
+      entityType: 'series',
+      entityId: seriesExpanded.id,
+      entityUpdatedAt: libraryItemMostRecentlyUpdatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,
+      siteURL: `/library/${booksWithTracks[0].libraryItem.libraryId}/series/${seriesExpanded.id}`,
+      title: seriesExpanded.name,
+      description: seriesExpanded.description || '',
+      author,
+      podcastType: 'serial',
+      preventIndexing: feedOptions.preventIndexing,
+      ownerName: feedOptions.ownerName,
+      ownerEmail: feedOptions.ownerEmail,
+      explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
+      coverPath: firstBookWithCover?.coverPath || null,
+      userId
+    }
+
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
+      feed.feedEpisodes = await feedEpisodeModel.createFromBooks(booksWithTracks, feed, slug, transaction)
 
       await transaction.commit()
 
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index c92ee9cc..4979ae6d 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -216,21 +216,19 @@ class FeedEpisode extends Model {
 
   /**
    *
-   * @param {import('./Collection')} collectionExpanded
+   * @param {import('./Book')[]} books
    * @param {import('./Feed')} feed
    * @param {string} slug
    * @param {import('sequelize').Transaction} transaction
    * @returns {Promise<FeedEpisode[]>}
    */
-  static async createFromCollectionBooks(collectionExpanded, feed, slug, transaction) {
-    const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
-
-    const earliestLibraryItemCreatedAt = collectionExpanded.books.reduce((earliest, book) => {
+  static async createFromBooks(books, feed, slug, transaction) {
+    const earliestLibraryItemCreatedAt = books.reduce((earliest, book) => {
       return book.libraryItem.createdAt < earliest.libraryItem.createdAt ? book : earliest
     }).libraryItem.createdAt
 
     const feedEpisodeObjs = []
-    for (const book of booksWithTracks) {
+    for (const book of books) {
       const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
       for (const track of book.trackList) {
         feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
diff --git a/server/models/Series.js b/server/models/Series.js
index 731908e9..4fa6b403 100644
--- a/server/models/Series.js
+++ b/server/models/Series.js
@@ -1,4 +1,4 @@
-const { DataTypes, Model, where, fn, col } = require('sequelize')
+const { DataTypes, Model, where, fn, col, literal } = require('sequelize')
 
 const { getTitlePrefixAtEnd } = require('../utils/index')
 
@@ -20,6 +20,11 @@ class Series extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    // Expanded properties
+
+    /** @type {import('./Book').BookExpandedWithLibraryItem[]} - only set when expanded */
+    this.books
   }
 
   /**
@@ -103,6 +108,35 @@ class Series extends Model {
     Series.belongsTo(library)
   }
 
+  /**
+   * Get all books in collection expanded with library item
+   *
+   * @returns {Promise<import('./Book').BookExpandedWithLibraryItem[]>}
+   */
+  getBooksExpandedWithLibraryItem() {
+    return this.getBooks({
+      joinTableAttributes: ['sequence'],
+      include: [
+        {
+          model: this.sequelize.models.libraryItem
+        },
+        {
+          model: this.sequelize.models.author,
+          through: {
+            attributes: []
+          }
+        },
+        {
+          model: this.sequelize.models.series,
+          through: {
+            attributes: ['sequence']
+          }
+        }
+      ],
+      order: [[literal('CAST(`bookSeries.sequence` AS FLOAT) ASC NULLS LAST')]]
+    })
+  }
+
   toOldJSON() {
     return {
       id: this.id,
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index 378ef3ee..668544d9 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -182,65 +182,6 @@ class Feed {
     this.updatedAt = Date.now()
   }
 
-  setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `/feed/${slug}`
-
-    let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    // Sort series items by series sequence
-    itemsWithTracks = naturalSort(itemsWithTracks).asc((li) => li.media.metadata.getSeriesSequence(seriesExpanded.id))
-
-    const libraryId = itemsWithTracks[0].libraryId
-    const firstItemWithCover = itemsWithTracks.find((li) => li.media.coverPath)
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'series'
-    this.entityId = seriesExpanded.id
-    this.entityUpdatedAt = seriesExpanded.updatedAt // This will be set to the most recently updated library item
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = seriesExpanded.name
-    this.meta.description = seriesExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/library/${libraryId}/series/${seriesExpanded.id}`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, serverAddress, slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
   updateFromSeries(seriesExpanded) {
     let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
     // Sort series items by series sequence

From 4c68ad46f43a891ff604ce3a62286e824866b0f8 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 12:37:01 -0600
Subject: [PATCH 029/143] Refactor RssFeedManager to use new model when closing
 feeds, fix close series feed when series is removed, update RssFeedManager to
 singleton

---
 server/Server.js                            |  9 ++-
 server/controllers/CollectionController.js  |  5 +-
 server/controllers/LibraryController.js     |  4 +-
 server/controllers/LibraryItemController.js |  4 +-
 server/controllers/RSSFeedController.js     | 29 ++++++---
 server/controllers/SeriesController.js      |  5 +-
 server/managers/RssFeedManager.js           | 68 +++++++++++++--------
 server/models/Feed.js                       | 34 ++++-------
 server/routers/ApiRouter.js                 |  7 +--
 server/scanner/BookScanner.js               | 18 ++++--
 10 files changed, 105 insertions(+), 78 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index 2f1220d8..95e3d683 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -71,7 +71,6 @@ class Server {
     this.playbackSessionManager = new PlaybackSessionManager()
     this.podcastManager = new PodcastManager()
     this.audioMetadataManager = new AudioMetadataMangaer()
-    this.rssFeedManager = new RssFeedManager()
     this.cronManager = new CronManager(this.podcastManager, this.playbackSessionManager)
     this.apiCacheManager = new ApiCacheManager()
     this.binaryManager = new BinaryManager()
@@ -137,7 +136,7 @@ class Server {
 
     await ShareManager.init()
     await this.backupManager.init()
-    await this.rssFeedManager.init()
+    await RssFeedManager.init()
 
     const libraries = await Database.libraryModel.getAllWithFolders()
     await this.cronManager.init(libraries)
@@ -291,14 +290,14 @@ class Server {
     // RSS Feed temp route
     router.get('/feed/:slug', (req, res) => {
       Logger.info(`[Server] Requesting rss feed ${req.params.slug}`)
-      this.rssFeedManager.getFeed(req, res)
+      RssFeedManager.getFeed(req, res)
     })
     router.get('/feed/:slug/cover*', (req, res) => {
-      this.rssFeedManager.getFeedCover(req, res)
+      RssFeedManager.getFeedCover(req, res)
     })
     router.get('/feed/:slug/item/:episodeId/*', (req, res) => {
       Logger.debug(`[Server] Requesting rss feed episode ${req.params.slug}/${req.params.episodeId}`)
-      this.rssFeedManager.getFeedItem(req, res)
+      RssFeedManager.getFeedItem(req, res)
     })
 
     // Auth routes
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 708c00b5..2445eb50 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -4,6 +4,7 @@ const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
+const RssFeedManager = require('../managers/RssFeedManager')
 const Collection = require('../objects/Collection')
 
 /**
@@ -148,6 +149,8 @@ class CollectionController {
   /**
    * DELETE: /api/collections/:id
    *
+   * @this {import('../routers/ApiRouter')}
+   *
    * @param {RequestWithUser} req
    * @param {Response} res
    */
@@ -155,7 +158,7 @@ class CollectionController {
     const jsonExpanded = await req.collection.getOldJsonExpanded()
 
     // Close rss feed - remove from db and emit socket event
-    await this.rssFeedManager.closeFeedForEntityId(req.collection.id)
+    await RssFeedManager.closeFeedForEntityId(req.collection.id)
 
     await req.collection.destroy()
 
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index fc15488d..da9859f2 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -18,6 +18,8 @@ const LibraryScanner = require('../scanner/LibraryScanner')
 const Scanner = require('../scanner/Scanner')
 const Database = require('../Database')
 const Watcher = require('../Watcher')
+const RssFeedManager = require('../managers/RssFeedManager')
+
 const libraryFilters = require('../utils/queries/libraryFilters')
 const libraryItemsPodcastFilters = require('../utils/queries/libraryItemsPodcastFilters')
 const authorFilters = require('../utils/queries/authorFilters')
@@ -759,7 +761,7 @@ class LibraryController {
     }
 
     if (include.includes('rssfeed')) {
-      const feedObj = await this.rssFeedManager.findFeedForEntityId(seriesJson.id)
+      const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
       seriesJson.rssFeed = feedObj?.toJSONMinified() || null
     }
 
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 5aaacee0..5fac31aa 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -13,6 +13,8 @@ const { getAudioMimeTypeFromExtname, encodeUriPath } = require('../utils/fileUti
 const LibraryItemScanner = require('../scanner/LibraryItemScanner')
 const AudioFileScanner = require('../scanner/AudioFileScanner')
 const Scanner = require('../scanner/Scanner')
+
+const RssFeedManager = require('../managers/RssFeedManager')
 const CacheManager = require('../managers/CacheManager')
 const CoverManager = require('../managers/CoverManager')
 const ShareManager = require('../managers/ShareManager')
@@ -48,7 +50,7 @@ class LibraryItemController {
       }
 
       if (includeEntities.includes('rssfeed')) {
-        const feedData = await this.rssFeedManager.findFeedForEntityId(item.id)
+        const feedData = await RssFeedManager.findFeedForEntityId(item.id)
         item.rssFeed = feedData?.toJSONMinified() || null
       }
 
diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index 57e02c5c..3cd7736b 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -1,7 +1,8 @@
 const { Request, Response, NextFunction } = require('express')
 const Logger = require('../Logger')
 const Database = require('../Database')
-const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
+
+const RssFeedManager = require('../managers/RssFeedManager')
 
 /**
  * @typedef RequestUserObject
@@ -22,7 +23,7 @@ class RSSFeedController {
    * @param {Response} res
    */
   async getAll(req, res) {
-    const feeds = await this.rssFeedManager.getFeeds()
+    const feeds = await RssFeedManager.getFeeds()
     res.json({
       feeds: feeds.map((f) => f.toJSON()),
       minified: feeds.map((f) => f.toJSONMinified())
@@ -62,12 +63,12 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const feed = await this.rssFeedManager.openFeedForItem(req.user.id, itemExpanded, reqBody)
+    const feed = await RssFeedManager.openFeedForItem(req.user.id, itemExpanded, reqBody)
     if (!feed) {
       Logger.error(`[RSSFeedController] Failed to open RSS feed for item "${itemExpanded.media.title}"`)
       return res.status(500).send('Failed to open RSS feed')
@@ -99,7 +100,7 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
@@ -112,7 +113,7 @@ class RSSFeedController {
       return res.status(400).send('Collection has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForCollection(req.user.id, collection, reqBody)
+    const feed = await RssFeedManager.openFeedForCollection(req.user.id, collection, reqBody)
     if (!feed) {
       Logger.error(`[RSSFeedController] Failed to open RSS feed for collection "${collection.name}"`)
       return res.status(500).send('Failed to open RSS feed')
@@ -144,7 +145,7 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
@@ -157,7 +158,7 @@ class RSSFeedController {
       return res.status(400).send('Series has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForSeries(req.user.id, series, req.body)
+    const feed = await RssFeedManager.openFeedForSeries(req.user.id, series, req.body)
     if (!feed) {
       Logger.error(`[RSSFeedController] Failed to open RSS feed for series "${series.name}"`)
       return res.status(500).send('Failed to open RSS feed')
@@ -176,8 +177,16 @@ class RSSFeedController {
    * @param {RequestWithUser} req
    * @param {Response} res
    */
-  closeRSSFeed(req, res) {
-    this.rssFeedManager.closeRssFeed(req, res)
+  async closeRSSFeed(req, res) {
+    const feed = await Database.feedModel.findByPk(req.params.id)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Cannot close RSS feed because feed "${req.params.id}" does not exist`)
+      return res.sendStatus(404)
+    }
+
+    await RssFeedManager.handleCloseFeed(feed)
+
+    res.sendStatus(200)
   }
 
   /**
diff --git a/server/controllers/SeriesController.js b/server/controllers/SeriesController.js
index 5d761ba9..f8aef05c 100644
--- a/server/controllers/SeriesController.js
+++ b/server/controllers/SeriesController.js
@@ -2,6 +2,9 @@ const { Request, Response, NextFunction } = require('express')
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
+
+const RssFeedManager = require('../managers/RssFeedManager')
+
 const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
 
 /**
@@ -51,7 +54,7 @@ class SeriesController {
     }
 
     if (include.includes('rssfeed')) {
-      const feedObj = await this.rssFeedManager.findFeedForEntityId(seriesJson.id)
+      const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
       seriesJson.rssFeed = feedObj?.toJSONMinified() || null
     }
 
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 8d5b5e40..da0d8dd2 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -6,7 +6,6 @@ const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
 const fs = require('../libs/fsExtra')
-const Feed = require('../objects/Feed')
 const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
 
 class RssFeedManager {
@@ -69,15 +68,6 @@ class RssFeedManager {
     return Database.feedModel.findOneOld({ slug })
   }
 
-  /**
-   * Find open feed for a slug
-   * @param {string} slug
-   * @returns {Promise<objects.Feed>} oldFeed
-   */
-  findFeed(id) {
-    return Database.feedModel.findByPkOld(id)
-  }
-
   /**
    * GET: /feed/:slug
    *
@@ -303,33 +293,57 @@ class RssFeedManager {
     return feedExpanded
   }
 
+  /**
+   * Close Feed and emit Socket event
+   *
+   * @param {import('../models/Feed')} feed
+   * @returns {Promise<boolean>} - true if feed was closed
+   */
   async handleCloseFeed(feed) {
-    if (!feed) return
-    await Database.removeFeed(feed.id)
-    SocketAuthority.emitter('rss_feed_closed', feed.toJSONMinified())
-    Logger.info(`[RssFeedManager] Closed RSS feed "${feed.feedUrl}"`)
-  }
-
-  async closeRssFeed(req, res) {
-    const feed = await this.findFeed(req.params.id)
-    if (!feed) {
-      Logger.error(`[RssFeedManager] RSS feed not found with id "${req.params.id}"`)
-      return res.sendStatus(404)
-    }
-    await this.handleCloseFeed(feed)
-    res.sendStatus(200)
+    if (!feed) return false
+    const wasRemoved = await Database.feedModel.removeById(feed.id)
+    SocketAuthority.emitter('rss_feed_closed', feed.toOldJSONMinified())
+    Logger.info(`[RssFeedManager] Closed RSS feed "${feed.feedURL}"`)
+    return wasRemoved
   }
 
+  /**
+   *
+   * @param {string} entityId
+   * @returns {Promise<boolean>} - true if feed was closed
+   */
   async closeFeedForEntityId(entityId) {
-    const feed = await this.findFeedForEntityId(entityId)
-    if (!feed) return
+    const feed = await Database.feedModel.findOne({
+      where: {
+        entityId
+      }
+    })
+    if (!feed) {
+      Logger.warn(`[RssFeedManager] closeFeedForEntityId: Feed not found for entity id ${entityId}`)
+      return false
+    }
     return this.handleCloseFeed(feed)
   }
 
+  /**
+   *
+   * @param {string[]} entityIds
+   */
+  async closeFeedsForEntityIds(entityIds) {
+    const feeds = await Database.feedModel.findAll({
+      where: {
+        entityId: entityIds
+      }
+    })
+    for (const feed of feeds) {
+      await this.handleCloseFeed(feed)
+    }
+  }
+
   async getFeeds() {
     const feeds = await Database.models.feed.getOldFeeds()
     Logger.info(`[RssFeedManager] Fetched all feeds`)
     return feeds
   }
 }
-module.exports = RssFeedManager
+module.exports = new RssFeedManager()
diff --git a/server/models/Feed.js b/server/models/Feed.js
index fa1b0f00..3b67ec62 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -124,12 +124,18 @@ class Feed extends Model {
     })
   }
 
-  static removeById(feedId) {
-    return this.destroy({
-      where: {
-        id: feedId
-      }
-    })
+  /**
+   * @param {string} feedId
+   * @returns {Promise<boolean>} - true if feed was removed
+   */
+  static async removeById(feedId) {
+    return (
+      (await this.destroy({
+        where: {
+          id: feedId
+        }
+      })) > 0
+    )
   }
 
   /**
@@ -163,22 +169,6 @@ class Feed extends Model {
     return this.getOldFeed(feedExpanded)
   }
 
-  /**
-   * Find feed and return oldFeed
-   * @param {string} id
-   * @returns {Promise<oldFeed>} oldFeed
-   */
-  static async findByPkOld(id) {
-    if (!id) return null
-    const feedExpanded = await this.findByPk(id, {
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    if (!feedExpanded) return null
-    return this.getOldFeed(feedExpanded)
-  }
-
   static async fullCreateFromOld(oldFeed) {
     const feedObj = this.getFromOld(oldFeed)
     const newFeed = await this.create(feedObj)
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index a92796e8..235d25cd 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -10,6 +10,7 @@ const fs = require('../libs/fsExtra')
 const date = require('../libs/dateAndTime')
 
 const CacheManager = require('../managers/CacheManager')
+const RssFeedManager = require('../managers/RssFeedManager')
 
 const LibraryController = require('../controllers/LibraryController')
 const UserController = require('../controllers/UserController')
@@ -49,8 +50,6 @@ class ApiRouter {
     this.podcastManager = Server.podcastManager
     /** @type {import('../managers/AudioMetadataManager')} */
     this.audioMetadataManager = Server.audioMetadataManager
-    /** @type {import('../managers/RssFeedManager')} */
-    this.rssFeedManager = Server.rssFeedManager
     /** @type {import('../managers/CronManager')} */
     this.cronManager = Server.cronManager
     /** @type {import('../managers/EmailManager')} */
@@ -394,7 +393,7 @@ class ApiRouter {
     }
 
     // Close rss feed - remove from db and emit socket event
-    await this.rssFeedManager.closeFeedForEntityId(libraryItemId)
+    await RssFeedManager.closeFeedForEntityId(libraryItemId)
 
     // purge cover cache
     await CacheManager.purgeCoverCache(libraryItemId)
@@ -493,7 +492,7 @@ class ApiRouter {
    * @param {import('../models/Series')} series
    */
   async removeEmptySeries(series) {
-    await this.rssFeedManager.closeFeedForEntityId(series.id)
+    await RssFeedManager.closeFeedForEntityId(series.id)
     Logger.info(`[ApiRouter] Series "${series.name}" is now empty. Removing series`)
 
     // Remove series from library filter data
diff --git a/server/scanner/BookScanner.js b/server/scanner/BookScanner.js
index f0737dac..74798dd6 100644
--- a/server/scanner/BookScanner.js
+++ b/server/scanner/BookScanner.js
@@ -6,21 +6,24 @@ const { getTitleIgnorePrefix, areEquivalent } = require('../utils/index')
 const parseNameString = require('../utils/parsers/parseNameString')
 const parseEbookMetadata = require('../utils/parsers/parseEbookMetadata')
 const globals = require('../utils/globals')
+const { readTextFile, filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
+
 const AudioFileScanner = require('./AudioFileScanner')
 const Database = require('../Database')
-const { readTextFile, filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
-const AudioFile = require('../objects/files/AudioFile')
-const CoverManager = require('../managers/CoverManager')
-const LibraryFile = require('../objects/files/LibraryFile')
 const SocketAuthority = require('../SocketAuthority')
-const fsExtra = require('../libs/fsExtra')
 const BookFinder = require('../finders/BookFinder')
+const fsExtra = require('../libs/fsExtra')
+const EBookFile = require('../objects/files/EBookFile')
+const AudioFile = require('../objects/files/AudioFile')
+const LibraryFile = require('../objects/files/LibraryFile')
+
+const RssFeedManager = require('../managers/RssFeedManager')
+const CoverManager = require('../managers/CoverManager')
 
 const LibraryScan = require('./LibraryScan')
 const OpfFileScanner = require('./OpfFileScanner')
 const NfoFileScanner = require('./NfoFileScanner')
 const AbsMetadataFileScanner = require('./AbsMetadataFileScanner')
-const EBookFile = require('../objects/files/EBookFile')
 
 /**
  * Metadata for books pulled from files
@@ -941,6 +944,9 @@ class BookScanner {
           id: bookSeriesToRemove
         }
       })
+      // Close any open feeds for series
+      await RssFeedManager.closeFeedsForEntityIds(bookSeriesToRemove)
+
       bookSeriesToRemove.forEach((seriesId) => {
         Database.removeSeriesFromFilterData(libraryId, seriesId)
         SocketAuthority.emitter('series_removed', { id: seriesId, libraryId })

From 302b651e7b93c6f248a8389f26c86db43e2d4dcd Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 12:38:50 -0600
Subject: [PATCH 030/143] Fix library item unit test

---
 test/server/controllers/LibraryItemController.test.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index 3e7c58b2..3fcd1cf8 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -6,7 +6,6 @@ const Database = require('../../../server/Database')
 const ApiRouter = require('../../../server/routers/ApiRouter')
 const LibraryItemController = require('../../../server/controllers/LibraryItemController')
 const ApiCacheManager = require('../../../server/managers/ApiCacheManager')
-const RssFeedManager = require('../../../server/managers/RssFeedManager')
 const Logger = require('../../../server/Logger')
 
 describe('LibraryItemController', () => {
@@ -20,8 +19,7 @@ describe('LibraryItemController', () => {
     await Database.buildModels()
 
     apiRouter = new ApiRouter({
-      apiCacheManager: new ApiCacheManager(),
-      rssFeedManager: new RssFeedManager()
+      apiCacheManager: new ApiCacheManager()
     })
 
     sinon.stub(Logger, 'info')

From 837a180dc1eb35fabbf03f1e068a73fdab5652cc Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 13:14:55 -0600
Subject: [PATCH 031/143] Refactor RssFeedManager.init to use new model only

---
 server/managers/RssFeedManager.js | 63 ++++++++++++++++---------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index da0d8dd2..e92c3259 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -11,43 +11,44 @@ const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilter
 class RssFeedManager {
   constructor() {}
 
-  async validateFeedEntity(feedObj) {
-    if (feedObj.entityType === 'collection') {
-      const collection = await Database.collectionModel.getOldById(feedObj.entityId)
-      if (!collection) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Collection "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else if (feedObj.entityType === 'libraryItem') {
-      const libraryItemExists = await Database.libraryItemModel.checkExistsById(feedObj.entityId)
-      if (!libraryItemExists) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Library item "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else if (feedObj.entityType === 'series') {
-      const series = await Database.seriesModel.findByPk(feedObj.entityId)
-      if (!series) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Series "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else {
-      Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Invalid entityType "${feedObj.entityType}"`)
-      return false
-    }
-    return true
-  }
-
   /**
-   * Validate all feeds and remove invalid
+   * Remove invalid feeds (invalid if the entity does not exist)
    */
   async init() {
-    const feeds = await Database.feedModel.getOldFeeds()
+    const feeds = await Database.feedModel.findAll({
+      attributes: ['id', 'entityId', 'entityType', 'title'],
+      include: [
+        {
+          model: Database.libraryItemModel,
+          attributes: ['id']
+        },
+        {
+          model: Database.collectionModel,
+          attributes: ['id']
+        },
+        {
+          model: Database.seriesModel,
+          attributes: ['id']
+        }
+      ]
+    })
+
+    const feedIdsToRemove = []
     for (const feed of feeds) {
-      // Remove invalid feeds
-      if (!(await this.validateFeedEntity(feed))) {
-        await Database.removeFeed(feed.id)
+      if (!feed.entity) {
+        Logger.error(`[RssFeedManager] Removing feed "${feed.title}". Entity not found`)
+        feedIdsToRemove.push(feed.id)
       }
     }
+
+    if (feedIdsToRemove.length) {
+      Logger.info(`[RssFeedManager] Removing ${feedIdsToRemove.length} invalid feeds`)
+      await Database.feedModel.destroy({
+        where: {
+          id: feedIdsToRemove
+        }
+      })
+    }
   }
 
   /**

From 369c05936bb82efbb5185b3fca00b6321810a599 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 14:07:46 -0600
Subject: [PATCH 032/143] Fix feed create entityUpdatedAt value

---
 server/models/Feed.js | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/server/models/Feed.js b/server/models/Feed.js
index 3b67ec62..28484cfd 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -279,11 +279,20 @@ class Feed extends Model {
   static async createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) {
     const media = libraryItem.media
 
+    let entityUpdatedAt = libraryItem.updatedAt
+
+    // Podcast feeds should use the most recent episode updatedAt if more recent
+    if (libraryItem.mediaType === 'podcast') {
+      entityUpdatedAt = libraryItem.media.podcastEpisodes.reduce((mostRecent, episode) => {
+        return episode.updatedAt > mostRecent ? episode.updatedAt : mostRecent
+      }, entityUpdatedAt)
+    }
+
     const feedObj = {
       slug,
       entityType: 'libraryItem',
       entityId: libraryItem.id,
-      entityUpdatedAt: libraryItem.updatedAt,
+      entityUpdatedAt,
       serverAddress,
       feedURL: `/feed/${slug}`,
       imageURL: media.coverPath ? `/feed/${slug}/cover${Path.extname(media.coverPath)}` : `/Logo.png`,
@@ -336,9 +345,10 @@ class Feed extends Model {
    */
   static async createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) {
     const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
-    const libraryItemMostRecentlyUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent.libraryItem.updatedAt ? book : mostRecent
-    }).libraryItem.updatedAt
+
+    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+    }, collectionExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
 
@@ -355,7 +365,7 @@ class Feed extends Model {
       slug,
       entityType: 'collection',
       entityId: collectionExpanded.id,
-      entityUpdatedAt: libraryItemMostRecentlyUpdatedAt,
+      entityUpdatedAt,
       serverAddress,
       feedURL: `/feed/${slug}`,
       imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,
@@ -402,9 +412,9 @@ class Feed extends Model {
    */
   static async createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) {
     const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
-    const libraryItemMostRecentlyUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent.libraryItem.updatedAt ? book : mostRecent
-    }).libraryItem.updatedAt
+    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+    }, seriesExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
 
@@ -421,7 +431,7 @@ class Feed extends Model {
       slug,
       entityType: 'series',
       entityId: seriesExpanded.id,
-      entityUpdatedAt: libraryItemMostRecentlyUpdatedAt,
+      entityUpdatedAt,
       serverAddress,
       feedURL: `/feed/${slug}`,
       imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,

From f8fbd3ac8cca4e3076fdecab95cfd160cce58190 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 16:56:59 -0600
Subject: [PATCH 033/143] Migrate Feed updating and build xml to new model

---
 server/controllers/CollectionController.js |   9 +-
 server/controllers/RSSFeedController.js    |  12 +-
 server/managers/RssFeedManager.js          | 151 +++++++-------
 server/models/Collection.js                |  34 ++-
 server/models/Feed.js                      | 227 +++++++++++++++++++--
 server/models/FeedEpisode.js               |  34 +++
 server/models/Series.js                    |  12 ++
 server/objects/Feed.js                     | 169 ---------------
 server/objects/FeedEpisode.js              | 114 -----------
 server/objects/FeedMeta.js                 |  37 ----
 10 files changed, 373 insertions(+), 426 deletions(-)

diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 2445eb50..3e35c08b 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -116,6 +116,7 @@ class CollectionController {
     }
 
     // If books array is passed in then update order in collection
+    let collectionBooksUpdated = false
     if (req.body.books?.length) {
       const collectionBooks = await req.collection.getCollectionBooks({
         include: {
@@ -134,9 +135,15 @@ class CollectionController {
           await collectionBooks[i].update({
             order: i + 1
           })
-          wasUpdated = true
+          collectionBooksUpdated = true
         }
       }
+
+      if (collectionBooksUpdated) {
+        req.collection.changed('updatedAt', true)
+        await req.collection.save()
+        wasUpdated = true
+      }
     }
 
     const jsonExpanded = await req.collection.getOldJsonExpanded()
diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index 3cd7736b..e1c9c514 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -90,9 +90,6 @@ class RSSFeedController {
   async openRSSFeedForCollection(req, res) {
     const reqBody = req.body || {}
 
-    const collection = await Database.collectionModel.findByPk(req.params.collectionId)
-    if (!collection) return res.sendStatus(404)
-
     // Check request body options exist
     if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
@@ -105,7 +102,8 @@ class RSSFeedController {
       return res.status(400).send('Slug already in use')
     }
 
-    collection.books = await collection.getBooksExpandedWithLibraryItem()
+    const collection = await Database.collectionModel.getExpandedById(req.params.collectionId)
+    if (!collection) return res.sendStatus(404)
 
     // Check collection has audio tracks
     if (!collection.books.some((book) => book.includedAudioFiles.length)) {
@@ -135,9 +133,6 @@ class RSSFeedController {
   async openRSSFeedForSeries(req, res) {
     const reqBody = req.body || {}
 
-    const series = await Database.seriesModel.findByPk(req.params.seriesId)
-    if (!series) return res.sendStatus(404)
-
     // Check request body options exist
     if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
@@ -150,7 +145,8 @@ class RSSFeedController {
       return res.status(400).send('Slug already in use')
     }
 
-    series.books = await series.getBooksExpandedWithLibraryItem()
+    const series = await Database.seriesModel.getExpandedById(req.params.seriesId)
+    if (!series) return res.sendStatus(404)
 
     // Check series has audio tracks
     if (!series.books.some((book) => book.includedAudioFiles.length)) {
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index e92c3259..335df110 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -6,7 +6,6 @@ const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
 const fs = require('../libs/fsExtra')
-const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
 
 class RssFeedManager {
   constructor() {}
@@ -69,6 +68,69 @@ class RssFeedManager {
     return Database.feedModel.findOneOld({ slug })
   }
 
+  /**
+   * Feed requires update if the entity (or child entities) has been updated since the feed was last updated
+   *
+   * @param {import('../models/Feed')} feed
+   * @returns {Promise<boolean>}
+   */
+  async checkFeedRequiresUpdate(feed) {
+    if (feed.entityType === 'libraryItem') {
+      feed.entity = await feed.getEntity({
+        attributes: ['id', 'updatedAt', 'mediaId', 'mediaType']
+      })
+
+      let newEntityUpdatedAt = feed.entity.updatedAt
+
+      if (feed.entity.mediaType === 'podcast') {
+        const mostRecentPodcastEpisode = await Database.podcastEpisodeModel.findOne({
+          where: {
+            podcastId: feed.entity.mediaId
+          },
+          attributes: ['id', 'updatedAt'],
+          order: [['createdAt', 'DESC']]
+        })
+        if (mostRecentPodcastEpisode && mostRecentPodcastEpisode.updatedAt > newEntityUpdatedAt) {
+          newEntityUpdatedAt = mostRecentPodcastEpisode.updatedAt
+        }
+      }
+
+      return newEntityUpdatedAt > feed.entityUpdatedAt
+    } else if (feed.entityType === 'collection' || feed.entityType === 'series') {
+      feed.entity = await feed.getEntity({
+        attributes: ['id', 'updatedAt'],
+        include: {
+          model: Database.bookModel,
+          attributes: ['id'],
+          through: {
+            attributes: []
+          },
+          include: {
+            model: Database.libraryItemModel,
+            attributes: ['id', 'updatedAt']
+          }
+        }
+      })
+
+      let newEntityUpdatedAt = feed.entity.updatedAt
+
+      const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
+        if (book.libraryItem.updatedAt > mostRecent) {
+          return book.libraryItem.updatedAt
+        }
+        return mostRecent
+      }, 0)
+
+      if (mostRecentItemUpdatedAt > newEntityUpdatedAt) {
+        newEntityUpdatedAt = mostRecentItemUpdatedAt
+      }
+
+      return newEntityUpdatedAt > feed.entityUpdatedAt
+    } else {
+      throw new Error('Invalid feed entity type')
+    }
+  }
+
   /**
    * GET: /feed/:slug
    *
@@ -76,88 +138,23 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeed(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    let feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      }
+    })
     if (!feed) {
       Logger.warn(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
       return
     }
 
-    // Check if feed needs to be updated
-    if (feed.entityType === 'libraryItem') {
-      const libraryItem = await Database.libraryItemModel.getOldById(feed.entityId)
-
-      let mostRecentlyUpdatedAt = libraryItem.updatedAt
-      if (libraryItem.isPodcast) {
-        libraryItem.media.episodes.forEach((episode) => {
-          if (episode.updatedAt > mostRecentlyUpdatedAt) mostRecentlyUpdatedAt = episode.updatedAt
-        })
-      }
-
-      if (libraryItem && (!feed.entityUpdatedAt || mostRecentlyUpdatedAt > feed.entityUpdatedAt)) {
-        Logger.debug(`[RssFeedManager] Updating RSS feed for item ${libraryItem.id} "${libraryItem.media.metadata.title}"`)
-
-        feed.updateFromItem(libraryItem)
-        await Database.updateFeed(feed)
-      }
-    } else if (feed.entityType === 'collection') {
-      const collection = await Database.collectionModel.findByPk(feed.entityId, {
-        include: Database.collectionBookModel
-      })
-      if (collection) {
-        const collectionExpanded = await collection.getOldJsonExpanded()
-
-        // Find most recently updated item in collection
-        let mostRecentlyUpdatedAt = collectionExpanded.lastUpdate
-        // Check for most recently updated book
-        collectionExpanded.books.forEach((libraryItem) => {
-          if (libraryItem.media.tracks.length && libraryItem.updatedAt > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = libraryItem.updatedAt
-          }
-        })
-        // Check for most recently added collection book
-        collection.collectionBooks.forEach((collectionBook) => {
-          if (collectionBook.createdAt.valueOf() > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = collectionBook.createdAt.valueOf()
-          }
-        })
-        const hasBooksRemoved = collection.collectionBooks.length < feed.episodes.length
-
-        if (!feed.entityUpdatedAt || hasBooksRemoved || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
-          Logger.debug(`[RssFeedManager] Updating RSS feed for collection "${collection.name}"`)
-
-          feed.updateFromCollection(collectionExpanded)
-          await Database.updateFeed(feed)
-        }
-      }
-    } else if (feed.entityType === 'series') {
-      const series = await Database.seriesModel.findByPk(feed.entityId)
-      if (series) {
-        const seriesJson = series.toOldJSON()
-
-        // Get books in series that have audio tracks
-        seriesJson.books = (await libraryItemsBookFilters.getLibraryItemsForSeries(series)).filter((li) => li.media.numTracks)
-
-        // Find most recently updated item in series
-        let mostRecentlyUpdatedAt = seriesJson.updatedAt
-        let totalTracks = 0 // Used to detect series items removed
-        seriesJson.books.forEach((libraryItem) => {
-          totalTracks += libraryItem.media.tracks.length
-          if (libraryItem.media.tracks.length && libraryItem.updatedAt > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = libraryItem.updatedAt
-          }
-        })
-        if (totalTracks !== feed.episodes.length) {
-          mostRecentlyUpdatedAt = Date.now()
-        }
-
-        if (!feed.entityUpdatedAt || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
-          Logger.debug(`[RssFeedManager] Updating RSS feed for series "${seriesJson.name}"`)
-
-          feed.updateFromSeries(seriesJson)
-          await Database.updateFeed(feed)
-        }
-      }
+    const feedRequiresUpdate = await this.checkFeedRequiresUpdate(feed)
+    if (feedRequiresUpdate) {
+      Logger.info(`[RssFeedManager] Feed "${feed.title}" requires update - updating feed`)
+      feed = await feed.updateFeedForEntity()
+    } else {
+      feed.feedEpisodes = await feed.getFeedEpisodes()
     }
 
     const xml = feed.buildXml(req.originalHostPrefix)
diff --git a/server/models/Collection.js b/server/models/Collection.js
index 0fb622dd..558ae843 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -1,7 +1,6 @@
 const { DataTypes, Model, Sequelize } = require('sequelize')
 
 const oldCollection = require('../objects/Collection')
-const Logger = require('../Logger')
 
 class Collection extends Model {
   constructor(values, options) {
@@ -121,6 +120,39 @@ class Collection extends Model {
       .filter((c) => c)
   }
 
+  /**
+   *
+   * @param {string} collectionId
+   * @returns {Promise<Collection>}
+   */
+  static async getExpandedById(collectionId) {
+    return this.findByPk(collectionId, {
+      include: [
+        {
+          model: this.sequelize.models.book,
+          include: [
+            {
+              model: this.sequelize.models.libraryItem
+            },
+            {
+              model: this.sequelize.models.author,
+              through: {
+                attributes: []
+              }
+            },
+            {
+              model: this.sequelize.models.series,
+              through: {
+                attributes: ['sequence']
+              }
+            }
+          ]
+        }
+      ],
+      order: [[this.sequelize.models.book, this.sequelize.models.collectionBook, 'order', 'ASC']]
+    })
+  }
+
   /**
    * Get old collection from Collection
    * @param {Collection} collectionExpanded
diff --git a/server/models/Feed.js b/server/models/Feed.js
index 28484cfd..f6ee4e3c 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -2,6 +2,9 @@ const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
 const oldFeed = require('../objects/Feed')
 const areEquivalent = require('../utils/areEquivalent')
+const Logger = require('../Logger')
+
+const RSS = require('../libs/rss')
 
 /**
  * @typedef FeedOptions
@@ -66,6 +69,8 @@ class Feed extends Model {
     /** @type {Date} */
     this.updatedAt
 
+    // Expanded properties
+
     /** @type {import('./FeedEpisode')[]} - only set if expanded */
     this.feedEpisodes
   }
@@ -272,11 +277,11 @@ class Feed extends Model {
    * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
    * @param {string} slug
    * @param {string} serverAddress
-   * @param {FeedOptions} feedOptions
+   * @param {FeedOptions} [feedOptions=null]
    *
-   * @returns {Promise<FeedExpanded>}
+   * @returns {Feed}
    */
-  static async createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) {
+  static getFeedObjForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions = null) {
     const media = libraryItem.media
 
     let entityUpdatedAt = libraryItem.updatedAt
@@ -302,14 +307,33 @@ class Feed extends Model {
       author: libraryItem.mediaType === 'podcast' ? media.author : media.authorName,
       podcastType: libraryItem.mediaType === 'podcast' ? media.podcastType : 'serial',
       language: media.language,
-      preventIndexing: feedOptions.preventIndexing,
-      ownerName: feedOptions.ownerName,
-      ownerEmail: feedOptions.ownerEmail,
       explicit: media.explicit,
       coverPath: media.coverPath,
       userId
     }
 
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
+    return feedObj
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) {
+    const feedObj = this.getFeedObjForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions)
+
     /** @type {typeof import('./FeedEpisode')} */
     const feedEpisodeModel = this.sequelize.models.feedEpisode
 
@@ -339,11 +363,11 @@ class Feed extends Model {
    * @param {import('./Collection')} collectionExpanded
    * @param {string} slug
    * @param {string} serverAddress
-   * @param {FeedOptions} feedOptions
+   * @param {FeedOptions} [feedOptions=null]
    *
-   * @returns {Promise<FeedExpanded>}
+   * @returns {{ feedObj: Feed, booksWithTracks: import('./Book').BookExpandedWithLibraryItem[] }}
    */
-  static async createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) {
+  static getFeedObjForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions = null) {
     const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
 
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
@@ -374,14 +398,36 @@ class Feed extends Model {
       description: collectionExpanded.description || '',
       author,
       podcastType: 'serial',
-      preventIndexing: feedOptions.preventIndexing,
-      ownerName: feedOptions.ownerName,
-      ownerEmail: feedOptions.ownerEmail,
       explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
       coverPath: firstBookWithCover?.coverPath || null,
       userId
     }
 
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
+    return {
+      feedObj,
+      booksWithTracks
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Collection')} collectionExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) {
+    const { feedObj, booksWithTracks } = this.getFeedObjForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions)
+
     /** @type {typeof import('./FeedEpisode')} */
     const feedEpisodeModel = this.sequelize.models.feedEpisode
 
@@ -406,11 +452,11 @@ class Feed extends Model {
    * @param {import('./Series')} seriesExpanded
    * @param {string} slug
    * @param {string} serverAddress
-   * @param {FeedOptions} feedOptions
+   * @param {FeedOptions} [feedOptions=null]
    *
-   * @returns {Promise<FeedExpanded>}
+   * @returns {{ feedObj: Feed, booksWithTracks: import('./Book').BookExpandedWithLibraryItem[] }}
    */
-  static async createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) {
+  static getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions = null) {
     const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
       return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
@@ -440,14 +486,36 @@ class Feed extends Model {
       description: seriesExpanded.description || '',
       author,
       podcastType: 'serial',
-      preventIndexing: feedOptions.preventIndexing,
-      ownerName: feedOptions.ownerName,
-      ownerEmail: feedOptions.ownerEmail,
       explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
       coverPath: firstBookWithCover?.coverPath || null,
       userId
     }
 
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
+    return {
+      feedObj,
+      booksWithTracks
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Series')} seriesExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) {
+    const { feedObj, booksWithTracks } = this.getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions)
+
     /** @type {typeof import('./FeedEpisode')} */
     const feedEpisodeModel = this.sequelize.models.feedEpisode
 
@@ -460,7 +528,7 @@ class Feed extends Model {
 
       return feed
     } catch (error) {
-      Logger.error(`[Feed] Error creating feed for collection ${collectionExpanded.id}`, error)
+      Logger.error(`[Feed] Error creating feed for series ${seriesExpanded.id}`, error)
       await transaction.rollback()
       return null
     }
@@ -580,12 +648,133 @@ class Feed extends Model {
     })
   }
 
+  /**
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  async updateFeedForEntity() {
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    let feedObj = null
+    let feedEpisodeCreateFunc = null
+    let feedEpisodeCreateFuncEntity = null
+
+    if (this.entityType === 'libraryItem') {
+      /** @type {typeof import('./LibraryItem')} */
+      const libraryItemModel = this.sequelize.models.libraryItem
+
+      const itemExpanded = await libraryItemModel.getExpandedById(this.entityId)
+      feedObj = Feed.getFeedObjForLibraryItem(this.userId, itemExpanded, this.slug, this.serverAddress)
+
+      feedEpisodeCreateFuncEntity = itemExpanded
+      if (itemExpanded.mediaType === 'podcast') {
+        feedEpisodeCreateFunc = feedEpisodeModel.createFromPodcastEpisodes.bind(feedEpisodeModel)
+      } else {
+        feedEpisodeCreateFunc = feedEpisodeModel.createFromAudiobookTracks.bind(feedEpisodeModel)
+      }
+    } else if (this.entityType === 'collection') {
+      /** @type {typeof import('./Collection')} */
+      const collectionModel = this.sequelize.models.collection
+
+      const collectionExpanded = await collectionModel.getExpandedById(this.entityId)
+      const feedObjData = Feed.getFeedObjForCollection(this.userId, collectionExpanded, this.slug, this.serverAddress)
+      feedObj = feedObjData.feedObj
+      feedEpisodeCreateFuncEntity = feedObjData.booksWithTracks
+      feedEpisodeCreateFunc = feedEpisodeModel.createFromBooks.bind(feedEpisodeModel)
+    } else if (this.entityType === 'series') {
+      /** @type {typeof import('./Series')} */
+      const seriesModel = this.sequelize.models.series
+
+      const seriesExpanded = await seriesModel.getExpandedById(this.entityId)
+      const feedObjData = Feed.getFeedObjForSeries(this.userId, seriesExpanded, this.slug, this.serverAddress)
+      feedObj = feedObjData.feedObj
+      feedEpisodeCreateFuncEntity = feedObjData.booksWithTracks
+      feedEpisodeCreateFunc = feedEpisodeModel.createFromBooks.bind(feedEpisodeModel)
+    } else {
+      Logger.error(`[Feed] Invalid entity type ${this.entityType} for feed ${this.id}`)
+      return null
+    }
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const updatedFeed = await this.update(feedObj, { transaction })
+
+      // Remove existing feed episodes
+      await feedEpisodeModel.destroy({
+        where: {
+          feedId: this.id
+        },
+        transaction
+      })
+
+      // Create new feed episodes
+      updatedFeed.feedEpisodes = await feedEpisodeCreateFunc(feedEpisodeCreateFuncEntity, updatedFeed, this.slug, transaction)
+
+      await transaction.commit()
+
+      return updatedFeed
+    } catch (error) {
+      Logger.error(`[Feed] Error updating feed ${this.entityId}`, error)
+      await transaction.rollback()
+
+      return null
+    }
+  }
+
   getEntity(options) {
     if (!this.entityType) return Promise.resolve(null)
     const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.entityType)}`
     return this[mixinMethodName](options)
   }
 
+  /**
+   *
+   * @param {string} hostPrefix
+   */
+  buildXml(hostPrefix) {
+    const blockTags = [{ 'itunes:block': 'yes' }, { 'googleplay:block': 'yes' }]
+    const rssData = {
+      title: this.title,
+      description: this.description || '',
+      generator: 'Audiobookshelf',
+      feed_url: `${hostPrefix}${this.feedURL}`,
+      site_url: `${hostPrefix}${this.siteURL}`,
+      image_url: `${hostPrefix}${this.imageURL}`,
+      custom_namespaces: {
+        itunes: 'http://www.itunes.com/dtds/podcast-1.0.dtd',
+        psc: 'http://podlove.org/simple-chapters',
+        podcast: 'https://podcastindex.org/namespace/1.0',
+        googleplay: 'http://www.google.com/schemas/play-podcasts/1.0'
+      },
+      custom_elements: [
+        { language: this.language || 'en' },
+        { author: this.author || 'advplyr' },
+        { 'itunes:author': this.author || 'advplyr' },
+        { 'itunes:summary': this.description || '' },
+        { 'itunes:type': this.podcastType },
+        {
+          'itunes:image': {
+            _attr: {
+              href: `${hostPrefix}${this.imageURL}`
+            }
+          }
+        },
+        {
+          'itunes:owner': [{ 'itunes:name': this.ownerName || this.author || '' }, { 'itunes:email': this.ownerEmail || '' }]
+        },
+        { 'itunes:explicit': !!this.explicit },
+        ...(this.preventIndexing ? blockTags : [])
+      ]
+    }
+
+    const rssfeed = new RSS(rssData)
+    this.feedEpisodes.forEach((ep) => {
+      rssfeed.item(ep.getRSSData(hostPrefix))
+    })
+    return rssfeed.xml()
+  }
+
   toOldJSON() {
     const episodes = this.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
     return {
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 4979ae6d..b14f1b7b 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -3,6 +3,7 @@ const { DataTypes, Model } = require('sequelize')
 const uuidv4 = require('uuid').v4
 const Logger = require('../Logger')
 const date = require('../libs/dateAndTime')
+const { secondsToTimestamp } = require('../utils')
 
 class FeedEpisode extends Model {
   constructor(values, options) {
@@ -13,6 +14,8 @@ class FeedEpisode extends Model {
     /** @type {string} */
     this.title
     /** @type {string} */
+    this.author
+    /** @type {string} */
     this.description
     /** @type {string} */
     this.siteURL
@@ -301,6 +304,37 @@ class FeedEpisode extends Model {
       fullPath: this.filePath
     }
   }
+
+  /**
+   *
+   * @param {string} hostPrefix
+   */
+  getRSSData(hostPrefix) {
+    return {
+      title: this.title,
+      description: this.description || '',
+      url: `${hostPrefix}${this.siteURL}`,
+      guid: `${hostPrefix}${this.enclosureURL}`,
+      author: this.author,
+      date: this.pubDate,
+      enclosure: {
+        url: `${hostPrefix}${this.enclosureURL}`,
+        type: this.enclosureType,
+        size: this.enclosureSize
+      },
+      custom_elements: [
+        { 'itunes:author': this.author },
+        { 'itunes:duration': secondsToTimestamp(this.duration) },
+        { 'itunes:summary': this.description || '' },
+        {
+          'itunes:explicit': !!this.explicit
+        },
+        { 'itunes:episodeType': this.episodeType },
+        { 'itunes:season': this.season },
+        { 'itunes:episode': this.episode }
+      ]
+    }
+  }
 }
 
 module.exports = FeedEpisode
diff --git a/server/models/Series.js b/server/models/Series.js
index 4fa6b403..c4bc1594 100644
--- a/server/models/Series.js
+++ b/server/models/Series.js
@@ -54,6 +54,18 @@ class Series extends Model {
     })
   }
 
+  /**
+   *
+   * @param {string} seriesId
+   * @returns {Promise<Series>}
+   */
+  static async getExpandedById(seriesId) {
+    const series = await this.findByPk(seriesId)
+    if (!series) return null
+    series.books = await series.getBooksExpandedWithLibraryItem()
+    return series
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
index 668544d9..4da7a995 100644
--- a/server/objects/Feed.js
+++ b/server/objects/Feed.js
@@ -1,15 +1,6 @@
-const Path = require('path')
-const uuidv4 = require('uuid').v4
 const FeedMeta = require('./FeedMeta')
 const FeedEpisode = require('./FeedEpisode')
 
-const date = require('../libs/dateAndTime')
-const RSS = require('../libs/rss')
-const { createNewSortInstance } = require('../libs/fastSort')
-const naturalSort = createNewSortInstance({
-  comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
-})
-
 class Feed {
   constructor(feed) {
     this.id = null
@@ -82,165 +73,5 @@ class Feed {
     if (!episode) return null
     return episode.fullPath
   }
-
-  /**
-   * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
-   *
-   * @param {import('../objects/LibraryItem')} libraryItem
-   * @returns {boolean}
-   */
-  checkUseChapterTitlesForEpisodes(libraryItem) {
-    const tracks = libraryItem.media.tracks
-    const chapters = libraryItem.media.chapters
-    if (tracks.length !== chapters.length) return false
-    for (let i = 0; i < tracks.length; i++) {
-      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
-        return false
-      }
-    }
-    return true
-  }
-
-  updateFromItem(libraryItem) {
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-    const isPodcast = libraryItem.mediaType === 'podcast'
-    const author = isPodcast ? mediaMetadata.author : mediaMetadata.authorName
-
-    this.entityUpdatedAt = libraryItem.updatedAt
-    this.coverPath = media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(media.coverPath) : null
-
-    this.meta.title = mediaMetadata.title
-    this.meta.description = mediaMetadata.description
-    this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!mediaMetadata.explicit
-    this.meta.type = mediaMetadata.type
-    this.meta.language = mediaMetadata.language
-
-    this.episodes = []
-    if (isPodcast) {
-      // PODCAST EPISODES
-      media.episodes.forEach((episode) => {
-        if (episode.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = episode.updatedAt
-
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromPodcastEpisode(libraryItem, this.serverAddress, this.slug, episode, this.meta)
-        this.episodes.push(feedEpisode)
-      })
-    } else {
-      // AUDIOBOOK EPISODES
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItem)
-      media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromAudiobookTrack(libraryItem, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles)
-        this.episodes.push(feedEpisode)
-      })
-    }
-
-    this.updatedAt = Date.now()
-  }
-
-  updateFromCollection(collectionExpanded) {
-    const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.entityUpdatedAt = collectionExpanded.lastUpdate
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta.title = collectionExpanded.name
-    this.meta.description = collectionExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.updatedAt = Date.now()
-  }
-
-  updateFromSeries(seriesExpanded) {
-    let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    // Sort series items by series sequence
-    itemsWithTracks = naturalSort(itemsWithTracks).asc((li) => li.media.metadata.getSeriesSequence(seriesExpanded.id))
-
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.entityUpdatedAt = seriesExpanded.updatedAt
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta.title = seriesExpanded.name
-    this.meta.description = seriesExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.updatedAt = Date.now()
-  }
-
-  buildXml(originalHostPrefix) {
-    var rssfeed = new RSS(this.meta.getRSSData(originalHostPrefix))
-    this.episodes.forEach((ep) => {
-      rssfeed.item(ep.getRSSData(originalHostPrefix))
-    })
-    return rssfeed.xml()
-  }
-
-  getAuthorsStringFromLibraryItems(libraryItems) {
-    let itemAuthors = []
-    libraryItems.forEach((item) => itemAuthors.push(...item.media.metadata.authors.map((au) => au.name)))
-    itemAuthors = [...new Set(itemAuthors)] // Filter out dupes
-    let author = itemAuthors.slice(0, 3).join(', ')
-    if (itemAuthors.length > 3) {
-      author += ' & more'
-    }
-    return author
-  }
 }
 module.exports = Feed
diff --git a/server/objects/FeedEpisode.js b/server/objects/FeedEpisode.js
index 13d590ff..4438eb52 100644
--- a/server/objects/FeedEpisode.js
+++ b/server/objects/FeedEpisode.js
@@ -1,8 +1,3 @@
-const Path = require('path')
-const uuidv4 = require('uuid').v4
-const date = require('../libs/dateAndTime')
-const { secondsToTimestamp } = require('../utils/index')
-
 class FeedEpisode {
   constructor(episode) {
     this.id = null
@@ -68,114 +63,5 @@ class FeedEpisode {
       fullPath: this.fullPath
     }
   }
-
-  setFromPodcastEpisode(libraryItem, serverAddress, slug, episode, meta) {
-    const contentFileExtension = Path.extname(episode.audioFile.metadata.filename)
-    const contentUrl = `/feed/${slug}/item/${episode.id}/media${contentFileExtension}`
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-
-    this.id = episode.id
-    this.title = episode.title
-    this.description = episode.description || ''
-    this.enclosure = {
-      url: `${contentUrl}`,
-      type: episode.audioTrack.mimeType,
-      size: episode.size
-    }
-    this.pubDate = episode.pubDate
-    this.link = meta.link
-    this.author = meta.author
-    this.explicit = mediaMetadata.explicit
-    this.duration = episode.duration
-    this.season = episode.season
-    this.episode = episode.episode
-    this.episodeType = episode.episodeType
-    this.libraryItemId = libraryItem.id
-    this.episodeId = episode.id
-    this.trackIndex = 0
-    this.fullPath = episode.audioFile.metadata.path
-  }
-
-  /**
-   *
-   * @param {import('../objects/LibraryItem')} libraryItem
-   * @param {string} serverAddress
-   * @param {string} slug
-   * @param {import('../objects/files/AudioTrack')} audioTrack
-   * @param {Object} meta
-   * @param {boolean} useChapterTitles
-   * @param {string} [pubDateOverride] Used for series & collections to ensure correct episode order
-   */
-  setFromAudiobookTrack(libraryItem, serverAddress, slug, audioTrack, meta, useChapterTitles, pubDateOverride = null) {
-    // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
-    let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
-    let episodeId = uuidv4()
-
-    // e.g. Track 1 will have a pub date before Track 2
-    const audiobookPubDate = pubDateOverride || date.format(new Date(libraryItem.addedAt + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-
-    const contentFileExtension = Path.extname(audioTrack.metadata.filename)
-    const contentUrl = `/feed/${slug}/item/${episodeId}/media${contentFileExtension}`
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-
-    let title = audioTrack.title
-    if (libraryItem.media.tracks.length == 1) {
-      // If audiobook is a single file, use book title instead of chapter/file title
-      title = libraryItem.media.metadata.title
-    } else {
-      if (useChapterTitles) {
-        // If audio track start and chapter start are within 1 seconds of eachother then use the chapter title
-        const matchingChapter = libraryItem.media.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
-        if (matchingChapter?.title) title = matchingChapter.title
-      }
-    }
-
-    this.id = episodeId
-    this.title = title
-    this.description = mediaMetadata.description || ''
-    this.enclosure = {
-      url: `${contentUrl}`,
-      type: audioTrack.mimeType,
-      size: audioTrack.metadata.size
-    }
-    this.pubDate = audiobookPubDate
-    this.link = meta.link
-    this.author = meta.author
-    this.explicit = mediaMetadata.explicit
-    this.duration = audioTrack.duration
-    this.libraryItemId = libraryItem.id
-    this.episodeId = null
-    this.trackIndex = audioTrack.index
-    this.fullPath = audioTrack.metadata.path
-  }
-
-  getRSSData(hostPrefix) {
-    return {
-      title: this.title,
-      description: this.description || '',
-      url: `${hostPrefix}${this.link}`,
-      guid: `${hostPrefix}${this.enclosure.url}`,
-      author: this.author,
-      date: this.pubDate,
-      enclosure: {
-        url: `${hostPrefix}${this.enclosure.url}`,
-        type: this.enclosure.type,
-        size: this.enclosure.size
-      },
-      custom_elements: [
-        { 'itunes:author': this.author },
-        { 'itunes:duration': secondsToTimestamp(this.duration) },
-        { 'itunes:summary': this.description || '' },
-        {
-          'itunes:explicit': !!this.explicit
-        },
-        { 'itunes:episodeType': this.episodeType },
-        { 'itunes:season': this.season },
-        { 'itunes:episode': this.episode }
-      ]
-    }
-  }
 }
 module.exports = FeedEpisode
diff --git a/server/objects/FeedMeta.js b/server/objects/FeedMeta.js
index e439fe8f..61fccaa3 100644
--- a/server/objects/FeedMeta.js
+++ b/server/objects/FeedMeta.js
@@ -59,42 +59,5 @@ class FeedMeta {
       ownerEmail: this.ownerEmail
     }
   }
-
-  getRSSData(hostPrefix) {
-    const blockTags = [{ 'itunes:block': 'yes' }, { 'googleplay:block': 'yes' }]
-    return {
-      title: this.title,
-      description: this.description || '',
-      generator: 'Audiobookshelf',
-      feed_url: `${hostPrefix}${this.feedUrl}`,
-      site_url: `${hostPrefix}${this.link}`,
-      image_url: `${hostPrefix}${this.imageUrl}`,
-      custom_namespaces: {
-        itunes: 'http://www.itunes.com/dtds/podcast-1.0.dtd',
-        psc: 'http://podlove.org/simple-chapters',
-        podcast: 'https://podcastindex.org/namespace/1.0',
-        googleplay: 'http://www.google.com/schemas/play-podcasts/1.0'
-      },
-      custom_elements: [
-        { language: this.language || 'en' },
-        { author: this.author || 'advplyr' },
-        { 'itunes:author': this.author || 'advplyr' },
-        { 'itunes:summary': this.description || '' },
-        { 'itunes:type': this.type },
-        {
-          'itunes:image': {
-            _attr: {
-              href: `${hostPrefix}${this.imageUrl}`
-            }
-          }
-        },
-        {
-          'itunes:owner': [{ 'itunes:name': this.ownerName || this.author || '' }, { 'itunes:email': this.ownerEmail || '' }]
-        },
-        { 'itunes:explicit': !!this.explicit },
-        ...(this.preventIndexing ? blockTags : [])
-      ]
-    }
-  }
 }
 module.exports = FeedMeta

From de8a9304d21dc53b607beee4396e3abf685652ac Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 17:05:57 -0600
Subject: [PATCH 034/143] Remove unused old feed methods

---
 server/Database.js           |  15 -----
 server/models/Feed.js        | 112 -----------------------------------
 server/models/FeedEpisode.js |  33 -----------
 3 files changed, 160 deletions(-)

diff --git a/server/Database.js b/server/Database.js
index 95e13c6b..afb09dae 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -444,21 +444,6 @@ class Database {
     return updated
   }
 
-  async createFeed(oldFeed) {
-    if (!this.sequelize) return false
-    await this.models.feed.fullCreateFromOld(oldFeed)
-  }
-
-  updateFeed(oldFeed) {
-    if (!this.sequelize) return false
-    return this.models.feed.fullUpdateFromOld(oldFeed)
-  }
-
-  async removeFeed(feedId) {
-    if (!this.sequelize) return false
-    await this.models.feed.removeById(feedId)
-  }
-
   async createBulkBookAuthors(bookAuthors) {
     if (!this.sequelize) return false
     await this.models.bookAuthor.bulkCreate(bookAuthors)
diff --git a/server/models/Feed.js b/server/models/Feed.js
index f6ee4e3c..5aaa4856 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -1,7 +1,6 @@
 const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
 const oldFeed = require('../objects/Feed')
-const areEquivalent = require('../utils/areEquivalent')
 const Logger = require('../Logger')
 
 const RSS = require('../libs/rss')
@@ -143,20 +142,6 @@ class Feed extends Model {
     )
   }
 
-  /**
-   * Find all library item ids that have an open feed (used in library filter)
-   * @returns {Promise<string[]>} array of library item ids
-   */
-  static async findAllLibraryItemIds() {
-    const feeds = await this.findAll({
-      attributes: ['entityId'],
-      where: {
-        entityType: 'libraryItem'
-      }
-    })
-    return feeds.map((f) => f.entityId).filter((f) => f) || []
-  }
-
   /**
    * Find feed where and return oldFeed
    * @param {Object} where sequelize where object
@@ -174,103 +159,6 @@ class Feed extends Model {
     return this.getOldFeed(feedExpanded)
   }
 
-  static async fullCreateFromOld(oldFeed) {
-    const feedObj = this.getFromOld(oldFeed)
-    const newFeed = await this.create(feedObj)
-
-    if (oldFeed.episodes?.length) {
-      for (const oldFeedEpisode of oldFeed.episodes) {
-        const feedEpisode = this.sequelize.models.feedEpisode.getFromOld(oldFeedEpisode)
-        feedEpisode.feedId = newFeed.id
-        await this.sequelize.models.feedEpisode.create(feedEpisode)
-      }
-    }
-  }
-
-  static async fullUpdateFromOld(oldFeed) {
-    const oldFeedEpisodes = oldFeed.episodes || []
-    const feedObj = this.getFromOld(oldFeed)
-
-    const existingFeed = await this.findByPk(feedObj.id, {
-      include: this.sequelize.models.feedEpisode
-    })
-    if (!existingFeed) return false
-
-    let hasUpdates = false
-
-    // Remove and update existing feed episodes
-    for (const feedEpisode of existingFeed.feedEpisodes) {
-      const oldFeedEpisode = oldFeedEpisodes.find((ep) => ep.id === feedEpisode.id)
-      // Episode removed
-      if (!oldFeedEpisode) {
-        feedEpisode.destroy()
-      } else {
-        let episodeHasUpdates = false
-        const oldFeedEpisodeCleaned = this.sequelize.models.feedEpisode.getFromOld(oldFeedEpisode)
-        for (const key in oldFeedEpisodeCleaned) {
-          if (!areEquivalent(oldFeedEpisodeCleaned[key], feedEpisode[key])) {
-            episodeHasUpdates = true
-          }
-        }
-        if (episodeHasUpdates) {
-          await feedEpisode.update(oldFeedEpisodeCleaned)
-          hasUpdates = true
-        }
-      }
-    }
-
-    // Add new feed episodes
-    for (const episode of oldFeedEpisodes) {
-      if (!existingFeed.feedEpisodes.some((fe) => fe.id === episode.id)) {
-        await this.sequelize.models.feedEpisode.createFromOld(feedObj.id, episode)
-        hasUpdates = true
-      }
-    }
-
-    let feedHasUpdates = false
-    for (const key in feedObj) {
-      let existingValue = existingFeed[key]
-      if (existingValue instanceof Date) existingValue = existingValue.valueOf()
-
-      if (!areEquivalent(existingValue, feedObj[key])) {
-        feedHasUpdates = true
-      }
-    }
-
-    if (feedHasUpdates) {
-      await existingFeed.update(feedObj)
-      hasUpdates = true
-    }
-
-    return hasUpdates
-  }
-
-  static getFromOld(oldFeed) {
-    const oldFeedMeta = oldFeed.meta || {}
-    return {
-      id: oldFeed.id,
-      slug: oldFeed.slug,
-      entityType: oldFeed.entityType,
-      entityId: oldFeed.entityId,
-      entityUpdatedAt: oldFeed.entityUpdatedAt,
-      serverAddress: oldFeed.serverAddress,
-      feedURL: oldFeed.feedUrl,
-      coverPath: oldFeed.coverPath || null,
-      imageURL: oldFeedMeta.imageUrl,
-      siteURL: oldFeedMeta.link,
-      title: oldFeedMeta.title,
-      description: oldFeedMeta.description,
-      author: oldFeedMeta.author,
-      podcastType: oldFeedMeta.type || null,
-      language: oldFeedMeta.language || null,
-      ownerName: oldFeedMeta.ownerName || null,
-      ownerEmail: oldFeedMeta.ownerEmail || null,
-      explicit: !!oldFeedMeta.explicit,
-      preventIndexing: !!oldFeedMeta.preventIndexing,
-      userId: oldFeed.userId
-    }
-  }
-
   /**
    *
    * @param {string} userId
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index b14f1b7b..31b26800 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -47,39 +47,6 @@ class FeedEpisode extends Model {
     this.updatedAt
   }
 
-  /**
-   * Create feed episode from old model
-   *
-   * @param {string} feedId
-   * @param {Object} oldFeedEpisode
-   * @returns {Promise<FeedEpisode>}
-   */
-  static createFromOld(feedId, oldFeedEpisode) {
-    const newEpisode = this.getFromOld(oldFeedEpisode)
-    newEpisode.feedId = feedId
-    return this.create(newEpisode)
-  }
-
-  static getFromOld(oldFeedEpisode) {
-    return {
-      id: oldFeedEpisode.id,
-      title: oldFeedEpisode.title,
-      author: oldFeedEpisode.author,
-      description: oldFeedEpisode.description,
-      siteURL: oldFeedEpisode.link,
-      enclosureURL: oldFeedEpisode.enclosure?.url || null,
-      enclosureType: oldFeedEpisode.enclosure?.type || null,
-      enclosureSize: oldFeedEpisode.enclosure?.size || null,
-      pubDate: oldFeedEpisode.pubDate,
-      season: oldFeedEpisode.season || null,
-      episode: oldFeedEpisode.episode || null,
-      episodeType: oldFeedEpisode.episodeType || null,
-      duration: oldFeedEpisode.duration,
-      filePath: oldFeedEpisode.fullPath,
-      explicit: !!oldFeedEpisode.explicit
-    }
-  }
-
   /**
    *
    * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded

From b39268ccb0fb5fae85cfcc2847be0971f7792b8b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 15 Dec 2024 17:54:36 -0600
Subject: [PATCH 035/143] Remove old Feed/FeedEpisode/FeedMeta objects

---
 server/controllers/LibraryController.js       |  2 +-
 server/controllers/LibraryItemController.js   |  2 +-
 server/controllers/RSSFeedController.js       | 10 +--
 server/controllers/SeriesController.js        |  2 +-
 server/managers/RssFeedManager.js             | 55 +++++++++---
 server/models/Collection.js                   |  4 +-
 server/models/Feed.js                         | 83 +++----------------
 server/models/FeedEpisode.js                  |  4 +-
 server/models/LibraryItem.js                  |  2 +-
 server/models/Playlist.js                     |  7 --
 server/objects/Feed.js                        | 77 -----------------
 server/objects/FeedEpisode.js                 | 67 ---------------
 server/objects/FeedMeta.js                    | 63 --------------
 server/utils/queries/libraryFilters.js        | 14 ++--
 .../utils/queries/libraryItemsBookFilters.js  | 12 +--
 .../queries/libraryItemsPodcastFilters.js     |  4 +-
 server/utils/queries/seriesFilters.js         |  2 +-
 17 files changed, 84 insertions(+), 326 deletions(-)
 delete mode 100644 server/objects/Feed.js
 delete mode 100644 server/objects/FeedEpisode.js
 delete mode 100644 server/objects/FeedMeta.js

diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index da9859f2..6e7fbea3 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -762,7 +762,7 @@ class LibraryController {
 
     if (include.includes('rssfeed')) {
       const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
-      seriesJson.rssFeed = feedObj?.toJSONMinified() || null
+      seriesJson.rssFeed = feedObj?.toOldJSONMinified() || null
     }
 
     res.json(seriesJson)
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 5fac31aa..f2a4383e 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -51,7 +51,7 @@ class LibraryItemController {
 
       if (includeEntities.includes('rssfeed')) {
         const feedData = await RssFeedManager.findFeedForEntityId(item.id)
-        item.rssFeed = feedData?.toJSONMinified() || null
+        item.rssFeed = feedData?.toOldJSONMinified() || null
       }
 
       if (item.mediaType === 'book' && req.user.isAdminOrUp && includeEntities.includes('share')) {
diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index e1c9c514..e0016421 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -25,8 +25,8 @@ class RSSFeedController {
   async getAll(req, res) {
     const feeds = await RssFeedManager.getFeeds()
     res.json({
-      feeds: feeds.map((f) => f.toJSON()),
-      minified: feeds.map((f) => f.toJSONMinified())
+      feeds: feeds.map((f) => f.toOldJSON()),
+      minified: feeds.map((f) => f.toOldJSONMinified())
     })
   }
 
@@ -63,7 +63,7 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
@@ -97,7 +97,7 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
@@ -140,7 +140,7 @@ class RSSFeedController {
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await RssFeedManager.findFeedBySlug(reqBody.slug)) {
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
diff --git a/server/controllers/SeriesController.js b/server/controllers/SeriesController.js
index f8aef05c..21c93f33 100644
--- a/server/controllers/SeriesController.js
+++ b/server/controllers/SeriesController.js
@@ -55,7 +55,7 @@ class SeriesController {
 
     if (include.includes('rssfeed')) {
       const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
-      seriesJson.rssFeed = feedObj?.toJSONMinified() || null
+      seriesJson.rssFeed = feedObj?.toOldJSONMinified() || null
     }
 
     res.json(seriesJson)
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 335df110..03d3c167 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -53,19 +53,29 @@ class RssFeedManager {
   /**
    * Find open feed for an entity (e.g. collection id, playlist id, library item id)
    * @param {string} entityId
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @returns {Promise<import('../models/Feed')>}
    */
   findFeedForEntityId(entityId) {
-    return Database.feedModel.findOneOld({ entityId })
+    return Database.feedModel.findOne({
+      where: {
+        entityId
+      }
+    })
   }
 
   /**
-   * Find open feed for a slug
+   *
    * @param {string} slug
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @returns {Promise<boolean>}
    */
-  findFeedBySlug(slug) {
-    return Database.feedModel.findOneOld({ slug })
+  checkExistsBySlug(slug) {
+    return Database.feedModel
+      .count({
+        where: {
+          slug
+        }
+      })
+      .then((count) => count > 0)
   }
 
   /**
@@ -169,7 +179,17 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeedItem(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    const feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      },
+      attributes: ['id', 'slug'],
+      include: {
+        model: Database.feedEpisodeModel,
+        attributes: ['id', 'filePath']
+      }
+    })
+
     if (!feed) {
       Logger.debug(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
@@ -191,7 +211,12 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeedCover(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    const feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      },
+      attributes: ['coverPath']
+    })
     if (!feed) {
       Logger.debug(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
@@ -338,10 +363,16 @@ class RssFeedManager {
     }
   }
 
-  async getFeeds() {
-    const feeds = await Database.models.feed.getOldFeeds()
-    Logger.info(`[RssFeedManager] Fetched all feeds`)
-    return feeds
+  /**
+   *
+   * @returns {Promise<import('../models/Feed').FeedExpanded[]>}
+   */
+  getFeeds() {
+    return Database.feedModel.findAll({
+      include: {
+        model: Database.feedEpisodeModel
+      }
+    })
   }
 }
 module.exports = new RssFeedManager()
diff --git a/server/models/Collection.js b/server/models/Collection.js
index 558ae843..e01ad90a 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -112,7 +112,7 @@ class Collection extends Model {
 
         // Map feed if found
         if (c.feeds?.length) {
-          collectionExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(c.feeds[0])
+          collectionExpanded.rssFeed = c.feeds[0].toOldJSON()
         }
 
         return collectionExpanded
@@ -348,7 +348,7 @@ class Collection extends Model {
     if (include?.includes('rssfeed')) {
       const feeds = await this.getFeeds()
       if (feeds?.length) {
-        collectionExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(feeds[0])
+        collectionExpanded.rssFeed = feeds[0].toOldJSON()
       }
     }
 
diff --git a/server/models/Feed.js b/server/models/Feed.js
index 5aaa4856..d8f8553c 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -1,6 +1,5 @@
 const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
-const oldFeed = require('../objects/Feed')
 const Logger = require('../Logger')
 
 const RSS = require('../libs/rss')
@@ -74,60 +73,6 @@ class Feed extends Model {
     this.feedEpisodes
   }
 
-  static async getOldFeeds() {
-    const feeds = await this.findAll({
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    return feeds.map((f) => this.getOldFeed(f))
-  }
-
-  /**
-   * Get old feed from Feed and optionally Feed with FeedEpisodes
-   * @param {Feed} feedExpanded
-   * @returns {oldFeed}
-   */
-  static getOldFeed(feedExpanded) {
-    const episodes = feedExpanded.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode()) || []
-
-    // Sort episodes by pubDate. Newest to oldest for episodic, oldest to newest for serial
-    if (feedExpanded.podcastType === 'episodic') {
-      episodes.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate))
-    } else {
-      episodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
-    }
-
-    return new oldFeed({
-      id: feedExpanded.id,
-      slug: feedExpanded.slug,
-      userId: feedExpanded.userId,
-      entityType: feedExpanded.entityType,
-      entityId: feedExpanded.entityId,
-      entityUpdatedAt: feedExpanded.entityUpdatedAt?.valueOf() || null,
-      coverPath: feedExpanded.coverPath || null,
-      meta: {
-        title: feedExpanded.title,
-        description: feedExpanded.description,
-        author: feedExpanded.author,
-        imageUrl: feedExpanded.imageURL,
-        feedUrl: feedExpanded.feedURL,
-        link: feedExpanded.siteURL,
-        explicit: feedExpanded.explicit,
-        type: feedExpanded.podcastType,
-        language: feedExpanded.language,
-        preventIndexing: feedExpanded.preventIndexing,
-        ownerName: feedExpanded.ownerName,
-        ownerEmail: feedExpanded.ownerEmail
-      },
-      serverAddress: feedExpanded.serverAddress,
-      feedUrl: feedExpanded.feedURL,
-      episodes,
-      createdAt: feedExpanded.createdAt.valueOf(),
-      updatedAt: feedExpanded.updatedAt.valueOf()
-    })
-  }
-
   /**
    * @param {string} feedId
    * @returns {Promise<boolean>} - true if feed was removed
@@ -142,23 +87,6 @@ class Feed extends Model {
     )
   }
 
-  /**
-   * Find feed where and return oldFeed
-   * @param {Object} where sequelize where object
-   * @returns {Promise<oldFeed>} oldFeed
-   */
-  static async findOneOld(where) {
-    if (!where) return null
-    const feedExpanded = await this.findOne({
-      where,
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    if (!feedExpanded) return null
-    return this.getOldFeed(feedExpanded)
-  }
-
   /**
    *
    * @param {string} userId
@@ -663,6 +591,17 @@ class Feed extends Model {
     return rssfeed.xml()
   }
 
+  /**
+   *
+   * @param {string} id
+   * @returns {string}
+   */
+  getEpisodePath(id) {
+    const episode = this.feedEpisodes.find((ep) => ep.id === id)
+    if (!episode) return null
+    return episode.filePath
+  }
+
   toOldJSON() {
     const episodes = this.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
     return {
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 31b26800..3bf0ff85 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -55,12 +55,14 @@ class FeedEpisode extends Model {
    * @param {import('./PodcastEpisode')} episode
    */
   static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
+    const episodeId = uuidv4()
     return {
+      id: episodeId,
       title: episode.title,
       author: feed.author,
       description: episode.description,
       siteURL: feed.siteURL,
-      enclosureURL: `/feed/${slug}/item/${episode.id}/media${Path.extname(episode.audioFile.metadata.filename)}`,
+      enclosureURL: `/feed/${slug}/item/${episodeId}/media${Path.extname(episode.audioFile.metadata.filename)}`,
       enclosureType: episode.audioFile.mimeType,
       enclosureSize: episode.audioFile.metadata.size,
       pubDate: episode.pubDate,
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 0c8df302..8ebed1d5 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -568,7 +568,7 @@ class LibraryItem extends Model {
           oldLibraryItem.media.metadata.series = li.series
         }
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = this.sequelize.models.feed.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.media.numEpisodes) {
           oldLibraryItem.media.numEpisodes = li.media.numEpisodes
diff --git a/server/models/Playlist.js b/server/models/Playlist.js
index fbc5f96a..490e8087 100644
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -84,13 +84,6 @@ class Playlist extends Model {
 
     const playlistExpanded = oldPlaylist.toJSONExpanded(libraryItems)
 
-    if (include?.includes('rssfeed')) {
-      const feeds = await this.getFeeds()
-      if (feeds?.length) {
-        playlistExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(feeds[0])
-      }
-    }
-
     return playlistExpanded
   }
 
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
deleted file mode 100644
index 4da7a995..00000000
--- a/server/objects/Feed.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const FeedMeta = require('./FeedMeta')
-const FeedEpisode = require('./FeedEpisode')
-
-class Feed {
-  constructor(feed) {
-    this.id = null
-    this.slug = null
-    this.userId = null
-    this.entityType = null
-    this.entityId = null
-    this.entityUpdatedAt = null
-
-    this.coverPath = null
-    this.serverAddress = null
-    this.feedUrl = null
-
-    this.meta = null
-    this.episodes = null
-
-    this.createdAt = null
-    this.updatedAt = null
-
-    if (feed) {
-      this.construct(feed)
-    }
-  }
-
-  construct(feed) {
-    this.id = feed.id
-    this.slug = feed.slug
-    this.userId = feed.userId
-    this.entityType = feed.entityType
-    this.entityId = feed.entityId
-    this.entityUpdatedAt = feed.entityUpdatedAt
-    this.coverPath = feed.coverPath
-    this.serverAddress = feed.serverAddress
-    this.feedUrl = feed.feedUrl
-    this.meta = new FeedMeta(feed.meta)
-    this.episodes = feed.episodes.map((ep) => new FeedEpisode(ep))
-    this.createdAt = feed.createdAt
-    this.updatedAt = feed.updatedAt
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      slug: this.slug,
-      userId: this.userId,
-      entityType: this.entityType,
-      entityId: this.entityId,
-      coverPath: this.coverPath,
-      serverAddress: this.serverAddress,
-      feedUrl: this.feedUrl,
-      meta: this.meta.toJSON(),
-      episodes: this.episodes.map((ep) => ep.toJSON()),
-      createdAt: this.createdAt,
-      updatedAt: this.updatedAt
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      id: this.id,
-      entityType: this.entityType,
-      entityId: this.entityId,
-      feedUrl: this.feedUrl,
-      meta: this.meta.toJSONMinified()
-    }
-  }
-
-  getEpisodePath(id) {
-    var episode = this.episodes.find((ep) => ep.id === id)
-    if (!episode) return null
-    return episode.fullPath
-  }
-}
-module.exports = Feed
diff --git a/server/objects/FeedEpisode.js b/server/objects/FeedEpisode.js
deleted file mode 100644
index 4438eb52..00000000
--- a/server/objects/FeedEpisode.js
+++ /dev/null
@@ -1,67 +0,0 @@
-class FeedEpisode {
-  constructor(episode) {
-    this.id = null
-
-    this.title = null
-    this.description = null
-    this.enclosure = null
-    this.pubDate = null
-    this.link = null
-    this.author = null
-    this.explicit = null
-    this.duration = null
-    this.season = null
-    this.episode = null
-    this.episodeType = null
-
-    this.libraryItemId = null
-    this.episodeId = null
-    this.trackIndex = null
-    this.fullPath = null
-
-    if (episode) {
-      this.construct(episode)
-    }
-  }
-
-  construct(episode) {
-    this.id = episode.id
-    this.title = episode.title
-    this.description = episode.description
-    this.enclosure = episode.enclosure ? { ...episode.enclosure } : null
-    this.pubDate = episode.pubDate
-    this.link = episode.link
-    this.author = episode.author
-    this.explicit = episode.explicit
-    this.duration = episode.duration
-    this.season = episode.season
-    this.episode = episode.episode
-    this.episodeType = episode.episodeType
-    this.libraryItemId = episode.libraryItemId
-    this.episodeId = episode.episodeId || null
-    this.trackIndex = episode.trackIndex || 0
-    this.fullPath = episode.fullPath
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      title: this.title,
-      description: this.description,
-      enclosure: this.enclosure ? { ...this.enclosure } : null,
-      pubDate: this.pubDate,
-      link: this.link,
-      author: this.author,
-      explicit: this.explicit,
-      duration: this.duration,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      libraryItemId: this.libraryItemId,
-      episodeId: this.episodeId,
-      trackIndex: this.trackIndex,
-      fullPath: this.fullPath
-    }
-  }
-}
-module.exports = FeedEpisode
diff --git a/server/objects/FeedMeta.js b/server/objects/FeedMeta.js
deleted file mode 100644
index 61fccaa3..00000000
--- a/server/objects/FeedMeta.js
+++ /dev/null
@@ -1,63 +0,0 @@
-class FeedMeta {
-  constructor(meta) {
-    this.title = null
-    this.description = null
-    this.author = null
-    this.imageUrl = null
-    this.feedUrl = null
-    this.link = null
-    this.explicit = null
-    this.type = null
-    this.language = null
-    this.preventIndexing = null
-    this.ownerName = null
-    this.ownerEmail = null
-
-    if (meta) {
-      this.construct(meta)
-    }
-  }
-
-  construct(meta) {
-    this.title = meta.title
-    this.description = meta.description
-    this.author = meta.author
-    this.imageUrl = meta.imageUrl
-    this.feedUrl = meta.feedUrl
-    this.link = meta.link
-    this.explicit = meta.explicit
-    this.type = meta.type
-    this.language = meta.language
-    this.preventIndexing = meta.preventIndexing
-    this.ownerName = meta.ownerName
-    this.ownerEmail = meta.ownerEmail
-  }
-
-  toJSON() {
-    return {
-      title: this.title,
-      description: this.description,
-      author: this.author,
-      imageUrl: this.imageUrl,
-      feedUrl: this.feedUrl,
-      link: this.link,
-      explicit: this.explicit,
-      type: this.type,
-      language: this.language,
-      preventIndexing: this.preventIndexing,
-      ownerName: this.ownerName,
-      ownerEmail: this.ownerEmail
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      title: this.title,
-      description: this.description,
-      preventIndexing: this.preventIndexing,
-      ownerName: this.ownerName,
-      ownerEmail: this.ownerEmail
-    }
-  }
-}
-module.exports = FeedMeta
diff --git a/server/utils/queries/libraryFilters.js b/server/utils/queries/libraryFilters.js
index bdddde75..57ca48ba 100644
--- a/server/utils/queries/libraryFilters.js
+++ b/server/utils/queries/libraryFilters.js
@@ -54,7 +54,7 @@ module.exports = {
         items: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.mediaItemShare) {
             oldLibraryItem.mediaItemShare = li.mediaItemShare
@@ -91,7 +91,7 @@ module.exports = {
         libraryItems: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.size && !oldLibraryItem.media.size) {
             oldLibraryItem.media.size = li.size
@@ -109,7 +109,7 @@ module.exports = {
         libraryItems: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.size && !oldLibraryItem.media.size) {
             oldLibraryItem.media.size = li.size
@@ -138,7 +138,7 @@ module.exports = {
       libraryItems: libraryItems.map((li) => {
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.series) {
           oldLibraryItem.media.metadata.series = li.series
@@ -168,7 +168,7 @@ module.exports = {
         items: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.mediaItemShare) {
             oldLibraryItem.mediaItemShare = li.mediaItemShare
@@ -279,7 +279,7 @@ module.exports = {
       const oldSeries = s.toOldJSON()
 
       if (s.feeds?.length) {
-        oldSeries.rssFeed = Database.feedModel.getOldFeed(s.feeds[0]).toJSONMinified()
+        oldSeries.rssFeed = s.feeds[0].toOldJSONMinified()
       }
 
       // TODO: Sort books by sequence in query
@@ -375,7 +375,7 @@ module.exports = {
       libraryItems: libraryItems.map((li) => {
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.mediaItemShare) {
           oldLibraryItem.mediaItemShare = li.mediaItemShare
diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js
index b2784f5d..ccce5304 100644
--- a/server/utils/queries/libraryItemsBookFilters.js
+++ b/server/utils/queries/libraryItemsBookFilters.js
@@ -615,8 +615,8 @@ module.exports = {
         }
       }
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (bookExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
       }
 
       if (includeMediaItemShare) {
@@ -766,8 +766,8 @@ module.exports = {
           name: s.name,
           sequence: s.bookSeries[bookIndex].sequence
         }
-        if (libraryItem.feeds?.length) {
-          libraryItem.rssFeed = libraryItem.feeds[0]
+        if (s.bookSeries[bookIndex].book.libraryItem.feeds?.length) {
+          libraryItem.rssFeed = s.bookSeries[bookIndex].book.libraryItem.feeds[0]
         }
         libraryItem.media = book
         return libraryItem
@@ -900,8 +900,8 @@ module.exports = {
       delete book.libraryItem
       libraryItem.media = book
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (bookExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
       }
 
       return libraryItem
diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js
index 2f259efc..c7c0914b 100644
--- a/server/utils/queries/libraryItemsPodcastFilters.js
+++ b/server/utils/queries/libraryItemsPodcastFilters.js
@@ -180,8 +180,8 @@ module.exports = {
 
       delete podcast.libraryItem
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (podcastExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = podcastExpanded.libraryItem.feeds[0]
       }
       if (podcast.numEpisodesIncomplete) {
         libraryItem.numEpisodesIncomplete = podcast.numEpisodesIncomplete
diff --git a/server/utils/queries/seriesFilters.js b/server/utils/queries/seriesFilters.js
index c293f1df..2e0e2346 100644
--- a/server/utils/queries/seriesFilters.js
+++ b/server/utils/queries/seriesFilters.js
@@ -182,7 +182,7 @@ module.exports = {
       }
 
       if (s.feeds?.length) {
-        oldSeries.rssFeed = Database.feedModel.getOldFeed(s.feeds[0]).toJSONMinified()
+        oldSeries.rssFeed = s.feeds[0].toOldJSONMinified()
       }
 
       // TODO: Sort books by sequence in query

From ba55413e63230311ba8c66cae93a6daa91dec1f9 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Mon, 16 Dec 2024 19:21:44 +0200
Subject: [PATCH 036/143] LazyBookshelf optimizations

---
 client/components/app/LazyBookshelf.vue | 141 +++++++++++++-----------
 1 file changed, 74 insertions(+), 67 deletions(-)

diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index d27ecdca..6e3083e0 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -65,7 +65,12 @@ export default {
       tempIsScanning: false,
       cardWidth: 0,
       cardHeight: 0,
-      resizeObserver: null
+      resizeObserver: null,
+      lastScrollTop: 0,
+      lastTimestamp: 0,
+      postScrollTimeout: null,
+      currFirstEntityIndex: -1,
+      currLastEntityIndex: -1
     }
   },
   watch: {
@@ -354,50 +359,53 @@ export default {
       }
     },
     loadPage(page) {
-      this.pagesLoaded[page] = true
-      this.fetchEntites(page)
+      if (!this.pagesLoaded[page]) this.pagesLoaded[page] = this.fetchEntites(page)
+      return this.pagesLoaded[page]
     },
     showHideBookPlaceholder(index, show) {
       var el = document.getElementById(`book-${index}-placeholder`)
       if (el) el.style.display = show ? 'flex' : 'none'
     },
-    mountEntites(fromIndex, toIndex) {
+    mountEntities(fromIndex, toIndex) {
       for (let i = fromIndex; i < toIndex; i++) {
         if (!this.entityIndexesMounted.includes(i)) {
           this.cardsHelpers.mountEntityCard(i)
         }
       }
     },
-    handleScroll(scrollTop) {
-      this.currScrollTop = scrollTop
-      var firstShelfIndex = Math.floor(scrollTop / this.shelfHeight)
-      var lastShelfIndex = Math.ceil((scrollTop + this.bookshelfHeight) / this.shelfHeight)
-      lastShelfIndex = Math.min(this.totalShelves - 1, lastShelfIndex)
-
-      var firstBookIndex = firstShelfIndex * this.entitiesPerShelf
-      var lastBookIndex = lastShelfIndex * this.entitiesPerShelf + this.entitiesPerShelf
-      lastBookIndex = Math.min(this.totalEntities, lastBookIndex)
-
-      var firstBookPage = Math.floor(firstBookIndex / this.booksPerFetch)
-      var lastBookPage = Math.floor(lastBookIndex / this.booksPerFetch)
-      if (!this.pagesLoaded[firstBookPage]) {
-        // console.log('Must load next batch', firstBookPage, 'book index', firstBookIndex)
-        this.loadPage(firstBookPage)
-      }
-      if (!this.pagesLoaded[lastBookPage]) {
-        // console.log('Must load last next batch', lastBookPage, 'book index', lastBookIndex)
-        this.loadPage(lastBookPage)
-      }
-
+    getVisibleIndices(scrollTop) {
+      const firstShelfIndex = Math.floor(scrollTop / this.shelfHeight)
+      const lastShelfIndex = Math.min(Math.ceil((scrollTop + this.bookshelfHeight) / this.shelfHeight), this.totalShelves - 1)
+      const firstEntityIndex = firstShelfIndex * this.entitiesPerShelf
+      const lastEntityIndex = Math.min(lastShelfIndex * this.entitiesPerShelf + this.entitiesPerShelf, this.totalEntities)
+      return { firstEntityIndex, lastEntityIndex }
+    },
+    postScroll() {
+      const { firstEntityIndex, lastEntityIndex } = this.getVisibleIndices(this.currScrollTop)
       this.entityIndexesMounted = this.entityIndexesMounted.filter((_index) => {
-        if (_index < firstBookIndex || _index >= lastBookIndex) {
-          var el = document.getElementById(`book-card-${_index}`)
-          if (el) el.remove()
+        if (_index < firstEntityIndex || _index >= lastEntityIndex) {
+          var el = this.entityComponentRefs[_index]
+          if (el && el.$el) el.$el.remove()
           return false
         }
         return true
       })
-      this.mountEntites(firstBookIndex, lastBookIndex)
+    },
+    handleScroll(scrollTop) {
+      this.currScrollTop = scrollTop
+      const { firstEntityIndex, lastEntityIndex } = this.getVisibleIndices(scrollTop)
+      if (firstEntityIndex === this.currFirstEntityIndex && lastEntityIndex === this.currLastEntityIndex) return
+      this.currFirstEntityIndex = firstEntityIndex
+      this.currLastEntityIndex = lastEntityIndex
+
+      clearTimeout(this.postScrollTimeout)
+      const firstPage = Math.floor(firstEntityIndex / this.booksPerFetch)
+      const lastPage = Math.floor(lastEntityIndex / this.booksPerFetch)
+      Promise.all([this.loadPage(firstPage), this.loadPage(lastPage)])
+        .then(() => this.mountEntities(firstEntityIndex, lastEntityIndex))
+        .catch((error) => console.error('Failed to load page', error))
+
+      this.postScrollTimeout = setTimeout(this.postScroll, 500)
     },
     async resetEntities() {
       if (this.isFetchingEntities) {
@@ -405,8 +413,6 @@ export default {
         return
       }
       this.destroyEntityComponents()
-      this.entityIndexesMounted = []
-      this.entityComponentRefs = {}
       this.pagesLoaded = {}
       this.entities = []
       this.totalShelves = 0
@@ -416,40 +422,21 @@ export default {
       this.initialized = false
 
       this.initSizeData()
-      this.pagesLoaded[0] = true
-      await this.fetchEntites(0)
+      await this.loadPage(0)
       var lastBookIndex = Math.min(this.totalEntities, this.shelvesPerPage * this.entitiesPerShelf)
-      this.mountEntites(0, lastBookIndex)
+      this.mountEntities(0, lastBookIndex)
     },
-    remountEntities() {
-      for (const key in this.entityComponentRefs) {
-        if (this.entityComponentRefs[key]) {
-          this.entityComponentRefs[key].destroy()
-        }
-      }
-      this.entityComponentRefs = {}
-      this.entityIndexesMounted.forEach((i) => {
-        this.cardsHelpers.mountEntityCard(i)
-      })
-    },
-    rebuild() {
+    async rebuild() {
       this.initSizeData()
 
       var lastBookIndex = Math.min(this.totalEntities, this.booksPerFetch)
-      this.entityIndexesMounted = []
-      for (let i = 0; i < lastBookIndex; i++) {
-        this.entityIndexesMounted.push(i)
-        if (!this.entities[i]) {
-          const page = Math.floor(i / this.booksPerFetch)
-          this.loadPage(page)
-        }
-      }
+      this.destroyEntityComponents()
+      await this.loadPage(0)
       var bookshelfEl = document.getElementById('bookshelf')
       if (bookshelfEl) {
         bookshelfEl.scrollTop = 0
       }
-
-      this.$nextTick(this.remountEntities)
+      this.mountEntities(0, lastBookIndex)
     },
     buildSearchParams() {
       if (this.page === 'search' || this.page === 'collections') {
@@ -513,12 +500,29 @@ export default {
       if (wasUpdated) {
         this.resetEntities()
       } else if (settings.bookshelfCoverSize !== this.currentBookWidth) {
-        this.executeRebuild()
+        this.rebuild()
       }
     },
+    getScrollRate() {
+      const currentTimestamp = Date.now()
+      const timeDelta = currentTimestamp - this.lastTimestamp
+      const scrollDelta = this.currScrollTop - this.lastScrollTop
+      const scrollRate = Math.abs(scrollDelta) / (timeDelta || 1)
+      this.lastScrollTop = this.currScrollTop
+      this.lastTimestamp = currentTimestamp
+      return scrollRate
+    },
     scroll(e) {
       if (!e || !e.target) return
-      var { scrollTop } = e.target
+      clearTimeout(this.scrollTimeout)
+      const { scrollTop } = e.target
+      const scrollRate = this.getScrollRate()
+      if (scrollRate > 5) {
+        this.scrollTimeout = setTimeout(() => {
+          this.handleScroll(scrollTop)
+        }, 25)
+        return
+      }
       this.handleScroll(scrollTop)
     },
     libraryItemAdded(libraryItem) {
@@ -667,13 +671,14 @@ export default {
     },
     updatePagesLoaded() {
       let numPages = Math.ceil(this.totalEntities / this.booksPerFetch)
+      this.pagesLoaded = {}
       for (let page = 0; page < numPages; page++) {
         let numEntities = Math.min(this.totalEntities - page * this.booksPerFetch, this.booksPerFetch)
-        this.pagesLoaded[page] = true
+        this.pagesLoaded[page] = Promise.resolve()
         for (let i = 0; i < numEntities; i++) {
           const index = page * this.booksPerFetch + i
           if (!this.entities[index]) {
-            this.pagesLoaded[page] = false
+            if (this.pagesLoaded[page]) delete this.pagesLoaded[page]
             break
           }
         }
@@ -688,7 +693,6 @@ export default {
       var entitiesPerShelfBefore = this.entitiesPerShelf
 
       var { clientHeight, clientWidth } = bookshelf
-      // console.log('Init bookshelf width', clientWidth, 'window width', window.innerWidth)
       this.mountWindowWidth = window.innerWidth
       this.bookshelfHeight = clientHeight
       this.bookshelfWidth = clientWidth
@@ -713,10 +717,9 @@ export default {
       this.initSizeData(bookshelf)
       this.checkUpdateSearchParams()
 
-      this.pagesLoaded[0] = true
-      await this.fetchEntites(0)
+      await this.loadPage(0)
       var lastBookIndex = Math.min(this.totalEntities, this.shelvesPerPage * this.entitiesPerShelf)
-      this.mountEntites(0, lastBookIndex)
+      this.mountEntities(0, lastBookIndex)
 
       // Set last scroll position for this bookshelf page
       if (this.$store.state.lastBookshelfScrollData[this.page] && window.bookshelf) {
@@ -747,7 +750,7 @@ export default {
         var bookshelf = document.getElementById('bookshelf')
         if (bookshelf) {
           this.init(bookshelf)
-          bookshelf.addEventListener('scroll', this.scroll)
+          bookshelf.addEventListener('scroll', this.scroll, { passive: true })
         }
       })
 
@@ -810,10 +813,14 @@ export default {
     },
     destroyEntityComponents() {
       for (const key in this.entityComponentRefs) {
-        if (this.entityComponentRefs[key] && this.entityComponentRefs[key].destroy) {
-          this.entityComponentRefs[key].destroy()
+        const ref = this.entityComponentRefs[key]
+        if (ref && ref.destroy) {
+          if (ref.$el) ref.$el.remove()
+          ref.destroy()
         }
       }
+      this.entityComponentRefs = {}
+      this.entityIndexesMounted = []
     },
     scan() {
       this.tempIsScanning = true

From 858d697d0f63d0361fa117dfb4037469fb3521e4 Mon Sep 17 00:00:00 2001
From: Vito0912 <86927734+Vito0912@users.noreply.github.com>
Date: Mon, 16 Dec 2024 23:44:06 +0100
Subject: [PATCH 037/143] DropDown for Year in Review (#3717)

* Accessibility updates
* Show "Share" button on large screen sizes

---------

Co-authored-by: advplyr <advplyr@protonmail.com>
---
 client/components/stats/YearInReview.vue      |  4 +-
 .../components/stats/YearInReviewBanner.vue   | 71 +++++++++++++++----
 .../components/stats/YearInReviewServer.vue   |  4 +-
 client/components/ui/Dropdown.vue             |  8 +--
 4 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index 56840b9c..ed8b800c 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
+    <div v-if="processing" role="img" :aria-label="$strings.MessageLoading" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" :aria-label="$getString('LabelPersonalYearReview', [variant + 1])" />
   </div>
 </template>
 
diff --git a/client/components/stats/YearInReviewBanner.vue b/client/components/stats/YearInReviewBanner.vue
index cf98d5cb..d3191acb 100644
--- a/client/components/stats/YearInReviewBanner.vue
+++ b/client/components/stats/YearInReviewBanner.vue
@@ -7,7 +7,7 @@
     </div>
 
     <div class="flex items-center">
-      <p class="hidden md:block text-xl font-semibold">{{ $getString('HeaderYearReview', [yearInReviewYear]) }}</p>
+      <h1 class="hidden md:block text-xl font-semibold">{{ $getString('HeaderYearReview', [yearInReviewYear]) }}</h1>
       <div class="hidden md:block flex-grow" />
       <ui-btn class="w-full md:w-auto" @click.stop="clickShowYearInReview">{{ showYearInReview ? $strings.LabelYearReviewHide : $strings.LabelYearReviewShow }}</ui-btn>
     </div>
@@ -16,17 +16,22 @@
     <div v-if="showYearInReview">
       <div class="w-full h-px bg-slate-200/10 my-4" />
 
-      <div class="flex items-center justify-center mb-2 max-w-[800px] mx-auto">
+      <div v-if="availableYears.length > 1" class="mb-2 py-2 max-w-[800px] mx-auto">
+        <!-- year selector -->
+        <ui-dropdown v-model="yearInReviewYear" small :items="availableYears" :disabled="processingYearInReview" class="max-w-24" @input="yearInReviewYearChanged" />
+      </div>
+
+      <div role="toolbar" class="flex items-center justify-center mb-2 max-w-[800px] mx-auto">
         <!-- previous button -->
-        <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
+        <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" :aria-label="$strings.ButtonPrevious" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
           <span class="material-symbols text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
           <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
         </ui-btn>
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview">{{ $strings.ButtonShare }} </ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview">{{ $strings.ButtonShare }} </ui-btn>
 
         <div class="flex-grow" />
-        <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelPersonalYearReview', [yearInReviewVariant + 1]) }}</p>
+        <h2 class="hidden sm:block text-lg font-semibold">{{ $getString('LabelPersonalYearReview', [yearInReviewVariant + 1]) }}</h2>
         <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewVariant + 1 }}</p>
         <div class="flex-grow" />
 
@@ -36,7 +41,7 @@
           <span class="material-symbols sm:!hidden text-lg py-px">refresh</span>
         </ui-btn>
         <!-- next button -->
-        <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
+        <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" :aria-label="$strings.ButtonNext" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
           <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
           <span class="material-symbols text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
         </ui-btn>
@@ -46,23 +51,23 @@
       <!-- your year in review short -->
       <div class="w-full max-w-[800px] mx-auto my-4">
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex sm:hidden items-center font-semibold mb-1" @click="shareYearInReviewShort">{{ $strings.ButtonShare }}</ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex items-center font-semibold mb-1" @click="shareYearInReviewShort">{{ $strings.ButtonShare }}</ui-btn>
         <stats-year-in-review-short ref="yearInReviewShort" :year="yearInReviewYear" :processing.sync="processingYearInReviewShort" />
       </div>
 
       <!-- your server in review -->
-      <div v-if="isAdminOrUp" class="w-full max-w-[800px] mx-auto mb-2 mt-4 border-t pt-4 border-white/10">
+      <div v-if="isAdminOrUp" role="toolbar" class="w-full max-w-[800px] mx-auto mb-2 mt-4 border-t pt-4 border-white/10">
         <div class="flex items-center justify-center mb-2">
           <!-- previous button -->
-          <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
+          <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" :aria-label="$strings.ButtonPrevious" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
             <span class="material-symbols text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
             <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
           </ui-btn>
           <!-- share button -->
-          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer">{{ $strings.ButtonShare }} </ui-btn>
+          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer">{{ $strings.ButtonShare }} </ui-btn>
 
           <div class="flex-grow" />
-          <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelServerYearReview', [yearInReviewServerVariant + 1]) }}</p>
+          <h2 class="hidden sm:block text-lg font-semibold">{{ $getString('LabelServerYearReview', [yearInReviewServerVariant + 1]) }}</h2>
           <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewServerVariant + 1 }}</p>
           <div class="flex-grow" />
 
@@ -72,7 +77,7 @@
             <span class="material-symbols sm:!hidden text-lg py-px">refresh</span>
           </ui-btn>
           <!-- next button -->
-          <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
+          <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" :aria-label="$strings.ButtonNext" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
             <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
             <span class="material-symbols text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
           </ui-btn>
@@ -88,6 +93,7 @@ export default {
   data() {
     return {
       showYearInReview: false,
+      availableYears: [],
       yearInReviewYear: 0,
       yearInReviewVariant: 0,
       yearInReviewServerVariant: 0,
@@ -100,6 +106,9 @@ export default {
   computed: {
     isAdminOrUp() {
       return this.$store.getters['user/getIsAdminOrUp']
+    },
+    user() {
+      return this.$store.state.user.user
     }
   },
   methods: {
@@ -112,25 +121,57 @@ export default {
     shareYearInReviewShort() {
       this.$refs.yearInReviewShort.share()
     },
+    yearInReviewYearChanged() {
+      this.$nextTick(() => {
+        this.refreshYearInReview()
+        this.refreshYearInReviewServer()
+      })
+    },
     refreshYearInReviewServer() {
-      this.$refs.yearInReviewServer.refresh()
+      if (this.$refs.yearInReviewServer != null) {
+        this.$refs.yearInReviewServer.refresh()
+      }
     },
     refreshYearInReview() {
-      this.$refs.yearInReview.refresh()
-      this.$refs.yearInReviewShort.refresh()
+      if (this.$refs.yearInReview != null && this.$refs.yearInReviewShort != null) {
+        this.$refs.yearInReview.refresh()
+        this.$refs.yearInReviewShort.refresh()
+      }
     },
     clickShowYearInReview() {
       this.showYearInReview = !this.showYearInReview
+    },
+    getAvailableYears() {
+      if (this.user) {
+        const oldestDate = this.user.createdAt
+        if (oldestDate) {
+          const date = new Date(oldestDate)
+          const oldestYear = date.getFullYear()
+          const currentYear = new Date().getFullYear()
+
+          const years = []
+          for (let year = currentYear; year >= oldestYear; year--) {
+            years.push({ value: year, text: year.toString() })
+          }
+
+          return years
+        }
+      }
+      // Fallback on error
+      return [{ value: this.yearInReviewYear, text: this.yearInReviewYear.toString() }]
     }
   },
   beforeMount() {
     this.yearInReviewYear = new Date().getFullYear()
+
     // When not December show previous year
     if (new Date().getMonth() < 11) {
       this.yearInReviewYear--
     }
   },
   mounted() {
+    this.availableYears = this.getAvailableYears()
+
     if (typeof navigator.share !== 'undefined' && navigator.share) {
       this.showShareButton = true
     } else {
diff --git a/client/components/stats/YearInReviewServer.vue b/client/components/stats/YearInReviewServer.vue
index 05bc0910..ecdcf1b9 100644
--- a/client/components/stats/YearInReviewServer.vue
+++ b/client/components/stats/YearInReviewServer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
+    <div v-if="processing" role="img" :aria-label="$strings.MessageLoading" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" :aria-label="$getString('LabelServerYearReview', [variant + 1])" />
   </div>
 </template>
 
diff --git a/client/components/ui/Dropdown.vue b/client/components/ui/Dropdown.vue
index 3c142686..3e7af46f 100644
--- a/client/components/ui/Dropdown.vue
+++ b/client/components/ui/Dropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative w-full" v-click-outside="clickOutsideObj">
     <p v-if="label" class="text-sm font-semibold px-1" :class="disabled ? 'text-gray-300' : ''">{{ label }}</p>
-    <button type="button" :aria-label="longLabel" :disabled="disabled" class="relative w-full border rounded shadow-sm pl-3 pr-8 py-2 text-left sm:text-sm" :class="buttonClass" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="clickShowMenu">
+    <button type="button" :aria-label="longLabel" :disabled="disabled" class="relative w-full border rounded shadow-sm pl-3 pr-8 py-2 text-left sm:text-sm" :class="buttonClass" aria-haspopup="menu" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
       <span class="flex items-center">
         <span class="block truncate font-sans" :class="{ 'font-semibold': selectedSubtext, 'text-sm': small }">{{ selectedText }}</span>
         <span v-if="selectedSubtext">:&nbsp;</span>
@@ -13,9 +13,9 @@
     </button>
 
     <transition name="menu">
-      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto sm:text-sm" tabindex="-1" role="listbox" :style="{ maxHeight: menuMaxHeight }">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto sm:text-sm" tabindex="-1" role="menu" :style="{ maxHeight: menuMaxHeight }">
         <template v-for="item in itemsToShow">
-          <li :key="item.value" class="text-gray-100 relative py-2 cursor-pointer hover:bg-black-400" :id="'listbox-option-' + item.value" role="option" tabindex="0" @keyup.enter="clickedOption(item.value)" @click="clickedOption(item.value)">
+          <li :key="item.value" class="text-gray-100 relative py-2 cursor-pointer hover:bg-black-400" role="menuitem" tabindex="0" @keyup.enter="clickedOption(item.value)" @click="clickedOption(item.value)">
             <div class="flex items-center">
               <span class="ml-3 block truncate font-sans text-sm" :class="{ 'font-semibold': item.subtext }">{{ item.text }}</span>
               <span v-if="item.subtext">:&nbsp;</span>
@@ -119,4 +119,4 @@ export default {
   },
   mounted() {}
 }
-</script>
\ No newline at end of file
+</script>

From 91f17efd5f8f2982d5ee5bc30a116ac0d14b4c09 Mon Sep 17 00:00:00 2001
From: Brinly <brinsjt@gmail.com>
Date: Tue, 17 Dec 2024 12:42:28 +0100
Subject: [PATCH 038/143] feat: Added Australia and New Zealand podcast regions

---
 client/plugins/i18n.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/plugins/i18n.js b/client/plugins/i18n.js
index 12d2b44b..5f6b1508 100644
--- a/client/plugins/i18n.js
+++ b/client/plugins/i18n.js
@@ -42,6 +42,7 @@ Vue.prototype.$languageCodeOptions = Object.keys(languageCodeMap).map((code) =>
 
 // iTunes search API uses ISO 3166 country codes: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 const podcastSearchRegionMap = {
+  au: { label: 'Australia' },
   br: { label: 'Brasil' },
   be: { label: 'België / Belgique / Belgien' },
   cz: { label: 'Česko' },
@@ -57,6 +58,7 @@ const podcastSearchRegionMap = {
   hu: { label: 'Magyarország' },
   nl: { label: 'Nederland' },
   no: { label: 'Norge' },
+  nz: { label: 'New Zealand' },
   at: { label: 'Österreich' },
   pl: { label: 'Polska' },
   pt: { label: 'Portugal' },

From 63b3f22504a5bcb54db425a03a2dc7b07a50b2e0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 17 Dec 2024 17:44:18 -0600
Subject: [PATCH 039/143] Trim podcast descriptions #3720

---
 server/utils/podcastUtils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index ac96c8d0..627e24b2 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -59,8 +59,8 @@ function extractPodcastMetadata(channel) {
 
   if (channel['description']) {
     const rawDescription = extractFirstArrayItem(channel, 'description') || ''
-    metadata.description = htmlSanitizer.sanitize(rawDescription)
-    metadata.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription)
+    metadata.description = htmlSanitizer.sanitize(rawDescription.trim())
+    metadata.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription.trim())
   }
 
   const arrayFields = ['title', 'language', 'itunes:explicit', 'itunes:author', 'pubDate', 'link', 'itunes:type']
@@ -103,8 +103,8 @@ function extractEpisodeData(item) {
   // Supposed to be the plaintext description but not always followed
   if (item['description']) {
     const rawDescription = extractFirstArrayItem(item, 'description') || ''
-    if (!episode.description) episode.description = htmlSanitizer.sanitize(rawDescription)
-    episode.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription)
+    if (!episode.description) episode.description = htmlSanitizer.sanitize(rawDescription.trim())
+    episode.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription.trim())
   }
 
   if (item['pubDate']) {

From 080b879d8ab0443bf93d0ac3fdcf0734aaf37155 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 9 Dec 2024 22:24:04 +0000
Subject: [PATCH 040/143] Translated using Weblate (Spanish)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/es/
---
 client/strings/es.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/es.json b/client/strings/es.json
index 87956e54..5c7eca62 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Funciones Experimentales",
   "HeaderSettingsGeneral": "General",
   "HeaderSettingsScanner": "Escáner",
+  "HeaderSettingsWebClient": "Cliente web",
   "HeaderSleepTimer": "Temporizador de apagado",
   "HeaderStatsLargestItems": "Artículos mas Grandes",
   "HeaderStatsLongestItems": "Artículos mas Largos (h)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Resumen del año del servidor ({0})",
   "LabelSetEbookAsPrimary": "Establecer como primario",
   "LabelSetEbookAsSupplementary": "Establecer como suplementario",
+  "LabelSettingsAllowIframe": "Permitir incrustación en un iframe",
   "LabelSettingsAudiobooksOnly": "Sólo Audiolibros",
   "LabelSettingsAudiobooksOnlyHelp": "Al activar esta opción se ignorarán los archivos de ebook a menos de que estén dentro de la carpeta de un audiolibro, en cuyo caso se marcarán como ebooks suplementarios",
   "LabelSettingsBookshelfViewHelp": "Diseño Esqueuomorfo con Estantes de Madera",

From f57a07c483af6764bd1c1a3c34ed40e8ab392f1d Mon Sep 17 00:00:00 2001
From: biuklija <ivan@biuklija.com>
Date: Sun, 8 Dec 2024 17:19:02 +0000
Subject: [PATCH 041/143] Translated using Weblate (Croatian)

Currently translated at 99.9% (1075 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hr/
---
 client/strings/hr.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/strings/hr.json b/client/strings/hr.json
index 48d9b5a0..57ea048e 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -542,6 +542,7 @@
   "LabelServerYearReview": "Godišnji pregled poslužitelja ({0})",
   "LabelSetEbookAsPrimary": "Postavi kao primarno",
   "LabelSetEbookAsSupplementary": "Postavi kao dopunsko",
+  "LabelSettingsAllowIframe": "Omogući ugrađivanje u iframeu",
   "LabelSettingsAudiobooksOnly": "Samo zvučne knjige",
   "LabelSettingsAudiobooksOnlyHelp": "Ako uključite ovu mogućnost, sustav će zanemariti datoteke e-knjiga ukoliko se ne nalaze u mapi zvučne knjige, gdje će se smatrati dopunskim e-knjigama",
   "LabelSettingsBookshelfViewHelp": "Skeumorfni dizajn sa drvenim policama",

From f26747627ed7001daeaded92b36528d95972808d Mon Sep 17 00:00:00 2001
From: ugyes <ferenc.bodi@live.com>
Date: Mon, 9 Dec 2024 17:12:35 +0000
Subject: [PATCH 042/143] Translated using Weblate (Hungarian)

Currently translated at 87.3% (940 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hu/
---
 client/strings/hu.json | 148 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 139 insertions(+), 9 deletions(-)

diff --git a/client/strings/hu.json b/client/strings/hu.json
index 8ab6be9e..8c500701 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -180,6 +180,7 @@
   "HeaderRemoveEpisodes": "{0} epizód eltávolítása",
   "HeaderSavedMediaProgress": "Mentett médialejátszási állapot",
   "HeaderSchedule": "Ütemezés",
+  "HeaderScheduleEpisodeDownloads": "Automatikus epizódletöltés ütemezése",
   "HeaderScheduleLibraryScans": "Könyvtárak automatikus szkennelésének ütemezése",
   "HeaderSession": "Munkamenet",
   "HeaderSetBackupSchedule": "Biztonsági másolatok ütemezésének beállítása",
@@ -188,13 +189,14 @@
   "HeaderSettingsExperimental": "Kísérleti funkciók",
   "HeaderSettingsGeneral": "Általános",
   "HeaderSettingsScanner": "Szkenner",
+  "HeaderSettingsWebClient": "Webkliens",
   "HeaderSleepTimer": "Alvásidőzítő",
   "HeaderStatsLargestItems": "Legnagyobb elemek",
   "HeaderStatsLongestItems": "Leghosszabb elemek (órákban)",
   "HeaderStatsMinutesListeningChart": "Hallgatási grafikon percekben (az elmúlt 7 napból)",
   "HeaderStatsRecentSessions": "Legutóbbi munkamenetek",
-  "HeaderStatsTop10Authors": "Top 10 szerzők",
-  "HeaderStatsTop5Genres": "Top 5 műfajok",
+  "HeaderStatsTop10Authors": "Top 10 szerző",
+  "HeaderStatsTop5Genres": "Top 5 műfaj",
   "HeaderTableOfContents": "Tartalomjegyzék",
   "HeaderTools": "Eszközök",
   "HeaderUpdateAccount": "Fiók frissítése",
@@ -225,7 +227,10 @@
   "LabelAllUsersExcludingGuests": "Minden felhasználó, vendégek kivételével",
   "LabelAllUsersIncludingGuests": "Minden felhasználó, beleértve a vendégeket is",
   "LabelAlreadyInYourLibrary": "Már a könyvtárában van",
+  "LabelApiToken": "API Token",
   "LabelAppend": "Hozzáfűzés",
+  "LabelAudioBitrate": "Audió bitráta (pl.128k)",
+  "LabelAudioChannels": "Audió csatorna (1 vagy 2)",
   "LabelAuthor": "Szerző",
   "LabelAuthorFirstLast": "Szerző (Keresztnév Vezetéknév)",
   "LabelAuthorLastFirst": "Szerző (Vezetéknév, Keresztnév)",
@@ -238,6 +243,7 @@
   "LabelAutoRegister": "Automatikus regisztráció",
   "LabelAutoRegisterDescription": "Új felhasználók automatikus létrehozása bejelentkezés után",
   "LabelBackToUser": "Vissza a felhasználóhoz",
+  "LabelBackupAudioFiles": "Audiófájlok biztonsági mentése",
   "LabelBackupLocation": "Biztonsági másolat helye",
   "LabelBackupsEnableAutomaticBackups": "Automatikus biztonsági másolatok engedélyezése",
   "LabelBackupsEnableAutomaticBackupsHelp": "Biztonsági másolatok mentése a /metadata/backups mappába",
@@ -246,15 +252,18 @@
   "LabelBackupsNumberToKeep": "Megtartandó biztonsági másolatok száma",
   "LabelBackupsNumberToKeepHelp": "Egyszerre csak 1 biztonsági másolat kerül eltávolításra, tehát ha már több biztonsági másolat van, mint ez a szám, akkor manuálisan kell eltávolítani őket.",
   "LabelBitrate": "Bitráta",
+  "LabelBonus": "Bónusz",
   "LabelBooks": "Könyvek",
   "LabelButtonText": "Gomb szövege",
   "LabelByAuthor": "{} által",
   "LabelChangePassword": "Jelszó megváltoztatása",
   "LabelChannels": "Csatornák",
+  "LabelChapterCount": "{0} Fejezet",
   "LabelChapterTitle": "Fejezet címe",
   "LabelChapters": "Fejezetek",
   "LabelChaptersFound": "fejezet található",
   "LabelClickForMoreInfo": "További információkért kattintson",
+  "LabelClickToUseCurrentValue": "Kattintson az aktuális érték használatához",
   "LabelClosePlayer": "Lejátszó bezárása",
   "LabelCodec": "Kodek",
   "LabelCollapseSeries": "Sorozat összecsukása",
@@ -304,12 +313,24 @@
   "LabelEmailSettingsTestAddress": "Teszt cím",
   "LabelEmbeddedCover": "Beágyazott borító",
   "LabelEnable": "Engedélyezés",
+  "LabelEncodingBackupLocation": "Az eredeti hangfájlok biztonsági másolata a következő helyen lesz tárolva:",
+  "LabelEncodingChaptersNotEmbedded": "A fejezetek nincsenek beágyazva a többsávos hangoskönyvekbe.",
+  "LabelEncodingClearItemCache": "Győződjön meg róla, hogy rendszeresen tisztítja az elemek gyorsítótárát.",
+  "LabelEncodingFinishedM4B": "A kész M4B a hangoskönyv mappádba kerül:",
+  "LabelEncodingStartedNavigation": "Ha a feladat elindult, el lehet navigálni erről az oldalról.",
+  "LabelEncodingTimeWarning": "A kódolás akár 30 percet is igénybe vehet.",
+  "LabelEncodingWarningAdvancedSettings": "Figyelmeztetés: Ne frissítse ezeket a beállításokat, hacsak nem ismeri az ffmpeg kódolási beállításait.",
+  "LabelEncodingWatcherDisabled": "Ha a figyelőt letiltotta, akkor ezt a hangoskönyvet utólag újra be kell olvasnia.",
   "LabelEnd": "Vége",
   "LabelEndOfChapter": "Fejezet vége",
   "LabelEpisode": "Epizód",
+  "LabelEpisodeNotLinkedToRssFeed": "Epizód nem kapcsolódik RSS feedhez",
+  "LabelEpisodeNumber": "Epizód #{0}",
   "LabelEpisodeTitle": "Epizód címe",
   "LabelEpisodeType": "Epizód típusa",
+  "LabelEpisodeUrlFromRssFeed": "Epizód URL-címe az RSS-ből",
   "LabelEpisodes": "Epizódok",
+  "LabelEpisodic": "Epizódikus",
   "LabelExample": "Példa",
   "LabelExpandSeries": "Sorozat kinyitása",
   "LabelExpandSubSeries": "Alsorozat kinyitása",
@@ -337,6 +358,7 @@
   "LabelFontScale": "Betűméret skála",
   "LabelFontStrikethrough": "Áthúzott",
   "LabelFormat": "Formátum",
+  "LabelFull": "Teljes",
   "LabelGenre": "Műfaj",
   "LabelGenres": "Műfajok",
   "LabelHardDeleteFile": "Fájl végleges törlése",
@@ -392,6 +414,10 @@
   "LabelLowestPriority": "Legalacsonyabb prioritás",
   "LabelMatchExistingUsersBy": "Meglévő felhasználók egyeztetése",
   "LabelMatchExistingUsersByDescription": "Meglévő felhasználók összekapcsolására használt. Egyszer összekapcsolva, a felhasználók egyedülálló azonosítóval lesznek egyeztetve az Ön SSO szolgáltatójától",
+  "LabelMaxEpisodesToDownload": "Letölthető epizódok maximális száma. Használja a 0-t a korlátlan letöltéshez.",
+  "LabelMaxEpisodesToDownloadPerCheck": "Ellenőrzésenként letölthető új epizódok maximális száma",
+  "LabelMaxEpisodesToKeep": "Maximálisan megtartható epizódok száma",
+  "LabelMaxEpisodesToKeepHelp": "A 0 érték nem állít be maximális korlátot. Az új epizód automatikus letöltése után ez a beállítás törli a legrégebbi epizódot, ha X epizódnál több van. Új letöltésenként csak 1 epizódot töröl.",
   "LabelMediaPlayer": "Médialejátszó",
   "LabelMediaType": "Média típus",
   "LabelMetaTag": "Meta címke",
@@ -399,7 +425,7 @@
   "LabelMetadataOrderOfPrecedenceDescription": "A magasabb prioritású metaadat-források felülírják az alacsonyabb prioritásúakat",
   "LabelMetadataProvider": "Metaadat-szolgáltató",
   "LabelMinute": "Perc",
-  "LabelMinutes": "Percek",
+  "LabelMinutes": "Perc",
   "LabelMissing": "Hiányzó",
   "LabelMissingEbook": "Nincs e-könyve",
   "LabelMissingSupplementaryEbook": "Nincs kiegészítő e-könyve",
@@ -437,12 +463,14 @@
   "LabelOpenIDGroupClaimDescription": "Az OpenID-igény neve, amely a felhasználó csoportjainak listáját tartalmazza. Általában groups néven hivatkoznak rá. Ha konfigurálva van, az alkalmazás automatikusan hozzárendeli a szerepköröket a felhasználó csoporttagságai alapján, feltéve, hogy ezek a csoportok az igényben kis- és nagybetűkre érzéketlenül ‘admin’, ‘user’ vagy ‘guest’ néven szerepelnek. Az igénynek egy listát kell tartalmaznia, és ha egy felhasználó több csoport tagja, az alkalmazás a legmagasabb szintű hozzáféréssel rendelkező szerepkört rendeli hozzá. Ha egyetlen csoport sem felel meg, a hozzáférés megtagadásra kerül.",
   "LabelOpenRSSFeed": "RSS hírcsatorna megnyitása",
   "LabelOverwrite": "Felülírás",
+  "LabelPaginationPageXOfY": "{0} oldal {1}-ból/ből",
   "LabelPassword": "Jelszó",
   "LabelPath": "Útvonal",
   "LabelPermanent": "Végleges",
   "LabelPermissionsAccessAllLibraries": "Hozzáférhet az összes könyvtárhoz",
   "LabelPermissionsAccessAllTags": "Hozzáférhet az összes címkéhez",
   "LabelPermissionsAccessExplicitContent": "Hozzáférhet explicit tartalomhoz",
+  "LabelPermissionsCreateEreader": "Létrehozhat Ereader-t",
   "LabelPermissionsDelete": "Törölhet",
   "LabelPermissionsDownload": "Letölthet",
   "LabelPermissionsUpdate": "Frissíthet",
@@ -466,6 +494,8 @@
   "LabelPubDate": "Kiadás dátuma",
   "LabelPublishYear": "Kiadás éve",
   "LabelPublishedDate": "Kiadva {0}",
+  "LabelPublishedDecade": "Közzétett évtized",
+  "LabelPublishedDecades": "Közzétett évtized",
   "LabelPublisher": "Kiadó",
   "LabelPublishers": "Kiadók",
   "LabelRSSFeedCustomOwnerEmail": "Egyéni tulajdonos e-mail",
@@ -475,6 +505,7 @@
   "LabelRSSFeedSlug": "RSS hírcsatorna slug",
   "LabelRSSFeedURL": "RSS hírcsatorna URL",
   "LabelRandomly": "Véletlenszerűen",
+  "LabelReAddSeriesToContinueListening": "Sorozat újbóli hozzáadása a folytatáshoz",
   "LabelRead": "Olvasás",
   "LabelReadAgain": "Újraolvasás",
   "LabelReadEbookWithoutProgress": "E-könyv olvasása haladás nélkül",
@@ -484,12 +515,18 @@
   "LabelRedo": "Újra",
   "LabelRegion": "Régió",
   "LabelReleaseDate": "Megjelenés dátuma",
+  "LabelRemoveAllMetadataAbs": "Az összes metadata.abs fájl eltávolítása",
+  "LabelRemoveAllMetadataJson": "Az összes metadata.json fájl eltávolítása",
   "LabelRemoveCover": "Borító eltávolítása",
+  "LabelRemoveMetadataFile": "Metaadatfájlok eltávolítása a könyvtár elemek mappáiból",
+  "LabelRemoveMetadataFileHelp": "A metadata.json és metadata.abs fájlokat eltávolítása a {0} mappáidból.",
   "LabelRowsPerPage": "Sorok száma oldalanként",
   "LabelSearchTerm": "Keresési kifejezés",
   "LabelSearchTitle": "Cím keresése",
   "LabelSearchTitleOrASIN": "Cím vagy ASIN keresése",
   "LabelSeason": "Évad",
+  "LabelSeasonNumber": "Évad #{0}",
+  "LabelSelectAll": "Minden kiválasztása",
   "LabelSelectAllEpisodes": "Összes epizód kiválasztása",
   "LabelSelectEpisodesShowing": "Kiválasztás {0} megjelenített epizód",
   "LabelSelectUsers": "Felhasználók kiválasztása",
@@ -498,8 +535,11 @@
   "LabelSeries": "Sorozat",
   "LabelSeriesName": "Sorozat neve",
   "LabelSeriesProgress": "Sorozat haladása",
+  "LabelServerLogLevel": "Kiszolgáló naplózási szint",
+  "LabelServerYearReview": "Szerver évértékelő ({0})",
   "LabelSetEbookAsPrimary": "Beállítás elsődlegesként",
   "LabelSetEbookAsSupplementary": "Beállítás kiegészítőként",
+  "LabelSettingsAllowIframe": "A beágyazás engedélyezése egy iframe-be",
   "LabelSettingsAudiobooksOnly": "Csak hangoskönyvek",
   "LabelSettingsAudiobooksOnlyHelp": "Ennek a beállításnak az engedélyezése figyelmen kívül hagyja az e-könyv fájlokat, kivéve, ha azok egy hangoskönyv mappában vannak, ebben az esetben kiegészítő e-könyvként lesznek beállítva",
   "LabelSettingsBookshelfViewHelp": "Skeuomorfikus dizájn fa polcokkal",
@@ -511,6 +551,8 @@
   "LabelSettingsEnableWatcher": "Figyelő engedélyezése",
   "LabelSettingsEnableWatcherForLibrary": "Mappafigyelő engedélyezése a könyvtárban",
   "LabelSettingsEnableWatcherHelp": "Engedélyezi az automatikus elem hozzáadás/frissítés funkciót, amikor fájlváltozásokat észlel. *Szerver újraindítása szükséges",
+  "LabelSettingsEpubsAllowScriptedContent": "Szkriptelt tartalmak engedélyezése epub-okban",
+  "LabelSettingsEpubsAllowScriptedContentHelp": "Megengedi, hogy az epub fájlok szkripteket hajtsanak végre. Ezt a beállítást kikapcsolva ajánlott tartani, kivéve, ha megbízik az epub fájlok forrásában.",
   "LabelSettingsExperimentalFeatures": "Kísérleti funkciók",
   "LabelSettingsExperimentalFeaturesHelp": "Fejlesztés alatt álló funkciók, amelyek visszajelzésre és tesztelésre szorulnak. Kattintson a github megbeszélés megnyitásához.",
   "LabelSettingsFindCovers": "Borítók keresése",
@@ -519,6 +561,8 @@
   "LabelSettingsHideSingleBookSeriesHelp": "A csak egy könyvet tartalmazó sorozatok el lesznek rejtve a sorozatok oldalról és a kezdőlap polcairól.",
   "LabelSettingsHomePageBookshelfView": "Kezdőlap használja a könyvespolc nézetet",
   "LabelSettingsLibraryBookshelfView": "Könyvtár használja a könyvespolc nézetet",
+  "LabelSettingsLibraryMarkAsFinishedTimeRemaining": "A hátralévő idő kevesebb, mint (másodperc)",
+  "LabelSettingsLibraryMarkAsFinishedWhen": "A médiaelem befejezettnek jelölése, ha",
   "LabelSettingsParseSubtitles": "Feliratok elemzése",
   "LabelSettingsParseSubtitlesHelp": "Feliratok kinyerése a hangoskönyv mappaneveiből.<br>A feliratnak el kell különülnie egy \" - \" jellel<br>például: \"Könyv címe - Egy felirat itt\" esetén a felirat \"Egy felirat itt\"",
   "LabelSettingsPreferMatchedMetadata": "Preferált egyeztetett metaadatok",
@@ -534,7 +578,9 @@
   "LabelSettingsStoreMetadataWithItem": "Metaadatok tárolása az elemmel",
   "LabelSettingsStoreMetadataWithItemHelp": "Alapértelmezés szerint a metaadatfájlok a /metadata/items mappában vannak tárolva, ennek a beállításnak az engedélyezése a metaadatfájlokat a könyvtári elem mappáiban tárolja",
   "LabelSettingsTimeFormat": "Időformátum",
+  "LabelShare": "Megosztás",
   "LabelShowAll": "Mindent mutat",
+  "LabelShowSubtitles": "Felirat megjelenítése",
   "LabelSize": "Méret",
   "LabelSleepTimer": "Alvásidőzítő",
   "LabelSlug": "Rövid cím",
@@ -547,13 +593,13 @@
   "LabelStatsBestDay": "Legjobb nap",
   "LabelStatsDailyAverage": "Napi átlag",
   "LabelStatsDays": "Napok",
-  "LabelStatsDaysListened": "Hallgatott napok",
+  "LabelStatsDaysListened": "Hallgatott nap",
   "LabelStatsHours": "Órák",
   "LabelStatsInARow": "egymás után",
-  "LabelStatsItemsFinished": "Befejezett elemek",
+  "LabelStatsItemsFinished": "Befejezett elem",
   "LabelStatsItemsInLibrary": "Elemek a könyvtárban",
-  "LabelStatsMinutes": "percek",
-  "LabelStatsMinutesListening": "Hallgatási percek",
+  "LabelStatsMinutes": "perc",
+  "LabelStatsMinutesListening": "Hallgatási perc",
   "LabelStatsOverallDays": "Összes nap",
   "LabelStatsOverallHours": "Összes óra",
   "LabelStatsWeekListening": "Heti hallgatás",
@@ -565,12 +611,18 @@
   "LabelTagsNotAccessibleToUser": "A felhasználó számára nem elérhető címkék",
   "LabelTasks": "Futó feladatok",
   "LabelTextEditorBulletedList": "Pontozott lista",
+  "LabelTextEditorLink": "Hivatkozás",
   "LabelTextEditorNumberedList": "Számozott lista",
   "LabelTextEditorUnlink": "Link eltávolítása",
   "LabelTheme": "Téma",
   "LabelThemeDark": "Sötét",
   "LabelThemeLight": "Világos",
   "LabelTimeBase": "Időalap",
+  "LabelTimeDurationXHours": "{0} óra",
+  "LabelTimeDurationXMinutes": "{0} perc",
+  "LabelTimeDurationXSeconds": "{0} másodperc",
+  "LabelTimeInMinutes": "Idő percben",
+  "LabelTimeLeft": "{0} maradt hátra",
   "LabelTimeListened": "Hallgatott idő",
   "LabelTimeListenedToday": "Ma hallgatott idő",
   "LabelTimeRemaining": "{0} maradt",
@@ -578,6 +630,7 @@
   "LabelTitle": "Cím",
   "LabelToolsEmbedMetadata": "Metaadatok beágyazása",
   "LabelToolsEmbedMetadataDescription": "Metaadatok beágyazása az audiofájlokba, beleértve a borítóképet és a fejezeteket.",
+  "LabelToolsM4bEncoder": "M4B kódoló",
   "LabelToolsMakeM4b": "M4B Hangoskönyv fájl készítése",
   "LabelToolsMakeM4bDescription": ".M4B hangoskönyv fájl generálása beágyazott metaadatokkal, borítóképpel és fejezetekkel.",
   "LabelToolsSplitM4b": "M4B felosztása MP3-ra",
@@ -594,6 +647,7 @@
   "LabelUnabridged": "Nem tömörített",
   "LabelUndo": "Visszavonás",
   "LabelUnknown": "Ismeretlen",
+  "LabelUnknownPublishDate": "Ismeretlen megjelenési dátum",
   "LabelUpdateCover": "Borító frissítése",
   "LabelUpdateCoverHelp": "Lehetővé teszi a meglévő borítók felülírását a kiválasztott könyveknél, amikor találatot talál",
   "LabelUpdateDetails": "Részletek frissítése",
@@ -602,17 +656,24 @@
   "LabelUploaderDragAndDrop": "Fájlok vagy mappák húzása és elengedése",
   "LabelUploaderDropFiles": "Fájlok elengedése",
   "LabelUploaderItemFetchMetadataHelp": "Cím, szerző és sorozat automatikus lekérése",
+  "LabelUseAdvancedOptions": "Haladó beállítások használata",
   "LabelUseChapterTrack": "Fejezetsáv használata",
   "LabelUseFullTrack": "Teljes sáv használata",
+  "LabelUseZeroForUnlimited": "Használja a 0-t a korlátlan értékhez",
   "LabelUser": "Felhasználó",
   "LabelUsername": "Felhasználónév",
   "LabelValue": "Érték",
   "LabelVersion": "Verzió",
   "LabelViewBookmarks": "Könyvjelzők megtekintése",
   "LabelViewChapters": "Fejezetek megtekintése",
+  "LabelViewPlayerSettings": "A lejátszó beállításainak megtekintése",
   "LabelViewQueue": "Lejátszó sor megtekintése",
   "LabelVolume": "Hangerő",
   "LabelWeekdaysToRun": "Futás napjai",
+  "LabelXBooks": "{0} könyv",
+  "LabelXItems": "{0} elem",
+  "LabelYearReviewHide": "Évértékelő elrejtése",
+  "LabelYearReviewShow": "Évértékelés megtekintése",
   "LabelYourAudiobookDuration": "Hangoskönyv időtartama",
   "LabelYourBookmarks": "Könyvjelzőid",
   "LabelYourPlaylists": "Lejátszási listáid",
@@ -620,10 +681,14 @@
   "MessageAddToPlayerQueue": "Hozzáadás a lejátszó sorhoz",
   "MessageAppriseDescription": "Ennek a funkció használatához futtatnia kell egy <a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">Apprise API</a> példányt vagy egy olyan API-t, amely kezeli ezeket a kéréseket. <br />Az Apprise API URL-nek a teljes URL útvonalat kell tartalmaznia az értesítés elküldéséhez, például, ha az API példánya a <code>http://192.168.1.1:8337</code> címen szolgáltatva, akkor <code>http://192.168.1.1:8337/notify</code> értéket kell megadnia.",
   "MessageBackupsDescription": "A biztonsági másolatok tartalmazzák a felhasználókat, a felhasználói haladást, a könyvtári elem részleteit, a szerver beállításait és a képeket, amelyek a <code>/metadata/items</code> és <code>/metadata/authors</code> mappákban vannak tárolva. A biztonsági másolatok <strong>nem</strong> tartalmazzák a könyvtári mappákban tárolt fájlokat.",
+  "MessageBackupsLocationEditNote": "Megjegyzés: A biztonsági mentés helyének frissítése nem mozgatja vagy módosítja a meglévő biztonsági mentéseket",
+  "MessageBackupsLocationNoEditNote": "Megjegyzés: A biztonsági mentés helye egy környezeti változóval van beállítva, és itt nem módosítható.",
+  "MessageBackupsLocationPathEmpty": "A biztonsági mentés helyének elérési útvonala nem lehet üres",
   "MessageBatchQuickMatchDescription": "A Gyors egyeztetés megpróbálja hozzáadni a hiányzó borítókat és metaadatokat a kiválasztott elemekhez. Engedélyezze az alábbi opciókat, hogy a Gyors egyeztetés felülírhassa a meglévő borítókat és/vagy metaadatokat.",
   "MessageBookshelfNoCollections": "Még nem készített gyűjteményeket",
   "MessageBookshelfNoRSSFeeds": "Nincsenek nyitott RSS hírcsatornák",
   "MessageBookshelfNoResultsForFilter": "Nincs eredmény a \"{0}: {1}\" szűrőre",
+  "MessageBookshelfNoResultsForQuery": "Nincs eredmény a lekérdezéshez",
   "MessageBookshelfNoSeries": "Nincsenek sorozatai",
   "MessageChapterEndIsAfter": "A fejezet vége a hangoskönyv végét követi",
   "MessageChapterErrorFirstNotZero": "Az első fejezetnek 0:00-kor kell kezdődnie",
@@ -633,16 +698,23 @@
   "MessageCheckingCron": "Cron ellenőrzése...",
   "MessageConfirmCloseFeed": "Biztosan be szeretné zárni ezt a hírcsatornát?",
   "MessageConfirmDeleteBackup": "Biztosan törölni szeretné a(z) {0} biztonsági másolatot?",
+  "MessageConfirmDeleteDevice": "Biztos, hogy törölni szeretné a „{0}” e-olvasó eszközt?",
   "MessageConfirmDeleteFile": "Ez törölni fogja a fájlt a fájlrendszerből. Biztos benne?",
   "MessageConfirmDeleteLibrary": "Biztosan véglegesen törölni szeretné a(z) \"{0}\" könyvtárat?",
   "MessageConfirmDeleteLibraryItem": "Ez eltávolítja a könyvtári elemet az adatbázisból és a fájlrendszerből. Biztos benne?",
   "MessageConfirmDeleteLibraryItems": "Ez eltávolítja a(z) {0} könyvtári elemet az adatbázisból és a fájlrendszerből. Biztos benne?",
+  "MessageConfirmDeleteMetadataProvider": "Biztos, hogy törölni szeretné a „{0}” egyéni metaadat-szolgáltatót?",
+  "MessageConfirmDeleteNotification": "Biztos, hogy törölni szeretné ezt az értesítést?",
   "MessageConfirmDeleteSession": "Biztosan törölni szeretné ezt a munkamenetet?",
+  "MessageConfirmEmbedMetadataInAudioFiles": "Biztos, hogy metaadatokat szeretne beágyazni {0} hangfájlba?",
   "MessageConfirmForceReScan": "Biztosan kényszeríteni szeretné az újraszkennelést?",
   "MessageConfirmMarkAllEpisodesFinished": "Biztosan meg szeretné jelölni az összes epizódot befejezettnek?",
   "MessageConfirmMarkAllEpisodesNotFinished": "Biztosan meg szeretné jelölni az összes epizódot nem befejezettnek?",
+  "MessageConfirmMarkItemFinished": "Biztos, hogy a „{0}”-t befejezettnek akarja jelölni?",
+  "MessageConfirmMarkItemNotFinished": "Biztos, hogy a „{0}”-t befejezetlennek akarja jelölni?",
   "MessageConfirmMarkSeriesFinished": "Biztosan meg szeretné jelölni a sorozat összes könyvét befejezettnek?",
   "MessageConfirmMarkSeriesNotFinished": "Biztosan meg szeretné jelölni a sorozat összes könyvét nem befejezettnek?",
+  "MessageConfirmNotificationTestTrigger": "Ez az értesítés indítható tesztadatokkal?",
   "MessageConfirmQuickEmbed": "Figyelem! A Gyors beágyazás nem készít biztonsági másolatot az audiofájlokról. Győződjön meg arról, hogy van biztonsági másolata az audiofájlokról. <br><br>Szeretné folytatni?",
   "MessageConfirmReScanLibraryItems": "Biztosan újra szeretné szkennelni a(z) {0} elemet?",
   "MessageConfirmRemoveAllChapters": "Biztosan eltávolítja az összes fejezetet?",
@@ -651,6 +723,7 @@
   "MessageConfirmRemoveEpisode": "Biztosan eltávolítja a(z) \"{0}\" epizódot?",
   "MessageConfirmRemoveEpisodes": "Biztosan eltávolítja a(z) {0} epizódot?",
   "MessageConfirmRemoveListeningSessions": "Biztosan eltávolítja a(z) {0} hallgatási munkamenetet?",
+  "MessageConfirmRemoveMetadataFiles": "Biztos, hogy az összes metaadatot el akarja távolítani {0} fájl van könyvtár mappáiban?",
   "MessageConfirmRemoveNarrator": "Biztosan eltávolítja a(z) \"{0}\" előadót?",
   "MessageConfirmRemovePlaylist": "Biztosan eltávolítja a(z) \"{0}\" lejátszási listáját?",
   "MessageConfirmRenameGenre": "Biztosan át szeretné nevezni a(z) \"{0}\" műfajt \"{1}\"-re az összes elemnél?",
@@ -659,11 +732,13 @@
   "MessageConfirmRenameTag": "Biztosan át szeretné nevezni a(z) \"{0}\" címkét \"{1}\"-re az összes elemnél?",
   "MessageConfirmRenameTagMergeNote": "Megjegyzés: Ez a címke már létezik, így össze lesznek vonva.",
   "MessageConfirmRenameTagWarning": "Figyelem! Egy hasonló, de eltérő nagybetűkkel rendelkező címke már létezik \"{0}\".",
+  "MessageConfirmResetProgress": "Biztos, hogy vissza akarja állítani a haladási folyamatát?",
   "MessageConfirmSendEbookToDevice": "Biztosan el szeretné küldeni a(z) {0} e-könyvet a(z) \"{1}\" eszközre?",
   "MessageDownloadingEpisode": "Epizód letöltése",
   "MessageDragFilesIntoTrackOrder": "Húzza a fájlokat a helyes sávrendbe",
   "MessageEmbedFinished": "Beágyazás befejeződött!",
   "MessageEpisodesQueuedForDownload": "{0} epizód letöltésre vár",
+  "MessageEreaderDevices": "Az e-könyvek kézbesítésének biztosítása érdekében a fenti e-mail címet az alább felsorolt minden egyes eszközhöz, mint érvényes feladót kell hozzáadnia.",
   "MessageFeedURLWillBe": "A hírcsatorna URL-je {0} lesz",
   "MessageFetching": "Lekérdezés...",
   "MessageForceReScanDescription": "minden fájlt újra szkennel, mint egy friss szkennelés. Az audiofájlok ID3 címkéi, OPF fájlok és szövegfájlok újként lesznek szkennelve.",
@@ -691,6 +766,7 @@
   "MessageNoCollections": "Nincsenek gyűjtemények",
   "MessageNoCoversFound": "Nem találhatóak borítók",
   "MessageNoDescription": "Nincs leírás",
+  "MessageNoDevices": "Nincs eszköz",
   "MessageNoDownloadsInProgress": "Jelenleg nincsenek folyamatban lévő letöltések",
   "MessageNoDownloadsQueued": "Nincsenek várakozó letöltések",
   "MessageNoEpisodeMatchesFound": "Nincs találat az epizódokra",
@@ -704,6 +780,7 @@
   "MessageNoLogs": "Nincsenek naplók",
   "MessageNoMediaProgress": "Nincs előrehaladás a médialejátszásban",
   "MessageNoNotifications": "Nincsenek értesítések",
+  "MessageNoPodcastFeed": "Érvénytelen podcast: Nincs forrás",
   "MessageNoPodcastsFound": "Nem találhatóak podcastok",
   "MessageNoResults": "Nincsenek eredmények",
   "MessageNoSearchResultsFor": "Nincs keresési eredmény erre: \"{0}\"",
@@ -713,11 +790,15 @@
   "MessageNoUpdatesWereNecessary": "Nem volt szükség frissítésekre",
   "MessageNoUserPlaylists": "Nincsenek felhasználói lejátszási listák",
   "MessageNotYetImplemented": "Még nem implementált",
+  "MessageOpmlPreviewNote": "Megjegyzés: Ez egy előnézeti kép az elemzett OPML fájlról. A podcast tényleges címe az RSS-csatornából származik.",
   "MessageOr": "vagy",
   "MessagePauseChapter": "Fejezet lejátszásának szüneteltetése",
   "MessagePlayChapter": "Fejezet elejének meghallgatása",
   "MessagePlaylistCreateFromCollection": "Lejátszási lista létrehozása gyűjteményből",
+  "MessagePleaseWait": "Kérem várjon...",
   "MessagePodcastHasNoRSSFeedForMatching": "A podcastnak nincs RSS hírcsatorna URL-je az egyeztetéshez",
+  "MessagePodcastSearchField": "Adja meg a keresési kifejezést vagy az RSS csatorna URL-címét",
+  "MessageQuickEmbedInProgress": "Gyors beágyazás folyamatban",
   "MessageQuickMatchDescription": "Üres elem részletek és borító feltöltése az első találati eredménnyel a(z) '{0}'-ból. Nem írja felül a részleteket, kivéve, ha a 'Preferált egyeztetett metaadatok' szerverbeállítás engedélyezve van.",
   "MessageRemoveChapter": "Fejezet eltávolítása",
   "MessageRemoveEpisodes": "Epizód(ok) eltávolítása: {0}",
@@ -732,7 +813,22 @@
   "MessageServerCouldNotBeReached": "A szervert nem lehet elérni",
   "MessageSetChaptersFromTracksDescription": "Fejezetek beállítása minden egyes hangfájlt egy fejezetként használva, és a fejezet címét a hangfájl neveként",
   "MessageStartPlaybackAtTime": "\"{0}\" lejátszásának kezdése {1} -tól?",
-  "MessageThinking": "Gondolkodás...",
+  "MessageTaskAudioFileNotWritable": "A/Az „{0}” hangfájl nem írható",
+  "MessageTaskFailed": "Sikertelen",
+  "MessageTaskNoFilesToScan": "Nincs beolvasandó fájl",
+  "MessageTaskOpmlImportFeedPodcastExists": "Podcast már létezik az elérési útvonalon",
+  "MessageTaskOpmlImportFeedPodcastFailed": "Nem sikerült podcastot létrehozni",
+  "MessageTaskOpmlImportFinished": "{0} podcast hozzáadva",
+  "MessageTaskOpmlParseFailed": "Az OPML fájl elemzése nem sikerült",
+  "MessageTaskOpmlParseFastFail": "Érvénytelen OPML fájl: <opml> tag nem található VAGY nem találtak <outline> taget",
+  "MessageTaskScanItemsAdded": "{0} hozzáadva",
+  "MessageTaskScanItemsMissing": "{0} hiányzik",
+  "MessageTaskScanItemsUpdated": "{0} frissítve",
+  "MessageTaskScanNoChangesNeeded": "Nincs szükség változtatásra",
+  "MessageTaskScanningFileChanges": "Fájlváltozások keresése a „{0}” fájlban",
+  "MessageTaskScanningLibrary": "„{0}” könyvtár beolvasása",
+  "MessageTaskTargetDirectoryNotWritable": "A célkönyvtár nem írható",
+  "MessageThinking": "Gondolkodom...",
   "MessageUploaderItemFailed": "A feltöltés sikertelen",
   "MessageUploaderItemSuccess": "Sikeresen feltöltve!",
   "MessageUploading": "Feltöltés...",
@@ -754,8 +850,24 @@
   "PlaceholderNewPlaylist": "Új lejátszási lista neve",
   "PlaceholderSearch": "Keresés..",
   "PlaceholderSearchEpisode": "Epizód keresése..",
+  "StatsAuthorsAdded": "szerző hozzáadva",
+  "StatsBooksAdded": "könyv hozzáadva",
+  "StatsBooksAdditional": "Néhány kiegészítés…",
+  "StatsBooksFinished": "könyv befejezve",
+  "StatsCollectionGrewTo": "Könyvgyűjtemény nőtt…",
+  "StatsTopAuthor": "TOP SZERZŐ",
+  "StatsTopAuthors": "TOP SZERZŐ",
+  "StatsTopGenre": "TOP MŰFAJ",
+  "StatsTopGenres": "TOP MŰFAJ",
+  "StatsTopMonth": "TOP HÓNAP",
+  "StatsTopNarrator": "TOP ELŐADÓ",
+  "StatsTopNarrators": "TOP ELŐADÓ",
+  "StatsYearInReview": "ÉVÉRTÉKELÉS",
   "ToastAccountUpdateSuccess": "Fiók frissítve",
   "ToastAuthorImageRemoveSuccess": "Szerző képe eltávolítva",
+  "ToastAuthorNotFound": "A szerző „{0}” nem található",
+  "ToastAuthorRemoveSuccess": "Szerző eltávolítva",
+  "ToastAuthorSearchNotFound": "Szerző nem található",
   "ToastAuthorUpdateMerged": "Szerző összevonva",
   "ToastAuthorUpdateSuccess": "Szerző frissítve",
   "ToastAuthorUpdateSuccessNoImageFound": "Szerző frissítve (nem található kép)",
@@ -774,15 +886,27 @@
   "ToastBookmarkUpdateSuccess": "Könyvjelző frissítve",
   "ToastChaptersHaveErrors": "A fejezetek hibákat tartalmaznak",
   "ToastChaptersMustHaveTitles": "A fejezeteknek címekkel kell rendelkezniük",
+  "ToastChaptersRemoved": "Fejezetek eltávolítva",
+  "ToastChaptersUpdated": "Fejezetek frissítve",
   "ToastCollectionItemsRemoveSuccess": "Elem(ek) eltávolítva a gyűjteményből",
   "ToastCollectionRemoveSuccess": "Gyűjtemény eltávolítva",
   "ToastCollectionUpdateSuccess": "Gyűjtemény frissítve",
+  "ToastDeviceTestEmailFailed": "Teszt email küldése sikertelen",
+  "ToastDeviceTestEmailSuccess": "Teszt email elküldve",
+  "ToastEmailSettingsUpdateSuccess": "Email beállítások frissítve",
+  "ToastEpisodeUpdateSuccess": "{0} epizód frissítve",
+  "ToastFailedToLoadData": "Sikertelen adatbetöltés",
+  "ToastFailedToMatch": "Nem sikerült egyezőséget találni",
+  "ToastFailedToShare": "Nem sikerült megosztani",
+  "ToastFailedToUpdate": "Nem sikerült frissíteni",
+  "ToastInvalidImageUrl": "Érvénytelen a kép URL címe",
   "ToastItemCoverUpdateSuccess": "Elem borítója frissítve",
   "ToastItemDetailsUpdateSuccess": "Elem részletei frissítve",
   "ToastItemMarkedAsFinishedFailed": "Megjelölés Befejezettként sikertelen",
   "ToastItemMarkedAsFinishedSuccess": "Elem megjelölve Befejezettként",
   "ToastItemMarkedAsNotFinishedFailed": "Az elem befejezetlennek jelölése sikertelen",
   "ToastItemMarkedAsNotFinishedSuccess": "Elem megjelölve Nem Befejezettként",
+  "ToastItemUpdateSuccess": "Elem frissítve",
   "ToastLibraryCreateFailed": "Könyvtár létrehozása sikertelen",
   "ToastLibraryCreateSuccess": "\"{0}\" könyvtár létrehozva",
   "ToastLibraryDeleteFailed": "Könyvtár törlése sikertelen",
@@ -790,6 +914,10 @@
   "ToastLibraryScanFailedToStart": "A beolvasás elindítása sikertelen",
   "ToastLibraryScanStarted": "Könyvtár beolvasása elindítva",
   "ToastLibraryUpdateSuccess": "\"{0}\" könyvtár frissítve",
+  "ToastMatchAllAuthorsFailed": "Nem sikerült az összes szerzőt azonosítani",
+  "ToastNoNewEpisodesFound": "Nincs új epizód",
+  "ToastNotificationSettingsUpdateSuccess": "Értesítési beállítások frissítve",
+  "ToastNotificationUpdateSuccess": "Értesítés frissítve",
   "ToastPlaylistCreateFailed": "Lejátszási lista létrehozása sikertelen",
   "ToastPlaylistCreateSuccess": "Lejátszási lista létrehozva",
   "ToastPlaylistRemoveSuccess": "Lejátszási lista eltávolítva",
@@ -809,6 +937,8 @@
   "ToastSocketConnected": "Socket csatlakoztatva",
   "ToastSocketDisconnected": "Socket lecsatlakoztatva",
   "ToastSocketFailedToConnect": "A Socket csatlakoztatása sikertelen",
+  "ToastUnknownError": "Ismeretlen hiba",
   "ToastUserDeleteFailed": "Felhasználó törlése sikertelen",
-  "ToastUserDeleteSuccess": "Felhasználó törölve"
+  "ToastUserDeleteSuccess": "Felhasználó törölve",
+  "ToastUserPasswordChangeSuccess": "Jelszó sikeresen megváltoztatva"
 }

From 244b5ab36d0e458a155ae42da247d3e1adb1c018 Mon Sep 17 00:00:00 2001
From: Petter Schaug-Pettersen <p@g51.no>
Date: Mon, 9 Dec 2024 23:13:45 +0000
Subject: [PATCH 043/143] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 63.1% (679 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/nb_NO/
---
 client/strings/no.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/no.json b/client/strings/no.json
index 01be88ef..592991b4 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -4,6 +4,7 @@
   "ButtonAddDevice": "Legg til enhet",
   "ButtonAddLibrary": "Legg til bibliotek",
   "ButtonAddPodcasts": "Legg til podcast",
+  "ButtonAddUser": "Legg til bruker",
   "ButtonAddYourFirstLibrary": "Legg til ditt første bibliotek",
   "ButtonApply": "Bruk",
   "ButtonApplyChapters": "Bruk kapittel",
@@ -18,6 +19,7 @@
   "ButtonChooseFiles": "Velg filer",
   "ButtonClearFilter": "Bytt filter",
   "ButtonCloseFeed": "Lukk Feed",
+  "ButtonCloseSession": "Lukk åpen økt",
   "ButtonCollections": "Samlinger",
   "ButtonConfigureScanner": "Konfigurer skanner",
   "ButtonCreate": "Opprett",

From a400c149a6ef667b9fd88e868c7351f9011659c9 Mon Sep 17 00:00:00 2001
From: Alex <alexcez@bk.ru>
Date: Mon, 9 Dec 2024 08:48:21 +0000
Subject: [PATCH 044/143] Translated using Weblate (Russian)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/ru/
---
 client/strings/ru.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/strings/ru.json b/client/strings/ru.json
index 2ec2fbd1..2ce5272f 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Экспериментальные функции",
   "HeaderSettingsGeneral": "Основные",
   "HeaderSettingsScanner": "Сканер",
+  "HeaderSettingsWebClient": "Веб-клиент",
   "HeaderSleepTimer": "Таймер сна",
   "HeaderStatsLargestItems": "Самые большые элементы",
   "HeaderStatsLongestItems": "Самые длинные элементы (часов)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Итоги года всего сервера ({0})",
   "LabelSetEbookAsPrimary": "Установить как основную",
   "LabelSetEbookAsSupplementary": "Установить как дополнительную",
+  "LabelSettingsAllowIframe": "Разрешить встраивание в iframe",
   "LabelSettingsAudiobooksOnly": "Только аудиокниги",
   "LabelSettingsAudiobooksOnlyHelp": "Если включить эту настройку, файлы электронных книг будут игнорироваться, за исключением случаев, когда они находятся в папке с аудиокнигами, в этом случае они будут рассматриваться как дополнительные электронные книги",
   "LabelSettingsBookshelfViewHelp": "Конструкция с деревянными полками",
@@ -679,6 +681,8 @@
   "LabelViewPlayerSettings": "Просмотр настроек плеера",
   "LabelViewQueue": "Очередь воспроизведения",
   "LabelVolume": "Громкость",
+  "LabelWebRedirectURLsDescription": "Авторизуйте эти URL в провайдере OAuth, чтобы разрешить перенаправление обратно в веб-приложение после входа:",
+  "LabelWebRedirectURLsSubfolder": "Вложенная папка для URL-адресов перенаправления",
   "LabelWeekdaysToRun": "Дни недели для запуска",
   "LabelXBooks": "{0} книг",
   "LabelXItems": "{0} элементов",

From 66f3f3eddf651f4e282aeb5075daccc49813d31a Mon Sep 17 00:00:00 2001
From: thehijacker <thehijacker@gmail.com>
Date: Mon, 9 Dec 2024 06:28:41 +0000
Subject: [PATCH 045/143] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sl/
---
 client/strings/sl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/sl.json b/client/strings/sl.json
index 58500f9f..bfba635d 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Eksperimentalne funkcije",
   "HeaderSettingsGeneral": "Splošno",
   "HeaderSettingsScanner": "Pregledovalnik",
+  "HeaderSettingsWebClient": "Spletni odjemalec",
   "HeaderSleepTimer": "Časovnik za izklop",
   "HeaderStatsLargestItems": "Največji elementi",
   "HeaderStatsLongestItems": "Najdaljši elementi (ure)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Pregled leta strežnika ({0})",
   "LabelSetEbookAsPrimary": "Nastavi kot primarno",
   "LabelSetEbookAsSupplementary": "Nastavi kot dodatno",
+  "LabelSettingsAllowIframe": "Dovoli vdelavo v iframu",
   "LabelSettingsAudiobooksOnly": "Samo zvočne knjige",
   "LabelSettingsAudiobooksOnlyHelp": "Če omogočite to nastavitev, bodo datoteke eknjig prezrte, razen če so znotraj mape zvočnih knjig, v tem primeru bodo nastavljene kot dodatne e-knjige",
   "LabelSettingsBookshelfViewHelp": "Skeuomorfna oblika z lesenimi policami",

From 680099cab43d8811e44fc0dfd6fe9e006b670a76 Mon Sep 17 00:00:00 2001
From: Vito0912 <86927734+Vito0912@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:26:57 +0000
Subject: [PATCH 046/143] Translated using Weblate (German)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/de/
---
 client/strings/de.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/de.json b/client/strings/de.json
index d3a10ead..3342f437 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Experimentelle Funktionen",
   "HeaderSettingsGeneral": "Allgemein",
   "HeaderSettingsScanner": "Scanner",
+  "HeaderSettingsWebClient": "Web-Client",
   "HeaderSleepTimer": "Sleep-Timer",
   "HeaderStatsLargestItems": "Größte Medien",
   "HeaderStatsLongestItems": "Längste Medien (h)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Server Jahr in Übersicht ({0})",
   "LabelSetEbookAsPrimary": "Als Hauptbuch setzen",
   "LabelSetEbookAsSupplementary": "Als Ergänzung setzen",
+  "LabelSettingsAllowIframe": "Einbetten in einem iFrame erlauben",
   "LabelSettingsAudiobooksOnly": "Nur Hörbücher",
   "LabelSettingsAudiobooksOnlyHelp": "Wenn du diese Einstellung aktivierst, werden E-Buch-Dateien ignoriert, es sei denn, sie befinden sich in einem Hörbuchordner. In diesem Fall werden sie als zusätzliche E-Bücher festgelegt",
   "LabelSettingsBookshelfViewHelp": "Skeumorphes Design mit Holzeinlegeböden",

From 63aa6aa950d6d1e6705379fb3da54df1600f7771 Mon Sep 17 00:00:00 2001
From: biuklija <ivan@biuklija.com>
Date: Tue, 10 Dec 2024 11:52:43 +0000
Subject: [PATCH 047/143] Translated using Weblate (Croatian)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hr/
---
 client/strings/hr.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/strings/hr.json b/client/strings/hr.json
index 57ea048e..96eb51dd 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Eksperimentalne značajke",
   "HeaderSettingsGeneral": "Općenito",
   "HeaderSettingsScanner": "Skener",
+  "HeaderSettingsWebClient": "Web klijent",
   "HeaderSleepTimer": "Timer za spavanje",
   "HeaderStatsLargestItems": "Najveće stavke",
   "HeaderStatsLongestItems": "Najduže stavke (sati)",

From a0c93e5dece0f5e98b94f1df64d1fef70643954e Mon Sep 17 00:00:00 2001
From: Bezruchenko Simon <worcposj44@gmail.com>
Date: Tue, 10 Dec 2024 20:01:04 +0000
Subject: [PATCH 048/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1076 of 1076 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/uk/
---
 client/strings/uk.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/uk.json b/client/strings/uk.json
index f2342636..1697579a 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Експериментальні функції",
   "HeaderSettingsGeneral": "Основне",
   "HeaderSettingsScanner": "Сканер",
+  "HeaderSettingsWebClient": "Вебклієнт",
   "HeaderSleepTimer": "Таймер вимкнення",
   "HeaderStatsLargestItems": "Найбільші елементи",
   "HeaderStatsLongestItems": "Найдовші елементи (год)",
@@ -542,6 +543,7 @@
   "LabelServerYearReview": "Підсумки року сервера ({0})",
   "LabelSetEbookAsPrimary": "Зробити основною",
   "LabelSetEbookAsSupplementary": "Зробити додатковою",
+  "LabelSettingsAllowIframe": "Дозволити вбудовування у iframe",
   "LabelSettingsAudiobooksOnly": "Лише аудіокниги",
   "LabelSettingsAudiobooksOnlyHelp": "Увімкніть цей параметр, щоб ігнорувати файли електронних книг, якщо вони не знаходяться у теці аудіокниги, тоді вони будуть встановлені як додаткові електронні книги",
   "LabelSettingsBookshelfViewHelp": "Імітує вигляд дерев'яних полиць",

From f3536dc3a37771b50a6c9a358ae697a93a43723c Mon Sep 17 00:00:00 2001
From: Mario <leet31337@web.de>
Date: Wed, 11 Dec 2024 07:57:04 +0000
Subject: [PATCH 049/143] Translated using Weblate (German)

Currently translated at 100.0% (1078 of 1078 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/de/
---
 client/strings/de.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/de.json b/client/strings/de.json
index 3342f437..2ea96072 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -594,6 +594,8 @@
   "LabelSize": "Größe",
   "LabelSleepTimer": "Schlummerfunktion",
   "LabelSlug": "URL Teil",
+  "LabelSortAscending": "Aufsteigend",
+  "LabelSortDescending": "Absteigend",
   "LabelStart": "Start",
   "LabelStartTime": "Startzeit",
   "LabelStarted": "Gestartet",

From fde51da4795ecc42b42f2d2fd29a77b918c119e9 Mon Sep 17 00:00:00 2001
From: Vito0912 <86927734+Vito0912@users.noreply.github.com>
Date: Wed, 11 Dec 2024 08:53:12 +0000
Subject: [PATCH 050/143] Translated using Weblate (German)

Currently translated at 100.0% (1078 of 1078 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/de/
---
 client/strings/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/strings/de.json b/client/strings/de.json
index 2ea96072..04e9db4c 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -683,7 +683,7 @@
   "LabelViewPlayerSettings": "Zeige player Einstellungen",
   "LabelViewQueue": "Player-Warteschlange anzeigen",
   "LabelVolume": "Lautstärke",
-  "LabelWebRedirectURLsDescription": "Autorisieren Sie diese URLs bei ihrem OAuth-Anbieter, um die Weiterleitung zurück zur Webanwendung nach dem Login zu ermöglichen:",
+  "LabelWebRedirectURLsDescription": "Autorisiere diese URLs bei deinem OAuth-Anbieter, um die Weiterleitung zurück zur Webanwendung nach dem Login zu ermöglichen:",
   "LabelWebRedirectURLsSubfolder": "Unterordner für Weiterleitung-URLs",
   "LabelWeekdaysToRun": "Wochentage für die Ausführung",
   "LabelXBooks": "{0} Bücher",

From 09421a44e2f94383d1c82a53d0f1088454f1df4f Mon Sep 17 00:00:00 2001
From: thehijacker <thehijacker@gmail.com>
Date: Wed, 11 Dec 2024 05:02:42 +0000
Subject: [PATCH 051/143] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1078 of 1078 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sl/
---
 client/strings/sl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/sl.json b/client/strings/sl.json
index bfba635d..ba77a067 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -594,6 +594,8 @@
   "LabelSize": "Velikost",
   "LabelSleepTimer": "Časovnik za spanje",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "Naraščajoče",
+  "LabelSortDescending": "Padajoče",
   "LabelStart": "Začetek",
   "LabelStartTime": "Čas začetka",
   "LabelStarted": "Začeto",

From 086da5f6a18354212263540633078ae2b3e518d0 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 12 Dec 2024 13:10:46 +0000
Subject: [PATCH 052/143] Translated using Weblate (Spanish)

Currently translated at 100.0% (1078 of 1078 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/es/
---
 client/strings/es.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/es.json b/client/strings/es.json
index 5c7eca62..40525613 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -594,6 +594,8 @@
   "LabelSize": "Tamaño",
   "LabelSleepTimer": "Temporizador de apagado",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "Ascendente",
+  "LabelSortDescending": "Descendente",
   "LabelStart": "Iniciar",
   "LabelStartTime": "Tiempo de Inicio",
   "LabelStarted": "Iniciado",

From 31d26929af7c15f46999d1e30d88f12cac619aa3 Mon Sep 17 00:00:00 2001
From: Bezruchenko Simon <worcposj44@gmail.com>
Date: Thu, 12 Dec 2024 09:53:07 +0000
Subject: [PATCH 053/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1078 of 1078 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/uk/
---
 client/strings/uk.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/uk.json b/client/strings/uk.json
index 1697579a..6b53fed8 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -594,6 +594,8 @@
   "LabelSize": "Розмір",
   "LabelSleepTimer": "Таймер вимкнення",
   "LabelSlug": "Назва",
+  "LabelSortAscending": "По зростанню",
+  "LabelSortDescending": "По спаданню",
   "LabelStart": "Початок",
   "LabelStartTime": "Час початку",
   "LabelStarted": "Почато",

From 7db28d0e98e80e8535d6cdf526b1cf556d0f34f9 Mon Sep 17 00:00:00 2001
From: Mario <leet31337@web.de>
Date: Fri, 13 Dec 2024 08:27:43 +0000
Subject: [PATCH 054/143] Translated using Weblate (German)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/de/
---
 client/strings/de.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/de.json b/client/strings/de.json
index 04e9db4c..db298c75 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Speichere die Titelliste",
   "ButtonScan": "Partial-Scan (nur geänderte/neue Medien)",
   "ButtonScanLibrary": "Bibliothek scannen",
+  "ButtonScrollLeft": "Nach Links scrollen",
+  "ButtonScrollRight": "Nach Rechts scrollen",
   "ButtonSearch": "Suchen",
   "ButtonSelectFolderPath": "Ordnerpfad auswählen",
   "ButtonSeries": "Serien",

From 46421d5f2cb948bb2bda786adeb094925590935b Mon Sep 17 00:00:00 2001
From: biuklija <ivan@biuklija.com>
Date: Fri, 13 Dec 2024 09:04:23 +0000
Subject: [PATCH 055/143] Translated using Weblate (Croatian)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hr/
---
 client/strings/hr.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/strings/hr.json b/client/strings/hr.json
index 96eb51dd..bc66b8a5 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Spremi popis zvučnih zapisa",
   "ButtonScan": "Skeniraj",
   "ButtonScanLibrary": "Skeniraj knjižnicu",
+  "ButtonScrollLeft": "Pomicanje lijevo",
+  "ButtonScrollRight": "Pomicanje desno",
   "ButtonSearch": "Traži",
   "ButtonSelectFolderPath": "Odaberi putanju mape",
   "ButtonSeries": "Serijali",
@@ -594,6 +596,8 @@
   "LabelSize": "Veličina",
   "LabelSleepTimer": "Timer za spavanje",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "Uzlazno",
+  "LabelSortDescending": "Silazno",
   "LabelStart": "Početak",
   "LabelStartTime": "Vrijeme početka",
   "LabelStarted": "Započeto",

From a3332f0478667850df1e06b368748e8e8b4cf2d8 Mon Sep 17 00:00:00 2001
From: Bezruchenko Simon <worcposj44@gmail.com>
Date: Fri, 13 Dec 2024 10:33:00 +0000
Subject: [PATCH 056/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/uk/
---
 client/strings/uk.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/strings/uk.json b/client/strings/uk.json
index 6b53fed8..3d0150f5 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Зберегти порядок",
   "ButtonScan": "Сканувати",
   "ButtonScanLibrary": "Сканувати бібліотеку",
+  "ButtonScrollLeft": "Прокрутити ліворуч",
+  "ButtonScrollRight": "Прокрутити праворуч",
   "ButtonSearch": "Пошук",
   "ButtonSelectFolderPath": "Обрати шлях до теки",
   "ButtonSeries": "Серії",
@@ -885,7 +887,7 @@
   "MessageXLibraryIsEmpty": "Бібліотека {0} порожня!",
   "MessageYourAudiobookDurationIsLonger": "Тривалість вашої аудіокниги довша за віднайдену",
   "MessageYourAudiobookDurationIsShorter": "Тривалість вашої аудіокниги коротша за віднайдену",
-  "NoteChangeRootPassword": "Кореневий користувач — єдиний, хто може мати порожній пароль",
+  "NoteChangeRootPassword": "Тільки користувач root — єдиний, хто може мати порожній пароль",
   "NoteChapterEditorTimes": "Примітка: Перша глава мусить починатися з 0:00, а час початку останньої глави не може бути більшим за зазначену тривалість аудіокниги.",
   "NoteFolderPicker": "Примітка: вже обрані теки не буде показано",
   "NoteRSSFeedPodcastAppsHttps": "Попередження: Більшість додатків подкастів вимагатимуть використання протоколу HTTPS від RSS-каналу",

From 3b8af9521136e46805ee4949738ca6bcb25ebc8d Mon Sep 17 00:00:00 2001
From: thehijacker <thehijacker@gmail.com>
Date: Fri, 13 Dec 2024 12:13:39 +0000
Subject: [PATCH 057/143] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sl/
---
 client/strings/sl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/sl.json b/client/strings/sl.json
index ba77a067..a12643f4 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Shrani seznam skladb",
   "ButtonScan": "Pregledovanje",
   "ButtonScanLibrary": "Preglej knjižnico",
+  "ButtonScrollLeft": "Premik levo",
+  "ButtonScrollRight": "Premik desno",
   "ButtonSearch": "Poišči",
   "ButtonSelectFolderPath": "Izberite pot do mape",
   "ButtonSeries": "Serije",

From b56bcbb80216bfbe6941b634bb01d402a7d8c9fb Mon Sep 17 00:00:00 2001
From: advplyr <dev@advplyr.com>
Date: Sat, 14 Dec 2024 18:49:44 +0100
Subject: [PATCH 058/143] Added translation using Weblate (Belarusian)

---
 client/strings/be.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 client/strings/be.json

diff --git a/client/strings/be.json b/client/strings/be.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/client/strings/be.json
@@ -0,0 +1 @@
+{}

From eb0b92a54733075bd86db4b8126ba7e8b95edd6a Mon Sep 17 00:00:00 2001
From: kuci-JK <jankucera254@gmail.com>
Date: Sun, 15 Dec 2024 15:40:47 +0000
Subject: [PATCH 059/143] Translated using Weblate (Czech)

Currently translated at 83.8% (906 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index 0dd6367c..9e44efbb 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -190,6 +190,7 @@
   "HeaderSettingsExperimental": "Experimentální funkce",
   "HeaderSettingsGeneral": "Obecné",
   "HeaderSettingsScanner": "Skener",
+  "HeaderSettingsWebClient": "Webový klient",
   "HeaderSleepTimer": "Časovač vypnutí",
   "HeaderStatsLargestItems": "Největší položky",
   "HeaderStatsLongestItems": "Nejdelší položky (hod.)",
@@ -264,6 +265,7 @@
   "LabelChapters": "Kapitoly",
   "LabelChaptersFound": "Kapitoly nalezeny",
   "LabelClickForMoreInfo": "Klikněte pro více informací",
+  "LabelClickToUseCurrentValue": "Klikni pro použití aktuální hodnoty",
   "LabelClosePlayer": "Zavřít přehrávač",
   "LabelCodec": "Kodek",
   "LabelCollapseSeries": "Sbalit sérii",
@@ -313,11 +315,23 @@
   "LabelEmailSettingsTestAddress": "Testovací adresa",
   "LabelEmbeddedCover": "Vložená obálka",
   "LabelEnable": "Povolit",
+  "LabelEncodingBackupLocation": "Záloha původních audio souborů bude uložena v:",
+  "LabelEncodingChaptersNotEmbedded": "Kapitoly nejsou vloženy ve vícestopých audioknihách.",
+  "LabelEncodingClearItemCache": "Nezapomeňte pravidelně promazávat mezipaměť položek.",
+  "LabelEncodingFinishedM4B": "Výsledné M4B bude uloženo do složky s audioknihou v:",
+  "LabelEncodingInfoEmbedded": "Metadata budou vložena do audio stop ve složce s audioknihou.",
+  "LabelEncodingStartedNavigation": "Po spuštění úlohy můžete opustit tuto stránku.",
+  "LabelEncodingTimeWarning": "Encoding může zabrat až 30 minut.",
+  "LabelEncodingWarningAdvancedSettings": "Varování: Neměňte toto nastavení pokud neznáte možnosti encodingu ffmpeg.",
+  "LabelEncodingWatcherDisabled": "Pokud máte zakázaný watcher, budete po skončení muset znovu naskenovat tuto audioknihu.",
   "LabelEnd": "Konec",
   "LabelEndOfChapter": "Konec kapitoly",
   "LabelEpisode": "Epizoda",
+  "LabelEpisodeNotLinkedToRssFeed": "Epizoda není propojená s RSS feed",
+  "LabelEpisodeNumber": "Epizoda #{0}",
   "LabelEpisodeTitle": "Název epizody",
   "LabelEpisodeType": "Typ epizody",
+  "LabelEpisodeUrlFromRssFeed": "URL epizody z RSS feed",
   "LabelEpisodes": "Epizody",
   "LabelExample": "Příklad",
   "LabelExpandSeries": "Rozbalit série",
@@ -346,6 +360,7 @@
   "LabelFontScale": "Měřítko písma",
   "LabelFontStrikethrough": "Přeškrtnutí",
   "LabelFormat": "Formát",
+  "LabelFull": "Plné",
   "LabelGenre": "Žánr",
   "LabelGenres": "Žánry",
   "LabelHardDeleteFile": "Trvale smazat soubor",
@@ -400,6 +415,7 @@
   "LabelLowestPriority": "Nejnižší priorita",
   "LabelMatchExistingUsersBy": "Přiřadit stávající uživatele podle",
   "LabelMatchExistingUsersByDescription": "Slouží k propojení stávajících uživatelů. Po propojení budou uživatelé přiřazeni k jedinečnému ID od poskytovatele SSO.",
+  "LabelMaxEpisodesToDownload": "Maximální # epizod pro stažení. Použijte 0 pro bez omezení.",
   "LabelMediaPlayer": "Přehrávač médií",
   "LabelMediaType": "Typ média",
   "LabelMetaTag": "Metaznačka",
@@ -445,12 +461,14 @@
   "LabelOpenIDGroupClaimDescription": "Název požadavku OpenID, který obsahuje seznam uživatelských skupin. Běžně se označuje jako <code>groups</code>. <b>Je-li nakonfigurováno</b>, plikace automaticky přiřadí role na základě členství uživatele ve skupinách, pokud jsou tyto skupiny v požadavku pojmenovány case-insensitive 'admin', 'user' nebo 'guest'. Požadavek by měl obsahovat seznam, a pokud uživatel patří do více skupin, aplikace přiřadí roli odpovídající nejvyšší úrovni práva přístupu. Pokud žádná skupina není shodná, bude přístup odepřen.",
   "LabelOpenRSSFeed": "Otevřít RSS kanál",
   "LabelOverwrite": "Přepsat",
+  "LabelPaginationPageXOfY": "Strana {0} z {1}",
   "LabelPassword": "Heslo",
   "LabelPath": "Cesta",
   "LabelPermanent": "Trvalé",
   "LabelPermissionsAccessAllLibraries": "Má přístup ke všem knihovnám",
   "LabelPermissionsAccessAllTags": "Má přístup ke všem značkám",
   "LabelPermissionsAccessExplicitContent": "Má přístup k explicitnímu obsahu",
+  "LabelPermissionsCreateEreader": "Může vytvořit Ereader",
   "LabelPermissionsDelete": "Může mazat",
   "LabelPermissionsDownload": "Může stahovat",
   "LabelPermissionsUpdate": "Může aktualizovat",
@@ -474,6 +492,7 @@
   "LabelPubDate": "Datum vydání",
   "LabelPublishYear": "Rok vydání",
   "LabelPublishedDate": "Vydáno {0}",
+  "LabelPublishedDecade": "Publikováno (dekáda)",
   "LabelPublisher": "Vydavatel",
   "LabelPublishers": "Vydavatelé",
   "LabelRSSFeedCustomOwnerEmail": "Vlastní e-mail vlastníka",
@@ -493,6 +512,8 @@
   "LabelRedo": "Přepracovat",
   "LabelRegion": "Region",
   "LabelReleaseDate": "Datum vydání",
+  "LabelRemoveAllMetadataAbs": "Odebrat všechny soubory metadata.abs",
+  "LabelRemoveAllMetadataJson": "Smazat všechny soubory metadata.json",
   "LabelRemoveCover": "Odstranit obálku",
   "LabelRowsPerPage": "Řádky na stránku",
   "LabelSearchTerm": "Vyhledat termín",

From c652b5bf7407f390f1e6758505150339e4524735 Mon Sep 17 00:00:00 2001
From: Pierrick Guillaume <pierguill@gmail.com>
Date: Mon, 16 Dec 2024 06:20:05 +0000
Subject: [PATCH 060/143] Translated using Weblate (French)

Currently translated at 99.4% (1074 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/fr/
---
 client/strings/fr.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/fr.json b/client/strings/fr.json
index 42dfefc5..2c92bf7c 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -592,6 +592,8 @@
   "LabelSize": "Taille",
   "LabelSleepTimer": "Minuterie de mise en veille",
   "LabelSlug": "Identifiant d’URL",
+  "LabelSortAscending": "Croissant",
+  "LabelSortDescending": "Décroissant",
   "LabelStart": "Démarrer",
   "LabelStartTime": "Heure de démarrage",
   "LabelStarted": "Démarré",

From b6875af148c268d5dab95e3d3f3dc231669b2ac7 Mon Sep 17 00:00:00 2001
From: Plazec <plazec82@gmail.com>
Date: Mon, 16 Dec 2024 11:34:49 +0000
Subject: [PATCH 061/143] Translated using Weblate (Czech)

Currently translated at 86.2% (931 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index 9e44efbb..b1f66d11 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Uložit seznam skladeb",
   "ButtonScan": "Prohledat",
   "ButtonScanLibrary": "Prohledat Knihovnu",
+  "ButtonScrollLeft": "Posunout vlevo",
+  "ButtonScrollRight": "Posunout vpravo",
   "ButtonSearch": "Hledat",
   "ButtonSelectFolderPath": "Vybrat cestu ke složce",
   "ButtonSeries": "Série",
@@ -333,6 +335,7 @@
   "LabelEpisodeType": "Typ epizody",
   "LabelEpisodeUrlFromRssFeed": "URL epizody z RSS feed",
   "LabelEpisodes": "Epizody",
+  "LabelEpisodic": "Epizodické",
   "LabelExample": "Příklad",
   "LabelExpandSeries": "Rozbalit série",
   "LabelExpandSubSeries": "Rozbalit podsérie",
@@ -416,6 +419,7 @@
   "LabelMatchExistingUsersBy": "Přiřadit stávající uživatele podle",
   "LabelMatchExistingUsersByDescription": "Slouží k propojení stávajících uživatelů. Po propojení budou uživatelé přiřazeni k jedinečnému ID od poskytovatele SSO.",
   "LabelMaxEpisodesToDownload": "Maximální # epizod pro stažení. Použijte 0 pro bez omezení.",
+  "LabelMaxEpisodesToKeepHelp": "Hodnotou 0 není nastaven žádný maximální limit. Po automatickém stažení nové epizody se odstraní nejstarší epizoda, pokud máte více než X epizod. Při každém novém stažení se odstraní pouze 1 epizoda.",
   "LabelMediaPlayer": "Přehrávač médií",
   "LabelMediaType": "Typ média",
   "LabelMetaTag": "Metaznačka",
@@ -493,6 +497,7 @@
   "LabelPublishYear": "Rok vydání",
   "LabelPublishedDate": "Vydáno {0}",
   "LabelPublishedDecade": "Publikováno (dekáda)",
+  "LabelPublishedDecades": "Publikováno (dekády)",
   "LabelPublisher": "Vydavatel",
   "LabelPublishers": "Vydavatelé",
   "LabelRSSFeedCustomOwnerEmail": "Vlastní e-mail vlastníka",
@@ -515,6 +520,8 @@
   "LabelRemoveAllMetadataAbs": "Odebrat všechny soubory metadata.abs",
   "LabelRemoveAllMetadataJson": "Smazat všechny soubory metadata.json",
   "LabelRemoveCover": "Odstranit obálku",
+  "LabelRemoveMetadataFile": "Odstranit soubory metadat ve složkách položek knihovny",
+  "LabelRemoveMetadataFileHelp": "Odstraníte všechny soubory metadata.json a metadata.abs ve svých složkách {0}.",
   "LabelRowsPerPage": "Řádky na stránku",
   "LabelSearchTerm": "Vyhledat termín",
   "LabelSearchTitle": "Vyhledat název",
@@ -529,9 +536,11 @@
   "LabelSeries": "Série",
   "LabelSeriesName": "Název série",
   "LabelSeriesProgress": "Průběh série",
+  "LabelServerLogLevel": "Úroveň protokolu serveru",
   "LabelServerYearReview": "Přehled roku na serveru ({0})",
   "LabelSetEbookAsPrimary": "Nastavit jako primární",
   "LabelSetEbookAsSupplementary": "Nastavit jako doplňkové",
+  "LabelSettingsAllowIframe": "Povolit vložení do rámce iframe",
   "LabelSettingsAudiobooksOnly": "Pouze audioknihy",
   "LabelSettingsAudiobooksOnlyHelp": "Povolením tohoto nastavení budou soubory e-knih ignorovány, pokud nejsou ve složce audioknih, v takovém případě budou nastaveny jako doplňkové e-knihy",
   "LabelSettingsBookshelfViewHelp": "Skeumorfní design s dřevěnými policemi",
@@ -553,6 +562,9 @@
   "LabelSettingsHideSingleBookSeriesHelp": "Série, které mají jedinou knihu, budou skryty na stránce série a na domovské stránce.",
   "LabelSettingsHomePageBookshelfView": "Domovská stránka používá zobrazení police s knihami",
   "LabelSettingsLibraryBookshelfView": "Knihovna používá zobrazení police s knihami",
+  "LabelSettingsLibraryMarkAsFinishedPercentComplete": "Procento dokončení je vyšší než",
+  "LabelSettingsLibraryMarkAsFinishedTimeRemaining": "Zbývající čas je kratší než (sekund)",
+  "LabelSettingsLibraryMarkAsFinishedWhen": "Označit položku médií jako dokončenou, když",
   "LabelSettingsOnlyShowLaterBooksInContinueSeries": "Přeskočit předchozí knihy v pokračování série",
   "LabelSettingsOnlyShowLaterBooksInContinueSeriesHelp": "Polička Pokračovat v sérii na domovské stránce zobrazuje první nezačatou knihu v sériích, které mají alespoň jednu knihu dokončenou a žádnou rozečtenou. Povolením tohoto nastavení budou série pokračovat od poslední dokončené knihy namísto první nezačaté knihy.",
   "LabelSettingsParseSubtitles": "Analzyovat podtitul",
@@ -577,6 +589,8 @@
   "LabelShowSubtitles": "Zobrazit titulky",
   "LabelSize": "Velikost",
   "LabelSleepTimer": "Časovač vypnutí",
+  "LabelSortAscending": "Vzestupně",
+  "LabelSortDescending": "Sestupně",
   "LabelStart": "Spustit",
   "LabelStartTime": "Čas Spuštění",
   "LabelStarted": "Spuštěno",
@@ -615,6 +629,7 @@
   "LabelTimeDurationXMinutes": "{0} minut",
   "LabelTimeDurationXSeconds": "{0} sekund",
   "LabelTimeInMinutes": "Čas v minutách",
+  "LabelTimeLeft": "{0} zbývá",
   "LabelTimeListened": "Čas poslechu",
   "LabelTimeListenedToday": "Čas poslechu dnes",
   "LabelTimeRemaining": "{0} zbývá",
@@ -622,6 +637,7 @@
   "LabelTitle": "Název",
   "LabelToolsEmbedMetadata": "Vložit metadata",
   "LabelToolsEmbedMetadataDescription": "Vložit metadata do zvukových souborů včetně obálky a kapitol.",
+  "LabelToolsM4bEncoder": "Enkodér M4B",
   "LabelToolsMakeM4b": "Vytvořit soubor audioknihy M4B",
   "LabelToolsMakeM4bDescription": "Vygenerovat soubor audioknihy M4B s vloženými metadaty, obálkou a kapitolami.",
   "LabelToolsSplitM4b": "Rozdělit M4B na MP3",
@@ -634,6 +650,7 @@
   "LabelTracksMultiTrack": "Více stop",
   "LabelTracksNone": "Žádné stopy",
   "LabelTracksSingleTrack": "Jedna stopa",
+  "LabelTrailer": "Upoutávka",
   "LabelType": "Typ",
   "LabelUnabridged": "Nezkráceno",
   "LabelUndo": "Zpět",
@@ -645,10 +662,13 @@
   "LabelUpdateDetailsHelp": "Povolit přepsání existujících údajů o vybraných knihách, když je nalezena shoda",
   "LabelUpdatedAt": "Aktualizováno v",
   "LabelUploaderDragAndDrop": "Přetáhnout soubory nebo složky",
+  "LabelUploaderDragAndDropFilesOnly": "Přetáhnout a upustit soubory",
   "LabelUploaderDropFiles": "Odstranit soubory",
   "LabelUploaderItemFetchMetadataHelp": "Automaticky načíst název, autora a sérii",
+  "LabelUseAdvancedOptions": "Použít pokročilé možnosti",
   "LabelUseChapterTrack": "Použít stopu kapitoly",
   "LabelUseFullTrack": "Použít celou stopu",
+  "LabelUseZeroForUnlimited": "Použijte 0 pro neomezené",
   "LabelUser": "Uživatel",
   "LabelUsername": "Uživatelské jméno",
   "LabelValue": "Hodnota",
@@ -658,6 +678,8 @@
   "LabelViewPlayerSettings": "Zobrazit nastavení přehrávače",
   "LabelViewQueue": "Zobrazit frontu přehrávače",
   "LabelVolume": "Hlasitost",
+  "LabelWebRedirectURLsDescription": "Autorizujte tyto adresy URL ve zprostředkovateli OAuth, abyste po přihlášení umožnili přesměrování zpět do webové aplikace:",
+  "LabelWebRedirectURLsSubfolder": "Podsložka pro přesměrování adres URL",
   "LabelWeekdaysToRun": "Dny v týdnu ke spuštění",
   "LabelXBooks": "{0} knih",
   "LabelXItems": "{0} položky",
@@ -695,6 +717,7 @@
   "MessageConfirmDeleteMetadataProvider": "Opravdu chcete vymazat vlastního poskytovatele metadat \"{0}\"?",
   "MessageConfirmDeleteNotification": "Opravdu chcete vymazat tuto notifikaci?",
   "MessageConfirmDeleteSession": "Opravdu chcete smazat tuto relaci?",
+  "MessageConfirmEmbedMetadataInAudioFiles": "Jste si jisti, že chcete vložit metadata do {0} zvukových souborů?",
   "MessageConfirmForceReScan": "Opravdu chcete vynutit opětovné prohledání?",
   "MessageConfirmMarkAllEpisodesFinished": "Opravdu chcete označit všechny epizody jako dokončené?",
   "MessageConfirmMarkAllEpisodesNotFinished": "Opravdu chcete označit všechny epizody jako nedokončené?",
@@ -702,6 +725,7 @@
   "MessageConfirmMarkItemNotFinished": "Opravdu chcete označit \"{0}\" jako nedokončené?",
   "MessageConfirmMarkSeriesFinished": "Opravdu chcete označit všechny knihy z této série jako dokončené?",
   "MessageConfirmMarkSeriesNotFinished": "Opravdu chcete označit všechny knihy z této série jako nedokončené?",
+  "MessageConfirmNotificationTestTrigger": "Spustit toto oznámení s testovacími daty?",
   "MessageConfirmPurgeCache": "Vyčistit mezipaměť odstraní celý adresář na adrese <code>/metadata/cache</code>. <br /><br />Určitě chcete odstranit adresář mezipaměti?",
   "MessageConfirmPurgeItemsCache": "Vyčištění mezipaměti položek odstraní celý adresář <code>/metadata/cache/items</code>.<br />Jste si jistí?",
   "MessageConfirmQuickEmbed": "Varování! Rychlé vložení nezálohuje vaše zvukové soubory. Ujistěte se, že máte zálohu zvukových souborů. <br><br>Chcete pokračovat?",

From 547a49e95bc880771621156e0d2488a9521fadda Mon Sep 17 00:00:00 2001
From: kuci-JK <jankucera254@gmail.com>
Date: Mon, 16 Dec 2024 15:27:33 +0000
Subject: [PATCH 062/143] Translated using Weblate (Czech)

Currently translated at 86.2% (931 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index b1f66d11..ce670018 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -583,6 +583,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "Ve výchozím nastavení jsou soubory metadat uloženy v adresáři /metadata/items, povolením tohoto nastavení budou soubory metadat uloženy ve složkách položek knihovny",
   "LabelSettingsTimeFormat": "Formát času",
   "LabelShare": "Sdílet",
+  "LabelShareOpen": "Otevřít sdílení",
   "LabelShareURL": "Sdílet URL",
   "LabelShowAll": "Zobrazit vše",
   "LabelShowSeconds": "Zobrazit sekundy",

From 4ecb22f70d897e70298ae2b241baface640f4277 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 16 Dec 2024 17:04:55 +0000
Subject: [PATCH 063/143] Translated using Weblate (Spanish)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/es/
---
 client/strings/es.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/es.json b/client/strings/es.json
index 40525613..fa4f8c45 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Guardar Tracklist",
   "ButtonScan": "Escanear",
   "ButtonScanLibrary": "Escanear Biblioteca",
+  "ButtonScrollLeft": "Desplazarse hacia la izquierda",
+  "ButtonScrollRight": "Desplazarse hacia la derecha",
   "ButtonSearch": "Buscar",
   "ButtonSelectFolderPath": "Seleccionar Ruta de Carpeta",
   "ButtonSeries": "Series",

From c242e9d3d6ec4b147f2da1298ad1086499a10da9 Mon Sep 17 00:00:00 2001
From: ugyes <ferenc.bodi@live.com>
Date: Mon, 16 Dec 2024 17:43:17 +0000
Subject: [PATCH 064/143] Translated using Weblate (Hungarian)

Currently translated at 92.4% (998 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hu/
---
 client/strings/hu.json | 68 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 6 deletions(-)

diff --git a/client/strings/hu.json b/client/strings/hu.json
index 8c500701..d0525800 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Sávlista mentése",
   "ButtonScan": "Szkennelés",
   "ButtonScanLibrary": "Könyvtár szkennelése",
+  "ButtonScrollLeft": "Balra görgetés",
+  "ButtonScrollRight": "Jobbra görgetés",
   "ButtonSearch": "Keresés",
   "ButtonSelectFolderPath": "Mappa útvonalának kiválasztása",
   "ButtonSeries": "Sorozatok",
@@ -231,6 +233,7 @@
   "LabelAppend": "Hozzáfűzés",
   "LabelAudioBitrate": "Audió bitráta (pl.128k)",
   "LabelAudioChannels": "Audió csatorna (1 vagy 2)",
+  "LabelAudioCodec": "Audio Codec",
   "LabelAuthor": "Szerző",
   "LabelAuthorFirstLast": "Szerző (Keresztnév Vezetéknév)",
   "LabelAuthorLastFirst": "Szerző (Vezetéknév, Keresztnév)",
@@ -334,7 +337,7 @@
   "LabelExample": "Példa",
   "LabelExpandSeries": "Sorozat kinyitása",
   "LabelExpandSubSeries": "Alsorozat kinyitása",
-  "LabelExplicit": "Explicit",
+  "LabelExplicit": "Szókimondó",
   "LabelExplicitChecked": "Explicit (ellenőrizve)",
   "LabelExplicitUnchecked": "Nem explicit (nem ellenőrzött)",
   "LabelExportOPML": "OPML exportálása",
@@ -460,7 +463,7 @@
   "LabelNumberOfEpisodes": "Epizódok száma",
   "LabelOpenIDAdvancedPermsClaimDescription": "Az OpenID-igény neve, amely a felhasználói műveletekre vonatkozó haladó jogosultságokat tartalmazza az alkalmazáson belül, és amely a nem adminisztrátori szerepkörökre vonatkozik (<b>ha konfigurálva van</b>). Ha az igény hiányzik a válaszból, az ABS-hez való hozzáférés megtagadásra kerül. Ha egyetlen opció hiányzik, azt <code>false</code>-ként fogja kezelni. Győződj meg arról, hogy az identitásszolgáltató igénye megfelel a várt struktúrának:",
   "LabelOpenIDClaims": "Hagyd üresen a következő opciókat, hogy letiltsd a haladó csoport- és jogosultság-hozzárendelést, ekkor automatikusan a ‘Felhasználó’ csoport kerül hozzárendelésre.",
-  "LabelOpenIDGroupClaimDescription": "Az OpenID-igény neve, amely a felhasználó csoportjainak listáját tartalmazza. Általában groups néven hivatkoznak rá. Ha konfigurálva van, az alkalmazás automatikusan hozzárendeli a szerepköröket a felhasználó csoporttagságai alapján, feltéve, hogy ezek a csoportok az igényben kis- és nagybetűkre érzéketlenül ‘admin’, ‘user’ vagy ‘guest’ néven szerepelnek. Az igénynek egy listát kell tartalmaznia, és ha egy felhasználó több csoport tagja, az alkalmazás a legmagasabb szintű hozzáféréssel rendelkező szerepkört rendeli hozzá. Ha egyetlen csoport sem felel meg, a hozzáférés megtagadásra kerül.",
+  "LabelOpenIDGroupClaimDescription": "Az OpenID-igény neve, amely a felhasználó csoportjainak listáját tartalmazza. Általában <code>groups<code> néven hivatkoznak rá. <b>Ha konfigurálva van<b>, az alkalmazás automatikusan hozzárendeli a szerepköröket a felhasználó csoporttagságai alapján, feltéve, hogy ezek a csoportok az igényben kis- és nagybetűkre érzéketlenül ‘admin’, ‘user’ vagy ‘guest’ néven szerepelnek. Az igénynek egy listát kell tartalmaznia, és ha egy felhasználó több csoport tagja, az alkalmazás a legmagasabb szintű hozzáféréssel rendelkező szerepkört rendeli hozzá. Ha egyetlen csoport sem felel meg, a hozzáférés megtagadásra kerül.",
   "LabelOpenRSSFeed": "RSS hírcsatorna megnyitása",
   "LabelOverwrite": "Felülírás",
   "LabelPaginationPageXOfY": "{0} oldal {1}-ból/ből",
@@ -561,8 +564,11 @@
   "LabelSettingsHideSingleBookSeriesHelp": "A csak egy könyvet tartalmazó sorozatok el lesznek rejtve a sorozatok oldalról és a kezdőlap polcairól.",
   "LabelSettingsHomePageBookshelfView": "Kezdőlap használja a könyvespolc nézetet",
   "LabelSettingsLibraryBookshelfView": "Könyvtár használja a könyvespolc nézetet",
+  "LabelSettingsLibraryMarkAsFinishedPercentComplete": "Százalékos befejezettség nagyobb mint",
   "LabelSettingsLibraryMarkAsFinishedTimeRemaining": "A hátralévő idő kevesebb, mint (másodperc)",
   "LabelSettingsLibraryMarkAsFinishedWhen": "A médiaelem befejezettnek jelölése, ha",
+  "LabelSettingsOnlyShowLaterBooksInContinueSeries": "Megelőző könyvek kihagyása a Sorozat folytatásában",
+  "LabelSettingsOnlyShowLaterBooksInContinueSeriesHelp": "A Sorozat folytatása kezdőlap polcán az első nem megkezdett könyv látható egy olyan sorozatban, amelynek legalább egy könyve befejeződött, és nincs folyamatban lévő rész. Ha engedélyezi ezt a beállítást, akkor a sorozatot a legvégső befejezett könyvtől folytatja az első el nem kezdett könyv helyett.",
   "LabelSettingsParseSubtitles": "Feliratok elemzése",
   "LabelSettingsParseSubtitlesHelp": "Feliratok kinyerése a hangoskönyv mappaneveiből.<br>A feliratnak el kell különülnie egy \" - \" jellel<br>például: \"Könyv címe - Egy felirat itt\" esetén a felirat \"Egy felirat itt\"",
   "LabelSettingsPreferMatchedMetadata": "Preferált egyeztetett metaadatok",
@@ -584,6 +590,8 @@
   "LabelSize": "Méret",
   "LabelSleepTimer": "Alvásidőzítő",
   "LabelSlug": "Rövid cím",
+  "LabelSortAscending": "Emelkedő",
+  "LabelSortDescending": "Csökkenő",
   "LabelStart": "Kezdés",
   "LabelStartTime": "Kezdési idő",
   "LabelStarted": "Elkezdődött",
@@ -593,7 +601,7 @@
   "LabelStatsBestDay": "Legjobb nap",
   "LabelStatsDailyAverage": "Napi átlag",
   "LabelStatsDays": "Napok",
-  "LabelStatsDaysListened": "Hallgatott nap",
+  "LabelStatsDaysListened": "Napon hallgatva",
   "LabelStatsHours": "Órák",
   "LabelStatsInARow": "egymás után",
   "LabelStatsItemsFinished": "Befejezett elem",
@@ -643,6 +651,7 @@
   "LabelTracksMultiTrack": "Többsávos",
   "LabelTracksNone": "Nincsenek sávok",
   "LabelTracksSingleTrack": "Egysávos",
+  "LabelTrailer": "Előzetes",
   "LabelType": "Típus",
   "LabelUnabridged": "Nem tömörített",
   "LabelUndo": "Visszavonás",
@@ -654,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Lehetővé teszi a meglévő részletek felülírását a kiválasztott könyveknél, amikor találatot talál",
   "LabelUpdatedAt": "Frissítve",
   "LabelUploaderDragAndDrop": "Fájlok vagy mappák húzása és elengedése",
+  "LabelUploaderDragAndDropFilesOnly": "Fájlok húzása és elengedése",
   "LabelUploaderDropFiles": "Fájlok elengedése",
   "LabelUploaderItemFetchMetadataHelp": "Cím, szerző és sorozat automatikus lekérése",
   "LabelUseAdvancedOptions": "Haladó beállítások használata",
@@ -669,6 +679,8 @@
   "LabelViewPlayerSettings": "A lejátszó beállításainak megtekintése",
   "LabelViewQueue": "Lejátszó sor megtekintése",
   "LabelVolume": "Hangerő",
+  "LabelWebRedirectURLsDescription": "Engedélyezze ezeket az URL-címeket az OAuth-szolgáltatóban, hogy a bejelentkezés után vissza lehessen irányítani a webes alkalmazáshoz:",
+  "LabelWebRedirectURLsSubfolder": "Almappa átirányító URL-ek számára",
   "LabelWeekdaysToRun": "Futás napjai",
   "LabelXBooks": "{0} könyv",
   "LabelXItems": "{0} elem",
@@ -715,7 +727,10 @@
   "MessageConfirmMarkSeriesFinished": "Biztosan meg szeretné jelölni a sorozat összes könyvét befejezettnek?",
   "MessageConfirmMarkSeriesNotFinished": "Biztosan meg szeretné jelölni a sorozat összes könyvét nem befejezettnek?",
   "MessageConfirmNotificationTestTrigger": "Ez az értesítés indítható tesztadatokkal?",
+  "MessageConfirmPurgeCache": "A gyorsítótár kiürítése törli a teljes könyvtárat a <code>/metadata/cache</code> helyről. <br /><br />Biztosan eltávolítja a gyorsítótár könyvtárát?",
+  "MessageConfirmPurgeItemsCache": "Az elemek gyorsítótárának kiürítése törli a teljes könyvtárat a <code>/metadata/cache/items</code> helyről.<br />Biztos benne?",
   "MessageConfirmQuickEmbed": "Figyelem! A Gyors beágyazás nem készít biztonsági másolatot az audiofájlokról. Győződjön meg arról, hogy van biztonsági másolata az audiofájlokról. <br><br>Szeretné folytatni?",
+  "MessageConfirmQuickMatchEpisodes": "Az epizódok gyors megfeleltetése felülírja a részleteket, ha egyezést talál. Csak a nem egyező epizódok frissülnek. Biztos benne?",
   "MessageConfirmReScanLibraryItems": "Biztosan újra szeretné szkennelni a(z) {0} elemet?",
   "MessageConfirmRemoveAllChapters": "Biztosan eltávolítja az összes fejezetet?",
   "MessageConfirmRemoveAuthor": "Biztosan eltávolítja a(z) \"{0}\" szerzőt?",
@@ -734,8 +749,10 @@
   "MessageConfirmRenameTagWarning": "Figyelem! Egy hasonló, de eltérő nagybetűkkel rendelkező címke már létezik \"{0}\".",
   "MessageConfirmResetProgress": "Biztos, hogy vissza akarja állítani a haladási folyamatát?",
   "MessageConfirmSendEbookToDevice": "Biztosan el szeretné küldeni a(z) {0} e-könyvet a(z) \"{1}\" eszközre?",
+  "MessageConfirmUnlinkOpenId": "Biztos, hogy el akarja távolítani ezt a felhasználót az OpenID-ból?",
   "MessageDownloadingEpisode": "Epizód letöltése",
   "MessageDragFilesIntoTrackOrder": "Húzza a fájlokat a helyes sávrendbe",
+  "MessageEmbedFailed": "A beágyazás sikertelen!",
   "MessageEmbedFinished": "Beágyazás befejeződött!",
   "MessageEpisodesQueuedForDownload": "{0} epizód letöltésre vár",
   "MessageEreaderDevices": "Az e-könyvek kézbesítésének biztosítása érdekében a fenti e-mail címet az alább felsorolt minden egyes eszközhöz, mint érvényes feladót kell hozzáadnia.",
@@ -746,10 +763,11 @@
   "MessageInsertChapterBelow": "Fejezet beszúrása alulra",
   "MessageItemsSelected": "{0} kiválasztott elem",
   "MessageItemsUpdated": "{0} frissített elem",
-  "MessageJoinUsOn": "Csatlakozzon hozzánk",
+  "MessageJoinUsOn": "Csatlakozzon hozzánk a",
   "MessageListeningSessionsInTheLastYear": "{0} hallgatási munkamenet az elmúlt évben",
   "MessageLoading": "Betöltés...",
   "MessageLoadingFolders": "Mappák betöltése...",
+  "MessageLogsDescription": "A naplók a <code>/metadata/logs</code> mappában JSON-fájlokként tárolódnak. Az összeomlási naplók a <code>/metadata/logs/crash_logs.txt</code> fájlban tárolódnak.",
   "MessageM4BFailed": "M4B sikertelen!",
   "MessageM4BFinished": "M4B befejeződött!",
   "MessageMapChapterTitles": "Fejezetcímek hozzárendelése a meglévő hangoskönyv fejezeteihez anélkül, hogy az időbélyegeket módosítaná",
@@ -799,6 +817,7 @@
   "MessagePodcastHasNoRSSFeedForMatching": "A podcastnak nincs RSS hírcsatorna URL-je az egyeztetéshez",
   "MessagePodcastSearchField": "Adja meg a keresési kifejezést vagy az RSS csatorna URL-címét",
   "MessageQuickEmbedInProgress": "Gyors beágyazás folyamatban",
+  "MessageQuickMatchAllEpisodes": "Minden epizód gyors egyeztetése",
   "MessageQuickMatchDescription": "Üres elem részletek és borító feltöltése az első találati eredménnyel a(z) '{0}'-ból. Nem írja felül a részleteket, kivéve, ha a 'Preferált egyeztetett metaadatok' szerverbeállítás engedélyezve van.",
   "MessageRemoveChapter": "Fejezet eltávolítása",
   "MessageRemoveEpisodes": "Epizód(ok) eltávolítása: {0}",
@@ -806,16 +825,36 @@
   "MessageRemoveUserWarning": "Biztosan véglegesen törölni szeretné a(z) \"{0}\" felhasználót?",
   "MessageReportBugsAndContribute": "Hibák jelentése, funkciók kérése és hozzájárulás itt",
   "MessageResetChaptersConfirm": "Biztosan alaphelyzetbe szeretné állítani a fejezeteket és visszavonni a módosításokat?",
-  "MessageRestoreBackupConfirm": "Biztosan vissza szeretné állítani a biztonsági másolatot, amely ekkor készült",
+  "MessageRestoreBackupConfirm": "Biztosan vissza szeretné állítani a biztonsági másolatot, amely ekkor készült:",
   "MessageRestoreBackupWarning": "A biztonsági mentés visszaállítása felülírja az egész adatbázist, amely a /config mappában található, valamint a borítóképeket a /metadata/items és /metadata/authors mappákban.<br /><br />A biztonsági mentések nem módosítják a könyvtár mappáiban található fájlokat. Ha engedélyezte a szerverbeállításokat a borítóképek és a metaadatok könyvtármappákban való tárolására, akkor ezek nem kerülnek biztonsági mentésre vagy felülírásra.<br /><br />A szerver használó összes kliens automatikusan frissül.",
   "MessageSearchResultsFor": "Keresési eredmények",
   "MessageSelected": "{0} kiválasztva",
   "MessageServerCouldNotBeReached": "A szervert nem lehet elérni",
   "MessageSetChaptersFromTracksDescription": "Fejezetek beállítása minden egyes hangfájlt egy fejezetként használva, és a fejezet címét a hangfájl neveként",
+  "MessageShareExpirationWillBe": "A lejárat: <strong>{0}</strong>",
+  "MessageShareExpiresIn": "{0} múlva jár le",
   "MessageStartPlaybackAtTime": "\"{0}\" lejátszásának kezdése {1} -tól?",
   "MessageTaskAudioFileNotWritable": "A/Az „{0}” hangfájl nem írható",
+  "MessageTaskCanceledByUser": "Felhasználó törölte a feladatot",
+  "MessageTaskDownloadingEpisodeDescription": "„{0}” epizód letöltése",
+  "MessageTaskEmbeddingMetadata": "Metaadatok beágyazása",
+  "MessageTaskEmbeddingMetadataDescription": "Metaadatok beágyazása a „{0}” hangoskönyvbe",
+  "MessageTaskEncodingM4b": "Kódolás M4B-ban",
+  "MessageTaskEncodingM4bDescription": "„{0}” hangoskönyv kódolása egyetlen m4b fájlba",
   "MessageTaskFailed": "Sikertelen",
+  "MessageTaskFailedToBackupAudioFile": "Nem sikerült a „{0}” hangfájl mentése",
+  "MessageTaskFailedToCreateCacheDirectory": "Nem sikerült létrehozni a gyorsítótár könyvtárat",
+  "MessageTaskFailedToEmbedMetadataInFile": "Nem sikerült beágyazni a metaadatokat a „{0}” fájlba",
+  "MessageTaskFailedToMergeAudioFiles": "A hangfájlok egyesítése nem sikerült",
+  "MessageTaskFailedToMoveM4bFile": "Nem sikerült m4b fájlt áthelyezni",
+  "MessageTaskFailedToWriteMetadataFile": "Metaadatfájl írása sikertelen",
+  "MessageTaskMatchingBooksInLibrary": "Könyvek egyeztetése a \"{0}\" könyvtárban",
   "MessageTaskNoFilesToScan": "Nincs beolvasandó fájl",
+  "MessageTaskOpmlImport": "OPML import",
+  "MessageTaskOpmlImportDescription": "Podcastok létrehozása {0} RSS-csatornákból",
+  "MessageTaskOpmlImportFeedDescription": "RSS feed „{0}” importálása",
+  "MessageTaskOpmlImportFeedFailed": "Nem sikerült letölteni a podcast feedet",
+  "MessageTaskOpmlImportFeedPodcastDescription": "„{0}” podcast létrehozása",
   "MessageTaskOpmlImportFeedPodcastExists": "Podcast már létezik az elérési útvonalon",
   "MessageTaskOpmlImportFeedPodcastFailed": "Nem sikerült podcastot létrehozni",
   "MessageTaskOpmlImportFinished": "{0} podcast hozzáadva",
@@ -845,6 +884,10 @@
   "NoteUploaderFoldersWithMediaFiles": "A médiafájlokat tartalmazó mappák külön könyvtári tételekként lesznek kezelve.",
   "NoteUploaderOnlyAudioFiles": "Ha csak hangfájlokat tölt fel, akkor minden egyes hangfájl külön hangoskönyvként lesz kezelve.",
   "NoteUploaderUnsupportedFiles": "A nem támogatott fájlok figyelmen kívül hagyásra kerülnek. Mappa kiválasztása vagy elengedésekor az elem mappáján kívüli egyéb fájlok figyelmen kívül lesznek hagyva.",
+  "NotificationOnBackupCompletedDescription": "A biztonsági mentés befejezésekor aktiválódik",
+  "NotificationOnBackupFailedDescription": "A biztonsági mentés sikertelensége esetén aktiválódik",
+  "NotificationOnEpisodeDownloadedDescription": "Egy podcast epizód automatikus letöltésekor aktiválódik",
+  "NotificationOnTestDescription": "Esemény az értesítési rendszer teszteléséhez",
   "PlaceholderNewCollection": "Új gyűjtemény neve",
   "PlaceholderNewFolderPath": "Új mappa útvonala",
   "PlaceholderNewPlaylist": "Új lejátszási lista neve",
@@ -854,7 +897,11 @@
   "StatsBooksAdded": "könyv hozzáadva",
   "StatsBooksAdditional": "Néhány kiegészítés…",
   "StatsBooksFinished": "könyv befejezve",
+  "StatsBooksFinishedThisYear": "Néhány idén befejezett könyv…",
+  "StatsBooksListenedTo": "hallgatott könyv",
   "StatsCollectionGrewTo": "Könyvgyűjtemény nőtt…",
+  "StatsSessions": "munkamenet",
+  "StatsSpentListening": "hallgatással töltött idő",
   "StatsTopAuthor": "TOP SZERZŐ",
   "StatsTopAuthors": "TOP SZERZŐ",
   "StatsTopGenre": "TOP MŰFAJ",
@@ -862,8 +909,11 @@
   "StatsTopMonth": "TOP HÓNAP",
   "StatsTopNarrator": "TOP ELŐADÓ",
   "StatsTopNarrators": "TOP ELŐADÓ",
+  "StatsTotalDuration": "A teljes időtartam…",
   "StatsYearInReview": "ÉVÉRTÉKELÉS",
   "ToastAccountUpdateSuccess": "Fiók frissítve",
+  "ToastAppriseUrlRequired": "Meg kell adnia egy Apprise URL-címet",
+  "ToastAsinRequired": "ASIN kötelező",
   "ToastAuthorImageRemoveSuccess": "Szerző képe eltávolítva",
   "ToastAuthorNotFound": "A szerző „{0}” nem található",
   "ToastAuthorRemoveSuccess": "Szerző eltávolítva",
@@ -871,13 +921,18 @@
   "ToastAuthorUpdateMerged": "Szerző összevonva",
   "ToastAuthorUpdateSuccess": "Szerző frissítve",
   "ToastAuthorUpdateSuccessNoImageFound": "Szerző frissítve (nem található kép)",
+  "ToastBackupAppliedSuccess": "Biztonsági mentés alkalmazva",
   "ToastBackupCreateFailed": "A biztonsági mentés létrehozása sikertelen",
   "ToastBackupCreateSuccess": "Biztonsági mentés létrehozva",
   "ToastBackupDeleteFailed": "A biztonsági mentés törlése sikertelen",
   "ToastBackupDeleteSuccess": "Biztonsági mentés törölve",
+  "ToastBackupInvalidMaxKeep": "A megőrzendő biztonsági másolatok száma érvénytelen",
+  "ToastBackupInvalidMaxSize": "Érvénytelen maximális mentésméret",
   "ToastBackupRestoreFailed": "A biztonsági mentés visszaállítása sikertelen",
   "ToastBackupUploadFailed": "A biztonsági mentés feltöltése sikertelen",
   "ToastBackupUploadSuccess": "Biztonsági mentés feltöltve",
+  "ToastBatchDeleteFailed": "A tömeges törlés nem sikerült",
+  "ToastBatchDeleteSuccess": "Sikeres tömeges törlés",
   "ToastBatchUpdateFailed": "Kötegelt frissítés sikertelen",
   "ToastBatchUpdateSuccess": "Kötegelt frissítés sikeres",
   "ToastBookmarkCreateFailed": "Könyvjelző létrehozása sikertelen",
@@ -940,5 +995,6 @@
   "ToastUnknownError": "Ismeretlen hiba",
   "ToastUserDeleteFailed": "Felhasználó törlése sikertelen",
   "ToastUserDeleteSuccess": "Felhasználó törölve",
-  "ToastUserPasswordChangeSuccess": "Jelszó sikeresen megváltoztatva"
+  "ToastUserPasswordChangeSuccess": "Jelszó sikeresen megváltoztatva",
+  "ToastUserRootRequireName": "Egy root felhasználónevet kell megadnia"
 }

From 26a6618e8f918021a8ebd5a68e340e2d1d8d1238 Mon Sep 17 00:00:00 2001
From: ugyes <ferenc.bodi@live.com>
Date: Tue, 17 Dec 2024 18:21:30 +0000
Subject: [PATCH 065/143] Translated using Weblate (Hungarian)

Currently translated at 95.0% (1026 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hu/
---
 client/strings/hu.json | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/client/strings/hu.json b/client/strings/hu.json
index d0525800..4aa24095 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -327,11 +327,11 @@
   "LabelEnd": "Vége",
   "LabelEndOfChapter": "Fejezet vége",
   "LabelEpisode": "Epizód",
-  "LabelEpisodeNotLinkedToRssFeed": "Epizód nem kapcsolódik RSS feedhez",
+  "LabelEpisodeNotLinkedToRssFeed": "Epizód nem kapcsolódik RSS hírcsatonához",
   "LabelEpisodeNumber": "Epizód #{0}",
   "LabelEpisodeTitle": "Epizód címe",
   "LabelEpisodeType": "Epizód típusa",
-  "LabelEpisodeUrlFromRssFeed": "Epizód URL-címe az RSS-ből",
+  "LabelEpisodeUrlFromRssFeed": "Epizód URL-címe az RSS hírcsatornából",
   "LabelEpisodes": "Epizódok",
   "LabelEpisodic": "Epizódikus",
   "LabelExample": "Példa",
@@ -808,14 +808,14 @@
   "MessageNoUpdatesWereNecessary": "Nem volt szükség frissítésekre",
   "MessageNoUserPlaylists": "Nincsenek felhasználói lejátszási listák",
   "MessageNotYetImplemented": "Még nem implementált",
-  "MessageOpmlPreviewNote": "Megjegyzés: Ez egy előnézeti kép az elemzett OPML fájlról. A podcast tényleges címe az RSS-csatornából származik.",
+  "MessageOpmlPreviewNote": "Megjegyzés: Ez egy előnézeti kép az elemzett OPML fájlról. A podcast tényleges címe az RSS hírcsatornából származik.",
   "MessageOr": "vagy",
   "MessagePauseChapter": "Fejezet lejátszásának szüneteltetése",
   "MessagePlayChapter": "Fejezet elejének meghallgatása",
   "MessagePlaylistCreateFromCollection": "Lejátszási lista létrehozása gyűjteményből",
   "MessagePleaseWait": "Kérem várjon...",
   "MessagePodcastHasNoRSSFeedForMatching": "A podcastnak nincs RSS hírcsatorna URL-je az egyeztetéshez",
-  "MessagePodcastSearchField": "Adja meg a keresési kifejezést vagy az RSS csatorna URL-címét",
+  "MessagePodcastSearchField": "Adja meg a keresési kifejezést vagy az RSS hírcsatorna URL-címét",
   "MessageQuickEmbedInProgress": "Gyors beágyazás folyamatban",
   "MessageQuickMatchAllEpisodes": "Minden epizód gyors egyeztetése",
   "MessageQuickMatchDescription": "Üres elem részletek és borító feltöltése az első találati eredménnyel a(z) '{0}'-ból. Nem írja felül a részleteket, kivéve, ha a 'Preferált egyeztetett metaadatok' szerverbeállítás engedélyezve van.",
@@ -851,7 +851,7 @@
   "MessageTaskMatchingBooksInLibrary": "Könyvek egyeztetése a \"{0}\" könyvtárban",
   "MessageTaskNoFilesToScan": "Nincs beolvasandó fájl",
   "MessageTaskOpmlImport": "OPML import",
-  "MessageTaskOpmlImportDescription": "Podcastok létrehozása {0} RSS-csatornákból",
+  "MessageTaskOpmlImportDescription": "Podcastok létrehozása {0} RSS hírcsatornából",
   "MessageTaskOpmlImportFeedDescription": "RSS feed „{0}” importálása",
   "MessageTaskOpmlImportFeedFailed": "Nem sikerült letölteni a podcast feedet",
   "MessageTaskOpmlImportFeedPodcastDescription": "„{0}” podcast létrehozása",
@@ -879,7 +879,7 @@
   "NoteChangeRootPassword": "A Root felhasználó az egyetlen felhasználó, akinek lehet üres jelszava",
   "NoteChapterEditorTimes": "Megjegyzés: Az első fejezet kezdőidejének 0:00 kell lennie, és az utolsó fejezet kezdőideje nem haladhatja meg a hangoskönyv időtartamát.",
   "NoteFolderPicker": "Megjegyzés: azok a mappák, amelyek már hozzá vannak rendelve, nem jelennek meg",
-  "NoteRSSFeedPodcastAppsHttps": "Figyelem: A legtöbb podcast alkalmazás megköveteli, hogy az RSS feed URL HTTPS-t használjon",
+  "NoteRSSFeedPodcastAppsHttps": "Figyelem: A legtöbb podcast alkalmazás megköveteli, hogy az RSS hírcsatorna URL-jában HTTPS-t használjon",
   "NoteRSSFeedPodcastAppsPubDate": "Figyelem: Az egy vagy több epizódnak nincs Közzétételi dátuma. Néhány podcast alkalmazás ezt megköveteli.",
   "NoteUploaderFoldersWithMediaFiles": "A médiafájlokat tartalmazó mappák külön könyvtári tételekként lesznek kezelve.",
   "NoteUploaderOnlyAudioFiles": "Ha csak hangfájlokat tölt fel, akkor minden egyes hangfájl külön hangoskönyvként lesz kezelve.",
@@ -939,6 +939,8 @@
   "ToastBookmarkCreateSuccess": "Könyvjelző hozzáadva",
   "ToastBookmarkRemoveSuccess": "Könyvjelző eltávolítva",
   "ToastBookmarkUpdateSuccess": "Könyvjelző frissítve",
+  "ToastCachePurgeFailed": "A gyorsítótár törlése sikertelen",
+  "ToastCachePurgeSuccess": "A gyorsítótár sikeresen törölve",
   "ToastChaptersHaveErrors": "A fejezetek hibákat tartalmaznak",
   "ToastChaptersMustHaveTitles": "A fejezeteknek címekkel kell rendelkezniük",
   "ToastChaptersRemoved": "Fejezetek eltávolítva",
@@ -946,16 +948,26 @@
   "ToastCollectionItemsRemoveSuccess": "Elem(ek) eltávolítva a gyűjteményből",
   "ToastCollectionRemoveSuccess": "Gyűjtemény eltávolítva",
   "ToastCollectionUpdateSuccess": "Gyűjtemény frissítve",
+  "ToastCoverUpdateFailed": "A borító frissítése nem sikerült",
+  "ToastDeleteFileFailed": "Nem sikerült törölni a fájlt",
+  "ToastDeleteFileSuccess": "Fájl törölve",
+  "ToastDeviceAddFailed": "Nem sikerült eszközt hozzáadni",
+  "ToastDeviceNameAlreadyExists": "Ilyen nevű olvasóeszköz már létezik",
   "ToastDeviceTestEmailFailed": "Teszt email küldése sikertelen",
   "ToastDeviceTestEmailSuccess": "Teszt email elküldve",
   "ToastEmailSettingsUpdateSuccess": "Email beállítások frissítve",
+  "ToastEncodeCancelSucces": "Kódolás törölve",
+  "ToastEpisodeDownloadQueueClearFailed": "Nem sikerült törölni a várólistát",
   "ToastEpisodeUpdateSuccess": "{0} epizód frissítve",
   "ToastFailedToLoadData": "Sikertelen adatbetöltés",
   "ToastFailedToMatch": "Nem sikerült egyezőséget találni",
   "ToastFailedToShare": "Nem sikerült megosztani",
   "ToastFailedToUpdate": "Nem sikerült frissíteni",
   "ToastInvalidImageUrl": "Érvénytelen a kép URL címe",
+  "ToastInvalidUrl": "Érvénytelen URL",
   "ToastItemCoverUpdateSuccess": "Elem borítója frissítve",
+  "ToastItemDeletedFailed": "Nem sikerült törölni az elemet",
+  "ToastItemDeletedSuccess": "Elem törölve",
   "ToastItemDetailsUpdateSuccess": "Elem részletei frissítve",
   "ToastItemMarkedAsFinishedFailed": "Megjelölés Befejezettként sikertelen",
   "ToastItemMarkedAsFinishedSuccess": "Elem megjelölve Befejezettként",
@@ -970,7 +982,21 @@
   "ToastLibraryScanStarted": "Könyvtár beolvasása elindítva",
   "ToastLibraryUpdateSuccess": "\"{0}\" könyvtár frissítve",
   "ToastMatchAllAuthorsFailed": "Nem sikerült az összes szerzőt azonosítani",
+  "ToastMetadataFilesRemovedError": "Hiba a metaadatok eltávolításakor.{0} fájl",
+  "ToastMetadataFilesRemovedNoneFound": "Nincsenek metaadatok.{0} fájl a könyvtárban",
+  "ToastMetadataFilesRemovedNoneRemoved": "Nincsenek metaadatok.{0} fájl eltávolítva",
+  "ToastMetadataFilesRemovedSuccess": "{0} metaadat.{1} fájl eltávolítva",
+  "ToastMustHaveAtLeastOnePath": "Legalább egy elérési útvonalnak kell lennie",
+  "ToastNameEmailRequired": "Név és e-mail cím megadása kötelező",
+  "ToastNameRequired": "A név megadása kötelező",
+  "ToastNewEpisodesFound": "{0} új epizód",
+  "ToastNewUserCreatedFailed": "Nem sikerült a fiókot létrehozni: „{0}”",
+  "ToastNewUserCreatedSuccess": "Új fiók létrehozva",
+  "ToastNewUserLibraryError": "Legalább egy könyvtárat ki kell választani",
+  "ToastNewUserPasswordError": "Kötelező a jelszó, csak a root felhasználónak lehet üres jelszava",
+  "ToastNewUserUsernameError": "Adjon meg egy felhasználónevet",
   "ToastNoNewEpisodesFound": "Nincs új epizód",
+  "ToastNoUpdatesNecessary": "Nincs szükség frissítésre",
   "ToastNotificationSettingsUpdateSuccess": "Értesítési beállítások frissítve",
   "ToastNotificationUpdateSuccess": "Értesítés frissítve",
   "ToastPlaylistCreateFailed": "Lejátszási lista létrehozása sikertelen",
@@ -979,8 +1005,10 @@
   "ToastPlaylistUpdateSuccess": "Lejátszási lista frissítve",
   "ToastPodcastCreateFailed": "Podcast létrehozása sikertelen",
   "ToastPodcastCreateSuccess": "A podcast sikeresen létrehozva",
+  "ToastPodcastNoEpisodesInFeed": "Nincsenek epizódok az RSS hírcsatornában",
+  "ToastPodcastNoRssFeed": "A podcastnak nincs RSS-hírcsatornája",
   "ToastRSSFeedCloseFailed": "Az RSS hírcsatorna bezárása sikertelen",
-  "ToastRSSFeedCloseSuccess": "RSS feed bezárva",
+  "ToastRSSFeedCloseSuccess": "RSS hírfolyam leállítva",
   "ToastRemoveItemFromCollectionFailed": "Tétel eltávolítása a gyűjteményből sikertelen",
   "ToastRemoveItemFromCollectionSuccess": "Tétel eltávolítva a gyűjteményből",
   "ToastSendEbookToDeviceFailed": "E-könyv küldése az eszközre sikertelen",

From 4318f64d602f91670a8f057e6e900c3b4d36964b Mon Sep 17 00:00:00 2001
From: Dmitry <dmitry@naboychenko.ru>
Date: Tue, 17 Dec 2024 16:57:10 +0000
Subject: [PATCH 066/143] Translated using Weblate (Russian)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/ru/
---
 client/strings/ru.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/strings/ru.json b/client/strings/ru.json
index 2ce5272f..3e07ea02 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Сохранить список треков",
   "ButtonScan": "Сканировать",
   "ButtonScanLibrary": "Сканировать библиотеку",
+  "ButtonScrollLeft": "Перемотать влево",
+  "ButtonScrollRight": "Перемотать вправо",
   "ButtonSearch": "Поиск",
   "ButtonSelectFolderPath": "Выберите путь папки",
   "ButtonSeries": "Серии",
@@ -594,6 +596,8 @@
   "LabelSize": "Размер",
   "LabelSleepTimer": "Таймер сна",
   "LabelSlug": "Слизень",
+  "LabelSortAscending": "По возрастанию",
+  "LabelSortDescending": "По убыванию",
   "LabelStart": "Начало",
   "LabelStartTime": "Время начала",
   "LabelStarted": "Начат",

From a94a7b7940fe5358ede1d49fb012ef24437a018d Mon Sep 17 00:00:00 2001
From: Plazec <plazec82@gmail.com>
Date: Tue, 17 Dec 2024 21:04:45 +0000
Subject: [PATCH 067/143] Translated using Weblate (Czech)

Currently translated at 86.8% (938 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index ce670018..b1bbe16a 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -419,6 +419,7 @@
   "LabelMatchExistingUsersBy": "Přiřadit stávající uživatele podle",
   "LabelMatchExistingUsersByDescription": "Slouží k propojení stávajících uživatelů. Po propojení budou uživatelé přiřazeni k jedinečnému ID od poskytovatele SSO.",
   "LabelMaxEpisodesToDownload": "Maximální # epizod pro stažení. Použijte 0 pro bez omezení.",
+  "LabelMaxEpisodesToKeep": "Maximální počet epizod k zachování",
   "LabelMaxEpisodesToKeepHelp": "Hodnotou 0 není nastaven žádný maximální limit. Po automatickém stažení nové epizody se odstraní nejstarší epizoda, pokud máte více než X epizod. Při každém novém stažení se odstraní pouze 1 epizoda.",
   "LabelMediaPlayer": "Přehrávač médií",
   "LabelMediaType": "Typ média",
@@ -527,12 +528,14 @@
   "LabelSearchTitle": "Vyhledat název",
   "LabelSearchTitleOrASIN": "Vyhledat název nebo ASIN",
   "LabelSeason": "Sezóna",
+  "LabelSeasonNumber": "Sezóna č.{0}",
   "LabelSelectAll": "Vybrat vše",
   "LabelSelectAllEpisodes": "Vybrat všechny epizody",
   "LabelSelectEpisodesShowing": "Vyberte {0} epizody, které se zobrazují",
   "LabelSelectUsers": "Vybrat uživatele",
   "LabelSendEbookToDevice": "Odeslat e-knihu do...",
   "LabelSequence": "Sekvence",
+  "LabelSerial": "Sériové",
   "LabelSeries": "Série",
   "LabelSeriesName": "Název série",
   "LabelSeriesProgress": "Průběh série",
@@ -590,6 +593,7 @@
   "LabelShowSubtitles": "Zobrazit titulky",
   "LabelSize": "Velikost",
   "LabelSleepTimer": "Časovač vypnutí",
+  "LabelSlug": "URL název",
   "LabelSortAscending": "Vzestupně",
   "LabelSortDescending": "Sestupně",
   "LabelStart": "Spustit",

From 5302f3225b98a179bd5f25c51b87923cfcfda197 Mon Sep 17 00:00:00 2001
From: kuci-JK <jankucera254@gmail.com>
Date: Tue, 17 Dec 2024 21:01:41 +0000
Subject: [PATCH 068/143] Translated using Weblate (Czech)

Currently translated at 86.8% (938 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index b1bbe16a..d079d7a5 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -406,6 +406,7 @@
   "LabelLess": "Méně",
   "LabelLibrariesAccessibleToUser": "Knihovny přístupné uživateli",
   "LabelLibrary": "Knihovna",
+  "LabelLibraryFilterSublistEmpty": "Žádné {0}",
   "LabelLibraryItem": "Položka knihovny",
   "LabelLibraryName": "Název knihovny",
   "LabelLimit": "Omezit",

From 71b943f4341364b010709a45370fed4e0737dc52 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 18 Dec 2024 17:44:46 -0600
Subject: [PATCH 069/143] Update mobile toolbar nav to show queue for podcast
 libraries #3719

---
 client/components/app/BookShelfToolbar.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/components/app/BookShelfToolbar.vue b/client/components/app/BookShelfToolbar.vue
index 6b5a3cd3..74157b18 100644
--- a/client/components/app/BookShelfToolbar.vue
+++ b/client/components/app/BookShelfToolbar.vue
@@ -42,6 +42,9 @@
       <nuxt-link v-if="isPodcastLibrary && userIsAdminOrUp" :to="`/library/${currentLibraryId}/podcast/search`" class="flex-grow h-full flex justify-center items-center" :class="isPodcastSearchPage ? 'bg-primary bg-opacity-80' : 'bg-primary bg-opacity-40'">
         <p class="text-sm">{{ $strings.ButtonAdd }}</p>
       </nuxt-link>
+      <nuxt-link v-if="isPodcastLibrary && userIsAdminOrUp" :to="`/library/${currentLibraryId}/podcast/download-queue`" class="flex-grow h-full flex justify-center items-center" :class="isPodcastDownloadQueuePage ? 'bg-primary bg-opacity-80' : 'bg-primary bg-opacity-40'">
+        <p class="text-sm">{{ $strings.ButtonDownloadQueue }}</p>
+      </nuxt-link>
     </div>
     <div id="toolbar" role="toolbar" aria-label="Library Toolbar" class="absolute top-10 md:top-0 left-0 w-full h-10 md:h-full z-40 flex items-center justify-end md:justify-start px-2 md:px-8">
       <!-- Series books page -->
@@ -265,6 +268,9 @@ export default {
     isPodcastLatestPage() {
       return this.$route.name === 'library-library-podcast-latest'
     },
+    isPodcastDownloadQueuePage() {
+      return this.$route.name === 'library-library-podcast-download-queue'
+    },
     isAuthorsPage() {
       return this.page === 'authors'
     },

From aea2951b8937fa77546ef4d774abc9b9c680a029 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 19 Dec 2024 18:04:56 -0600
Subject: [PATCH 070/143] Accessibility updates to config page settings

---
 client/components/ui/ToggleSwitch.vue |  3 +-
 client/pages/config/index.vue         | 18 +++++-----
 plugins/Test/index.js                 | 18 ++++++++++
 plugins/Test/manifest.json            | 52 +++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 plugins/Test/index.js
 create mode 100644 plugins/Test/manifest.json

diff --git a/client/components/ui/ToggleSwitch.vue b/client/components/ui/ToggleSwitch.vue
index aabaa00f..2e7c045c 100644
--- a/client/components/ui/ToggleSwitch.vue
+++ b/client/components/ui/ToggleSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <button :aria-labelledby="labeledBy" role="checkbox" type="button" class="border rounded-full border-black-100 flex items-center cursor-pointer justify-start" :style="{ width: buttonWidth + 'px' }" :aria-checked="toggleValue" :class="className" @click="clickToggle">
+    <button :aria-labelledby="labeledBy" :aria-label="label" role="checkbox" type="button" class="border rounded-full border-black-100 flex items-center cursor-pointer justify-start" :style="{ width: buttonWidth + 'px' }" :aria-checked="toggleValue" :class="className" @click="clickToggle">
       <span class="rounded-full border border-black-50 shadow transform transition-transform duration-100" :style="{ width: cursorHeightWidth + 'px', height: cursorHeightWidth + 'px' }" :class="switchClassName"></span>
     </button>
   </div>
@@ -20,6 +20,7 @@ export default {
     },
     disabled: Boolean,
     labeledBy: String,
+    label: String,
     size: {
       type: String,
       default: 'md'
diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index bbb75b93..1f4ee336 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -6,9 +6,9 @@
           <div class="pt-4">
             <h2 class="font-semibold">{{ $strings.HeaderSettingsGeneral }}</h2>
           </div>
-          <div class="flex items-end py-2">
-            <ui-toggle-switch labeledBy="settings-store-cover-with-items" v-model="newServerSettings.storeCoverWithItem" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('storeCoverWithItem', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsStoreCoversWithItemHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsStoreCoversWithItemHelp" class="flex items-end py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsStoreCoversWithItem" v-model="newServerSettings.storeCoverWithItem" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('storeCoverWithItem', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsStoreCoversWithItemHelp">
               <p class="pl-4">
                 <span id="settings-store-cover-with-items">{{ $strings.LabelSettingsStoreCoversWithItem }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -16,9 +16,9 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-store-metadata-with-items" v-model="newServerSettings.storeMetadataWithItem" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('storeMetadataWithItem', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsStoreMetadataWithItemHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsStoreMetadataWithItemHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsStoreMetadataWithItem" v-model="newServerSettings.storeMetadataWithItem" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('storeMetadataWithItem', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsStoreMetadataWithItemHelp">
               <p class="pl-4">
                 <span id="settings-store-metadata-with-items">{{ $strings.LabelSettingsStoreMetadataWithItem }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -26,9 +26,9 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-sorting-ignore-prefixes" v-model="newServerSettings.sortingIgnorePrefix" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('sortingIgnorePrefix', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsSortingIgnorePrefixesHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsSortingIgnorePrefixesHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsSortingIgnorePrefixes" v-model="newServerSettings.sortingIgnorePrefix" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('sortingIgnorePrefix', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsSortingIgnorePrefixesHelp">
               <p class="pl-4">
                 <span id="settings-sorting-ignore-prefixes">{{ $strings.LabelSettingsSortingIgnorePrefixes }}</span>
                 <span class="material-symbols icon-text">info</span>
diff --git a/plugins/Test/index.js b/plugins/Test/index.js
new file mode 100644
index 00000000..b71a2308
--- /dev/null
+++ b/plugins/Test/index.js
@@ -0,0 +1,18 @@
+const PluginAbstract = require('../../server/PluginAbstract')
+
+class TestPlugin extends PluginAbstract {
+  constructor() {
+    super()
+
+    this.name = 'Test'
+  }
+
+  init(context) {
+    context.Logger.info('[TestPlugin] Test plugin loaded successfully')
+  }
+
+  async onAction(context, actionName, target, data) {
+    context.Logger.info('[TestPlugin] Test plugin onAction', actionName, target, data)
+  }
+}
+module.exports = new TestPlugin()
diff --git a/plugins/Test/manifest.json b/plugins/Test/manifest.json
new file mode 100644
index 00000000..eb24021e
--- /dev/null
+++ b/plugins/Test/manifest.json
@@ -0,0 +1,52 @@
+{
+  "name": "Test Plugin",
+  "slug": "test",
+  "version": "1.0.0",
+  "description": "This is a test plugin",
+  "extensions": [
+    {
+      "target": "item.detail.actions",
+      "name": "test",
+      "label": "Test Action",
+      "labelKey": "TestAction"
+    }
+  ],
+  "config": {
+    "title": "Test Plugin Configuration",
+    "titleKey": "TestPluginConfiguration",
+    "description": "This is a test plugin",
+    "descriptionKey": "TestPluginConfigurationDescription",
+    "formFields": [
+      {
+        "name": "apiKey",
+        "label": "API Key",
+        "labelKey": "LabelApiKey",
+        "type": "text",
+        "required": false
+      },
+      {
+        "name": "requestAddress",
+        "label": "Request Address",
+        "labelKey": "LabelRequestAddress",
+        "type": "text",
+        "required": true
+      },
+      {
+        "name": "enable",
+        "label": "Enable",
+        "labelKey": "LabelEnable",
+        "type": "checkbox"
+      }
+    ]
+  },
+  "localization": {
+    "en-us": {
+      "TestAction": "Test Action",
+      "LabelApiKey": "API Key",
+      "LabelEnable": "Enable",
+      "TestPluginConfiguration": "Test Plugin Configuration",
+      "TestPluginConfigurationDescription": "This is a test plugin",
+      "LabelRequestAddress": "Request Address"
+    }
+  }
+}

From 600c1e4668192bb6eb456844b553e4a64ec6e35b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 19 Dec 2024 18:06:42 -0600
Subject: [PATCH 071/143] Delete plugins directory

---
 plugins/Test/index.js      | 18 -------------
 plugins/Test/manifest.json | 52 --------------------------------------
 2 files changed, 70 deletions(-)
 delete mode 100644 plugins/Test/index.js
 delete mode 100644 plugins/Test/manifest.json

diff --git a/plugins/Test/index.js b/plugins/Test/index.js
deleted file mode 100644
index b71a2308..00000000
--- a/plugins/Test/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const PluginAbstract = require('../../server/PluginAbstract')
-
-class TestPlugin extends PluginAbstract {
-  constructor() {
-    super()
-
-    this.name = 'Test'
-  }
-
-  init(context) {
-    context.Logger.info('[TestPlugin] Test plugin loaded successfully')
-  }
-
-  async onAction(context, actionName, target, data) {
-    context.Logger.info('[TestPlugin] Test plugin onAction', actionName, target, data)
-  }
-}
-module.exports = new TestPlugin()
diff --git a/plugins/Test/manifest.json b/plugins/Test/manifest.json
deleted file mode 100644
index eb24021e..00000000
--- a/plugins/Test/manifest.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "name": "Test Plugin",
-  "slug": "test",
-  "version": "1.0.0",
-  "description": "This is a test plugin",
-  "extensions": [
-    {
-      "target": "item.detail.actions",
-      "name": "test",
-      "label": "Test Action",
-      "labelKey": "TestAction"
-    }
-  ],
-  "config": {
-    "title": "Test Plugin Configuration",
-    "titleKey": "TestPluginConfiguration",
-    "description": "This is a test plugin",
-    "descriptionKey": "TestPluginConfigurationDescription",
-    "formFields": [
-      {
-        "name": "apiKey",
-        "label": "API Key",
-        "labelKey": "LabelApiKey",
-        "type": "text",
-        "required": false
-      },
-      {
-        "name": "requestAddress",
-        "label": "Request Address",
-        "labelKey": "LabelRequestAddress",
-        "type": "text",
-        "required": true
-      },
-      {
-        "name": "enable",
-        "label": "Enable",
-        "labelKey": "LabelEnable",
-        "type": "checkbox"
-      }
-    ]
-  },
-  "localization": {
-    "en-us": {
-      "TestAction": "Test Action",
-      "LabelApiKey": "API Key",
-      "LabelEnable": "Enable",
-      "TestPluginConfiguration": "Test Plugin Configuration",
-      "TestPluginConfigurationDescription": "This is a test plugin",
-      "LabelRequestAddress": "Request Address"
-    }
-  }
-}

From e21cbc9ff4d8cf01394c59a51cb3363ea4c8efef Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 19 Dec 2024 18:07:24 -0600
Subject: [PATCH 072/143] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1eda8e1f..d375bae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /podcasts/
 /media/
 /metadata/
+/plugins/
 /client/.nuxt/
 /client/dist/
 /dist/

From 0099ae633af74b9dec00eb45fedf21cd4a96dad3 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 20 Dec 2024 17:27:31 -0600
Subject: [PATCH 073/143] Config page localization updates

---
 client/pages/config/index.vue | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/pages/config/index.vue b/client/pages/config/index.vue
index 1f4ee336..5636113e 100644
--- a/client/pages/config/index.vue
+++ b/client/pages/config/index.vue
@@ -46,9 +46,9 @@
             <h2 class="font-semibold">{{ $strings.HeaderSettingsScanner }}</h2>
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-parse-subtitles" v-model="newServerSettings.scannerParseSubtitle" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerParseSubtitle', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsParseSubtitlesHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsParseSubtitlesHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsParseSubtitles" v-model="newServerSettings.scannerParseSubtitle" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerParseSubtitle', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsParseSubtitlesHelp">
               <p class="pl-4">
                 <span id="settings-parse-subtitles">{{ $strings.LabelSettingsParseSubtitles }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -56,9 +56,9 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-find-covers" v-model="newServerSettings.scannerFindCovers" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerFindCovers', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsFindCoversHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsFindCoversHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsFindCovers" v-model="newServerSettings.scannerFindCovers" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerFindCovers', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsFindCoversHelp">
               <p class="pl-4">
                 <span id="settings-find-covers">{{ $strings.LabelSettingsFindCovers }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -70,9 +70,9 @@
             <ui-dropdown v-model="newServerSettings.scannerCoverProvider" small :items="providers" label="Cover Provider" @input="updateScannerCoverProvider" :disabled="updatingServerSettings" />
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-prefer-matched-metadata" v-model="newServerSettings.scannerPreferMatchedMetadata" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerPreferMatchedMetadata', val)" />
-            <ui-tooltip :text="$strings.LabelSettingsPreferMatchedMetadataHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsPreferMatchedMetadataHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsPreferMatchedMetadata" v-model="newServerSettings.scannerPreferMatchedMetadata" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerPreferMatchedMetadata', val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsPreferMatchedMetadataHelp">
               <p class="pl-4">
                 <span id="settings-prefer-matched-metadata">{{ $strings.LabelSettingsPreferMatchedMetadata }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -80,9 +80,9 @@
             </ui-tooltip>
           </div>
 
-          <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-disable-watcher" v-model="scannerEnableWatcher" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerDisableWatcher', !val)" />
-            <ui-tooltip :text="$strings.LabelSettingsEnableWatcherHelp">
+          <div role="article" :aria-label="$strings.LabelSettingsEnableWatcherHelp" class="flex items-center py-2">
+            <ui-toggle-switch :label="$strings.LabelSettingsEnableWatcher" v-model="scannerEnableWatcher" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('scannerDisableWatcher', !val)" />
+            <ui-tooltip aria-hidden="true" :text="$strings.LabelSettingsEnableWatcherHelp">
               <p class="pl-4">
                 <span id="settings-disable-watcher">{{ $strings.LabelSettingsEnableWatcher }}</span>
                 <span class="material-symbols icon-text">info</span>
@@ -95,13 +95,13 @@
           </div>
 
           <div class="flex items-center py-2">
-            <ui-toggle-switch labeledBy="settings-chromecast-support" v-model="newServerSettings.chromecastEnabled" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('chromecastEnabled', val)" />
-            <p class="pl-4" id="settings-chromecast-support">{{ $strings.LabelSettingsChromecastSupport }}</p>
+            <ui-toggle-switch v-model="newServerSettings.chromecastEnabled" :label="$strings.LabelSettingsChromecastSupport" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('chromecastEnabled', val)" />
+            <p aria-hidden="true" class="pl-4">{{ $strings.LabelSettingsChromecastSupport }}</p>
           </div>
 
           <div class="flex items-center py-2 mb-2">
-            <ui-toggle-switch labeledBy="settings-allow-iframe" v-model="newServerSettings.allowIframe" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('allowIframe', val)" />
-            <p class="pl-4" id="settings-allow-iframe">{{ $strings.LabelSettingsAllowIframe }}</p>
+            <ui-toggle-switch v-model="newServerSettings.allowIframe" :label="$strings.LabelSettingsAllowIframe" :disabled="updatingServerSettings" @input="(val) => updateSettingsKey('allowIframe', val)" />
+            <p aria-hidden="true" class="pl-4">{{ $strings.LabelSettingsAllowIframe }}</p>
           </div>
         </div>
 

From 921880445a197846d358840d26e4307eaa33b00d Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sat, 21 Dec 2024 17:42:32 +0200
Subject: [PATCH 074/143] Introduce static skeleton cards

---
 client/components/app/LazyBookshelf.vue  | 13 +++++++++++++
 client/components/cards/AuthorCard.vue   |  3 +++
 client/components/cards/LazyBookCard.vue |  2 +-
 client/mixins/bookshelfCardsHelpers.js   |  5 +++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index 6e3083e0..fb888cad 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -2,6 +2,10 @@
   <div id="bookshelf" ref="bookshelf" class="w-full overflow-y-auto" :style="{ fontSize: sizeMultiplier + 'rem' }">
     <template v-for="shelf in totalShelves">
       <div :key="shelf" :id="`shelf-${shelf - 1}`" class="w-full px-4e sm:px-8e relative" :class="{ bookshelfRow: !isAlternativeBookshelfView }" :style="{ height: shelfHeight + 'px' }">
+        <!-- Card skeletons -->
+        <template v-for="entityIndex in entitiesInShelf(shelf)">
+          <div :key="entityIndex" class="w-full h-full absolute rounded z-5 top-0 left-0 bg-primary" :style="{ transform: entityTransform(entityIndex), width: cardWidth + 'px', height: coverHeight + 'px' }" />
+        </template>
         <div v-if="!isAlternativeBookshelfView" class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20 h-6e" />
       </div>
     </template>
@@ -65,6 +69,7 @@ export default {
       tempIsScanning: false,
       cardWidth: 0,
       cardHeight: 0,
+      coverHeight: 0,
       resizeObserver: null,
       lastScrollTop: 0,
       lastTimestamp: 0,
@@ -833,6 +838,14 @@ export default {
         .finally(() => {
           this.tempIsScanning = false
         })
+    },
+    entitiesInShelf(shelf) {
+      return shelf == this.totalShelves ? this.totalEntities % this.entitiesPerShelf : this.entitiesPerShelf
+    },
+    entityTransform(entityIndex) {
+      const shelfOffsetY = this.shelfPaddingHeight * this.sizeMultiplier
+      const shelfOffsetX = (entityIndex - 1) * this.totalEntityCardWidth + this.bookshelfMarginLeft
+      return `translate3d(${shelfOffsetX}px, ${shelfOffsetY}px, 0px)`
     }
   },
   async mounted() {
diff --git a/client/components/cards/AuthorCard.vue b/client/components/cards/AuthorCard.vue
index 597aca99..27e67725 100644
--- a/client/components/cards/AuthorCard.vue
+++ b/client/components/cards/AuthorCard.vue
@@ -68,6 +68,9 @@ export default {
     cardHeight() {
       return this.height * this.sizeMultiplier
     },
+    coverHeight() {
+      return this.cardHeight
+    },
     userToken() {
       return this.store.getters['user/getToken']
     },
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 09424b3c..12a96dcb 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -19,7 +19,7 @@
         </div>
 
         <!-- Cover Image -->
-        <img cy-id="coverImage" v-show="libraryItem" ref="cover" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
+        <img cy-id="coverImage" v-if="libraryItem" ref="cover" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
 
         <!-- Placeholder Cover Title & Author -->
         <div cy-id="placeholderTitle" v-if="!hasCover" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full flex items-center justify-center" :style="{ padding: placeholderCoverPadding + 'em' }">
diff --git a/client/mixins/bookshelfCardsHelpers.js b/client/mixins/bookshelfCardsHelpers.js
index 802b2cc8..01a6869b 100644
--- a/client/mixins/bookshelfCardsHelpers.js
+++ b/client/mixins/bookshelfCardsHelpers.js
@@ -57,9 +57,10 @@ export default {
         for (let entry of entries) {
           this.cardWidth = entry.borderBoxSize[0].inlineSize
           this.cardHeight = entry.borderBoxSize[0].blockSize
-          this.resizeObserver.disconnect()
-          this.$refs.bookshelf.removeChild(instance.$el)
         }
+        this.coverHeight = instance.coverHeight
+        this.resizeObserver.disconnect()
+        this.$refs.bookshelf.removeChild(instance.$el)
       })
       instance.$el.style.visibility = 'hidden'
       instance.$el.style.position = 'absolute'

From 004210ee02ec9e518450e824101aa8c782797d7b Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sat, 21 Dec 2024 17:48:22 +0200
Subject: [PATCH 075/143] reuse entityTransform in mountEntityCard

---
 client/mixins/bookshelfCardsHelpers.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/mixins/bookshelfCardsHelpers.js b/client/mixins/bookshelfCardsHelpers.js
index 01a6869b..d3e18128 100644
--- a/client/mixins/bookshelfCardsHelpers.js
+++ b/client/mixins/bookshelfCardsHelpers.js
@@ -132,10 +132,7 @@ export default {
       this.entityComponentRefs[index] = instance
 
       instance.$mount()
-      const shelfOffsetY = this.shelfPaddingHeight * this.sizeMultiplier
-      const row = index % this.entitiesPerShelf
-      const shelfOffsetX = row * this.totalEntityCardWidth + this.bookshelfMarginLeft
-      instance.$el.style.transform = `translate3d(${shelfOffsetX}px, ${shelfOffsetY}px, 0px)`
+      instance.$el.style.transform = this.entityTransform((index % this.entitiesPerShelf) + 1)
       instance.$el.classList.add('absolute', 'top-0', 'left-0')
       shelfEl.appendChild(instance.$el)
 

From 7eb315a371ae7ae305ad061c69c4a773bbc747b6 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 21 Dec 2024 17:22:48 -0600
Subject: [PATCH 076/143] Fix watcher skip dot files #3230

---
 server/Watcher.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/Watcher.js b/server/Watcher.js
index 85c13e2a..b2cbc0e8 100644
--- a/server/Watcher.js
+++ b/server/Watcher.js
@@ -190,7 +190,9 @@ class FolderWatcher extends EventEmitter {
       return
     }
     Logger.debug('[Watcher] File Added', path)
-    this.addFileUpdate(libraryId, path, 'added')
+    if (!this.addFileUpdate(libraryId, path, 'added')) {
+      return
+    }
 
     if (!this.filesBeingAdded.has(path)) {
       this.filesBeingAdded.add(path)
@@ -261,22 +263,23 @@ class FolderWatcher extends EventEmitter {
    * @param {string} libraryId
    * @param {string} path
    * @param {string} type
+   * @returns {boolean} - If file was added to pending updates
    */
   addFileUpdate(libraryId, path, type) {
-    if (this.pendingFilePaths.includes(path)) return
+    if (this.pendingFilePaths.includes(path)) return false
 
     // Get file library
     const libwatcher = this.libraryWatchers.find((lw) => lw.id === libraryId)
     if (!libwatcher) {
       Logger.error(`[Watcher] Invalid library id from watcher ${libraryId}`)
-      return
+      return false
     }
 
     // Get file folder
     const folder = libwatcher.libraryFolders.find((fold) => isSameOrSubPath(fold.path, path))
     if (!folder) {
       Logger.error(`[Watcher] New file folder not found in library "${libwatcher.name}" with path "${path}"`)
-      return
+      return false
     }
 
     const folderPath = filePathToPOSIX(folder.path)
@@ -285,14 +288,14 @@ class FolderWatcher extends EventEmitter {
 
     if (Path.extname(relPath).toLowerCase() === '.part') {
       Logger.debug(`[Watcher] Ignoring .part file "${relPath}"`)
-      return
+      return false
     }
 
     // Ignore files/folders starting with "."
     const hasDotPath = relPath.split('/').find((p) => p.startsWith('.'))
     if (hasDotPath) {
       Logger.debug(`[Watcher] Ignoring dot path "${relPath}" | Piece "${hasDotPath}"`)
-      return
+      return false
     }
 
     Logger.debug(`[Watcher] Modified file in library "${libwatcher.name}" and folder "${folder.id}" with relPath "${relPath}"`)
@@ -318,6 +321,7 @@ class FolderWatcher extends EventEmitter {
     })
 
     this.handlePendingFileUpdatesTimeout()
+    return true
   }
 
   /**

From 5fa263023f8f6122e01d58b4d0b3e5c81ccb94bf Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 22 Dec 2024 10:58:22 -0600
Subject: [PATCH 077/143] Fix:Quick match not removing empty series/authors
 #3743

---
 .../modals/BatchQuickMatchModel.vue           |  7 +-
 server/controllers/LibraryController.js       |  2 +-
 server/controllers/LibraryItemController.js   | 35 ++++++--
 server/managers/RssFeedManager.js             |  1 -
 server/scanner/Scanner.js                     | 84 ++++++++++++++-----
 5 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/client/components/modals/BatchQuickMatchModel.vue b/client/components/modals/BatchQuickMatchModel.vue
index ce227c28..bf596199 100644
--- a/client/components/modals/BatchQuickMatchModel.vue
+++ b/client/components/modals/BatchQuickMatchModel.vue
@@ -54,8 +54,7 @@ export default {
       options: {
         provider: undefined,
         overrideDetails: true,
-        overrideCover: true,
-        overrideDefaults: true
+        overrideCover: true
       }
     }
   },
@@ -99,8 +98,8 @@ export default {
     init() {
       // If we don't have a set provider (first open of dialog) or we've switched library, set
       // the selected provider to the current library default provider
-      if (!this.options.provider || this.options.lastUsedLibrary != this.currentLibraryId) {
-        this.options.lastUsedLibrary = this.currentLibraryId
+      if (!this.options.provider || this.lastUsedLibrary != this.currentLibraryId) {
+        this.lastUsedLibrary = this.currentLibraryId
         this.options.provider = this.libraryProvider
       }
     },
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 6e7fbea3..f42a023d 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -1217,7 +1217,7 @@ class LibraryController {
       Logger.error(`[LibraryController] Non-root user "${req.user.username}" attempted to match library items`)
       return res.sendStatus(403)
     }
-    Scanner.matchLibraryItems(req.library)
+    Scanner.matchLibraryItems(this, req.library)
     res.sendStatus(200)
   }
 
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index f2a4383e..17c7be83 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -456,10 +456,24 @@ class LibraryItemController {
    * @param {Response} res
    */
   async match(req, res) {
-    var libraryItem = req.libraryItem
+    const libraryItem = req.libraryItem
+    const reqBody = req.body || {}
 
-    var options = req.body || {}
-    var matchResult = await Scanner.quickMatchLibraryItem(libraryItem, options)
+    const options = {}
+    const matchOptions = ['provider', 'title', 'author', 'isbn', 'asin']
+    for (const key of matchOptions) {
+      if (reqBody[key] && typeof reqBody[key] === 'string') {
+        options[key] = reqBody[key]
+      }
+    }
+    if (reqBody.overrideCover !== undefined) {
+      options.overrideCover = !!reqBody.overrideCover
+    }
+    if (reqBody.overrideDetails !== undefined) {
+      options.overrideDetails = !!reqBody.overrideDetails
+    }
+
+    var matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
     res.json(matchResult)
   }
 
@@ -642,7 +656,6 @@ class LibraryItemController {
     let itemsUpdated = 0
     let itemsUnmatched = 0
 
-    const options = req.body.options || {}
     if (!req.body.libraryItemIds?.length) {
       return res.sendStatus(400)
     }
@@ -656,8 +669,20 @@ class LibraryItemController {
 
     res.sendStatus(200)
 
+    const reqBodyOptions = req.body.options || {}
+    const options = {}
+    if (reqBodyOptions.provider && typeof reqBodyOptions.provider === 'string') {
+      options.provider = reqBodyOptions.provider
+    }
+    if (reqBodyOptions.overrideCover !== undefined) {
+      options.overrideCover = !!reqBodyOptions.overrideCover
+    }
+    if (reqBodyOptions.overrideDetails !== undefined) {
+      options.overrideDetails = !!reqBodyOptions.overrideDetails
+    }
+
     for (const libraryItem of libraryItems) {
-      const matchResult = await Scanner.quickMatchLibraryItem(libraryItem, options)
+      const matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
       if (matchResult.updated) {
         itemsUpdated++
       } else if (matchResult.warning) {
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 03d3c167..cedf0dfb 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -342,7 +342,6 @@ class RssFeedManager {
       }
     })
     if (!feed) {
-      Logger.warn(`[RssFeedManager] closeFeedForEntityId: Feed not found for entity id ${entityId}`)
       return false
     }
     return this.handleCloseFeed(feed)
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index cfdeb140..942c4d02 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -13,36 +13,58 @@ const LibraryScanner = require('./LibraryScanner')
 const CoverManager = require('../managers/CoverManager')
 const TaskManager = require('../managers/TaskManager')
 
+/**
+ * @typedef QuickMatchOptions
+ * @property {string} [provider]
+ * @property {string} [title]
+ * @property {string} [author]
+ * @property {string} [isbn] - This override is currently unused in Abs clients
+ * @property {string} [asin] - This override is currently unused in Abs clients
+ * @property {boolean} [overrideCover]
+ * @property {boolean} [overrideDetails]
+ */
+
 class Scanner {
   constructor() {}
 
-  async quickMatchLibraryItem(libraryItem, options = {}) {
-    var provider = options.provider || 'google'
-    var searchTitle = options.title || libraryItem.media.metadata.title
-    var searchAuthor = options.author || libraryItem.media.metadata.authorName
-    var overrideDefaults = options.overrideDefaults || false
+  /**
+   *
+   * @param {import('../routers/ApiRouter')} apiRouterCtx
+   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {QuickMatchOptions} options
+   * @returns {Promise<{updated: boolean, libraryItem: import('../objects/LibraryItem')}>}
+   */
+  async quickMatchLibraryItem(apiRouterCtx, libraryItem, options = {}) {
+    const provider = options.provider || 'google'
+    const searchTitle = options.title || libraryItem.media.metadata.title
+    const searchAuthor = options.author || libraryItem.media.metadata.authorName
 
-    // Set to override existing metadata if scannerPreferMatchedMetadata setting is true and
-    // the overrideDefaults option is not set or set to false.
-    if (overrideDefaults == false && Database.serverSettings.scannerPreferMatchedMetadata) {
+    // If overrideCover and overrideDetails is not sent in options than use the server setting to determine if we should override
+    if (options.overrideCover === undefined && options.overrideDetails === undefined && Database.serverSettings.scannerPreferMatchedMetadata) {
       options.overrideCover = true
       options.overrideDetails = true
     }
 
-    var updatePayload = {}
-    var hasUpdated = false
+    let updatePayload = {}
+    let hasUpdated = false
+
+    let existingAuthors = [] // Used for checking if authors or series are now empty
+    let existingSeries = []
 
     if (libraryItem.isBook) {
-      var searchISBN = options.isbn || libraryItem.media.metadata.isbn
-      var searchASIN = options.asin || libraryItem.media.metadata.asin
+      existingAuthors = libraryItem.media.metadata.authors.map((a) => a.id)
+      existingSeries = libraryItem.media.metadata.series.map((s) => s.id)
 
-      var results = await BookFinder.search(libraryItem, provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
+      const searchISBN = options.isbn || libraryItem.media.metadata.isbn
+      const searchASIN = options.asin || libraryItem.media.metadata.asin
+
+      const results = await BookFinder.search(libraryItem, provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
       if (!results.length) {
         return {
           warning: `No ${provider} match found`
         }
       }
-      var matchData = results[0]
+      const matchData = results[0]
 
       // Update cover if not set OR overrideCover flag
       if (matchData.cover && (!libraryItem.media.coverPath || options.overrideCover)) {
@@ -58,13 +80,13 @@ class Scanner {
       updatePayload = await this.quickMatchBookBuildUpdatePayload(libraryItem, matchData, options)
     } else if (libraryItem.isPodcast) {
       // Podcast quick match
-      var results = await PodcastFinder.search(searchTitle)
+      const results = await PodcastFinder.search(searchTitle)
       if (!results.length) {
         return {
           warning: `No ${provider} match found`
         }
       }
-      var matchData = results[0]
+      const matchData = results[0]
 
       // Update cover if not set OR overrideCover flag
       if (matchData.cover && (!libraryItem.media.coverPath || options.overrideCover)) {
@@ -95,6 +117,19 @@ class Scanner {
 
       await Database.updateLibraryItem(libraryItem)
       SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+
+      // Check if any authors or series are now empty and should be removed
+      if (libraryItem.isBook) {
+        const authorsRemoved = existingAuthors.filter((aid) => !libraryItem.media.metadata.authors.find((au) => au.id === aid))
+        const seriesRemoved = existingSeries.filter((sid) => !libraryItem.media.metadata.series.find((se) => se.id === sid))
+
+        if (authorsRemoved.length) {
+          await apiRouterCtx.checkRemoveAuthorsWithNoBooks(authorsRemoved)
+        }
+        if (seriesRemoved.length) {
+          await apiRouterCtx.checkRemoveEmptySeries(seriesRemoved)
+        }
+      }
     }
 
     return {
@@ -149,6 +184,13 @@ class Scanner {
     return updatePayload
   }
 
+  /**
+   *
+   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {*} matchData
+   * @param {QuickMatchOptions} options
+   * @returns
+   */
   async quickMatchBookBuildUpdatePayload(libraryItem, matchData, options) {
     // Update media metadata if not set OR overrideDetails flag
     const detailKeysToUpdate = ['title', 'subtitle', 'description', 'narrator', 'publisher', 'publishedYear', 'genres', 'tags', 'language', 'explicit', 'abridged', 'asin', 'isbn']
@@ -307,12 +349,13 @@ class Scanner {
   /**
    * Quick match library items
    *
+   * @param {import('../routers/ApiRouter')} apiRouterCtx
    * @param {import('../models/Library')} library
    * @param {import('../objects/LibraryItem')[]} libraryItems
    * @param {LibraryScan} libraryScan
    * @returns {Promise<boolean>} false if scan canceled
    */
-  async matchLibraryItemsChunk(library, libraryItems, libraryScan) {
+  async matchLibraryItemsChunk(apiRouterCtx, library, libraryItems, libraryScan) {
     for (let i = 0; i < libraryItems.length; i++) {
       const libraryItem = libraryItems[i]
 
@@ -327,7 +370,7 @@ class Scanner {
       }
 
       Logger.debug(`[Scanner] matchLibraryItems: Quick matching "${libraryItem.media.metadata.title}" (${i + 1} of ${libraryItems.length})`)
-      const result = await this.quickMatchLibraryItem(libraryItem, { provider: library.provider })
+      const result = await this.quickMatchLibraryItem(apiRouterCtx, libraryItem, { provider: library.provider })
       if (result.warning) {
         Logger.warn(`[Scanner] matchLibraryItems: Match warning ${result.warning} for library item "${libraryItem.media.metadata.title}"`)
       } else if (result.updated) {
@@ -346,9 +389,10 @@ class Scanner {
   /**
    * Quick match all library items for library
    *
+   * @param {import('../routers/ApiRouter')} apiRouterCtx
    * @param {import('../models/Library')} library
    */
-  async matchLibraryItems(library) {
+  async matchLibraryItems(apiRouterCtx, library) {
     if (library.mediaType === 'podcast') {
       Logger.error(`[Scanner] matchLibraryItems: Match all not supported for podcasts yet`)
       return
@@ -388,7 +432,7 @@ class Scanner {
       hasMoreChunks = libraryItems.length === limit
       let oldLibraryItems = libraryItems.map((li) => Database.libraryItemModel.getOldLibraryItem(li))
 
-      const shouldContinue = await this.matchLibraryItemsChunk(library, oldLibraryItems, libraryScan)
+      const shouldContinue = await this.matchLibraryItemsChunk(apiRouterCtx, library, oldLibraryItems, libraryScan)
       if (!shouldContinue) {
         isCanceled = true
         break

From 331c7c011c8ea4aa2907b7c7ff47b632db99aab5 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 23 Dec 2024 17:18:08 -0600
Subject: [PATCH 078/143] Support SSRF_REQUEST_FILTER_WHITELIST as a comma
 separated string of hostnames to pass through the ssrf request filter #3742

---
 server/Server.js             | 12 +++++++++++-
 server/utils/fileUtils.js    |  4 ++--
 server/utils/podcastUtils.js |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index 95e3d683..46850cbb 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -53,7 +53,17 @@ class Server {
     global.RouterBasePath = ROUTER_BASE_PATH
     global.XAccel = process.env.USE_X_ACCEL
     global.AllowCors = process.env.ALLOW_CORS === '1'
-    global.DisableSsrfRequestFilter = process.env.DISABLE_SSRF_REQUEST_FILTER === '1'
+
+    if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
+      Logger.info(`[Server] SSRF Request Filter Disabled`)
+      global.DisableSsrfRequestFilter = () => true
+    } else if (process.env.SSRF_REQUEST_FILTER_WHITELIST?.length) {
+      const whitelistedUrls = process.env.SSRF_REQUEST_FILTER_WHITELIST.split(',').map((url) => url.trim())
+      if (whitelistedUrls.length) {
+        Logger.info(`[Server] SSRF Request Filter Whitelisting: ${whitelistedUrls.join(',')}`)
+        global.DisableSsrfRequestFilter = (url) => whitelistedUrls.includes(new URL(url).hostname)
+      }
+    }
 
     if (!fs.pathExistsSync(global.ConfigPath)) {
       fs.mkdirSync(global.ConfigPath)
diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js
index 8b87d3a0..109cab5b 100644
--- a/server/utils/fileUtils.js
+++ b/server/utils/fileUtils.js
@@ -277,8 +277,8 @@ module.exports.downloadFile = (url, filepath, contentTypeFilter = null) => {
         'User-Agent': 'audiobookshelf (+https://audiobookshelf.org)'
       },
       timeout: 30000,
-      httpAgent: global.DisableSsrfRequestFilter ? null : ssrfFilter(url),
-      httpsAgent: global.DisableSsrfRequestFilter ? null : ssrfFilter(url)
+      httpAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl),
+      httpsAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl)
     })
       .then((response) => {
         // Validate content type
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index 627e24b2..26bd1733 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -244,8 +244,8 @@ module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
       Accept: 'application/rss+xml, application/xhtml+xml, application/xml, */*;q=0.8',
       'User-Agent': userAgent
     },
-    httpAgent: global.DisableSsrfRequestFilter ? null : ssrfFilter(feedUrl),
-    httpsAgent: global.DisableSsrfRequestFilter ? null : ssrfFilter(feedUrl)
+    httpAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl),
+    httpsAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl)
   })
     .then(async (data) => {
       // Adding support for ios-8859-1 encoded RSS feeds.

From 94fdd99ab5ce2481d7b2be75cb047d491c1bcf14 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 24 Dec 2024 15:07:11 -0600
Subject: [PATCH 079/143] Fix wrong url used for SSRF filter in fileUtils

---
 server/utils/fileUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js
index 109cab5b..3725481f 100644
--- a/server/utils/fileUtils.js
+++ b/server/utils/fileUtils.js
@@ -277,8 +277,8 @@ module.exports.downloadFile = (url, filepath, contentTypeFilter = null) => {
         'User-Agent': 'audiobookshelf (+https://audiobookshelf.org)'
       },
       timeout: 30000,
-      httpAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl),
-      httpsAgent: global.DisableSsrfRequestFilter?.(feedUrl) ? null : ssrfFilter(feedUrl)
+      httpAgent: global.DisableSsrfRequestFilter?.(url) ? null : ssrfFilter(url),
+      httpsAgent: global.DisableSsrfRequestFilter?.(url) ? null : ssrfFilter(url)
     })
       .then((response) => {
         // Validate content type

From e1c41e4e5853aadee43fb1dd55aab7815c4319d7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 25 Dec 2024 09:18:18 -0600
Subject: [PATCH 080/143] Accessibility update edit modal tabs

---
 client/components/modals/item/EditModal.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/components/modals/item/EditModal.vue b/client/components/modals/item/EditModal.vue
index d12a8a8f..c41e6b54 100644
--- a/client/components/modals/item/EditModal.vue
+++ b/client/components/modals/item/EditModal.vue
@@ -2,24 +2,24 @@
   <modals-modal v-model="show" name="edit-book" :width="800" :height="height" :processing="processing" :content-margin-top="marginTop">
     <template #outer>
       <div class="absolute top-0 left-0 p-4 landscape:px-4 landscape:py-2 md:portrait:p-5 lg:p-5 w-2/3 overflow-hidden pointer-events-none">
-        <p class="text-xl md:portrait:text-3xl md:landscape:text-lg lg:text-3xl text-white truncate pointer-events-none">{{ title }}</p>
+        <h1 class="text-xl md:portrait:text-3xl md:landscape:text-lg lg:text-3xl text-white truncate pointer-events-none">{{ title }}</h1>
       </div>
     </template>
-    <div class="absolute -top-10 left-0 z-10 w-full flex">
+    <div role="tablist" class="absolute -top-10 left-0 z-10 w-full flex">
       <template v-for="tab in availableTabs">
-        <div :key="tab.id" class="w-28 rounded-t-lg flex items-center justify-center mr-0.5 sm:mr-1 cursor-pointer hover:bg-bg border-t border-l border-r border-black-300 tab text-xs sm:text-base" :class="selectedTab === tab.id ? 'tab-selected bg-bg pb-px' : 'bg-primary text-gray-400'" @click="selectTab(tab.id)">{{ tab.title }}</div>
+        <button :key="tab.id" role="tab" class="w-28 rounded-t-lg flex items-center justify-center mr-0.5 sm:mr-1 cursor-pointer hover:bg-bg border-t border-l border-r border-black-300 tab text-xs sm:text-base" :class="selectedTab === tab.id ? 'tab-selected bg-bg pb-px' : 'bg-primary text-gray-400'" @click="selectTab(tab.id)">{{ tab.title }}</button>
       </template>
     </div>
 
-    <div v-show="canGoPrev" class="absolute -left-24 top-0 bottom-0 h-full pointer-events-none flex items-center px-6">
-      <div class="material-symbols text-5xl text-white text-opacity-50 hover:text-opacity-90 cursor-pointer pointer-events-auto" @click.stop.prevent="goPrevBook" @mousedown.prevent>arrow_back_ios</div>
-    </div>
-    <div v-show="canGoNext" class="absolute -right-24 top-0 bottom-0 h-full pointer-events-none flex items-center px-6">
-      <div class="material-symbols text-5xl text-white text-opacity-50 hover:text-opacity-90 cursor-pointer pointer-events-auto" @click.stop.prevent="goNextBook" @mousedown.prevent>arrow_forward_ios</div>
+    <div role="tabpanel" class="w-full h-full max-h-full text-sm rounded-b-lg rounded-tr-lg bg-bg shadow-lg border border-black-300 relative">
+      <component v-if="libraryItem && show" :is="tabName" :library-item="libraryItem" :processing.sync="processing" @close="show = false" @selectTab="selectTab" />
     </div>
 
-    <div class="w-full h-full max-h-full text-sm rounded-b-lg rounded-tr-lg bg-bg shadow-lg border border-black-300 relative">
-      <component v-if="libraryItem && show" :is="tabName" :library-item="libraryItem" :processing.sync="processing" @close="show = false" @selectTab="selectTab" />
+    <div v-show="canGoPrev" class="absolute -left-24 top-0 bottom-0 h-full pointer-events-none flex items-center px-6">
+      <button class="material-symbols text-5xl text-white text-opacity-50 hover:text-opacity-90 cursor-pointer pointer-events-auto" :aria-label="$strings.ButtonNext" @click.stop.prevent="goPrevBook" @mousedown.prevent>arrow_back_ios</button>
+    </div>
+    <div v-show="canGoNext" class="absolute -right-24 top-0 bottom-0 h-full pointer-events-none flex items-center px-6">
+      <button class="material-symbols text-5xl text-white text-opacity-50 hover:text-opacity-90 cursor-pointer pointer-events-auto" :aria-label="$strings.ButtonPrevious" @click.stop.prevent="goNextBook" @mousedown.prevent>arrow_forward_ios</button>
     </div>
   </modals-modal>
 </template>

From 7073f17ccae4f8655ce9353e19f7e3ce92ec14d1 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 25 Dec 2024 09:40:16 -0600
Subject: [PATCH 081/143] Accessibility update for multi select inputs and edit
 series modal

---
 .../modals/EditSeriesInputInnerModal.vue        |  6 +++---
 client/components/ui/MultiSelect.vue            | 15 +++++++++------
 client/components/ui/MultiSelectQueryInput.vue  | 17 ++++++++++-------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/client/components/modals/EditSeriesInputInnerModal.vue b/client/components/modals/EditSeriesInputInnerModal.vue
index c70097a0..53225788 100644
--- a/client/components/modals/EditSeriesInputInnerModal.vue
+++ b/client/components/modals/EditSeriesInputInnerModal.vue
@@ -1,8 +1,8 @@
 <template>
-  <div ref="wrapper" class="hidden absolute top-0 left-0 w-full h-full bg-black bg-opacity-50 rounded-lg items-center justify-center" style="z-index: 61" @click="clickClose">
-    <div class="absolute top-3 right-3 md:top-5 md:right-5 h-8 w-8 md:h-12 md:w-12 flex items-center justify-center cursor-pointer text-white hover:text-gray-300">
+  <div ref="wrapper" role="dialog" aria-modal="true" class="hidden absolute top-0 left-0 w-full h-full bg-black bg-opacity-50 rounded-lg items-center justify-center" style="z-index: 61" @click="clickClose">
+    <button type="button" class="absolute top-3 right-3 md:top-5 md:right-5 h-8 w-8 md:h-12 md:w-12 flex items-center justify-center cursor-pointer text-white hover:text-gray-300" aria-label="Close modal">
       <span class="material-symbols text-2xl md:text-4xl">close</span>
-    </div>
+    </button>
     <div ref="content" class="text-white">
       <form v-if="selectedSeries" @submit.prevent="submitSeriesForm">
         <div class="bg-bg rounded-lg px-2 py-6 sm:p-6 md:p-8" @click.stop>
diff --git a/client/components/ui/MultiSelect.vue b/client/components/ui/MultiSelect.vue
index da4bcc13..676f0e46 100644
--- a/client/components/ui/MultiSelect.vue
+++ b/client/components/ui/MultiSelect.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="w-full">
-    <p class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</p>
+    <label :for="identifier" class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</label>
     <div ref="wrapper" class="relative">
       <form @submit.prevent="submitForm">
-        <div ref="inputWrapper" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-1" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
-          <div v-for="item in selected" :key="item" class="rounded-full px-2 py-1 mx-0.5 my-0.5 text-xs bg-bg flex flex-nowrap break-all items-center relative">
+        <div ref="inputWrapper" role="list" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-1" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
+          <div v-for="item in selected" :key="item" role="listitem" class="rounded-full px-2 py-1 mx-0.5 my-0.5 text-xs bg-bg flex flex-nowrap break-all items-center relative">
             <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 px-1 bg-bg bg-opacity-75 flex items-center justify-end opacity-0 hover:opacity-100" :class="{ 'opacity-100': inputFocused }">
-              <span v-if="showEdit" class="material-symbols text-white hover:text-warning cursor-pointer" style="font-size: 1.1rem" @click.stop="editItem(item)">edit</span>
-              <span class="material-symbols text-white hover:text-error focus:text-error cursor-pointer" style="font-size: 1.1rem" @click.stop="removeItem(item)" @keydown.enter.stop.prevent="removeItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</span>
+              <button v-if="showEdit" type="button" :aria-label="$strings.ButtonEdit" class="material-symbols text-white hover:text-warning cursor-pointer" style="font-size: 1.1rem" @click.stop="editItem(item)">edit</button>
+              <button type="button" :aria-label="$strings.ButtonRemove" class="material-symbols text-white hover:text-error focus:text-error cursor-pointer" style="font-size: 1.1rem" @click.stop="removeItem(item)" @keydown.enter.stop.prevent="removeItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</button>
             </div>
             {{ item }}
           </div>
-          <input v-show="!readonly" ref="input" v-model="textInput" :disabled="disabled" class="h-full bg-primary focus:outline-none px-1 w-6" @keydown="keydownInput" @focus="inputFocus" @blur="inputBlur" @paste="inputPaste" />
+          <input v-show="!readonly" v-model="textInput" ref="input" :id="identifier" :disabled="disabled" class="h-full bg-primary focus:outline-none px-1 w-6" @keydown="keydownInput" @focus="inputFocus" @blur="inputBlur" @paste="inputPaste" />
         </div>
       </form>
 
@@ -101,6 +101,9 @@ export default {
       }
 
       return this.filteredItems
+    },
+    identifier() {
+      return Math.random().toString(36).substring(2)
     }
   },
   methods: {
diff --git a/client/components/ui/MultiSelectQueryInput.vue b/client/components/ui/MultiSelectQueryInput.vue
index fe7187ee..25107b79 100644
--- a/client/components/ui/MultiSelectQueryInput.vue
+++ b/client/components/ui/MultiSelectQueryInput.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="w-full">
-    <p class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</p>
+    <label :for="identifier" class="px-1 text-sm font-semibold" :class="disabled ? 'text-gray-400' : ''">{{ label }}</label>
     <div ref="wrapper" class="relative">
       <form @submit.prevent="submitForm">
-        <div ref="inputWrapper" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-0.5" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
-          <div v-for="item in selected" :key="item.id" class="rounded-full px-2 py-0.5 m-0.5 text-xs bg-bg flex flex-nowrap whitespace-nowrap items-center justify-center relative min-w-12">
+        <div ref="inputWrapper" role="list" style="min-height: 36px" class="flex-wrap relative w-full shadow-sm flex items-center border border-gray-600 rounded px-2 py-0.5" :class="wrapperClass" @click.stop.prevent="clickWrapper" @mouseup.stop.prevent @mousedown.prevent>
+          <div v-for="item in selected" :key="item.id" role="listitem" class="rounded-full px-2 py-0.5 m-0.5 text-xs bg-bg flex flex-nowrap whitespace-nowrap items-center justify-center relative min-w-12">
             <div v-if="!disabled" class="w-full h-full rounded-full absolute top-0 left-0 opacity-0 hover:opacity-100 px-1 bg-bg bg-opacity-75 flex items-center justify-end cursor-pointer" :class="{ 'opacity-100': inputFocused }">
-              <span v-if="showEdit" class="material-symbols text-base text-white hover:text-warning focus:text-warning mr-1" @click.stop="editItem(item)" @keydown.enter.stop.prevent="editItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">edit</span>
-              <span class="material-symbols text-white hover:text-error focus:text-error" style="font-size: 1.1rem" @click.stop="removeItem(item.id)" @keydown.enter.stop="removeItem(item.id)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</span>
+              <button v-if="showEdit" type="button" :aria-label="$strings.ButtonEdit" class="material-symbols text-base text-white hover:text-warning focus:text-warning mr-1" @click.stop="editItem(item)" @keydown.enter.stop.prevent="editItem(item)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">edit</button>
+              <button type="button" :aria-label="$strings.ButtonRemove" class="material-symbols text-white hover:text-error focus:text-error" style="font-size: 1.1rem" @click.stop="removeItem(item.id)" @keydown.enter.stop="removeItem(item.id)" @focus="setInputFocused(true)" @blur="setInputFocused(false)" tabindex="0">close</button>
             </div>
             {{ item[textKey] }}
           </div>
           <div v-if="showEdit && !disabled" class="rounded-full cursor-pointer w-6 h-6 mx-0.5 bg-bg flex items-center justify-center">
-            <span class="material-symbols text-white hover:text-success focus:text-success pt-px pr-px" style="font-size: 1.1rem" @click.stop="addItem" @keydown.enter.stop="addItem" tabindex="0">add</span>
+            <button type="button" :aria-label="$strings.ButtonAdd" class="material-symbols text-white hover:text-success focus:text-success pt-px pr-px" style="font-size: 1.1rem" @click.stop="addItem" @keydown.enter.stop="addItem" tabindex="0">add</button>
           </div>
-          <input v-show="!readonly" ref="input" v-model="textInput" :disabled="disabled" class="h-full bg-primary focus:outline-none px-1 w-6" @keydown="keydownInput" @focus="inputFocus" @blur="inputBlur" @paste="inputPaste" />
+          <input v-show="!readonly" v-model="textInput" ref="input" :id="identifier" :disabled="disabled" class="h-full bg-primary focus:outline-none px-1 w-6" @keydown="keydownInput" @focus="inputFocus" @blur="inputBlur" @paste="inputPaste" />
         </div>
       </form>
 
@@ -103,6 +103,9 @@ export default {
     },
     filterData() {
       return this.$store.state.libraries.filterData || {}
+    },
+    identifier() {
+      return Math.random().toString(36).substring(2)
     }
   },
   methods: {

From 4d8501c34797ac389f10612024cc78ad4d63950a Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 26 Dec 2024 16:34:25 -0600
Subject: [PATCH 082/143] Update skeleton card to have box shadow, fix last row
 of skeleton cards

---
 client/components/app/LazyBookshelf.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/client/components/app/LazyBookshelf.vue b/client/components/app/LazyBookshelf.vue
index fb888cad..29b06df3 100644
--- a/client/components/app/LazyBookshelf.vue
+++ b/client/components/app/LazyBookshelf.vue
@@ -4,7 +4,7 @@
       <div :key="shelf" :id="`shelf-${shelf - 1}`" class="w-full px-4e sm:px-8e relative" :class="{ bookshelfRow: !isAlternativeBookshelfView }" :style="{ height: shelfHeight + 'px' }">
         <!-- Card skeletons -->
         <template v-for="entityIndex in entitiesInShelf(shelf)">
-          <div :key="entityIndex" class="w-full h-full absolute rounded z-5 top-0 left-0 bg-primary" :style="{ transform: entityTransform(entityIndex), width: cardWidth + 'px', height: coverHeight + 'px' }" />
+          <div :key="entityIndex" class="w-full h-full absolute rounded z-5 top-0 left-0 bg-primary box-shadow-book" :style="{ transform: entityTransform(entityIndex), width: cardWidth + 'px', height: coverHeight + 'px' }" />
         </template>
         <div v-if="!isAlternativeBookshelfView" class="bookshelfDivider w-full absolute bottom-0 left-0 right-0 z-20 h-6e" />
       </div>
@@ -181,9 +181,6 @@ export default {
     bookWidth() {
       return this.cardWidth
     },
-    bookHeight() {
-      return this.cardHeight
-    },
     shelfPadding() {
       if (this.bookshelfWidth < 640) return 32 * this.sizeMultiplier
       return 64 * this.sizeMultiplier
@@ -194,9 +191,6 @@ export default {
     entityWidth() {
       return this.cardWidth
     },
-    entityHeight() {
-      return this.cardHeight
-    },
     shelfPaddingHeight() {
       return 16
     },
@@ -840,7 +834,7 @@ export default {
         })
     },
     entitiesInShelf(shelf) {
-      return shelf == this.totalShelves ? this.totalEntities % this.entitiesPerShelf : this.entitiesPerShelf
+      return shelf == this.totalShelves ? this.totalEntities % this.entitiesPerShelf || this.entitiesPerShelf : this.entitiesPerShelf
     },
     entityTransform(entityIndex) {
       const shelfOffsetY = this.shelfPaddingHeight * this.sizeMultiplier

From f46b5a533c9ddf83bb1399dc9b3d4a63292d8682 Mon Sep 17 00:00:00 2001
From: Nicholas Wallace <nicholaslwallace@gmail.com>
Date: Thu, 26 Dec 2024 22:53:45 -0700
Subject: [PATCH 083/143] Change: height of RSS feed preview to match aspect
 ratio

---
 client/pages/config/rss-feeds.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pages/config/rss-feeds.vue b/client/pages/config/rss-feeds.vue
index 039e9a0d..9b070f91 100644
--- a/client/pages/config/rss-feeds.vue
+++ b/client/pages/config/rss-feeds.vue
@@ -25,7 +25,7 @@
           <tr v-for="feed in feeds" :key="feed.id" class="cursor-pointer h-12" @click="showFeed(feed)">
             <!--  -->
             <td>
-              <img :src="coverUrl(feed)" class="h-full w-full" />
+              <img :src="coverUrl(feed)" class="h-auto w-full" />
             </td>
             <!--  -->
             <td class="w-48 max-w-64 min-w-24 text-left truncate">

From d7830f4bfc79cb0dbd7c507263813a8e19083a41 Mon Sep 17 00:00:00 2001
From: maxlajoie99 <max.lajoie99@hotmail.com>
Date: Fri, 27 Dec 2024 20:26:55 -0500
Subject: [PATCH 084/143] Experimental proxy support by manually following
 redirects

---
 server/Server.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/server/Server.js b/server/Server.js
index 46850cbb..9bbdb486 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -6,6 +6,7 @@ const util = require('util')
 const fs = require('./libs/fsExtra')
 const fileUpload = require('./libs/expressFileupload')
 const cookieParser = require('cookie-parser')
+const axios = require('axios')
 
 const { version } = require('../package.json')
 
@@ -54,7 +55,25 @@ class Server {
     global.XAccel = process.env.USE_X_ACCEL
     global.AllowCors = process.env.ALLOW_CORS === '1'
 
-    if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
+    if (process.env.EXP_PROXY_SUPPORT === '1') {
+      Logger.info(`[Server] Experimental Proxy Support Enabled, SSRF Request Filter was Disabled`);
+      global.DisableSsrfRequestFilter = () => true
+      
+      axios.defaults.maxRedirects = 0;
+      axios.interceptors.response.use(
+        response => response,
+        error => {
+          if ([301, 302].includes(error.response?.status)) {
+            return axios({
+              ...error.config,
+              url: error.response.headers.location,
+            });
+          }
+    
+          return Promise.reject(error);
+        }
+      );
+    } else if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
       Logger.info(`[Server] SSRF Request Filter Disabled`)
       global.DisableSsrfRequestFilter = () => true
     } else if (process.env.SSRF_REQUEST_FILTER_WHITELIST?.length) {

From e0c674d9a9519124227a874638ec7da3ac6ec43c Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 28 Dec 2024 16:36:53 -0600
Subject: [PATCH 085/143] Fix:Opening audiobook RSS feeds use audiofile name
 #3752

---
 server/models/FeedEpisode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 3bf0ff85..0d1a3a48 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -138,7 +138,7 @@ class FeedEpisode extends Model {
 
     const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`
 
-    let title = audioTrack.title
+    let title = Path.basename(audioTrack.metadata.filename, Path.extname(audioTrack.metadata.filename))
     if (book.trackList.length == 1) {
       // If audiobook is a single file, use book title instead of chapter/file title
       title = book.title

From 4cdc2a8c28c3759cdbbd84dd4ae2ac79f6bb7ee9 Mon Sep 17 00:00:00 2001
From: Greg Lorenzen <31518305+glorenzen@users.noreply.github.com>
Date: Sun, 29 Dec 2024 14:52:57 -0800
Subject: [PATCH 086/143] Feat/download via share link (#3666)

* Adds share download endpoint
* Adds Downloadable toggle to share modal

---------

Co-authored-by: advplyr <advplyr@protonmail.com>
---
 client/components/modals/ShareModal.vue       | 20 ++++--
 client/pages/share/_slug.vue                  | 10 +++
 client/strings/en-us.json                     |  2 +
 server/controllers/ShareController.js         | 65 +++++++++++++++++-
 server/migrations/changelog.md                |  1 +
 .../v2.17.6-share-add-isdownloadable.js       | 68 +++++++++++++++++++
 server/models/MediaItemShare.js               | 36 +++++++++-
 server/routers/PublicRouter.js                |  1 +
 .../v2.17.6-share-add-isdownloadable.test.js  | 68 +++++++++++++++++++
 9 files changed, 263 insertions(+), 8 deletions(-)
 create mode 100644 server/migrations/v2.17.6-share-add-isdownloadable.js
 create mode 100644 test/server/migrations/v2.17.6-share-add-isdownloadable.test.js

diff --git a/client/components/modals/ShareModal.vue b/client/components/modals/ShareModal.vue
index d0487fd3..5b379884 100644
--- a/client/components/modals/ShareModal.vue
+++ b/client/components/modals/ShareModal.vue
@@ -19,12 +19,13 @@
           <ui-text-input v-model="currentShareUrl" show-copy readonly class="text-base h-10" />
         </div>
         <div class="w-full py-2 px-1">
-          <p v-if="currentShare.expiresAt" class="text-base">{{ $getString('MessageShareExpiresIn', [currentShareTimeRemaining]) }}</p>
+          <p v-if="currentShare.isDownloadable" class="text-sm mb-2">{{ $strings.LabelDownloadable }}</p>
+          <p v-if="currentShare.expiresAt">{{ $getString('MessageShareExpiresIn', [currentShareTimeRemaining]) }}</p>
           <p v-else>{{ $strings.LabelPermanent }}</p>
         </div>
       </template>
       <template v-else>
-        <div class="flex flex-col sm:flex-row items-center justify-between space-y-4 sm:space-y-0 sm:space-x-4 mb-4">
+        <div class="flex flex-col sm:flex-row items-center justify-between space-y-4 sm:space-y-0 sm:space-x-4 mb-2">
           <div class="w-full sm:w-48">
             <label class="px-1 text-sm font-semibold block">{{ $strings.LabelSlug }}</label>
             <ui-text-input v-model="newShareSlug" class="text-base h-10" />
@@ -46,6 +47,15 @@
             </div>
           </div>
         </div>
+        <div class="flex items-center w-full md:w-1/2 mb-4">
+          <p class="text-sm text-gray-300 py-1 px-1">{{ $strings.LabelDownloadable }}</p>
+          <ui-toggle-switch size="sm" v-model="isDownloadable" />
+          <ui-tooltip :text="$strings.LabelShareDownloadableHelp">
+            <p class="pl-4 text-sm">
+              <span class="material-symbols icon-text text-sm">info</span>
+            </p>
+          </ui-tooltip>
+        </div>
         <p class="text-sm text-gray-300 py-1 px-1" v-html="$getString('MessageShareURLWillBe', [demoShareUrl])" />
         <p class="text-sm text-gray-300 py-1 px-1" v-html="$getString('MessageShareExpirationWillBe', [expirationDateString])" />
       </template>
@@ -81,7 +91,8 @@ export default {
           text: this.$strings.LabelDays,
           value: 'days'
         }
-      ]
+      ],
+      isDownloadable: false
     }
   },
   watch: {
@@ -172,7 +183,8 @@ export default {
         slug: this.newShareSlug,
         mediaItemType: 'book',
         mediaItemId: this.libraryItem.media.id,
-        expiresAt: this.expireDurationSeconds ? Date.now() + this.expireDurationSeconds * 1000 : 0
+        expiresAt: this.expireDurationSeconds ? Date.now() + this.expireDurationSeconds * 1000 : 0,
+        isDownloadable: this.isDownloadable
       }
       this.processing = true
       this.$axios
diff --git a/client/pages/share/_slug.vue b/client/pages/share/_slug.vue
index 7ddb994c..6bce2f8a 100644
--- a/client/pages/share/_slug.vue
+++ b/client/pages/share/_slug.vue
@@ -12,6 +12,10 @@
         <div class="w-full pt-16">
           <player-ui ref="audioPlayer" :chapters="chapters" :current-chapter="currentChapter" :paused="isPaused" :loading="!hasLoaded" :is-podcast="false" hide-bookmarks hide-sleep-timer @playPause="playPause" @jumpForward="jumpForward" @jumpBackward="jumpBackward" @setVolume="setVolume" @setPlaybackRate="setPlaybackRate" @seek="seek" />
         </div>
+
+        <ui-tooltip v-if="mediaItemShare.isDownloadable" direction="bottom" :text="$strings.LabelDownload" class="absolute top-0 left-0 m-4">
+          <button aria-label="Download" class="text-gray-300 hover:text-white" @click="downloadShareItem"><span class="material-symbols text-2xl sm:text-3xl">download</span></button>
+        </ui-tooltip>
       </div>
     </div>
   </div>
@@ -63,6 +67,9 @@ export default {
       if (!this.playbackSession.coverPath) return `${this.$config.routerBasePath}/book_placeholder.jpg`
       return `${this.$config.routerBasePath}/public/share/${this.mediaItemShare.slug}/cover`
     },
+    downloadUrl() {
+      return `${process.env.serverUrl}/public/share/${this.mediaItemShare.slug}/download`
+    },
     audioTracks() {
       return (this.playbackSession.audioTracks || []).map((track) => {
         track.relativeContentUrl = track.contentUrl
@@ -247,6 +254,9 @@ export default {
     },
     playerFinished() {
       console.log('Player finished')
+    },
+    downloadShareItem() {
+      this.$downloadFile(this.downloadUrl)
     }
   },
   mounted() {
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index a029fadb..eee94abf 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -300,6 +300,7 @@
   "LabelDiscover": "Discover",
   "LabelDownload": "Download",
   "LabelDownloadNEpisodes": "Download {0} episodes",
+  "LabelDownloadable": "Downloadable",
   "LabelDuration": "Duration",
   "LabelDurationComparisonExactMatch": "(exact match)",
   "LabelDurationComparisonLonger": "({0} longer)",
@@ -588,6 +589,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "By default metadata files are stored in /metadata/items, enabling this setting will store metadata files in your library item folders",
   "LabelSettingsTimeFormat": "Time Format",
   "LabelShare": "Share",
+  "LabelShareDownloadableHelp": "Allows users with the share link to download a zip file of the library item.",
   "LabelShareOpen": "Share Open",
   "LabelShareURL": "Share URL",
   "LabelShowAll": "Show All",
diff --git a/server/controllers/ShareController.js b/server/controllers/ShareController.js
index e1568c0d..93c6e9fb 100644
--- a/server/controllers/ShareController.js
+++ b/server/controllers/ShareController.js
@@ -7,6 +7,7 @@ const Database = require('../Database')
 
 const { PlayMethod } = require('../utils/constants')
 const { getAudioMimeTypeFromExtname, encodeUriPath } = require('../utils/fileUtils')
+const zipHelpers = require('../utils/zipHelpers')
 
 const PlaybackSession = require('../objects/PlaybackSession')
 const ShareManager = require('../managers/ShareManager')
@@ -210,6 +211,65 @@ class ShareController {
     res.sendFile(audioTrackPath)
   }
 
+  /**
+   * Public route - requires share_session_id cookie
+   *
+   * GET: /api/share/:slug/download
+   * Downloads media item share
+   *
+   * @param {Request} req
+   * @param {Response} res
+   */
+  async downloadMediaItemShare(req, res) {
+    if (!req.cookies.share_session_id) {
+      return res.status(404).send('Share session not set')
+    }
+
+    const { slug } = req.params
+    const mediaItemShare = ShareManager.findBySlug(slug)
+    if (!mediaItemShare) {
+      return res.status(404)
+    }
+    if (!mediaItemShare.isDownloadable) {
+      return res.status(403).send('Download is not allowed for this item')
+    }
+
+    const playbackSession = ShareManager.findPlaybackSessionBySessionId(req.cookies.share_session_id)
+    if (!playbackSession || playbackSession.mediaItemShareId !== mediaItemShare.id) {
+      return res.status(404).send('Share session not found')
+    }
+
+    const libraryItem = await Database.libraryItemModel.findByPk(playbackSession.libraryItemId, {
+      attributes: ['id', 'path', 'relPath', 'isFile']
+    })
+    if (!libraryItem) {
+      return res.status(404).send('Library item not found')
+    }
+
+    const itemPath = libraryItem.path
+    const itemTitle = playbackSession.displayTitle
+
+    Logger.info(`[ShareController] Requested download for book "${itemTitle}" at "${itemPath}"`)
+
+    try {
+      if (libraryItem.isFile) {
+        const audioMimeType = getAudioMimeTypeFromExtname(Path.extname(itemPath))
+        if (audioMimeType) {
+          res.setHeader('Content-Type', audioMimeType)
+        }
+        await new Promise((resolve, reject) => res.download(itemPath, libraryItem.relPath, (error) => (error ? reject(error) : resolve())))
+      } else {
+        const filename = `${itemTitle}.zip`
+        await zipHelpers.zipDirectoryPipe(itemPath, filename, res)
+      }
+
+      Logger.info(`[ShareController] Downloaded item "${itemTitle}" at "${itemPath}"`)
+    } catch (error) {
+      Logger.error(`[ShareController] Download failed for item "${itemTitle}" at "${itemPath}"`, error)
+      res.status(500).send('Failed to download the item')
+    }
+  }
+
   /**
    * Public route - requires share_session_id cookie
    *
@@ -259,7 +319,7 @@ class ShareController {
       return res.sendStatus(403)
     }
 
-    const { slug, expiresAt, mediaItemType, mediaItemId } = req.body
+    const { slug, expiresAt, mediaItemType, mediaItemId, isDownloadable } = req.body
 
     if (!slug?.trim?.() || typeof mediaItemType !== 'string' || typeof mediaItemId !== 'string') {
       return res.status(400).send('Missing or invalid required fields')
@@ -298,7 +358,8 @@ class ShareController {
         expiresAt: expiresAt || null,
         mediaItemId,
         mediaItemType,
-        userId: req.user.id
+        userId: req.user.id,
+        isDownloadable
       })
 
       ShareManager.openMediaItemShare(mediaItemShare)
diff --git a/server/migrations/changelog.md b/server/migrations/changelog.md
index f4992432..c2de4693 100644
--- a/server/migrations/changelog.md
+++ b/server/migrations/changelog.md
@@ -11,3 +11,4 @@ Please add a record of every database migration that you create to this file. Th
 | v2.17.3        | v2.17.3-fk-constraints                       | Changes the foreign key constraints for tables due to sequelize bug dropping constraints in v2.17.0 migration |
 | v2.17.4        | v2.17.4-use-subfolder-for-oidc-redirect-uris | Save subfolder to OIDC redirect URIs to support existing installations                                        |
 | v2.17.5        | v2.17.5-remove-host-from-feed-urls           | removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables                        |
+| v2.17.6        | v2.17.6-share-add-isdownloadable             | Adds the isDownloadable column to the mediaItemShares table                                                   |
diff --git a/server/migrations/v2.17.6-share-add-isdownloadable.js b/server/migrations/v2.17.6-share-add-isdownloadable.js
new file mode 100644
index 00000000..9434d284
--- /dev/null
+++ b/server/migrations/v2.17.6-share-add-isdownloadable.js
@@ -0,0 +1,68 @@
+/**
+ * @typedef MigrationContext
+ * @property {import('sequelize').QueryInterface} queryInterface - a Sequelize QueryInterface object.
+ * @property {import('../Logger')} logger - a Logger object.
+ *
+ * @typedef MigrationOptions
+ * @property {MigrationContext} context - an object containing the migration context.
+ */
+
+const migrationVersion = '2.17.6'
+const migrationName = `${migrationVersion}-share-add-isdownloadable`
+const loggerPrefix = `[${migrationVersion} migration]`
+
+/**
+ * This migration script adds the isDownloadable column to the mediaItemShares table.
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function up({ context: { queryInterface, logger } }) {
+  logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
+
+  if (await queryInterface.tableExists('mediaItemShares')) {
+    const tableDescription = await queryInterface.describeTable('mediaItemShares')
+    if (!tableDescription.isDownloadable) {
+      logger.info(`${loggerPrefix} Adding isDownloadable column to mediaItemShares table`)
+      await queryInterface.addColumn('mediaItemShares', 'isDownloadable', {
+        type: queryInterface.sequelize.Sequelize.DataTypes.BOOLEAN,
+        defaultValue: false,
+        allowNull: false
+      })
+      logger.info(`${loggerPrefix} Added isDownloadable column to mediaItemShares table`)
+    } else {
+      logger.info(`${loggerPrefix} isDownloadable column already exists in mediaItemShares table`)
+    }
+  } else {
+    logger.info(`${loggerPrefix} mediaItemShares table does not exist`)
+  }
+
+  logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
+}
+
+/**
+ * This migration script removes the isDownloadable column from the mediaItemShares table.
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function down({ context: { queryInterface, logger } }) {
+  logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
+
+  if (await queryInterface.tableExists('mediaItemShares')) {
+    const tableDescription = await queryInterface.describeTable('mediaItemShares')
+    if (tableDescription.isDownloadable) {
+      logger.info(`${loggerPrefix} Removing isDownloadable column from mediaItemShares table`)
+      await queryInterface.removeColumn('mediaItemShares', 'isDownloadable')
+      logger.info(`${loggerPrefix} Removed isDownloadable column from mediaItemShares table`)
+    } else {
+      logger.info(`${loggerPrefix} isDownloadable column does not exist in mediaItemShares table`)
+    }
+  } else {
+    logger.info(`${loggerPrefix} mediaItemShares table does not exist`)
+  }
+
+  logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
+}
+
+module.exports = { up, down }
diff --git a/server/models/MediaItemShare.js b/server/models/MediaItemShare.js
index 38b8dbbf..2d7b3896 100644
--- a/server/models/MediaItemShare.js
+++ b/server/models/MediaItemShare.js
@@ -12,6 +12,7 @@ const { DataTypes, Model } = require('sequelize')
  * @property {Object} extraData
  * @property {Date} createdAt
  * @property {Date} updatedAt
+ * @property {boolean} isDownloadable
  *
  * @typedef {MediaItemShareObject & MediaItemShare} MediaItemShareModel
  */
@@ -25,11 +26,40 @@ const { DataTypes, Model } = require('sequelize')
  * @property {Date} expiresAt
  * @property {Date} createdAt
  * @property {Date} updatedAt
+ * @property {boolean} isDownloadable
  */
 
 class MediaItemShare extends Model {
   constructor(values, options) {
     super(values, options)
+
+    /** @type {UUIDV4} */
+    this.id
+    /** @type {UUIDV4} */
+    this.mediaItemId
+    /** @type {string} */
+    this.mediaItemType
+    /** @type {string} */
+    this.slug
+    /** @type {string} */
+    this.pash
+    /** @type {UUIDV4} */
+    this.userId
+    /** @type {Date} */
+    this.expiresAt
+    /** @type {Object} */
+    this.extraData
+    /** @type {Date} */
+    this.createdAt
+    /** @type {Date} */
+    this.updatedAt
+    /** @type {boolean} */
+    this.isDownloadable
+
+    // Expanded properties
+
+    /** @type {import('./Book')|import('./PodcastEpisode')} */
+    this.mediaItem
   }
 
   toJSONForClient() {
@@ -40,7 +70,8 @@ class MediaItemShare extends Model {
       slug: this.slug,
       expiresAt: this.expiresAt,
       createdAt: this.createdAt,
-      updatedAt: this.updatedAt
+      updatedAt: this.updatedAt,
+      isDownloadable: this.isDownloadable
     }
   }
 
@@ -114,7 +145,8 @@ class MediaItemShare extends Model {
         slug: DataTypes.STRING,
         pash: DataTypes.STRING,
         expiresAt: DataTypes.DATE,
-        extraData: DataTypes.JSON
+        extraData: DataTypes.JSON,
+        isDownloadable: DataTypes.BOOLEAN
       },
       {
         sequelize,
diff --git a/server/routers/PublicRouter.js b/server/routers/PublicRouter.js
index 98ac4955..107edf99 100644
--- a/server/routers/PublicRouter.js
+++ b/server/routers/PublicRouter.js
@@ -15,6 +15,7 @@ class PublicRouter {
     this.router.get('/share/:slug', ShareController.getMediaItemShareBySlug.bind(this))
     this.router.get('/share/:slug/track/:index', ShareController.getMediaItemShareAudioTrack.bind(this))
     this.router.get('/share/:slug/cover', ShareController.getMediaItemShareCoverImage.bind(this))
+    this.router.get('/share/:slug/download', ShareController.downloadMediaItemShare.bind(this))
     this.router.patch('/share/:slug/progress', ShareController.updateMediaItemShareProgress.bind(this))
   }
 }
diff --git a/test/server/migrations/v2.17.6-share-add-isdownloadable.test.js b/test/server/migrations/v2.17.6-share-add-isdownloadable.test.js
new file mode 100644
index 00000000..6c778b14
--- /dev/null
+++ b/test/server/migrations/v2.17.6-share-add-isdownloadable.test.js
@@ -0,0 +1,68 @@
+const chai = require('chai')
+const sinon = require('sinon')
+const { expect } = chai
+
+const { DataTypes } = require('sequelize')
+
+const { up, down } = require('../../../server/migrations/v2.17.6-share-add-isdownloadable')
+
+describe('Migration v2.17.6-share-add-isDownloadable', () => {
+  let queryInterface, logger
+
+  beforeEach(() => {
+    queryInterface = {
+      addColumn: sinon.stub().resolves(),
+      removeColumn: sinon.stub().resolves(),
+      tableExists: sinon.stub().resolves(true),
+      describeTable: sinon.stub().resolves({ isDownloadable: undefined }),
+      sequelize: {
+        Sequelize: {
+          DataTypes: {
+            BOOLEAN: DataTypes.BOOLEAN
+          }
+        }
+      }
+    }
+
+    logger = {
+      info: sinon.stub(),
+      error: sinon.stub()
+    }
+  })
+
+  describe('up', () => {
+    it('should add the isDownloadable column to mediaItemShares table', async () => {
+      await up({ context: { queryInterface, logger } })
+
+      expect(queryInterface.addColumn.calledOnce).to.be.true
+      expect(
+        queryInterface.addColumn.calledWith('mediaItemShares', 'isDownloadable', {
+          type: DataTypes.BOOLEAN,
+          defaultValue: false,
+          allowNull: false
+        })
+      ).to.be.true
+
+      expect(logger.info.calledWith('[2.17.6 migration] UPGRADE BEGIN: 2.17.6-share-add-isdownloadable')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] Adding isDownloadable column to mediaItemShares table')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] Added isDownloadable column to mediaItemShares table')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] UPGRADE END: 2.17.6-share-add-isdownloadable')).to.be.true
+    })
+  })
+
+  describe('down', () => {
+    it('should remove the isDownloadable column from mediaItemShares table', async () => {
+      queryInterface.describeTable.resolves({ isDownloadable: true })
+
+      await down({ context: { queryInterface, logger } })
+
+      expect(queryInterface.removeColumn.calledOnce).to.be.true
+      expect(queryInterface.removeColumn.calledWith('mediaItemShares', 'isDownloadable')).to.be.true
+
+      expect(logger.info.calledWith('[2.17.6 migration] DOWNGRADE BEGIN: 2.17.6-share-add-isdownloadable')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] Removing isDownloadable column from mediaItemShares table')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] Removed isDownloadable column from mediaItemShares table')).to.be.true
+      expect(logger.info.calledWith('[2.17.6 migration] DOWNGRADE END: 2.17.6-share-add-isdownloadable')).to.be.true
+    })
+  })
+})

From 6928f6eeb657a2a394555faa97ae0f7c8d5866b5 Mon Sep 17 00:00:00 2001
From: jonarihen <jonathan@aaris.tech>
Date: Thu, 19 Dec 2024 18:34:31 +0000
Subject: [PATCH 087/143] Translated using Weblate (Danish)

Currently translated at 62.3% (673 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/da/
---
 client/strings/da.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/strings/da.json b/client/strings/da.json
index b4b92bc8..0f7af2c4 100644
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -19,6 +19,7 @@
   "ButtonChooseFiles": "Vælg filer",
   "ButtonClearFilter": "Ryd filter",
   "ButtonCloseFeed": "Luk feed",
+  "ButtonCloseSession": "Luk Åben Session",
   "ButtonCollections": "Samlinger",
   "ButtonConfigureScanner": "Konfigurer scanner",
   "ButtonCreate": "Opret",
@@ -29,7 +30,9 @@
   "ButtonEditChapters": "Rediger kapitler",
   "ButtonEditPodcast": "Rediger podcast",
   "ButtonEnable": "Aktiver",
-  "ButtonForceReScan": "Tvungen genindlæsning",
+  "ButtonFireAndFail": "Affyring Og Fejl",
+  "ButtonFireOnTest": "Affyring vedTest begivenhed",
+  "ButtonForceReScan": "Tving genindlæsning",
   "ButtonFullPath": "Fuld sti",
   "ButtonHide": "Skjul",
   "ButtonHome": "Hjem",

From 20e0172fa3b4b33d507274bf5440165963da559d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98ystein=20S=2E=20Hegnander?= <eins16@gmail.com>
Date: Thu, 19 Dec 2024 21:45:35 +0000
Subject: [PATCH 088/143] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 82.3% (889 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/nb_NO/
---
 client/strings/no.json | 238 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 217 insertions(+), 21 deletions(-)

diff --git a/client/strings/no.json b/client/strings/no.json
index 592991b4..96de90d9 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -29,13 +29,16 @@
   "ButtonEdit": "Rediger",
   "ButtonEditChapters": "Rediger kapittel",
   "ButtonEditPodcast": "Rediger podcast",
+  "ButtonEnable": "Aktiver",
+  "ButtonFireAndFail": "Kjør ved feil",
+  "ButtonFireOnTest": "Kjør onTest-kommando",
   "ButtonForceReScan": "Tving skann",
   "ButtonFullPath": "Full sti",
   "ButtonHide": "Gjøm",
   "ButtonHome": "Hjem",
   "ButtonIssues": "Problemer",
-  "ButtonJumpBackward": "Hopp Bakover",
-  "ButtonJumpForward": "Hopp Fremover",
+  "ButtonJumpBackward": "Hopp bakover",
+  "ButtonJumpForward": "Hopp frem",
   "ButtonLatest": "Siste",
   "ButtonLibrary": "Bibliotek",
   "ButtonLogout": "Logg ut",
@@ -45,24 +48,31 @@
   "ButtonMatchAllAuthors": "Søk opp alle forfattere",
   "ButtonMatchBooks": "Søk opp bøker",
   "ButtonNevermind": "Avbryt",
+  "ButtonNext": "Neste",
   "ButtonNextChapter": "Neste Kapittel",
+  "ButtonNextItemInQueue": "Neste element i køen",
+  "ButtonOk": "Ok",
   "ButtonOpenFeed": "Åpne Feed",
   "ButtonOpenManager": "Åpne behandler",
+  "ButtonPause": "Pause",
   "ButtonPlay": "Spill av",
+  "ButtonPlayAll": "Spill av alle",
   "ButtonPlaying": "Spiller av",
   "ButtonPlaylists": "Spillelister",
   "ButtonPrevious": "Forrige",
   "ButtonPreviousChapter": "Forrige Kapittel",
+  "ButtonProbeAudioFile": "Analyser lydfil",
   "ButtonPurgeAllCache": "Tøm alle mellomlager",
   "ButtonPurgeItemsCache": "Tøm mellomlager",
   "ButtonQueueAddItem": "Legg til kø",
   "ButtonQueueRemoveItem": "Fjern fra kø",
-  "ButtonQuickEmbedMetadata": "Hurtig Innbygging Av Metadata",
+  "ButtonQuickEmbed": "Hurtiginnbygging",
+  "ButtonQuickEmbedMetadata": "Bygg inn metadata",
   "ButtonQuickMatch": "Kjapt søk",
   "ButtonReScan": "Skann på nytt",
   "ButtonRead": "Les",
-  "ButtonReadLess": "Les Mindre",
-  "ButtonReadMore": "Les Mer",
+  "ButtonReadLess": "Vis mindre",
+  "ButtonReadMore": "Vis mer",
   "ButtonRefresh": "Oppdater",
   "ButtonRemove": "Fjern",
   "ButtonRemoveAll": "Fjern alle",
@@ -71,12 +81,15 @@
   "ButtonRemoveFromContinueReading": "Fjern fra Fortsett å lese",
   "ButtonRemoveSeriesFromContinueSeries": "Fjern serie fra Fortsett serie",
   "ButtonReset": "Nullstill",
+  "ButtonResetToDefault": "Tilbakestill til standard",
   "ButtonRestore": "Gjenopprett",
   "ButtonSave": "Lagre",
   "ButtonSaveAndClose": "Lagre og lukk",
   "ButtonSaveTracklist": "Lagre spilleliste",
   "ButtonScan": "Skann",
   "ButtonScanLibrary": "Skann bibliotek",
+  "ButtonScrollLeft": "Rull til venstre",
+  "ButtonScrollRight": "Rull til høyre",
   "ButtonSearch": "Søk",
   "ButtonSelectFolderPath": "Velg mappe",
   "ButtonSeries": "Serier",
@@ -88,20 +101,26 @@
   "ButtonStartMetadataEmbed": "Start Metadata innbaking",
   "ButtonStats": "Statistikk",
   "ButtonSubmit": "Send inn",
+  "ButtonTest": "Test",
+  "ButtonUnlinkOpenId": "Koble fra OpenID",
   "ButtonUpload": "Last opp",
   "ButtonUploadBackup": "Last opp sikkerhetskopi",
   "ButtonUploadCover": "Last opp cover",
   "ButtonUploadOPMLFile": "Last opp OPML fil",
   "ButtonUserDelete": "Slett bruker {0}",
   "ButtonUserEdit": "Rediger bruker {0}",
-  "ButtonViewAll": "Vis alt",
+  "ButtonViewAll": "Vis alle",
   "ButtonYes": "Ja",
   "ErrorUploadFetchMetadataAPI": "Feil ved innhenting av metadata",
+  "ErrorUploadFetchMetadataNoResults": "Kunne ikke hente metadata - forsøk å oppdatere tittel og/eller forfatter",
+  "ErrorUploadLacksTitle": "Tittel kreves",
   "HeaderAccount": "Konto",
+  "HeaderAddCustomMetadataProvider": "Legg til egendefinert metadata tilbyder",
   "HeaderAdvanced": "Avansert",
-  "HeaderAppriseNotificationSettings": "Apprise notifikasjonsinstillinger",
+  "HeaderAppriseNotificationSettings": "Apprise varslingsinstillinger",
   "HeaderAudioTracks": "Lydspor",
   "HeaderAudiobookTools": "Lydbok Filbehandlingsverktøy",
+  "HeaderAuthentication": "Autentisering",
   "HeaderBackups": "Sikkerhetskopier",
   "HeaderChangePassword": "Bytt passord",
   "HeaderChapters": "Kapittel",
@@ -110,6 +129,8 @@
   "HeaderCollectionItems": "Samlingsgjenstander",
   "HeaderCover": "Omslag",
   "HeaderCurrentDownloads": "Aktive nedlastinger",
+  "HeaderCustomMessageOnLogin": "Egendefinert melding ved pålogging",
+  "HeaderCustomMetadataProviders": "Egendefinerte metadata tilbydere",
   "HeaderDetails": "Detaljer",
   "HeaderDownloadQueue": "Last ned kø",
   "HeaderEbookFiles": "Ebook filer",
@@ -140,12 +161,17 @@
   "HeaderMetadataToEmbed": "Metadata å bake inn",
   "HeaderNewAccount": "Ny konto",
   "HeaderNewLibrary": "Ny bibliotek",
-  "HeaderNotifications": "Notifikasjoner",
+  "HeaderNotificationCreate": "Opprett varsling",
+  "HeaderNotificationUpdate": "Oppdater varsling",
+  "HeaderNotifications": "Varslinger",
   "HeaderOpenIDConnectAuthentication": "Autentisering med OpenID Connect",
+  "HeaderOpenListeningSessions": "Åpne lyttesesjoner",
   "HeaderOpenRSSFeed": "Åpne RSS Feed",
   "HeaderOtherFiles": "Andre filer",
+  "HeaderPasswordAuthentication": "Logg inn med brukernavn og passord",
   "HeaderPermissions": "Rettigheter",
   "HeaderPlayerQueue": "Spiller kø",
+  "HeaderPlayerSettings": "Avspillingsinnstillinger",
   "HeaderPlaylist": "Spilleliste",
   "HeaderPlaylistItems": "Spillelisteelement",
   "HeaderPodcastsToAdd": "Podcaster å legge til",
@@ -157,6 +183,7 @@
   "HeaderRemoveEpisodes": "Fjern {0} episoder",
   "HeaderSavedMediaProgress": "Lagret mediefremgang",
   "HeaderSchedule": "Timeplan",
+  "HeaderScheduleEpisodeDownloads": "Planlegg automatisk nedlasting av episoder",
   "HeaderScheduleLibraryScans": "Planlegg automatisk bibliotek skann",
   "HeaderSession": "Sesjon",
   "HeaderSetBackupSchedule": "Sett timeplan for sikkerhetskopi",
@@ -165,6 +192,7 @@
   "HeaderSettingsExperimental": "Eksperimentelle funksjoner",
   "HeaderSettingsGeneral": "Generell",
   "HeaderSettingsScanner": "Skanner",
+  "HeaderSettingsWebClient": "Webklient",
   "HeaderSleepTimer": "Sove timer",
   "HeaderStatsLargestItems": "Største enheter",
   "HeaderStatsLongestItems": "Lengste enheter (timer)",
@@ -179,9 +207,14 @@
   "HeaderUpdateDetails": "Oppdater detaljer",
   "HeaderUpdateLibrary": "Oppdater bibliotek",
   "HeaderUsers": "Brukere",
+  "HeaderYearReview": "{0} oppsummert",
   "HeaderYourStats": "Din statistikk",
   "LabelAbridged": "Forkortet",
+  "LabelAbridgedChecked": "Forkortet (valgt)",
+  "LabelAbridgedUnchecked": "Forkortet (ikke valgt)",
+  "LabelAccessibleBy": "Tilgjengelig via",
   "LabelAccountType": "Kontotype",
+  "LabelAccountTypeAdmin": "Administrator",
   "LabelAccountTypeGuest": "Gjest",
   "LabelAccountTypeUser": "Bruker",
   "LabelActivity": "Aktivitet",
@@ -190,32 +223,55 @@
   "LabelAddToPlaylist": "Legg til i spilleliste",
   "LabelAddToPlaylistBatch": "Legg {0} enheter til i spilleliste",
   "LabelAddedAt": "Lagt Til",
+  "LabelAddedDate": "La til {0}",
+  "LabelAdminUsersOnly": "Kun administratorer",
   "LabelAll": "Alle",
   "LabelAllUsers": "Alle brukere",
+  "LabelAllUsersExcludingGuests": "Alle brukere bortsett fra gjester",
+  "LabelAllUsersIncludingGuests": "Alle brukere inkludert gjester",
   "LabelAlreadyInYourLibrary": "Allerede i biblioteket",
+  "LabelApiToken": "API token",
   "LabelAppend": "Legge til",
+  "LabelAudioBitrate": "Bitrate for lyd (f.eks. 128k)",
+  "LabelAudioChannels": "Lydkanaler (1 eller 2)",
+  "LabelAudioCodec": "Audio Codec",
   "LabelAuthor": "Forfatter",
   "LabelAuthorFirstLast": "Forfatter (Fornavn Etternavn)",
   "LabelAuthorLastFirst": "Forfatter (Etternavn Fornavn)",
   "LabelAuthors": "Forfattere",
   "LabelAutoDownloadEpisodes": "Last ned episoder automatisk",
+  "LabelAutoFetchMetadata": "Automatisk henting av metadata",
+  "LabelAutoFetchMetadataHelp": "Henter metadata for tittel, forfatter og serie for å optimalisere opplasting. Ekstra metadata må kanskje bekreftes etter opplasting.",
+  "LabelAutoLaunch": "Autostart",
+  "LabelAutoLaunchDescription": "Omdiriger til leverandør for innlogging automatisk når innloggingssiden åpnes. (Kan overstyres med <code>/login?autoLaunch=0</code>)",
+  "LabelAutoRegister": "Automatisk registrering",
+  "LabelAutoRegisterDescription": "Lag bruker automatisk ved første innlogging",
   "LabelBackToUser": "Tilbake til bruker",
+  "LabelBackupAudioFiles": "Sikkerhetskopier lydfiler",
+  "LabelBackupLocation": "Mappe for sikkerhetskopiering",
   "LabelBackupsEnableAutomaticBackups": "Aktiver automatisk sikkerhetskopi",
   "LabelBackupsEnableAutomaticBackupsHelp": "Sikkerhetskopier lagret under /metadata/backups",
-  "LabelBackupsMaxBackupSize": "Maks sikkerhetskopi størrelse (i GB)",
+  "LabelBackupsMaxBackupSize": "Maksimal størrelse for sikkerhetskopi (i GB) (0 for ubegrenset)",
   "LabelBackupsMaxBackupSizeHelp": "For å forhindre feilkonfigurasjon, vil sikkerhetskopier mislykkes hvis de oveskride konfigurert størrelse.",
   "LabelBackupsNumberToKeep": "Antall sikkerhetskopier som skal beholdes",
   "LabelBackupsNumberToKeepHelp": "Kun 1 sikkerhetskopi vil bli fjernet om gangen, hvis du allerede har flere sikkerhetskopier enn dette bør du fjerne de manuelt.",
   "LabelBitrate": "Bithastighet",
+  "LabelBonus": "Bonus",
   "LabelBooks": "Bøker",
+  "LabelButtonText": "Tekst på knappen",
+  "LabelByAuthor": "av {0}",
   "LabelChangePassword": "Endre passord",
   "LabelChannels": "Kanaler",
+  "LabelChapterCount": "{0} kapitler",
   "LabelChapterTitle": "Kapittel tittel",
   "LabelChapters": "Kapitler",
   "LabelChaptersFound": "kapitler funnet",
+  "LabelClickForMoreInfo": "Klikk for mer informasjon",
+  "LabelClickToUseCurrentValue": "Klikk for å bruke valgt verdi",
   "LabelClosePlayer": "Lukk spiller",
   "LabelCodec": "Kodek",
   "LabelCollapseSeries": "Minimer serier",
+  "LabelCollapseSubSeries": "Skjul underserier",
   "LabelCollection": "Samling",
   "LabelCollections": "Samlings",
   "LabelComplete": "Fullfør",
@@ -232,58 +288,94 @@
   "LabelCustomCronExpression": "Tilpasset Cron utrykk:",
   "LabelDatetime": "Dato tid",
   "LabelDays": "Dager",
+  "LabelDeleteFromFileSystemCheckbox": "Slett fra filsystemet (fjern haken for kun å ta bort fra databasen)",
   "LabelDescription": "Beskrivelse",
   "LabelDeselectAll": "Fjern valg",
   "LabelDevice": "Enhet",
   "LabelDeviceInfo": "Enhetsinformasjon",
+  "LabelDeviceIsAvailableTo": "Enheten er tilgjengelig for...",
   "LabelDirectory": "Mappe",
   "LabelDiscFromFilename": "Disk fra filnavn",
   "LabelDiscFromMetadata": "Disk fra metadata",
-  "LabelDiscover": "Oppdagelse",
+  "LabelDiscover": "Oppdag",
   "LabelDownload": "Last ned",
   "LabelDownloadNEpisodes": "Last ned {0} episoder",
   "LabelDuration": "Varighet",
+  "LabelDurationComparisonExactMatch": "(nøyaktig treff)",
+  "LabelDurationComparisonLonger": "({0} lenger)",
+  "LabelDurationComparisonShorter": "({0} kortere)",
   "LabelDurationFound": "Varighet funnet:",
   "LabelEbook": "Ebok",
   "LabelEbooks": "E-bøker",
   "LabelEdit": "Rediger",
   "LabelEmail": "Epost",
   "LabelEmailSettingsFromAddress": "Fra Adresse",
+  "LabelEmailSettingsRejectUnauthorized": "Avvis uautoriserte sertifikat",
+  "LabelEmailSettingsRejectUnauthorizedHelp": "Ved å deaktivere sjekk av SSL sertifikat eksponerer man tilkoblingen for sikkerhetsrisiko, som for eksempel mann-i-midten-angrep. Slå av kun om du forstår implikasjonene og stoler på e-post-serveren du kobler til!",
   "LabelEmailSettingsSecure": "Sikker",
   "LabelEmailSettingsSecureHelp": "Hvis aktivert, vil tilkoblingen bruke TLS under tilkobling til tjeneren. Ellers vil TLS bli brukt hvis tjeneren støtter STARTTLS utvidelsen. I de fleste tilfeller aktiver valget hvis du kobler til med port 465. Med port 587 eller 25 deaktiver valget. (fra nodemailer.com/smtp/#authentication)",
   "LabelEmailSettingsTestAddress": "Test Adresse",
   "LabelEmbeddedCover": "Bak inn omslag",
   "LabelEnable": "Aktiver",
+  "LabelEncodingBackupLocation": "En sikkerhetskopi av de originale lyd-filene lagres i mappen:",
+  "LabelEncodingChaptersNotEmbedded": "Kapitler er ikke bygget inn i flersporede lydbøker.",
+  "LabelEncodingClearItemCache": "Husk å tømme mellomlageret med jevne mellomrom.",
+  "LabelEncodingFinishedM4B": "Ferdig konvertert M4B-lydbøker legges i lydbok-mappen:",
+  "LabelEncodingInfoEmbedded": "Metadata bygges inn i lydsporene i lydbokmappen.",
+  "LabelEncodingStartedNavigation": "Så snart oppgaven er startet kan du navigere bort fra denne siden.",
+  "LabelEncodingTimeWarning": "Konvertering kan ta opptil 30 minutter.",
+  "LabelEncodingWarningAdvancedSettings": "Advarsel: Ikke oppdater disse innstillingene med mindre du er godt kjent med hvordan ffmpeg og konverteringsvalgene fungerer.",
+  "LabelEncodingWatcherDisabled": "Hvis du har slått av overvåking så må du skanne dette biblioteket på nytt etterpå.",
   "LabelEnd": "Slutt",
   "LabelEndOfChapter": "Slutt på kapittel",
+  "LabelEpisode": "Episode",
+  "LabelEpisodeNotLinkedToRssFeed": "Episode er ikke koblet til en RSS feed",
+  "LabelEpisodeNumber": "Episode #{0}",
   "LabelEpisodeTitle": "Episode tittel",
   "LabelEpisodeType": "Episode type",
+  "LabelEpisodeUrlFromRssFeed": "Episode URL fra RSS feed",
+  "LabelEpisodes": "Episoder",
+  "LabelEpisodic": "Episodisk",
   "LabelExample": "Eksempel",
+  "LabelExpandSeries": "Vis serie",
+  "LabelExpandSubSeries": "Vis underserie",
   "LabelExplicit": "Eksplisitt",
+  "LabelExplicitChecked": "Eksplisitt (avhuket)",
+  "LabelExplicitUnchecked": "Ikke eksplisitt (ikke avhuket)",
   "LabelExportOPML": "Eksporter OPML",
   "LabelFeedURL": "Feed Adresse",
+  "LabelFetchingMetadata": "Henter metadata",
   "LabelFile": "Fil",
   "LabelFileBirthtime": "Fil Opprettelsesdato",
+  "LabelFileBornDate": "Født {0}",
   "LabelFileModified": "Fil Endret",
+  "LabelFileModifiedDate": "Redigert {0}",
   "LabelFilename": "Filnavn",
   "LabelFilterByUser": "Filtrer etter bruker",
   "LabelFindEpisodes": "Finn episoder",
   "LabelFinished": "Fullført",
   "LabelFolder": "Mappe",
   "LabelFolders": "Mapper",
+  "LabelFontBold": "Fet",
   "LabelFontBoldness": "Skrifttykkelse",
   "LabelFontFamily": "Fontfamilie",
+  "LabelFontItalic": "Kursiv",
   "LabelFontScale": "Font størrelse",
+  "LabelFontStrikethrough": "Gjennomstreking",
+  "LabelFormat": "Format",
+  "LabelFull": "Full",
   "LabelGenre": "Sjanger",
   "LabelGenres": "Sjangers",
   "LabelHardDeleteFile": "Tving sletting av fil",
   "LabelHasEbook": "Har e-bok",
   "LabelHasSupplementaryEbook": "Har komplimentær e-bok",
   "LabelHideSubtitles": "Skjul undertekster",
+  "LabelHighestPriority": "Høyeste prioritet",
   "LabelHost": "Tjener",
   "LabelHour": "Time",
   "LabelHours": "Timer",
   "LabelIcon": "Ikon",
+  "LabelImageURLFromTheWeb": "Bilde-URL fra nett",
   "LabelInProgress": "I gang",
   "LabelIncludeInTracklist": "Inkluder i sporliste",
   "LabelIncomplete": "Ufullstendig",
@@ -298,8 +390,11 @@
   "LabelIntervalEveryHour": "Hver time",
   "LabelInvert": "Inverter",
   "LabelItem": "Enhet",
+  "LabelJumpBackwardAmount": "Hopp bakover med",
+  "LabelJumpForwardAmount": "Hopp forover med",
   "LabelLanguage": "Språk",
   "LabelLanguageDefaultServer": "Standard tjener språk",
+  "LabelLanguages": "Språk",
   "LabelLastBookAdded": "Siste bok lagt til",
   "LabelLastBookUpdated": "Siste bok oppdatert",
   "LabelLastSeen": "Sist sett",
@@ -316,12 +411,30 @@
   "LabelLimit": "Begrensning",
   "LabelLineSpacing": "Linjemellomrom",
   "LabelListenAgain": "Lytt igjen",
+  "LabelLogLevelDebug": "Debug",
+  "LabelLogLevelInfo": "Info",
+  "LabelLogLevelWarn": "Warn",
   "LabelLookForNewEpisodesAfterDate": "Se etter nye episoder etter denne datoen",
+  "LabelLowestPriority": "Laveste prioritet",
+  "LabelMatchExistingUsersBy": "Knytt sammen eksisterende brukere basert på",
+  "LabelMatchExistingUsersByDescription": "Brukes for å koble til eksisterende brukere. Når koblingen er i orden vil brukerne bli identifisert med en unik id fra SSO-tilbyderen.",
+  "LabelMaxEpisodesToDownload": "Maksimalt antall episoder som skal lastes ned. Bruk 0 for ubegrenset.",
+  "LabelMaxEpisodesToDownloadPerCheck": "Maksimalt antall nye episoder som skal lastes ned per sjekk",
+  "LabelMaxEpisodesToKeep": "Maksimalt antall episoder som skal beholdes",
+  "LabelMaxEpisodesToKeepHelp": "Sett verdien til null (0) for ubegrenset. Etter at en episode lastes ned automatisk, så slettes den eldste episoden, om du har mer enn X episoder. Det slettes kun én episode per nye nedlasting.",
   "LabelMediaPlayer": "Mediespiller",
   "LabelMediaType": "Medie type",
+  "LabelMetaTag": "Meta tag",
+  "LabelMetaTags": "Meta tags",
+  "LabelMetadataOrderOfPrecedenceDescription": "Høyere prioritert kilder for metadata overstyrer laverer prioriterte kilder for metadata.",
   "LabelMetadataProvider": "Metadata Leverandør",
   "LabelMinute": "Minutt",
+  "LabelMinutes": "Minutter",
   "LabelMissing": "Mangler",
+  "LabelMissingEbook": "Har ingen e-bok",
+  "LabelMissingSupplementaryEbook": "Har ingen komplementær e-bok",
+  "LabelMobileRedirectURIs": "Tillatte URL-er for vidersending",
+  "LabelMobileRedirectURIsDescription": "Dette er en liste over godkjente videresendings-URL-er for mobil-apper. Standarden er <code>audiobookshelf://oauth</code>, som du kan fjerne eller supplere med ekstra URL-er for tredjeparts app-integrasjoner. For å tillate alle URL-er kan du bruke kun en (<code>*</code>) .",
   "LabelMore": "Mer",
   "LabelMoreInfo": "Mer info",
   "LabelName": "Navn",
@@ -333,6 +446,7 @@
   "LabelNewestEpisodes": "Nyeste episoder",
   "LabelNextBackupDate": "Neste sikkerhetskopi dato",
   "LabelNextScheduledRun": "Neste planlagte kjøring",
+  "LabelNoCustomMetadataProviders": "Ingen egendefinerte tilbydere for metadata",
   "LabelNoEpisodesSelected": "Ingen episoder valgt",
   "LabelNotFinished": "Ikke fullført",
   "LabelNotStarted": "Ikke startet",
@@ -340,66 +454,95 @@
   "LabelNotificationAppriseURL": "Apprise URL(er)",
   "LabelNotificationAvailableVariables": "Tilgjengelige variabler",
   "LabelNotificationBodyTemplate": "Kroppsmal",
-  "LabelNotificationEvent": "Notifikasjons hendelse",
+  "LabelNotificationEvent": "Varsling",
   "LabelNotificationTitleTemplate": "Tittel mal",
   "LabelNotificationsMaxFailedAttempts": "Maks mislykkede forsøk",
-  "LabelNotificationsMaxFailedAttemptsHelp": "Notifikasjoner er deaktivert når de mislykkes på sende dette flere ganger",
-  "LabelNotificationsMaxQueueSize": "Maks kø lengde for Notifikasjonshendelser",
-  "LabelNotificationsMaxQueueSizeHelp": "Hendelser er begrenset til avfyre 1 gang per sekund. Hendelser vil bli ignorert om køen er full. Dette forhindrer Notifikasjon spam.",
+  "LabelNotificationsMaxFailedAttemptsHelp": "Varslinger deaktiveres når sending feiles dette antallet ganger",
+  "LabelNotificationsMaxQueueSize": "Maksimalt antall varslinger i kø",
+  "LabelNotificationsMaxQueueSizeHelp": "Hendelser er begrenset til avfyre én gang per sekund. Hendelser blir ignorert om køen er full. Dette forhindrer overflod av varslinger.",
   "LabelNumberOfBooks": "Antall bøker",
   "LabelNumberOfEpisodes": "Antall episoder",
+  "LabelOpenIDClaims": "La følge valg være tomme for å slå av avanserte gruppe og tillatelser. Gruppen \"Bruker\" vil da også automatisk legges til.",
   "LabelOpenRSSFeed": "Åpne RSS Feed",
   "LabelOverwrite": "Overskriv",
+  "LabelPaginationPageXOfY": "Side {0} av {1}",
   "LabelPassword": "Passord",
   "LabelPath": "Sti",
   "LabelPermanent": "Fast",
   "LabelPermissionsAccessAllLibraries": "Har tilgang til alle bibliotek",
   "LabelPermissionsAccessAllTags": "Har til gang til alle tags",
   "LabelPermissionsAccessExplicitContent": "Har tilgang til eksplisitt material",
+  "LabelPermissionsCreateEreader": "Kan opprette e-leser",
   "LabelPermissionsDelete": "Kan slette",
   "LabelPermissionsDownload": "Kan laste ned",
   "LabelPermissionsUpdate": "Kan oppdatere",
   "LabelPermissionsUpload": "Kan laste opp",
+  "LabelPersonalYearReview": "Oppsummering av året ditt ({0})",
   "LabelPhotoPathURL": "Bilde sti/URL",
   "LabelPlayMethod": "Avspillingsmetode",
+  "LabelPlayerChapterNumberMarker": "{0} av {1}",
   "LabelPlaylists": "Spilleliste",
+  "LabelPodcast": "Podcast",
   "LabelPodcastSearchRegion": "Podcast-søkeområde",
   "LabelPodcastType": "Podcast type",
   "LabelPodcasts": "Podcaster",
+  "LabelPort": "Port",
   "LabelPrefixesToIgnore": "Prefiks som skal ignoreres (skiller ikke mellom store og små bokstaver)",
   "LabelPreventIndexing": "Forhindre at din feed fra å bli indeksert av iTunes og Google podcast kataloger",
   "LabelPrimaryEbook": "Primær ebok",
   "LabelProgress": "Framgang",
   "LabelProvider": "Tilbyder",
+  "LabelProviderAuthorizationValue": "Autorisasjons header-verdi",
   "LabelPubDate": "Publiseringsdato",
   "LabelPublishYear": "Publikasjonsår",
+  "LabelPublishedDate": "Publisert {0}",
+  "LabelPublishedDecade": "Tiår for utgivelse",
+  "LabelPublishedDecades": "Tiår for utgivelse",
   "LabelPublisher": "Forlegger",
+  "LabelPublishers": "Utgivere",
   "LabelRSSFeedCustomOwnerEmail": "Tilpasset eier e-post",
   "LabelRSSFeedCustomOwnerName": "Tilpasset eier Navn",
   "LabelRSSFeedOpen": "RSS Feed åpne",
   "LabelRSSFeedPreventIndexing": "Forhindre indeksering",
-  "LabelRSSFeedSlug": "RSS-informasjonskanalunderadresse",
+  "LabelRSSFeedSlug": "RSS-feed ID",
+  "LabelRSSFeedURL": "RSS-feed URL",
+  "LabelRandomly": "Tilfeldig",
+  "LabelReAddSeriesToContinueListening": "Legg til igjen til \"Fortsett å lytte\"",
   "LabelRead": "Les",
   "LabelReadAgain": "Les igjen",
   "LabelReadEbookWithoutProgress": "Les ebok uten å beholde fremgang",
   "LabelRecentSeries": "Nylige serier",
   "LabelRecentlyAdded": "Nylig tillagt",
   "LabelRecommended": "Anbefalte",
+  "LabelRedo": "Gjenta",
+  "LabelRegion": "Region",
   "LabelReleaseDate": "Utgivelsesdato",
+  "LabelRemoveAllMetadataAbs": "Fjern alle metadata.abs filer",
+  "LabelRemoveAllMetadataJson": "Fjern alle metadata.json filer",
   "LabelRemoveCover": "Fjern omslag",
+  "LabelRemoveMetadataFile": "Fjern metadata-filer fra biblioteks-mapper",
+  "LabelRemoveMetadataFileHelp": "Fjern alle metadata.json og metadata.abs i alle {0} mappene.",
+  "LabelRowsPerPage": "Rader per side",
   "LabelSearchTerm": "Søkeord",
   "LabelSearchTitle": "Søk tittel",
   "LabelSearchTitleOrASIN": "Søk tittel eller ASIN",
   "LabelSeason": "Sesong",
+  "LabelSeasonNumber": "Sesong #{0}",
+  "LabelSelectAll": "Velg alt",
   "LabelSelectAllEpisodes": "Velg alle episoder",
   "LabelSelectEpisodesShowing": "Velg {0} episoder vist",
+  "LabelSelectUsers": "Velg brukere",
   "LabelSendEbookToDevice": "Send Ebok til...",
   "LabelSequence": "Sekvens",
+  "LabelSerial": "Serienr.",
   "LabelSeries": "Serier",
   "LabelSeriesName": "Serier Navn",
   "LabelSeriesProgress": "Serier fremgang",
+  "LabelServerLogLevel": "Server logg-nivå",
+  "LabelServerYearReview": "Server - Oppsummering av året ({0})",
   "LabelSetEbookAsPrimary": "Sett som primær",
   "LabelSetEbookAsSupplementary": "Sett som supplerende",
+  "LabelSettingsAllowIframe": "Tillat å bygge inn i en iframe",
   "LabelSettingsAudiobooksOnly": "Kun lydbøker",
   "LabelSettingsAudiobooksOnlyHelp": "Aktivering av dette valget til ignorere ebok filer utenom de er i en lydbok mappe hvor de vil bli satt som supplerende ebøker",
   "LabelSettingsBookshelfViewHelp": "Skeuomorf design med hyller av ved",
@@ -411,6 +554,8 @@
   "LabelSettingsEnableWatcher": "Aktiver overvåker",
   "LabelSettingsEnableWatcherForLibrary": "Aktiver mappe overvåker for bibliotek",
   "LabelSettingsEnableWatcherHelp": "Aktiverer automatisk opprettelse/oppdatering av enheter når filendringer er oppdaget. *Krever restart av server*",
+  "LabelSettingsEpubsAllowScriptedContent": "Tillat scripting i innholdet i ebub-bøker",
+  "LabelSettingsEpubsAllowScriptedContentHelp": "Tillat epub-filer å kjøre script. Det er anbefalt å slå av denne innstillingen med mindre du stoler på kilden til epub-filene.",
   "LabelSettingsExperimentalFeatures": "Eksperimentelle funksjoner",
   "LabelSettingsExperimentalFeaturesHelp": "Funksjoner under utvikling som kan trenge din tilbakemelding og hjelp med testing. Klikk for å åpne GitHub diskusjon.",
   "LabelSettingsFindCovers": "Finn omslag",
@@ -419,8 +564,12 @@
   "LabelSettingsHideSingleBookSeriesHelp": "Serier som har kun en bok vil bli gjemt på serie- og hjemmeside hyllen.",
   "LabelSettingsHomePageBookshelfView": "Hjemmeside bruk bokhyllevisning",
   "LabelSettingsLibraryBookshelfView": "Bibliotek bruk bokhyllevisning",
+  "LabelSettingsLibraryMarkAsFinishedPercentComplete": "Prosent ferdig er større enn",
+  "LabelSettingsLibraryMarkAsFinishedTimeRemaining": "Gjenværende tid er mindre enn (sekunder)",
+  "LabelSettingsLibraryMarkAsFinishedWhen": "Marker som ferdig når",
+  "LabelSettingsOnlyShowLaterBooksInContinueSeries": "Hopp over tidligere bøker i \"Fortsett serien\"",
   "LabelSettingsParseSubtitles": "Analyser undertekster",
-  "LabelSettingsParseSubtitlesHelp": "Trekk ut undertekster fra lydbok mappenavn.<br>undertekster må være separert med \" - \"<br>f.eks. \"Boktittel - Undertekst her\" har Undertekst \"Undertekst her\"",
+  "LabelSettingsParseSubtitlesHelp": "Hent undertittel fra lydbokens mappenavn.<br>Undertittel må være separert med \" - \"<br>f.eks. \"Boktittel - En lengre tittel\" har undertittel \"En lengre tittel\".",
   "LabelSettingsPreferMatchedMetadata": "Foretrekk funnet metadata",
   "LabelSettingsPreferMatchedMetadataHelp": "Funnet data vil overskrive enhetens detaljene når man bruker Kjapt søk. Som standard vil Kjapt søk kun fylle inn manglende detaljer.",
   "LabelSettingsSkipMatchingBooksWithASIN": "Hopp over bøker som allerede har ASIN",
@@ -435,10 +584,17 @@
   "LabelSettingsStoreMetadataWithItemHelp": "Som standard vil metadata bli lagret under /metadata/items, aktiveres dette valget vil metadata bli lagret i samme mappe som gjenstanden",
   "LabelSettingsTimeFormat": "Tid format",
   "LabelShare": "Dele",
+  "LabelShareOpen": "Åpne deling",
   "LabelShareURL": "Dele URL",
-  "LabelShowAll": "Vis alt",
+  "LabelShowAll": "Vis alle",
+  "LabelShowSeconds": "Vis sekunder",
+  "LabelShowSubtitles": "Vis undertitler",
   "LabelSize": "Størrelse",
   "LabelSleepTimer": "Sove-timer",
+  "LabelSlug": "Slug",
+  "LabelSortAscending": "Stigende",
+  "LabelSortDescending": "Synkende",
+  "LabelStart": "Start",
   "LabelStartTime": "Start Tid",
   "LabelStarted": "Startet",
   "LabelStartedAt": "Startet",
@@ -459,15 +615,24 @@
   "LabelStatsWeekListening": "Uker lyttet",
   "LabelSubtitle": "undertekster",
   "LabelSupportedFileTypes": "Støttede filtyper",
+  "LabelTag": "Tag",
   "LabelTags": "Tagger",
   "LabelTagsAccessibleToUser": "Tagger tilgjengelig for bruker",
   "LabelTagsNotAccessibleToUser": "Tagger ikke tilgjengelig for bruker",
   "LabelTasks": "Oppgaver som kjører",
+  "LabelTextEditorBulletedList": "Punkt-liste",
+  "LabelTextEditorLink": "Link",
+  "LabelTextEditorNumberedList": "Nummerert liste",
+  "LabelTextEditorUnlink": "Fjern link",
   "LabelTheme": "Tema",
   "LabelThemeDark": "Mørk",
   "LabelThemeLight": "Lys",
   "LabelTimeBase": "Tidsbase",
+  "LabelTimeDurationXHours": "{0} timer",
+  "LabelTimeDurationXMinutes": "{0} minutter",
+  "LabelTimeDurationXSeconds": "{0} sekunder",
   "LabelTimeInMinutes": "Timer i minutter",
+  "LabelTimeLeft": "{0} gjenstår",
   "LabelTimeListened": "Tid lyttet",
   "LabelTimeListenedToday": "Tid lyttet idag",
   "LabelTimeRemaining": "{0} gjennstående",
@@ -475,6 +640,7 @@
   "LabelTitle": "Tittel",
   "LabelToolsEmbedMetadata": "Bak inn metadata",
   "LabelToolsEmbedMetadataDescription": "Bak inn metadata i lydfilen, inkludert omslagsbilde og kapitler.",
+  "LabelToolsM4bEncoder": "M4B enkoder",
   "LabelToolsMakeM4b": "Lag M4B Lydbokfil",
   "LabelToolsMakeM4bDescription": "Lager en.M4B lydbokfil med innbakte omslagsbilde og kapitler.",
   "LabelToolsSplitM4b": "Del M4B inn i MP3er",
@@ -487,39 +653,55 @@
   "LabelTracksMultiTrack": "Flerspor",
   "LabelTracksNone": "Ingen spor",
   "LabelTracksSingleTrack": "Enkelspor",
+  "LabelTrailer": "Trailer",
+  "LabelType": "Type",
   "LabelUnabridged": "Uavkortet",
+  "LabelUndo": "Angre",
   "LabelUnknown": "Ukjent",
+  "LabelUnknownPublishDate": "Ukjent publiseringsdato",
   "LabelUpdateCover": "Oppdater omslag",
   "LabelUpdateCoverHelp": "Tillat overskriving av eksisterende omslag for de valgte bøkene når en lik bok er funnet",
   "LabelUpdateDetails": "Oppdater detaljer",
   "LabelUpdateDetailsHelp": "Tillat overskriving av eksisterende detaljer for de valgte bøkene når en lik bok er funnet",
   "LabelUpdatedAt": "Oppdatert",
   "LabelUploaderDragAndDrop": "Dra og slipp filer eller mapper",
+  "LabelUploaderDragAndDropFilesOnly": "Dra & slipp filer",
   "LabelUploaderDropFiles": "Slipp filer",
+  "LabelUploaderItemFetchMetadataHelp": "Hent tittel, forfatter og serie automatisk",
+  "LabelUseAdvancedOptions": "Bruk avanserte valg",
   "LabelUseChapterTrack": "Bruk kapittelspor",
   "LabelUseFullTrack": "Bruke hele sporet",
+  "LabelUseZeroForUnlimited": "Bruk 0 for ubegrenset",
   "LabelUser": "Bruker",
   "LabelUsername": "Brukernavn",
   "LabelValue": "Verdi",
   "LabelVersion": "Versjon",
   "LabelViewBookmarks": "Vis bokmerker",
   "LabelViewChapters": "Vis kapitler",
+  "LabelViewPlayerSettings": "Vis innstillinger for avspiller",
   "LabelViewQueue": "Vis spillerkø",
   "LabelVolume": "Volum",
+  "LabelWebRedirectURLsSubfolder": "Undermapper for videresendings-URL-er",
   "LabelWeekdaysToRun": "Ukedager å kjøre",
+  "LabelXBooks": "{0} bøker",
+  "LabelXItems": "{0} elementer",
+  "LabelYearReviewHide": "Skjul oppsummering av året",
+  "LabelYearReviewShow": "Vis oppsummering av året",
   "LabelYourAudiobookDuration": "Din lydbok lengde",
   "LabelYourBookmarks": "Dine bokmerker",
   "LabelYourPlaylists": "Dine spillelister",
   "LabelYourProgress": "Din fremgang",
   "MessageAddToPlayerQueue": "Legg til i kø",
-  "MessageAppriseDescription": "For å bruke denne funksjonen trenger du en instans av <a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">Apprise API</a> kjørende eller ett api som vil håndere disse forespørslene. <br />Apprise API Url skal være den fulle URL stien for å sende Notifikasjonen, f.eks., hvis din API instans er hos <code>http://192.168.1.1:8337</code> vil du bruke <code>http://192.168.1.1:8337/notify</code>.",
+  "MessageAppriseDescription": "For å bruke denne funksjonen trenger du en instans av <a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">Apprise API</a> kjørende eller et API som håndterer disse forespørslene. <br />Apprise API URL skal være hele URL-en til varslingen, f.eks., hvis din API-instans er på <code>http://192.168.1.1:8337</code> så skal du bruke <code>http://192.168.1.1:8337/notify</code>.",
   "MessageBackupsDescription": "Sikkerhetskopier inkluderer, brukerfremgang, detaljer om bibliotekgjenstander, tjener instillinger og bilder lagret under <code>/metadata/items</code> og <code>/metadata/authors</code>. Sikkerhetskopier <strong>vil ikke</strong> inkludere filer som er lagret i bibliotek mappene.",
-  "MessageBackupsLocationEditNote": "Merk: Endring av sikkerhetskopieringssted hverken endrer eller flytter eksisterende sikkerhetskopier",
-  "MessageBackupsLocationPathEmpty": "Sti til sikkerhetskopieringssted må angis",
+  "MessageBackupsLocationEditNote": "Viktig: Endring av mappen for sikkerhetskopi hverken endrer eller flytter eksisterende sikkerhetskopier!",
+  "MessageBackupsLocationNoEditNote": "NB: Mappen for sikkerhetskopi settes i en miljøvariabel og kan ikke endres her.",
+  "MessageBackupsLocationPathEmpty": "Mappen for sikkerhetskopiering må angis",
   "MessageBatchQuickMatchDescription": "Kjapt søk vil forsøke å legge til manglende omslag og metadata for de valgte gjenstandene. Aktiver dette valget for å tillate Kjapt søk til å overskrive eksisterende omslag og/eller metadata.",
   "MessageBookshelfNoCollections": "Du har ikke laget noen samlinger ennå",
   "MessageBookshelfNoRSSFeeds": "Ingen RSS feed er åpen",
   "MessageBookshelfNoResultsForFilter": "Ingen resultat for filter \"{0}: {1}\"",
+  "MessageBookshelfNoResultsForQuery": "Ingen resultater for søket",
   "MessageBookshelfNoSeries": "Du har ingen serier",
   "MessageChapterEndIsAfter": "Kapittel slutt er etter slutt av lydboken",
   "MessageChapterErrorFirstNotZero": "Første kapittel starter på 0",
@@ -529,14 +711,28 @@
   "MessageCheckingCron": "Sjekker cron...",
   "MessageConfirmCloseFeed": "Er du sikker på at du vil lukke denne feeden?",
   "MessageConfirmDeleteBackup": "Er du sikker på at du vil slette sikkerhetskopi for {0}?",
+  "MessageConfirmDeleteDevice": "Er du sikker på at du vil slette e-leser enheten \"{0}\"?",
   "MessageConfirmDeleteFile": "Dette vil slette filen fra filsystemet. Er du sikker?",
   "MessageConfirmDeleteLibrary": "Er du sikker på at du vil slette biblioteket \"{0}\" for godt?",
+  "MessageConfirmDeleteLibraryItem": "Nå slettes elementet fra databasen og fil-systemet. Er du sikker?",
+  "MessageConfirmDeleteLibraryItems": "Nå slettes {0} elementer fra databasen og fil-systemet. Er du sikker?",
+  "MessageConfirmDeleteMetadataProvider": "Er du sikker på at du vil slette den egendefinerte leverandøren av metadata: \"{0}\"?",
+  "MessageConfirmDeleteNotification": "Er du sikker på at du vil slette dette varselet?",
   "MessageConfirmDeleteSession": "Er du sikker på at du vil slette denne sesjonen?",
+  "MessageConfirmEmbedMetadataInAudioFiles": "Er du sikker på at du vil legge til metadata i {0} lyd-filer?",
   "MessageConfirmForceReScan": "Er du sikker på at du vil tvinge en ny skann?",
   "MessageConfirmMarkAllEpisodesFinished": "Er du sikker på at du vil markere alle episodene som fullført?",
   "MessageConfirmMarkAllEpisodesNotFinished": "Er du sikker på at du vil markere alle episodene som ikke fullført?",
+  "MessageConfirmMarkItemFinished": "Er du sikker på at du vil markere {0} som ferdig?",
+  "MessageConfirmMarkItemNotFinished": "Er du sikker på at du vil markere {0} som ikke ferdig?",
   "MessageConfirmMarkSeriesFinished": "Er du sikker på at du vil markere alle bøkene i serien som fullført?",
   "MessageConfirmMarkSeriesNotFinished": "Er du sikker på at du vil markere alle bøkene i serien som ikke fullført?",
+  "MessageConfirmNotificationTestTrigger": "Utløs dette varselet med test-data?",
+  "MessageConfirmPurgeCache": "(Purge cache) Dette vil sletter hele mappen  <code>/metadata/cache</code>. <br /><br />Er du sikker på at du du vil slette cache-mappen?",
+  "MessageConfirmPurgeItemsCache": "(Purge items cache) Dette vil sletter hele mappen <code>/metadata/cache/items</code>.<br />Er du sikker?",
+  "MessageConfirmQuickEmbed": "Advarsel! Rask innbygging av metadata tar ikke backup av lyd-filene først. Forsikre deg om at du har sikkerhetskopi av filene. <br><br> Fortsett?",
+  "MessageConfirmQuickMatchEpisodes": "Hurtig gjenkjenning av episoder overskriver detaljene hvis en match blir funnet. Kun episoder som ikke allerede er matchet blir oppdatert. Er du sikker?",
+  "MessageConfirmReScanLibraryItems": "Er du sikker på at du ønsker å skanne {0} elementer på nytt?",
   "MessageConfirmRemoveAllChapters": "Er du sikker på at du vil fjerne alle kapitler?",
   "MessageConfirmRemoveCollection": "Er du sikker på at du vil fjerne samling\"{0}\"?",
   "MessageConfirmRemoveEpisode": "Er du sikker på at du vil fjerne episode \"{0}\"?",
@@ -593,7 +789,7 @@
   "MessageNoListeningSessions": "Ingen Lyttesesjoner",
   "MessageNoLogs": "Ingen logger",
   "MessageNoMediaProgress": "Ingen mediefremgang",
-  "MessageNoNotifications": "Ingen notifikasjoner",
+  "MessageNoNotifications": "Ingen varslinger",
   "MessageNoPodcastsFound": "Ingen podcaster funnet",
   "MessageNoResults": "Ingen resultat",
   "MessageNoSearchResultsFor": "Ingen søkeresultat for \"{0}\"",

From 2e0156d9faab22c7e834b65d8e7b80fdb3479977 Mon Sep 17 00:00:00 2001
From: ugyes <ferenc.bodi@live.com>
Date: Fri, 20 Dec 2024 07:51:14 +0000
Subject: [PATCH 089/143] Translated using Weblate (Hungarian)

Currently translated at 95.0% (1026 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/hu/
---
 client/strings/hu.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/strings/hu.json b/client/strings/hu.json
index 4aa24095..10807375 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -206,7 +206,7 @@
   "HeaderUpdateDetails": "Részletek frissítése",
   "HeaderUpdateLibrary": "Könyvtár frissítése",
   "HeaderUsers": "Felhasználók",
-  "HeaderYearReview": "{0} év áttekintése",
+  "HeaderYearReview": "{0} év visszatekintése",
   "HeaderYourStats": "Saját statisztikák",
   "LabelAbridged": "Tömörített",
   "LabelAbridgedChecked": "Rövidített (ellenőrizve)",
@@ -478,7 +478,7 @@
   "LabelPermissionsDownload": "Letölthet",
   "LabelPermissionsUpdate": "Frissíthet",
   "LabelPermissionsUpload": "Feltölthet",
-  "LabelPersonalYearReview": "Az éved áttekintése ({0})",
+  "LabelPersonalYearReview": "Az évvisszatekintésed ({0})",
   "LabelPhotoPathURL": "Fénykép útvonal/URL",
   "LabelPlayMethod": "Lejátszási módszer",
   "LabelPlayerChapterNumberMarker": "{0} a {1} -ből",
@@ -539,7 +539,7 @@
   "LabelSeriesName": "Sorozat neve",
   "LabelSeriesProgress": "Sorozat haladása",
   "LabelServerLogLevel": "Kiszolgáló naplózási szint",
-  "LabelServerYearReview": "Szerver évértékelő ({0})",
+  "LabelServerYearReview": "Szerver évvisszatekintés ({0})",
   "LabelSetEbookAsPrimary": "Beállítás elsődlegesként",
   "LabelSetEbookAsSupplementary": "Beállítás kiegészítőként",
   "LabelSettingsAllowIframe": "A beágyazás engedélyezése egy iframe-be",
@@ -684,8 +684,8 @@
   "LabelWeekdaysToRun": "Futás napjai",
   "LabelXBooks": "{0} könyv",
   "LabelXItems": "{0} elem",
-  "LabelYearReviewHide": "Évértékelő elrejtése",
-  "LabelYearReviewShow": "Évértékelés megtekintése",
+  "LabelYearReviewHide": "Az évvisszatekintés elrejtése",
+  "LabelYearReviewShow": "Évvisszatekintés megtekintése",
   "LabelYourAudiobookDuration": "Hangoskönyv időtartama",
   "LabelYourBookmarks": "Könyvjelzőid",
   "LabelYourPlaylists": "Lejátszási listáid",
@@ -910,7 +910,7 @@
   "StatsTopNarrator": "TOP ELŐADÓ",
   "StatsTopNarrators": "TOP ELŐADÓ",
   "StatsTotalDuration": "A teljes időtartam…",
-  "StatsYearInReview": "ÉVÉRTÉKELÉS",
+  "StatsYearInReview": "ÉVVISSZATEKINTÉS",
   "ToastAccountUpdateSuccess": "Fiók frissítve",
   "ToastAppriseUrlRequired": "Meg kell adnia egy Apprise URL-címet",
   "ToastAsinRequired": "ASIN kötelező",

From aa82439125ff2558bb2c3f09ee5e42e5e3b143ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98ystein=20S=2E=20Hegnander?= <eins16@gmail.com>
Date: Fri, 20 Dec 2024 06:45:05 +0000
Subject: [PATCH 090/143] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 91.9% (993 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/nb_NO/
---
 client/strings/no.json | 107 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/client/strings/no.json b/client/strings/no.json
index 96de90d9..ddfc2489 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -406,6 +406,7 @@
   "LabelLess": "Mindre",
   "LabelLibrariesAccessibleToUser": "Biblioteker tilgjengelig for bruker",
   "LabelLibrary": "Bibliotek",
+  "LabelLibraryFilterSublistEmpty": "",
   "LabelLibraryItem": "Bibliotek enhet",
   "LabelLibraryName": "Bibliotek navn",
   "LabelLimit": "Begrensning",
@@ -568,6 +569,7 @@
   "LabelSettingsLibraryMarkAsFinishedTimeRemaining": "Gjenværende tid er mindre enn (sekunder)",
   "LabelSettingsLibraryMarkAsFinishedWhen": "Marker som ferdig når",
   "LabelSettingsOnlyShowLaterBooksInContinueSeries": "Hopp over tidligere bøker i \"Fortsett serien\"",
+  "LabelSettingsOnlyShowLaterBooksInContinueSeriesHelp": "\"Fortsett serie\"-siden viser første bok som ikke er påbegynt i serier der en bok er lest og ingen bøker leses nå. Ved å slå på denne innstillingen så vil man fortsette på serien etter siste leste bok, fremfor første bok som ikke er startet på i en serie.",
   "LabelSettingsParseSubtitles": "Analyser undertekster",
   "LabelSettingsParseSubtitlesHelp": "Hent undertittel fra lydbokens mappenavn.<br>Undertittel må være separert med \" - \"<br>f.eks. \"Boktittel - En lengre tittel\" har undertittel \"En lengre tittel\".",
   "LabelSettingsPreferMatchedMetadata": "Foretrekk funnet metadata",
@@ -681,6 +683,7 @@
   "LabelViewPlayerSettings": "Vis innstillinger for avspiller",
   "LabelViewQueue": "Vis spillerkø",
   "LabelVolume": "Volum",
+  "LabelWebRedirectURLsDescription": "Godkjenn disse URL-ene hos OAuth-tilbyder for å tillate videresending til web-appen etter innlogging:",
   "LabelWebRedirectURLsSubfolder": "Undermapper for videresendings-URL-er",
   "LabelWeekdaysToRun": "Ukedager å kjøre",
   "LabelXBooks": "{0} bøker",
@@ -734,9 +737,12 @@
   "MessageConfirmQuickMatchEpisodes": "Hurtig gjenkjenning av episoder overskriver detaljene hvis en match blir funnet. Kun episoder som ikke allerede er matchet blir oppdatert. Er du sikker?",
   "MessageConfirmReScanLibraryItems": "Er du sikker på at du ønsker å skanne {0} elementer på nytt?",
   "MessageConfirmRemoveAllChapters": "Er du sikker på at du vil fjerne alle kapitler?",
+  "MessageConfirmRemoveAuthor": "Er du sikker på at du vil fjerne forfatteren \"{0}\"?",
   "MessageConfirmRemoveCollection": "Er du sikker på at du vil fjerne samling\"{0}\"?",
   "MessageConfirmRemoveEpisode": "Er du sikker på at du vil fjerne episode \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Er du sikker på at du vil fjerne {0} episoder?",
+  "MessageConfirmRemoveListeningSessions": "Er du sikker på at du vil fjerne {0} lytte-sesjoner?",
+  "MessageConfirmRemoveMetadataFiles": "Er du sikker på at du vil fjerne alle metadata.{0}-filer i mappene for biblioteks-elementer?",
   "MessageConfirmRemoveNarrator": "Er du sikker på at du vil fjerne forteller \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Er du sikker på at du vil fjerne spillelisten \"{0}\"?",
   "MessageConfirmRenameGenre": "Er du sikker på at du vil endre sjanger \"{0}\" til \"{1}\" for alle gjenstandene?",
@@ -745,11 +751,16 @@
   "MessageConfirmRenameTag": "Er du sikker på at du vil endre tag \"{0}\" til \"{1}\" for alle gjenstandene?",
   "MessageConfirmRenameTagMergeNote": "Notis: Denne taggen finnes allerede så de vil bli slått sammen.",
   "MessageConfirmRenameTagWarning": "Advarsel! En lignende tag eksisterer allerede (med forsjellige store / små bokstaver) \"{0}\".",
+  "MessageConfirmResetProgress": "Er du sikkert på at du vil tilbakestille fremgangen?",
   "MessageConfirmSendEbookToDevice": "Er du sikker på at du vil sende {0} ebok \"{1}\" til enhet \"{2}\"?",
+  "MessageConfirmUnlinkOpenId": "Er du sikker på at du vil koble denne brukeren fra OpenID?",
   "MessageDownloadingEpisode": "Laster ned episode",
   "MessageDragFilesIntoTrackOrder": "Dra filene i rett spor rekkefølge",
+  "MessageEmbedFailed": "Innbygging feilet!",
   "MessageEmbedFinished": "Bak inn Fullført!",
+  "MessageEmbedQueue": "Lagt i køen for innbygging av metadata ({0} i kø)",
   "MessageEpisodesQueuedForDownload": "{0} Episode(r) lagt til i kø for nedlasting",
+  "MessageEreaderDevices": "For å sikre sendingen av e-bøker, så må du kanskje legge til e-postadressen over som en gyldig avsender for hver enhet i listen over.",
   "MessageFeedURLWillBe": "Feed URL vil bli {0}",
   "MessageFetching": "Henter...",
   "MessageForceReScanDescription": "vil skanne alle filene igjen som en ny skann. Lyd fil ID3 tagger, OPF filer og tekstfiler vil bli skannet som nye.",
@@ -844,30 +855,66 @@
   "ToastAuthorUpdateMerged": "Forfatter slått sammen",
   "ToastAuthorUpdateSuccess": "Forfatter oppdatert",
   "ToastAuthorUpdateSuccessNoImageFound": "Forfatter oppdater (ingen bilde funnet)",
+  "ToastBackupAppliedSuccess": "Sikkerhetskopi slått på",
   "ToastBackupCreateFailed": "Mislykkes å lage sikkerhetskopi",
   "ToastBackupCreateSuccess": "Sikkerhetskopi opprettet",
   "ToastBackupDeleteFailed": "Mislykkes å slette sikkerhetskopi",
   "ToastBackupDeleteSuccess": "Sikkerhetskopi slettet",
+  "ToastBackupInvalidMaxKeep": "Ugyldig antall sikkerhetskopier ønskes beholdt",
+  "ToastBackupInvalidMaxSize": "Ugyldig maksimal størrelse for sikkerhetskopi",
   "ToastBackupRestoreFailed": "Misslykkes å gjenopprette sikkerhetskopi",
   "ToastBackupUploadFailed": "Misslykkes å laste opp sikkerhetskopi",
   "ToastBackupUploadSuccess": "Sikkerhetskopi lastet opp",
+  "ToastBatchDeleteFailed": "Sletting feilet på utvalget",
+  "ToastBatchDeleteSuccess": "Sletting av samling utført",
+  "ToastBatchQuickMatchFailed": "Feil ved rask integrering av metadata!",
+  "ToastBatchQuickMatchStarted": "Rask integrering av metadata for {0} bøker startet!",
   "ToastBatchUpdateFailed": "Bulk oppdatering mislykket",
   "ToastBatchUpdateSuccess": "Bulk oppdatering fullført",
   "ToastBookmarkCreateFailed": "Misslykkes å opprette bokmerke",
   "ToastBookmarkCreateSuccess": "Bokmerke lagt til",
   "ToastBookmarkRemoveSuccess": "Bokmerke fjernet",
   "ToastBookmarkUpdateSuccess": "Bokmerke oppdatert",
+  "ToastCachePurgeFailed": "Kunne ikke å slette mellomlager",
+  "ToastCachePurgeSuccess": "Mellomlager slettet",
   "ToastChaptersHaveErrors": "Kapittel har feil",
   "ToastChaptersMustHaveTitles": "Kapittel må ha titler",
+  "ToastChaptersRemoved": "Kapitler fjernet",
+  "ToastChaptersUpdated": "Kapitler oppdatert",
+  "ToastCollectionItemsAddFailed": "Feil med å legge til element(er)",
+  "ToastCollectionItemsAddSuccess": "Element(er) lagt til samlingen",
   "ToastCollectionItemsRemoveSuccess": "Gjenstand(er) fjernet fra samling",
   "ToastCollectionRemoveSuccess": "Samling fjernet",
   "ToastCollectionUpdateSuccess": "samlingupdated",
+  "ToastCoverUpdateFailed": "Oppdatering av bilde feilet",
+  "ToastDeleteFileFailed": "Kunne ikke slette fil",
+  "ToastDeleteFileSuccess": "Fil slettet",
+  "ToastDeviceAddFailed": "Kunne ikke legge til enhet",
+  "ToastDeviceNameAlreadyExists": "E-leser med dette navnet eksisterer allerede",
+  "ToastDeviceTestEmailFailed": "Kunne ikke sende test e-post",
+  "ToastDeviceTestEmailSuccess": "E-post for testing er sendt",
+  "ToastEmailSettingsUpdateSuccess": "Innstillinger for e-post oppdatert",
+  "ToastEncodeCancelFailed": "Kunne ikke stoppe konverteringen",
+  "ToastEncodeCancelSucces": "Konvertering kansellert",
+  "ToastEpisodeDownloadQueueClearFailed": "Kunne ikke tømme køen",
+  "ToastEpisodeDownloadQueueClearSuccess": "Nedlastingskø for eposider tømt",
+  "ToastEpisodeUpdateSuccess": "{0} episoder oppdatert",
+  "ToastFailedToLoadData": "Kunne ikke laste inn data",
+  "ToastFailedToMatch": "Kunne ikke matche",
+  "ToastFailedToShare": "Deling feilet",
+  "ToastFailedToUpdate": "Oppdatering feilet",
+  "ToastInvalidImageUrl": "Ugyldig URL for bilde",
+  "ToastInvalidMaxEpisodesToDownload": "Ugyldig maksimalt antall for nedlasting av episoder",
+  "ToastInvalidUrl": "Ugyldig URL",
   "ToastItemCoverUpdateSuccess": "Omslag oppdatert",
+  "ToastItemDeletedFailed": "Kunne ikke slette element",
+  "ToastItemDeletedSuccess": "Element slettet",
   "ToastItemDetailsUpdateSuccess": "Detaljer oppdatert",
   "ToastItemMarkedAsFinishedFailed": "Misslykkes å markere som Fullført",
   "ToastItemMarkedAsFinishedSuccess": "Gjenstand marker som Fullført",
   "ToastItemMarkedAsNotFinishedFailed": "Misslykkes å markere som Ikke Fullført",
   "ToastItemMarkedAsNotFinishedSuccess": "Markert som Ikke Fullført",
+  "ToastItemUpdateSuccess": "Element oppdatert",
   "ToastLibraryCreateFailed": "Misslykkes å opprette bibliotek",
   "ToastLibraryCreateSuccess": "Bibliotek \"{0}\" opprettet",
   "ToastLibraryDeleteFailed": "Misslykkes å slette bibliotek",
@@ -875,25 +922,83 @@
   "ToastLibraryScanFailedToStart": "Misslykkes å starte skann",
   "ToastLibraryScanStarted": "Bibliotek skann startet",
   "ToastLibraryUpdateSuccess": "Bibliotek \"{0}\" oppdatert",
+  "ToastMatchAllAuthorsFailed": "Kunne ikke finne match for alle forfattere",
+  "ToastMetadataFilesRemovedError": "Feil ved fjerning av metadata.{0}-filer",
+  "ToastMetadataFilesRemovedNoneFound": "Ingen metata.{0}-filer funnet i biblioteket",
+  "ToastMetadataFilesRemovedNoneRemoved": "Ingen metata.{0}-filer fjernet",
+  "ToastMetadataFilesRemovedSuccess": "{0} metata.{1}-filer fjernet",
+  "ToastMustHaveAtLeastOnePath": "Påkrevd med minst én mappe",
+  "ToastNameEmailRequired": "Navn og e-post påkrevd",
+  "ToastNameRequired": "Navn er påkrevd",
+  "ToastNewEpisodesFound": "{0} nye episoder funnet",
+  "ToastNewUserCreatedFailed": "Kunne ikke opprette konto: \"{0}\"",
+  "ToastNewUserCreatedSuccess": "Ny konto opprettet",
+  "ToastNewUserLibraryError": "Velg minst ett bibliotek",
+  "ToastNewUserPasswordError": "Passord kreves. Kun root-bruker kan ha blankt passord",
+  "ToastNewUserTagError": "Velg minst en tag",
+  "ToastNewUserUsernameError": "Skriv inn brukernavn",
+  "ToastNoNewEpisodesFound": "Ingen nye episoder funnet",
+  "ToastNoUpdatesNecessary": "Ingen oppdateringer nødvendig",
+  "ToastNotificationCreateFailed": "Kunne ikke opprette varsling",
+  "ToastNotificationDeleteFailed": "Kunne ikke slette varsling",
+  "ToastNotificationFailedMaximum": "Maksimalt antall forsøk som feiler må være større eller lik null (0)",
+  "ToastNotificationQueueMaximum": "Maksimal størrelse på varsel-kø må være større eller lik null (0)",
+  "ToastNotificationSettingsUpdateSuccess": "Innstillinger for varsling oppdatert",
+  "ToastNotificationTestTriggerFailed": "Kunne ikke utløse test-varsel",
+  "ToastNotificationTestTriggerSuccess": "Test-varsel utløst",
+  "ToastNotificationUpdateSuccess": "Varsel oppdatert",
   "ToastPlaylistCreateFailed": "Misslykkes å opprette spilleliste",
   "ToastPlaylistCreateSuccess": "Spilleliste opprettet",
   "ToastPlaylistRemoveSuccess": "Spilleliste fjernet",
   "ToastPlaylistUpdateSuccess": "Spilleliste oppdatert",
   "ToastPodcastCreateFailed": "Misslykkes å opprette podcast",
   "ToastPodcastCreateSuccess": "Podcast opprettet",
+  "ToastPodcastGetFeedFailed": "Kunne ikke hente podcast-feed",
+  "ToastPodcastNoEpisodesInFeed": "Ingen episoder funnet i RSS-feed",
+  "ToastPodcastNoRssFeed": "Podcast har ingen RSS-feed",
+  "ToastProgressIsNotBeingSynced": "Progresjon synkroniserer ikke, start avspilling på nytt",
+  "ToastProviderCreatedFailed": "Kunne ikke legge til tilbyder",
+  "ToastProviderCreatedSuccess": "Ny tilbyder lagt til",
+  "ToastProviderNameAndUrlRequired": "Navn og URL er påkrevd",
+  "ToastProviderRemoveSuccess": "Tilbyder fjernet",
   "ToastRSSFeedCloseFailed": "Misslykkes å lukke RSS feed",
   "ToastRSSFeedCloseSuccess": "RSS feed lukket",
+  "ToastRemoveFailed": "Kunne ikke fjerne",
   "ToastRemoveItemFromCollectionFailed": "Misslykkes å fjerne gjenstsand fra samling",
   "ToastRemoveItemFromCollectionSuccess": "Gjenstand fjernet fra samling",
+  "ToastRemoveItemsWithIssuesFailed": "Kunne ikke fjerne bibliotek-elementer med feil",
+  "ToastRemoveItemsWithIssuesSuccess": "Fjernet bibliotek-elementer med feil",
+  "ToastRenameFailed": "Kunne ikke endre navn",
+  "ToastRescanFailed": "Ny skanning feilet for {0}",
+  "ToastRescanRemoved": "Ny skanning utført og element fjernet",
+  "ToastRescanUpToDate": "Ny skanning utført og element var oppdatert",
+  "ToastRescanUpdated": "Ny skanning utført og element oppdatert",
+  "ToastScanFailed": "Kunne ikke skanne bibliotek-element",
+  "ToastSelectAtLeastOneUser": "Velg minst én bruker",
   "ToastSendEbookToDeviceFailed": "Misslykkes å sende ebok",
   "ToastSendEbookToDeviceSuccess": "Ebok sendt til \"{0}\"",
   "ToastSeriesUpdateFailed": "Misslykkes å oppdatere serie",
   "ToastSeriesUpdateSuccess": "Serie oppdatert",
+  "ToastServerSettingsUpdateSuccess": "Server-innstillinger oppdatert",
+  "ToastSessionCloseFailed": "Kunne ikke avslutte sesjon",
   "ToastSessionDeleteFailed": "Misslykkes å slette sesjon",
   "ToastSessionDeleteSuccess": "Sesjon slettet",
+  "ToastSleepTimerDone": "Søvn-timer ferdig... zZzzZz",
+  "ToastSlugMustChange": "Slug inneholder ugyldige tegn",
+  "ToastSlugRequired": "Slug påkrevd",
   "ToastSocketConnected": "Socket koblet til",
   "ToastSocketDisconnected": "Socket koblet fra",
   "ToastSocketFailedToConnect": "Misslykkes å koble til Socket",
+  "ToastSortingPrefixesEmptyError": "Må ha minst én sorteringsprefiks",
+  "ToastSortingPrefixesUpdateSuccess": "Sorteringsprefiks oppdatert ({0} element)",
+  "ToastTitleRequired": "Tittel påkrevd",
+  "ToastUnknownError": "Ukjent feil",
+  "ToastUnlinkOpenIdFailed": "Kunne ikke koble bruker fra OpenID",
+  "ToastUnlinkOpenIdSuccess": "Bruker koblet fra OpenID",
   "ToastUserDeleteFailed": "Misslykkes å slette bruker",
-  "ToastUserDeleteSuccess": "Bruker slettet"
+  "ToastUserDeleteSuccess": "Bruker slettet",
+  "ToastUserPasswordChangeSuccess": "Passord ble endret",
+  "ToastUserPasswordMismatch": "Passord må stemme overens",
+  "ToastUserPasswordMustChange": "Nytt passord kan ikke være identisk med gammelt passord",
+  "ToastUserRootRequireName": "Root-brukernavn er påkrevd"
 }

From da7d9c10ad548b7e212f5a09a79e51e32a661edf Mon Sep 17 00:00:00 2001
From: Tamanegii <onionsb@outlook.com>
Date: Sun, 22 Dec 2024 02:39:01 +0000
Subject: [PATCH 091/143] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/zh_Hans/
---
 client/strings/zh-cn.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index e4791aff..3a8b432f 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "保存音轨列表",
   "ButtonScan": "扫描",
   "ButtonScanLibrary": "扫描库",
+  "ButtonScrollLeft": "向左滚动",
+  "ButtonScrollRight": "向右滚动",
   "ButtonSearch": "查找",
   "ButtonSelectFolderPath": "选择文件夹路径",
   "ButtonSeries": "系列",
@@ -190,6 +192,7 @@
   "HeaderSettingsExperimental": "实验功能",
   "HeaderSettingsGeneral": "通用",
   "HeaderSettingsScanner": "扫描",
+  "HeaderSettingsWebClient": "网页客户端",
   "HeaderSleepTimer": "睡眠计时",
   "HeaderStatsLargestItems": "最大的项目",
   "HeaderStatsLongestItems": "项目时长(小时)",
@@ -542,6 +545,7 @@
   "LabelServerYearReview": "服务器年度回顾 ({0})",
   "LabelSetEbookAsPrimary": "设置为主",
   "LabelSetEbookAsSupplementary": "设置为补充",
+  "LabelSettingsAllowIframe": "允许嵌入到 iframe 中",
   "LabelSettingsAudiobooksOnly": "只有有声读物",
   "LabelSettingsAudiobooksOnlyHelp": "启用此设置将忽略电子书文件, 除非它们位于有声读物文件夹中, 在这种情况下, 它们将被设置为补充电子书",
   "LabelSettingsBookshelfViewHelp": "带有木架子的拟物化设计",
@@ -592,6 +596,8 @@
   "LabelSize": "文件大小",
   "LabelSleepTimer": "睡眠定时",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "升序",
+  "LabelSortDescending": "降序",
   "LabelStart": "开始",
   "LabelStartTime": "开始时间",
   "LabelStarted": "开始于",

From 3cc5fae586895a314e76f5cae469694fbca8a2eb Mon Sep 17 00:00:00 2001
From: Plazec <plazec82@gmail.com>
Date: Mon, 23 Dec 2024 13:58:27 +0000
Subject: [PATCH 092/143] Translated using Weblate (Czech)

Currently translated at 87.9% (950 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/cs/
---
 client/strings/cs.json | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/strings/cs.json b/client/strings/cs.json
index d079d7a5..684a25e1 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -234,7 +234,7 @@
   "LabelAppend": "Připojit",
   "LabelAudioBitrate": "Bitový tok zvuku (např. 128k)",
   "LabelAudioChannels": "Zvukové kanály (1 nebo 2)",
-  "LabelAudioCodec": "Kodek audia",
+  "LabelAudioCodec": "Audio Kodek",
   "LabelAuthor": "Autor",
   "LabelAuthorFirstLast": "Autor (jméno a příjmení)",
   "LabelAuthorLastFirst": "Autor (příjmení a jméno)",
@@ -420,6 +420,7 @@
   "LabelMatchExistingUsersBy": "Přiřadit stávající uživatele podle",
   "LabelMatchExistingUsersByDescription": "Slouží k propojení stávajících uživatelů. Po propojení budou uživatelé přiřazeni k jedinečnému ID od poskytovatele SSO.",
   "LabelMaxEpisodesToDownload": "Maximální # epizod pro stažení. Použijte 0 pro bez omezení.",
+  "LabelMaxEpisodesToDownloadPerCheck": "Maximální počet nových epizod ke stažení při jedné kontrole",
   "LabelMaxEpisodesToKeep": "Maximální počet epizod k zachování",
   "LabelMaxEpisodesToKeepHelp": "Hodnotou 0 není nastaven žádný maximální limit. Po automatickém stažení nové epizody se odstraní nejstarší epizoda, pokud máte více než X epizod. Při každém novém stažení se odstraní pouze 1 epizoda.",
   "LabelMediaPlayer": "Přehrávač médií",
@@ -735,6 +736,7 @@
   "MessageConfirmPurgeCache": "Vyčistit mezipaměť odstraní celý adresář na adrese <code>/metadata/cache</code>. <br /><br />Určitě chcete odstranit adresář mezipaměti?",
   "MessageConfirmPurgeItemsCache": "Vyčištění mezipaměti položek odstraní celý adresář <code>/metadata/cache/items</code>.<br />Jste si jistí?",
   "MessageConfirmQuickEmbed": "Varování! Rychlé vložení nezálohuje vaše zvukové soubory. Ujistěte se, že máte zálohu zvukových souborů. <br><br>Chcete pokračovat?",
+  "MessageConfirmQuickMatchEpisodes": "Pokud je nalezena shoda při rychlém párování epizod, dojde k přepsání podrobností. Aktualizovány budou pouze nespárované epizody. Jste si jisti?",
   "MessageConfirmReScanLibraryItems": "Opravdu chcete znovu prohledat {0} položky?",
   "MessageConfirmRemoveAllChapters": "Opravdu chcete odstranit všechny kapitoly?",
   "MessageConfirmRemoveAuthor": "Opravdu chcete odstranit autora \"{0}\"?",
@@ -742,6 +744,7 @@
   "MessageConfirmRemoveEpisode": "Opravdu chcete odstranit epizodu \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Opravdu chcete odstranit {0} epizody?",
   "MessageConfirmRemoveListeningSessions": "Opravdu chcete odebrat {0} poslechových relací?",
+  "MessageConfirmRemoveMetadataFiles": "Jste si jisti, že chcete odstranit všechny metadata.{0} soubory ve složkách s položkami ve vaší knihovně?",
   "MessageConfirmRemoveNarrator": "Opravdu chcete odebrat předčítání \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Opravdu chcete odstranit svůj playlist \"{0}\"?",
   "MessageConfirmRenameGenre": "Opravdu chcete přejmenovat žánr \"{0}\" na \"{1}\" pro všechny položky?",
@@ -757,6 +760,7 @@
   "MessageDragFilesIntoTrackOrder": "Přetáhněte soubory do správného pořadí stop",
   "MessageEmbedFailed": "Vložení selhalo!",
   "MessageEmbedFinished": "Vložení dokončeno!",
+  "MessageEmbedQueue": "Zařazeno do fronty pro vložení metadat ({0} ve frontě)",
   "MessageEpisodesQueuedForDownload": "{0} Epizody zařazené do fronty ke stažení",
   "MessageEreaderDevices": "Aby bylo zajištěno doručení elektronických knih, může být nutné přidat výše uvedenou e-mailovou adresu jako platného odesílatele pro každé zařízení uvedené níže.",
   "MessageFeedURLWillBe": "URL zdroje bude {0}",
@@ -801,6 +805,7 @@
   "MessageNoLogs": "Žádné protokoly",
   "MessageNoMediaProgress": "Žádný průběh médií",
   "MessageNoNotifications": "Žádná oznámení",
+  "MessageNoPodcastFeed": "Neplatný podcast: Žádný kanál",
   "MessageNoPodcastsFound": "Nebyly nalezeny žádné podcasty",
   "MessageNoResults": "Žádné výsledky",
   "MessageNoSearchResultsFor": "Nebyly nalezeny žádné výsledky hledání pro \"{0}\"",
@@ -817,7 +822,10 @@
   "MessagePlaylistCreateFromCollection": "Vytvořit seznam skladeb z kolekce",
   "MessagePleaseWait": "Čekejte prosím...",
   "MessagePodcastHasNoRSSFeedForMatching": "Podcast nemá žádnou adresu URL kanálu RSS, kterou by mohl použít pro porovnávání",
-  "MessageQuickMatchDescription": "Vyplňte prázdné detaily položky a obálku prvním výsledkem shody z '{0}'. Nepřepisuje podrobnosti, pokud není povoleno nastavení serveru \"Preferovat párování metadata\".",
+  "MessageQuickEmbedInProgress": "Probíhá rychlé vkládání",
+  "MessageQuickEmbedQueue": "Zařazeno do fronty pro rychlé vložení ({0} ve frontě)",
+  "MessageQuickMatchAllEpisodes": "Rychlá shoda všech epizod",
+  "MessageQuickMatchDescription": "Vyplnit prázdné detaily položky a obálky prvním výsledkem shody z '{0}'. Nepřepisuje detaily, pokud není povoleno nastavení serveru 'Preferovat shodná metadata'.",
   "MessageRemoveChapter": "Odstranit kapitolu",
   "MessageRemoveEpisodes": "Odstranit {0} epizodu",
   "MessageRemoveFromPlayerQueue": "Odstranit z fronty přehrávače",
@@ -848,10 +856,13 @@
   "MessageTaskFailedToMergeAudioFiles": "Spojení audio souborů selhalo",
   "MessageTaskFailedToMoveM4bFile": "Přesunutí m4b souboru selhalo",
   "MessageTaskFailedToWriteMetadataFile": "Zápis souboru metadat selhal",
+  "MessageTaskMatchingBooksInLibrary": "Párování knih v knihovně „{0}“",
   "MessageTaskNoFilesToScan": "Žádné soubory ke skenování",
   "MessageTaskOpmlImport": "Import OPML",
   "MessageTaskOpmlImportDescription": "Vytváření podcastů z {0} RSS feedů",
+  "MessageTaskOpmlImportFeed": "Importní zdroj OPML",
   "MessageTaskOpmlImportFeedDescription": "Importování RSS feedu \"{0}\"",
+  "MessageTaskOpmlImportFeedFailed": "Nepodařilo se získat kanál podcastu",
   "MessageTaskOpmlImportFeedPodcastDescription": "Vytváření podcastu \"{0}\"",
   "MessageTaskOpmlImportFeedPodcastExists": "Podcast se stejnou cestou již existuje",
   "MessageTaskOpmlImportFeedPodcastFailed": "Vytváření podcastu selhalo",

From ba9277cc443be7ab11446cb4aaf384bbaba15faa Mon Sep 17 00:00:00 2001
From: pranelio <pramanauskas@icloud.com>
Date: Tue, 24 Dec 2024 15:08:14 +0000
Subject: [PATCH 093/143] Translated using Weblate (Lithuanian)

Currently translated at 65.2% (705 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/lt/
---
 client/strings/lt.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/strings/lt.json b/client/strings/lt.json
index 9fe65e3a..e1a63510 100644
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -104,7 +104,7 @@
   "ButtonViewAll": "Peržiūrėti visus",
   "ButtonYes": "Taip",
   "ErrorUploadFetchMetadataAPI": "Klaida gaunant metaduomenis",
-  "ErrorUploadFetchMetadataNoResults": "Nepavyko gauti metaduomenų - pabandykite atnaujinti pavadinimą ir/ar autorių.",
+  "ErrorUploadFetchMetadataNoResults": "Nepavyko gauti metaduomenų - pabandykite atnaujinti pavadinimą ir/ar autorių",
   "ErrorUploadLacksTitle": "Pavadinimas yra privalomas",
   "HeaderAccount": "Paskyra",
   "HeaderAdvanced": "Papildomi",
@@ -419,7 +419,7 @@
   "LabelSettingsExperimentalFeatures": "Eksperimentiniai funkcionalumai",
   "LabelSettingsExperimentalFeaturesHelp": "Funkcijos, kurios yra kuriamos ir laukiami jūsų komentarai. Spustelėkite, kad atidarytumėte „GitHub“ diskusiją.",
   "LabelSettingsFindCovers": "Rasti viršelius",
-  "LabelSettingsFindCoversHelp": "Jei jūsų audioknyga neturi įterpto viršelio arba viršelio paveikslėlio aplanke, bandyti rasti viršelį.<br>Pastaba: Tai padidins skenavimo trukmę.",
+  "LabelSettingsFindCoversHelp": "Jei jūsų audioknyga neturi įterpto viršelio arba viršelio paveikslėlio aplanke, bandyti rasti viršelį.<br>Pastaba: Tai padidins skenavimo trukmę",
   "LabelSettingsHideSingleBookSeries": "Slėpti serijas, turinčias tik vieną knygą",
   "LabelSettingsHideSingleBookSeriesHelp": "Serijos, turinčios tik vieną knygą, bus paslėptos nuo serijų puslapio ir pagrindinio puslapio lentynų.",
   "LabelSettingsHomePageBookshelfView": "Naudoti pagrindinio puslapio knygų lentynų vaizdą",

From bacb8aeac7673f2ab27ee1a4b519487ca63b3918 Mon Sep 17 00:00:00 2001
From: Jan-Eric Myhrgren <jan-eric@myhrgren.se>
Date: Sun, 29 Dec 2024 10:41:29 +0000
Subject: [PATCH 094/143] Translated using Weblate (Swedish)

Currently translated at 68.7% (743 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sv/
---
 client/strings/sv.json | 156 ++++++++++++++++++++++++++---------------
 1 file changed, 98 insertions(+), 58 deletions(-)

diff --git a/client/strings/sv.json b/client/strings/sv.json
index 0d156efd..7513e8db 100644
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -13,7 +13,7 @@
   "ButtonBrowseForFolder": "Bläddra efter mapp",
   "ButtonCancel": "Avbryt",
   "ButtonCancelEncode": "Avbryt kodning",
-  "ButtonChangeRootPassword": "Ändra rootlösenord",
+  "ButtonChangeRootPassword": "Ändra lösenordet för root",
   "ButtonCheckAndDownloadNewEpisodes": "Kontrollera och ladda ner nya avsnitt",
   "ButtonChooseAFolder": "Välj en mapp",
   "ButtonChooseFiles": "Välj filer",
@@ -29,7 +29,7 @@
   "ButtonEditChapters": "Redigera kapitel",
   "ButtonEditPodcast": "Redigera podcast",
   "ButtonForceReScan": "Tvinga omstart",
-  "ButtonFullPath": "Full sökväg",
+  "ButtonFullPath": "Fullständig sökväg",
   "ButtonHide": "Dölj",
   "ButtonHome": "Hem",
   "ButtonIssues": "Problem",
@@ -42,13 +42,18 @@
   "ButtonMatchAllAuthors": "Matcha alla författare",
   "ButtonMatchBooks": "Matcha böcker",
   "ButtonNevermind": "Glöm det",
-  "ButtonOk": "Okej",
+  "ButtonNext": "Nästa",
+  "ButtonNextChapter": "Nästa kapitel",
+  "ButtonOk": "Ok",
   "ButtonOpenFeed": "Öppna flöde",
   "ButtonOpenManager": "Öppna Manager",
   "ButtonPause": "Pausa",
   "ButtonPlay": "Spela",
+  "ButtonPlayAll": "Spela alla",
   "ButtonPlaying": "Spelar",
   "ButtonPlaylists": "Spellistor",
+  "ButtonPrevious": "Föregående",
+  "ButtonPreviousChapter": "Föregående kapitel",
   "ButtonPurgeAllCache": "Rensa all cache",
   "ButtonPurgeItemsCache": "Rensa föremåls-cache",
   "ButtonQueueAddItem": "Lägg till i kön",
@@ -56,6 +61,9 @@
   "ButtonQuickMatch": "Snabb matchning",
   "ButtonReScan": "Omstart",
   "ButtonRead": "Läs",
+  "ButtonReadLess": "Visa mindre",
+  "ButtonReadMore": "Visa mer",
+  "ButtonRefresh": "Uppdatera",
   "ButtonRemove": "Ta bort",
   "ButtonRemoveAll": "Ta bort alla",
   "ButtonRemoveAllLibraryItems": "Ta bort alla biblioteksobjekt",
@@ -72,12 +80,13 @@
   "ButtonScanLibrary": "Skanna bibliotek",
   "ButtonSearch": "Sök",
   "ButtonSelectFolderPath": "Välj mappens sökväg",
-  "ButtonSeries": "Serie",
+  "ButtonSeries": "Serier",
   "ButtonSetChaptersFromTracks": "Ställ in kapitel från spår",
   "ButtonShiftTimes": "Förskjut tider",
   "ButtonShow": "Visa",
   "ButtonStartM4BEncode": "Starta M4B-kodning",
   "ButtonStartMetadataEmbed": "Starta inbäddning av metadata",
+  "ButtonStats": "Statistik",
   "ButtonSubmit": "Skicka",
   "ButtonTest": "Testa",
   "ButtonUpload": "Ladda upp",
@@ -123,7 +132,7 @@
   "HeaderListeningStats": "Lyssningsstatistik",
   "HeaderLogin": "Logga in",
   "HeaderLogs": "Loggar",
-  "HeaderManageGenres": "Hantera genrer",
+  "HeaderManageGenres": "Hantera kategorier",
   "HeaderManageTags": "Hantera taggar",
   "HeaderMapDetails": "Karta detaljer",
   "HeaderMatch": "Matcha",
@@ -154,13 +163,14 @@
   "HeaderSettingsExperimental": "Experimentella funktioner",
   "HeaderSettingsGeneral": "Allmänt",
   "HeaderSettingsScanner": "Skanner",
+  "HeaderSettingsWebClient": "Webklient",
   "HeaderSleepTimer": "Sovtidtagare",
-  "HeaderStatsLargestItems": "Största föremål",
-  "HeaderStatsLongestItems": "Längsta föremål (tim)",
+  "HeaderStatsLargestItems": "Största objekt",
+  "HeaderStatsLongestItems": "Längsta objekt (tim)",
   "HeaderStatsMinutesListeningChart": "Minuters lyssning (senaste 7 dagar)",
   "HeaderStatsRecentSessions": "Senaste sessioner",
-  "HeaderStatsTop10Authors": "Topp 10 författare",
-  "HeaderStatsTop5Genres": "Topp 5 genrer",
+  "HeaderStatsTop10Authors": "10 populäraste författarna",
+  "HeaderStatsTop5Genres": "5 populäraste kategorierna",
   "HeaderTableOfContents": "Innehållsförteckning",
   "HeaderTools": "Verktyg",
   "HeaderUpdateAccount": "Uppdatera konto",
@@ -168,7 +178,8 @@
   "HeaderUpdateDetails": "Uppdatera detaljer",
   "HeaderUpdateLibrary": "Uppdatera bibliotek",
   "HeaderUsers": "Användare",
-  "HeaderYourStats": "Dina statistik",
+  "HeaderYearReview": "Sammanställning för {0}",
+  "HeaderYourStats": "Din statistik",
   "LabelAbridged": "Förkortad",
   "LabelAccountType": "Kontotyp",
   "LabelAccountTypeGuest": "Gäst",
@@ -191,18 +202,23 @@
   "LabelAuthorLastFirst": "Författare (Efternamn, Förnamn)",
   "LabelAuthors": "Författare",
   "LabelAutoDownloadEpisodes": "Automatisk nedladdning av avsnitt",
+  "LabelAutoFetchMetadata": "Automatisk nedladdning av metadata",
+  "LabelAutoFetchMetadataHelp": "Hämtar metadata för titel, författare och serier. Kompletterande metadata får adderas efter uppladdningen.",
   "LabelBackToUser": "Tillbaka till användaren",
-  "LabelBackupLocation": "Säkerhetskopia Plats",
+  "LabelBackupLocation": "Plats för säkerhetskopia",
   "LabelBackupsEnableAutomaticBackups": "Aktivera automatiska säkerhetskopior",
-  "LabelBackupsEnableAutomaticBackupsHelp": "Säkerhetskopior sparas i /metadata/säkerhetskopior",
-  "LabelBackupsMaxBackupSize": "Maximal säkerhetskopiostorlek (i GB)",
+  "LabelBackupsEnableAutomaticBackupsHelp": "Säkerhetskopior sparas i \"/metadata/backups\"",
+  "LabelBackupsMaxBackupSize": "Maximal storlek på säkerhetskopia (i GB) (0 = obegränsad)",
   "LabelBackupsMaxBackupSizeHelp": "Som ett skydd mot felkonfiguration kommer säkerhetskopior att misslyckas om de överskrider den konfigurerade storleken.",
   "LabelBackupsNumberToKeep": "Antal säkerhetskopior att behålla",
   "LabelBackupsNumberToKeepHelp": "Endast en säkerhetskopia tas bort åt gången, så om du redan har fler säkerhetskopior än detta bör du ta bort dem manuellt.",
   "LabelBitrate": "Bitfrekvens",
   "LabelBooks": "Böcker",
+  "LabelButtonText": "Knapptext",
+  "LabelByAuthor": "av {0}",
   "LabelChangePassword": "Ändra lösenord",
   "LabelChannels": "Kanaler",
+  "LabelChapterCount": "{0} kapitel",
   "LabelChapterTitle": "Kapitelrubrik",
   "LabelChapters": "Kapitel",
   "LabelChaptersFound": "hittade kapitel",
@@ -215,7 +231,7 @@
   "LabelConfirmPassword": "Bekräfta lösenord",
   "LabelContinueListening": "Fortsätt Lyssna",
   "LabelContinueReading": "Fortsätt Läsa",
-  "LabelContinueSeries": "Forsätt Serie",
+  "LabelContinueSeries": "Fortsätt Serie",
   "LabelCover": "Omslag",
   "LabelCoverImageURL": "URL till omslagsbild",
   "LabelCreatedAt": "Skapad vid",
@@ -267,8 +283,8 @@
   "LabelFontBoldness": "Fetstil",
   "LabelFontFamily": "Teckensnittsfamilj",
   "LabelFontScale": "Teckensnittsskala",
-  "LabelGenre": "Genre",
-  "LabelGenres": "Genrer",
+  "LabelGenre": "Kategori",
+  "LabelGenres": "Kategorier",
   "LabelHardDeleteFile": "Hård radering av fil",
   "LabelHasEbook": "Har E-bok",
   "LabelHasSupplementaryEbook": "Har komplimenterande E-bok",
@@ -316,19 +332,19 @@
   "LabelMediaType": "Mediatyp",
   "LabelMetaTag": "Metamärke",
   "LabelMetaTags": "Metamärken",
-  "LabelMetadataProvider": "Metadataleverantör",
+  "LabelMetadataProvider": "Källa för metadata",
   "LabelMinute": "Minut",
   "LabelMissing": "Saknad",
   "LabelMore": "Mer",
   "LabelMoreInfo": "Mer information",
   "LabelName": "Namn",
-  "LabelNarrator": "Berättare",
-  "LabelNarrators": "Berättare",
+  "LabelNarrator": "Uppläsare",
+  "LabelNarrators": "Uppläsare",
   "LabelNew": "Ny",
   "LabelNewPassword": "Nytt lösenord",
   "LabelNewestAuthors": "Senast tillagda författare",
   "LabelNewestEpisodes": "Senast tillagda avsnitt",
-  "LabelNextBackupDate": "Nästa säkerhetskopia datum",
+  "LabelNextBackupDate": "Nästa datum för säkerhetskopia",
   "LabelNextScheduledRun": "Nästa schemalagda körning",
   "LabelNoEpisodesSelected": "Inga avsnitt valda",
   "LabelNotFinished": "Ej avslutad",
@@ -367,7 +383,7 @@
   "LabelPreventIndexing": "Förhindra att ditt flöde indexeras av iTunes och Google-podcastsökmotorer",
   "LabelPrimaryEbook": "Primär e-bok",
   "LabelProgress": "Framsteg",
-  "LabelProvider": "Leverantör",
+  "LabelProvider": "Källa",
   "LabelPubDate": "Publiceringsdatum",
   "LabelPublishYear": "Publiceringsår",
   "LabelPublisher": "Utgivare",
@@ -388,14 +404,14 @@
   "LabelRemoveCover": "Ta bort omslag",
   "LabelSearchTerm": "Sökterm",
   "LabelSearchTitle": "Sök titel",
-  "LabelSearchTitleOrASIN": "Sök titel eller ASIN",
+  "LabelSearchTitleOrASIN": "Sök titel eller ASIN-kod",
   "LabelSeason": "Säsong",
   "LabelSelectAllEpisodes": "Välj alla avsnitt",
   "LabelSelectEpisodesShowing": "Välj {0} avsnitt som visas",
   "LabelSelectUsers": "Välj användare",
   "LabelSendEbookToDevice": "Skicka e-bok till...",
   "LabelSequence": "Sekvens",
-  "LabelSeries": "Serie",
+  "LabelSeries": "Serier",
   "LabelSeriesName": "Serienamn",
   "LabelSeriesProgress": "Serieframsteg",
   "LabelSetEbookAsPrimary": "Ange som primär",
@@ -403,7 +419,7 @@
   "LabelSettingsAudiobooksOnly": "Endast ljudböcker",
   "LabelSettingsAudiobooksOnlyHelp": "Aktivera detta alternativ kommer att ignorera e-boksfiler om de inte finns inom en ljudboksmapp, i vilket fall de kommer att anges som kompletterande e-böcker",
   "LabelSettingsBookshelfViewHelp": "Skeumorfisk design med trähyllor",
-  "LabelSettingsChromecastSupport": "Chromecast-stöd",
+  "LabelSettingsChromecastSupport": "Stöd för Chromecast",
   "LabelSettingsDateFormat": "Datumformat",
   "LabelSettingsDisableWatcher": "Inaktivera Watcher",
   "LabelSettingsDisableWatcherForLibrary": "Inaktivera mappbevakning för bibliotek",
@@ -415,24 +431,24 @@
   "LabelSettingsExperimentalFeaturesHelp": "Funktioner under utveckling som behöver din feedback och hjälp med testning. Klicka för att öppna diskussionen på GitHub.",
   "LabelSettingsFindCovers": "Hitta omslag",
   "LabelSettingsFindCoversHelp": "Om din ljudbok inte har ett inbäddat omslag eller en omslagsbild i mappen kommer skannern att försöka hitta ett omslag.<br>Observera: Detta kommer att förlänga skannningstiden",
-  "LabelSettingsHideSingleBookSeries": "Dölj enboksserier",
+  "LabelSettingsHideSingleBookSeries": "Dölj serier med en bok",
   "LabelSettingsHideSingleBookSeriesHelp": "Serier som har en enda bok kommer att döljas från seriesidan och hyllsidan på startsidan.",
   "LabelSettingsHomePageBookshelfView": "Startsida använd bokhyllvy",
   "LabelSettingsLibraryBookshelfView": "Bibliotek använd bokhyllvy",
   "LabelSettingsParseSubtitles": "Analysera undertexter",
-  "LabelSettingsParseSubtitlesHelp": "Extrahera undertexter från mappnamn för ljudböcker.<br>Undertext måste vara åtskilda av \" - \"<br>t.ex. \"Boktitel - En undertitel här\" har undertiteln \"En undertitel här\"",
+  "LabelSettingsParseSubtitlesHelp": "Extrahera undertitlar från namnet på mappar för ljudböcker.<br>Undertiteln måste vara åtskilda med ett bindestreck \" - \".<br>Mappen \"Boktitel - En undertitel här\" har undertiteln \"En undertitel här\"",
   "LabelSettingsPreferMatchedMetadata": "Föredra matchad metadata",
   "LabelSettingsPreferMatchedMetadataHelp": "Matchad data kommer att åsidosätta objektdetaljer vid snabbmatchning. Som standard kommer snabbmatchning endast att fylla i saknade detaljer.",
-  "LabelSettingsSkipMatchingBooksWithASIN": "Hoppa över matchande böcker med ASIN",
+  "LabelSettingsSkipMatchingBooksWithASIN": "Hoppa över matchande böcker med ASIN-kod",
   "LabelSettingsSkipMatchingBooksWithISBN": "Hoppa över matchande böcker med ISBN",
   "LabelSettingsSortingIgnorePrefixes": "Ignorera prefix vid sortering",
-  "LabelSettingsSortingIgnorePrefixesHelp": "t.ex. för prefixet \"the\" kommer boktiteln \"The Book Title\" att sorteras som \"Book Title, The\"",
+  "LabelSettingsSortingIgnorePrefixesHelp": "För prefix som t.ex. \"the\" kommer boktiteln \"The Book Title\" att sorteras som \"Book Title, The\"",
   "LabelSettingsSquareBookCovers": "Använd fyrkantiga bokomslag",
   "LabelSettingsSquareBookCoversHelp": "Föredrar att använda fyrkantiga omslag över standard 1.6:1 bokomslag",
   "LabelSettingsStoreCoversWithItem": "Lagra omslag med objekt",
-  "LabelSettingsStoreCoversWithItemHelp": "Som standard lagras omslag i /metadata/items, att aktivera detta alternativ kommer att lagra omslag i din biblioteksmapp. Endast en fil med namnet \"cover\" kommer att behållas",
+  "LabelSettingsStoreCoversWithItemHelp": "Som standard lagras bokomslag i mappen /metadata/items. Genom att aktivera detta alternativ kommer omslagen att lagra i din biblioteksmapp. Endast en fil med namnet \"cover\" kommer att behållas",
   "LabelSettingsStoreMetadataWithItem": "Lagra metadata med objekt",
-  "LabelSettingsStoreMetadataWithItemHelp": "Som standard lagras metadatafiler i /metadata/items, att aktivera detta alternativ kommer att lagra metadatafiler i dina biblioteksmappar",
+  "LabelSettingsStoreMetadataWithItemHelp": "Som standard lagras metadatafiler i mappen /metadata/items. Genom att aktivera detta alternativ kommer metadatafilerna att lagras i dina biblioteksmappar",
   "LabelSettingsTimeFormat": "Tidsformat",
   "LabelShowAll": "Visa alla",
   "LabelSize": "Storlek",
@@ -457,7 +473,7 @@
   "LabelStatsOverallHours": "Totalt antal timmar",
   "LabelStatsWeekListening": "Veckans lyssnande",
   "LabelSubtitle": "Underrubrik",
-  "LabelSupportedFileTypes": "Stödda filtyper",
+  "LabelSupportedFileTypes": "Filtyper som accepteras",
   "LabelTag": "Tagg",
   "LabelTags": "Taggar",
   "LabelTagsAccessibleToUser": "Taggar tillgängliga för användaren",
@@ -467,17 +483,22 @@
   "LabelThemeDark": "Mörkt",
   "LabelThemeLight": "Ljust",
   "LabelTimeBase": "Tidsbas",
+  "LabelTimeDurationXHours": "{0} timmar",
+  "LabelTimeDurationXMinutes": "{0} minuter",
+  "LabelTimeDurationXSeconds": "{0} sekunder",
+  "LabelTimeInMinutes": "Tid i minuter",
+  "LabelTimeLeft": "{0} återstår",
   "LabelTimeListened": "Tid lyssnad",
   "LabelTimeListenedToday": "Tid lyssnad idag",
-  "LabelTimeRemaining": "{0} kvar",
+  "LabelTimeRemaining": "{0} återstår",
   "LabelTimeToShift": "Tid att skifta i sekunder",
   "LabelTitle": "Titel",
   "LabelToolsEmbedMetadata": "Bädda in metadata",
   "LabelToolsEmbedMetadataDescription": "Bädda in metadata i ljudfiler, inklusive omslagsbild och kapitel.",
   "LabelToolsMakeM4b": "Skapa M4B ljudbok",
   "LabelToolsMakeM4bDescription": "Skapa en .M4B ljudboksfil med inbäddad metadata, omslagsbild och kapitel.",
-  "LabelToolsSplitM4b": "Dela M4B till MP3-filer",
-  "LabelToolsSplitM4bDescription": "Skapa MP3-filer från en M4B fil uppdelad i kapitel med inbäddad metadata, omslagsbild och kapitel.",
+  "LabelToolsSplitM4b": "Dela upp M4B-fil i MP3-filer",
+  "LabelToolsSplitM4bDescription": "Skapa MP3-filer från en M4B-fil uppdelad i kapitel med inbäddad metadata, omslagsbild och kapitel.",
   "LabelTotalDuration": "Total varaktighet",
   "LabelTotalTimeListened": "Total tid lyssnad",
   "LabelTrackFromFilename": "Spår från filnamn",
@@ -486,6 +507,7 @@
   "LabelTracksMultiTrack": "Flerspårigt",
   "LabelTracksNone": "Inga spår",
   "LabelTracksSingleTrack": "Enspårigt",
+  "LabelTrailer": "Trailer",
   "LabelType": "Typ",
   "LabelUnabridged": "Oavkortad",
   "LabelUnknown": "Okänd",
@@ -496,16 +518,20 @@
   "LabelUpdatedAt": "Uppdaterad vid",
   "LabelUploaderDragAndDrop": "Dra och släpp filer eller mappar",
   "LabelUploaderDropFiles": "Släpp filer",
+  "LabelUploaderItemFetchMetadataHelp": "Hämtar automatiskt titel, författare och serier.",
   "LabelUseChapterTrack": "Använd kapitelspår",
   "LabelUseFullTrack": "Använd hela spåret",
   "LabelUser": "Användare",
   "LabelUsername": "Användarnamn",
   "LabelValue": "Värde",
+  "LabelVersion": "Version",
   "LabelViewBookmarks": "Visa bokmärken",
   "LabelViewChapters": "Visa kapitel",
   "LabelViewQueue": "Visa spellista",
   "LabelVolume": "Volym",
   "LabelWeekdaysToRun": "Vardagar att köra",
+  "LabelYearReviewHide": "Dölj sammanställning för året",
+  "LabelYearReviewShow": "Visa sammanställning för året",
   "LabelYourAudiobookDuration": "Din ljudboks varaktighet",
   "LabelYourBookmarks": "Dina bokmärken",
   "LabelYourPlaylists": "Dina spellistor",
@@ -535,22 +561,22 @@
   "MessageConfirmMarkAllEpisodesFinished": "Är du säker på att du vill markera alla avsnitt som avslutade?",
   "MessageConfirmMarkAllEpisodesNotFinished": "Är du säker på att du vill markera alla avsnitt som inte avslutade?",
   "MessageConfirmMarkSeriesFinished": "Är du säker på att du vill markera alla böcker i denna serie som avslutade?",
-  "MessageConfirmMarkSeriesNotFinished": "Är du säker på att du vill markera alla böcker i denna serie som inte avslutade?",
-  "MessageConfirmQuickEmbed": "Varning! Quick embed kommer inte att säkerhetskopiera dina ljudfiler. Se till att du har en säkerhetskopia av dina ljudfiler. <br><br>Vill du fortsätta?",
+  "MessageConfirmMarkSeriesNotFinished": "Är du säker på att du vill markera alla böcker i denna serie som ej avslutade?",
+  "MessageConfirmQuickEmbed": "VARNING! Quick embed kommer inte att säkerhetskopiera dina ljudfiler. Se till att du har en säkerhetskopia av dina ljudfiler. <br><br>Vill du fortsätta?",
   "MessageConfirmReScanLibraryItems": "Är du säker på att du vill göra omgenomsökning för {0} objekt?",
   "MessageConfirmRemoveAllChapters": "Är du säker på att du vill ta bort alla kapitel?",
   "MessageConfirmRemoveAuthor": "Är du säker på att du vill ta bort författaren \"{0}\"?",
   "MessageConfirmRemoveCollection": "Är du säker på att du vill ta bort samlingen \"{0}\"?",
   "MessageConfirmRemoveEpisode": "Är du säker på att du vill ta bort avsnittet \"{0}\"?",
   "MessageConfirmRemoveEpisodes": "Är du säker på att du vill ta bort {0} avsnitt?",
-  "MessageConfirmRemoveNarrator": "Är du säker på att du vill ta bort berättaren \"{0}\"?",
+  "MessageConfirmRemoveNarrator": "Är du säker på att du vill ta bort uppläsaren \"{0}\"?",
   "MessageConfirmRemovePlaylist": "Är du säker på att du vill ta bort din spellista \"{0}\"?",
-  "MessageConfirmRenameGenre": "Är du säker på att du vill byta namn på genren \"{0}\" till \"{1}\" för alla objekt?",
-  "MessageConfirmRenameGenreMergeNote": "Observera: Den här genren finns redan, så de kommer att slås samman.",
-  "MessageConfirmRenameGenreWarning": "Varning! En liknande genre med annat skrivsätt finns redan \"{0}\".",
+  "MessageConfirmRenameGenre": "Är du säker på att du vill byta namn på kategori \"{0}\" till \"{1}\" för alla objekt?",
+  "MessageConfirmRenameGenreMergeNote": "OBS: Den här kategorin finns redan, så de kommer att slås samman.",
+  "MessageConfirmRenameGenreWarning": "Varning! En liknande kategori med annat skrivsätt finns redan \"{0}\".",
   "MessageConfirmRenameTag": "Är du säker på att du vill byta namn på taggen \"{0}\" till \"{1}\" för alla objekt?",
-  "MessageConfirmRenameTagMergeNote": "Observera: Den här taggen finns redan, så de kommer att slås samman.",
-  "MessageConfirmRenameTagWarning": "Varning! En liknande tagg med annat skrivsätt finns redan \"{0}\".",
+  "MessageConfirmRenameTagMergeNote": "OBS: Den här taggen finns redan, så de kommer att slås samman.",
+  "MessageConfirmRenameTagWarning": "VARNING! En liknande tagg med annat skrivsätt finns redan \"{0}\".",
   "MessageConfirmSendEbookToDevice": "Är du säker på att du vill skicka {0} e-bok \"{1}\" till enheten \"{2}\"?",
   "MessageDownloadingEpisode": "Laddar ner avsnitt",
   "MessageDragFilesIntoTrackOrder": "Dra filer till rätt spårordning",
@@ -574,7 +600,7 @@
   "MessageMarkAllEpisodesNotFinished": "Markera alla avsnitt som inte avslutade",
   "MessageMarkAsFinished": "Markera som avslutad",
   "MessageMarkAsNotFinished": "Markera som inte avslutad",
-  "MessageMatchBooksDescription": "kommer att försöka matcha böcker i biblioteket med en bok från den valda sökleverantören och fylla i tomma detaljer och omslagskonst. Överskriver inte detaljer.",
+  "MessageMatchBooksDescription": "kommer att försöka matcha böcker i biblioteket med en bok från den valda källan och fylla i uppgifter som saknas och bokomslag. Inga befintliga uppgifter kommer att ersättas.",
   "MessageNoAudioTracks": "Inga ljudspår",
   "MessageNoAuthors": "Inga författare",
   "MessageNoBackups": "Inga säkerhetskopior",
@@ -588,7 +614,7 @@
   "MessageNoEpisodeMatchesFound": "Inga matchande avsnitt hittades",
   "MessageNoEpisodes": "Inga avsnitt",
   "MessageNoFoldersAvailable": "Inga mappar tillgängliga",
-  "MessageNoGenres": "Inga genrer",
+  "MessageNoGenres": "Inga kategorier",
   "MessageNoIssues": "Inga problem",
   "MessageNoItems": "Inga objekt",
   "MessageNoItemsFound": "Inga objekt hittades",
@@ -637,7 +663,7 @@
   "NoteFolderPicker": "Obs: Mappar som redan är kartlagda kommer inte att visas",
   "NoteRSSFeedPodcastAppsHttps": "Varning: De flesta podcastappar kräver att RSS-flödets URL används med HTTPS",
   "NoteRSSFeedPodcastAppsPubDate": "Varning: 1 eller flera av dina avsnitt har inte ett publiceringsdatum. Vissa podcastappar kräver detta.",
-  "NoteUploaderFoldersWithMediaFiles": "Mappar med mediefiler hanteras som separata biblioteksobjekt.",
+  "NoteUploaderFoldersWithMediaFiles": "Mappar med flera mediefiler hanteras som separata objekt i biblioteket.",
   "NoteUploaderOnlyAudioFiles": "Om du bara laddar upp ljudfiler kommer varje ljudfil att hanteras som en separat ljudbok.",
   "NoteUploaderUnsupportedFiles": "Oaccepterade filer ignoreras. När du väljer eller släpper en mapp ignoreras andra filer som inte finns i ett objektmapp.",
   "PlaceholderNewCollection": "Nytt samlingsnamn",
@@ -645,29 +671,43 @@
   "PlaceholderNewPlaylist": "Nytt spellistanamn",
   "PlaceholderSearch": "Sök...",
   "PlaceholderSearchEpisode": "Sök avsnitt...",
+  "StatsTopAuthor": "POPULÄRAST FÖRFATTAREN",
+  "StatsTopAuthors": "POPULÄRASTE FÖRFATTARNA",
+  "StatsTopGenre": "Populäraste kategorin",
+  "StatsTopGenres": "Populäraste kategorierna",
+  "StatsTopMonth": "Bästa månaden",
+  "StatsTopNarrator": "Populärast uppläsarna",
+  "StatsTopNarrators": "Populäraste uppläsaren",
+  "StatsYearInReview": "SAMMANSTÄLLNING AV ÅRET",
   "ToastAccountUpdateSuccess": "Kontot uppdaterat",
+  "ToastAsinRequired": "En ASIN-kod krävs",
   "ToastAuthorImageRemoveSuccess": "Författarens bild borttagen",
+  "ToastAuthorNotFound": "Författaren \"{0}\" kunde inte identifieras",
+  "ToastAuthorRemoveSuccess": "Författaren har raderats",
+  "ToastAuthorSearchNotFound": "Författaren kunde inte identifieras",
   "ToastAuthorUpdateMerged": "Författaren sammanslagen",
   "ToastAuthorUpdateSuccess": "Författaren uppdaterad",
   "ToastAuthorUpdateSuccessNoImageFound": "Författaren uppdaterad (ingen bild hittad)",
   "ToastBackupCreateFailed": "Det gick inte att skapa en säkerhetskopia",
-  "ToastBackupCreateSuccess": "Säkerhetskopia skapad",
-  "ToastBackupDeleteFailed": "Det gick inte att ta bort säkerhetskopian",
-  "ToastBackupDeleteSuccess": "Säkerhetskopan borttagen",
-  "ToastBackupRestoreFailed": "Det gick inte att återställa säkerhetskopan",
-  "ToastBackupUploadFailed": "Det gick inte att ladda upp säkerhetskopan",
-  "ToastBackupUploadSuccess": "Säkerhetskopan uppladdad",
+  "ToastBackupCreateSuccess": "Säkerhetskopian har skapats",
+  "ToastBackupDeleteFailed": "Det gick inte att radera säkerhetskopian",
+  "ToastBackupDeleteSuccess": "Säkerhetskopian har raderats",
+  "ToastBackupInvalidMaxKeep": "Felaktigt antal kopior av backup har angivits",
+  "ToastBackupInvalidMaxSize": "Felaktig storlek på backup har angivits",
+  "ToastBackupRestoreFailed": "Det gick inte att återställa säkerhetskopian",
+  "ToastBackupUploadFailed": "Det gick inte att ladda upp säkerhetskopian",
+  "ToastBackupUploadSuccess": "Säkerhetskopian uppladdad",
   "ToastBatchUpdateFailed": "Batchuppdateringen misslyckades",
   "ToastBatchUpdateSuccess": "Batchuppdateringen lyckades",
   "ToastBookmarkCreateFailed": "Det gick inte att skapa bokmärket",
-  "ToastBookmarkCreateSuccess": "Bokmärket tillagt",
-  "ToastBookmarkRemoveSuccess": "Bokmärket borttaget",
-  "ToastBookmarkUpdateSuccess": "Bokmärket uppdaterat",
+  "ToastBookmarkCreateSuccess": "Bokmärket har adderats",
+  "ToastBookmarkRemoveSuccess": "Bokmärket har raderats",
+  "ToastBookmarkUpdateSuccess": "Bokmärket har uppdaterats",
   "ToastChaptersHaveErrors": "Kapitlen har fel",
   "ToastChaptersMustHaveTitles": "Kapitel måste ha titlar",
   "ToastCollectionItemsRemoveSuccess": "Objekt borttagna från samlingen",
-  "ToastCollectionRemoveSuccess": "Samlingen borttagen",
-  "ToastCollectionUpdateSuccess": "Samlingen uppdaterad",
+  "ToastCollectionRemoveSuccess": "Samlingen har raderats",
+  "ToastCollectionUpdateSuccess": "Samlingen har uppdaterats",
   "ToastItemCoverUpdateSuccess": "Objektets omslag uppdaterat",
   "ToastItemDetailsUpdateSuccess": "Objektdetaljer uppdaterade",
   "ToastItemMarkedAsFinishedFailed": "Misslyckades med att markera som färdig",
@@ -693,8 +733,8 @@
   "ToastRemoveItemFromCollectionSuccess": "Objektet borttaget från samlingen",
   "ToastSendEbookToDeviceFailed": "Misslyckades med att skicka e-boken till enheten",
   "ToastSendEbookToDeviceSuccess": "E-boken skickad till enheten \"{0}\"",
-  "ToastSeriesUpdateFailed": "Serieuppdateringen misslyckades",
-  "ToastSeriesUpdateSuccess": "Serieuppdateringen lyckades",
+  "ToastSeriesUpdateFailed": "Uppdateringen av serier misslyckades",
+  "ToastSeriesUpdateSuccess": "Uppdateringen av serierna lyckades",
   "ToastSessionDeleteFailed": "Misslyckades med att ta bort sessionen",
   "ToastSessionDeleteSuccess": "Sessionen borttagen",
   "ToastSocketConnected": "Socket ansluten",

From 2464aac2bfeefa6571dae97aaccf5bf38c9c6e61 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 29 Dec 2024 17:11:46 -0600
Subject: [PATCH 095/143] Version bump v2.17.6

---
 client/package-lock.json | 4 ++--
 client/package.json      | 2 +-
 package-lock.json        | 4 ++--
 package.json             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 807976bd..992600cd 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.17.5",
+      "version": "2.17.6",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",
diff --git a/client/package.json b/client/package.json
index 6f9d9d44..6338c1b1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
diff --git a/package-lock.json b/package-lock.json
index efa917dc..c3452537 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.17.5",
+      "version": "2.17.6",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",
diff --git a/package.json b/package.json
index 2e9c9709..d7b19037 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.5",
+  "version": "2.17.6",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

From 476933a144f5c1038cda742f71f96bd1694d9d6d Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 30 Dec 2024 16:54:48 -0600
Subject: [PATCH 096/143] Refactor Collection model/controller to not use old
 Collection object, remove

---
 server/Database.js                         |   5 -
 server/controllers/CollectionController.js | 128 +++++++++------
 server/models/Collection.js                | 176 +++++----------------
 server/models/CollectionBook.js            |   9 --
 server/models/LibraryItem.js               |   2 +-
 server/objects/Collection.js               | 115 --------------
 6 files changed, 122 insertions(+), 313 deletions(-)
 delete mode 100644 server/objects/Collection.js

diff --git a/server/Database.js b/server/Database.js
index afb09dae..070c89d7 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -406,11 +406,6 @@ class Database {
     return Promise.all(oldBooks.map((oldBook) => this.models.book.saveFromOld(oldBook)))
   }
 
-  createBulkCollectionBooks(collectionBooks) {
-    if (!this.sequelize) return false
-    return this.models.collectionBook.bulkCreate(collectionBooks)
-  }
-
   createPlaylistMediaItem(playlistMediaItem) {
     if (!this.sequelize) return false
     return this.models.playlistMediaItem.create(playlistMediaItem)
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 3e35c08b..23f8796f 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -5,13 +5,17 @@ const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
 const RssFeedManager = require('../managers/RssFeedManager')
-const Collection = require('../objects/Collection')
 
 /**
  * @typedef RequestUserObject
  * @property {import('../models/User')} user
  *
  * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/Collection')} collection
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} CollectionControllerRequest
  */
 
 class CollectionController {
@@ -25,36 +29,68 @@ class CollectionController {
    * @param {Response} res
    */
   async create(req, res) {
-    const newCollection = new Collection()
-    req.body.userId = req.user.id
-    if (!newCollection.setData(req.body)) {
+    const reqBody = req.body || {}
+
+    // Validation
+    if (!reqBody.name || !reqBody.libraryId) {
       return res.status(400).send('Invalid collection data')
     }
+    const libraryItemIds = (reqBody.books || []).filter((b) => !!b && typeof b == 'string')
+    if (!libraryItemIds.length) {
+      return res.status(400).send('Invalid collection data. No books')
+    }
 
-    // Create collection record
-    await Database.collectionModel.createFromOld(newCollection)
-
-    // Get library items in collection
-    const libraryItemsInCollection = await Database.libraryItemModel.getForCollection(newCollection)
-
-    // Create collectionBook records
-    let order = 1
-    const collectionBooksToAdd = []
-    for (const libraryItemId of newCollection.books) {
-      const libraryItem = libraryItemsInCollection.find((li) => li.id === libraryItemId)
-      if (libraryItem) {
-        collectionBooksToAdd.push({
-          collectionId: newCollection.id,
-          bookId: libraryItem.media.id,
-          order: order++
-        })
+    // Load library items
+    const libraryItems = await Database.libraryItemModel.findAll({
+      attributes: ['id', 'mediaId', 'mediaType', 'libraryId'],
+      where: {
+        id: libraryItemIds,
+        libraryId: reqBody.libraryId,
+        mediaType: 'book'
       }
-    }
-    if (collectionBooksToAdd.length) {
-      await Database.createBulkCollectionBooks(collectionBooksToAdd)
+    })
+    if (libraryItems.length !== libraryItemIds.length) {
+      return res.status(400).send('Invalid collection data. Invalid books')
     }
 
-    const jsonExpanded = newCollection.toJSONExpanded(libraryItemsInCollection)
+    /** @type {import('../models/Collection')} */
+    let newCollection = null
+
+    const transaction = await Database.sequelize.transaction()
+    try {
+      // Create collection
+      newCollection = await Database.collectionModel.create(
+        {
+          libraryId: reqBody.libraryId,
+          name: reqBody.name,
+          description: reqBody.description || null
+        },
+        { transaction }
+      )
+
+      // Create collectionBooks
+      const collectionBookPayloads = libraryItemIds.map((llid, index) => {
+        const libraryItem = libraryItems.find((li) => li.id === llid)
+        return {
+          collectionId: newCollection.id,
+          bookId: libraryItem.mediaId,
+          order: index + 1
+        }
+      })
+      await Database.collectionBookModel.bulkCreate(collectionBookPayloads, { transaction })
+
+      await transaction.commit()
+    } catch (error) {
+      await transaction.rollback()
+      Logger.error('[CollectionController] create:', error)
+      return res.status(500).send('Failed to create collection')
+    }
+
+    // Load books expanded
+    newCollection.books = await newCollection.getBooksExpandedWithLibraryItem()
+
+    // Note: The old collection model stores expanded libraryItems in the books property
+    const jsonExpanded = newCollection.toOldJSONExpanded()
     SocketAuthority.emitter('collection_added', jsonExpanded)
     res.json(jsonExpanded)
   }
@@ -75,7 +111,7 @@ class CollectionController {
   /**
    * GET: /api/collections/:id
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async findOne(req, res) {
@@ -94,7 +130,7 @@ class CollectionController {
    * PATCH: /api/collections/:id
    * Update collection
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async update(req, res) {
@@ -158,7 +194,7 @@ class CollectionController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async delete(req, res) {
@@ -178,7 +214,7 @@ class CollectionController {
    * Add a single book to a collection
    * Req.body { id: <library item id> }
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async addBook(req, res) {
@@ -212,7 +248,7 @@ class CollectionController {
    * Remove a single book from a collection. Re-order books
    * TODO: bookId is actually libraryItemId. Clients need updating to use bookId
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async removeBook(req, res) {
@@ -257,29 +293,31 @@ class CollectionController {
    * Add multiple books to collection
    * Req.body { books: <Array of library item ids> }
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async addBatch(req, res) {
     // filter out invalid libraryItemIds
     const bookIdsToAdd = (req.body.books || []).filter((b) => !!b && typeof b == 'string')
     if (!bookIdsToAdd.length) {
-      return res.status(500).send('Invalid request body')
+      return res.status(400).send('Invalid request body')
     }
 
     // Get library items associated with ids
     const libraryItems = await Database.libraryItemModel.findAll({
+      attributes: ['id', 'mediaId', 'mediaType', 'libraryId'],
       where: {
-        id: {
-          [Sequelize.Op.in]: bookIdsToAdd
-        }
-      },
-      include: {
-        model: Database.bookModel
+        id: bookIdsToAdd,
+        libraryId: req.collection.libraryId,
+        mediaType: 'book'
       }
     })
+    if (!libraryItems.length) {
+      return res.status(400).send('Invalid request body. No valid books')
+    }
 
     // Get collection books already in collection
+    /** @type {import('../models/CollectionBook')[]} */
     const collectionBooks = await req.collection.getCollectionBooks()
 
     let order = collectionBooks.length + 1
@@ -288,10 +326,10 @@ class CollectionController {
 
     // Check and set new collection books to add
     for (const libraryItem of libraryItems) {
-      if (!collectionBooks.some((cb) => cb.bookId === libraryItem.media.id)) {
+      if (!collectionBooks.some((cb) => cb.bookId === libraryItem.mediaId)) {
         collectionBooksToAdd.push({
           collectionId: req.collection.id,
-          bookId: libraryItem.media.id,
+          bookId: libraryItem.mediaId,
           order: order++
         })
         hasUpdated = true
@@ -302,7 +340,8 @@ class CollectionController {
 
     let jsonExpanded = null
     if (hasUpdated) {
-      await Database.createBulkCollectionBooks(collectionBooksToAdd)
+      await Database.collectionBookModel.bulkCreate(collectionBooksToAdd)
+
       jsonExpanded = await req.collection.getOldJsonExpanded()
       SocketAuthority.emitter('collection_updated', jsonExpanded)
     } else {
@@ -316,7 +355,7 @@ class CollectionController {
    * Remove multiple books from collection
    * Req.body { books: <Array of library item ids> }
    *
-   * @param {RequestWithUser} req
+   * @param {CollectionControllerRequest} req
    * @param {Response} res
    */
   async removeBatch(req, res) {
@@ -329,9 +368,7 @@ class CollectionController {
     // Get library items associated with ids
     const libraryItems = await Database.libraryItemModel.findAll({
       where: {
-        id: {
-          [Sequelize.Op.in]: bookIdsToRemove
-        }
+        id: bookIdsToRemove
       },
       include: {
         model: Database.bookModel
@@ -339,6 +376,7 @@ class CollectionController {
     })
 
     // Get collection books already in collection
+    /** @type {import('../models/CollectionBook')[]} */
     const collectionBooks = await req.collection.getCollectionBooks({
       order: [['order', 'ASC']]
     })
diff --git a/server/models/Collection.js b/server/models/Collection.js
index e01ad90a..c8f62e69 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -1,7 +1,5 @@
 const { DataTypes, Model, Sequelize } = require('sequelize')
 
-const oldCollection = require('../objects/Collection')
-
 class Collection extends Model {
   constructor(values, options) {
     super(values, options)
@@ -26,12 +24,12 @@ class Collection extends Model {
   }
 
   /**
-   * Get all old collections toJSONExpanded, items filtered for user permissions
+   * Get all toOldJSONExpanded, items filtered for user permissions
    *
    * @param {import('./User')} user
    * @param {string} [libraryId]
    * @param {string[]} [include]
-   * @returns {Promise<oldCollection[]>} oldCollection.toJSONExpanded
+   * @async
    */
   static async getOldCollectionsJsonExpanded(user, libraryId, include) {
     let collectionWhere = null
@@ -79,8 +77,6 @@ class Collection extends Model {
     // TODO: Handle user permission restrictions on initial query
     return collections
       .map((c) => {
-        const oldCollection = this.getOldCollection(c)
-
         // Filter books using user permissions
         const books =
           c.books?.filter((b) => {
@@ -95,20 +91,14 @@ class Collection extends Model {
             return true
           }) || []
 
-        // Map to library items
-        const libraryItems = books.map((b) => {
-          const libraryItem = b.libraryItem
-          delete b.libraryItem
-          libraryItem.media = b
-          return this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-        })
-
         // Users with restricted permissions will not see this collection
-        if (!books.length && oldCollection.books.length) {
+        if (!books.length && c.books.length) {
           return null
         }
 
-        const collectionExpanded = oldCollection.toJSONExpanded(libraryItems)
+        this.books = books
+
+        const collectionExpanded = c.toOldJSONExpanded()
 
         // Map feed if found
         if (c.feeds?.length) {
@@ -153,69 +143,6 @@ class Collection extends Model {
     })
   }
 
-  /**
-   * Get old collection from Collection
-   * @param {Collection} collectionExpanded
-   * @returns {oldCollection}
-   */
-  static getOldCollection(collectionExpanded) {
-    const libraryItemIds = collectionExpanded.books?.map((b) => b.libraryItem?.id || null).filter((lid) => lid) || []
-    return new oldCollection({
-      id: collectionExpanded.id,
-      libraryId: collectionExpanded.libraryId,
-      name: collectionExpanded.name,
-      description: collectionExpanded.description,
-      books: libraryItemIds,
-      lastUpdate: collectionExpanded.updatedAt.valueOf(),
-      createdAt: collectionExpanded.createdAt.valueOf()
-    })
-  }
-
-  /**
-   *
-   * @param {oldCollection} oldCollection
-   * @returns {Promise<Collection>}
-   */
-  static createFromOld(oldCollection) {
-    const collection = this.getFromOld(oldCollection)
-    return this.create(collection)
-  }
-
-  static getFromOld(oldCollection) {
-    return {
-      id: oldCollection.id,
-      name: oldCollection.name,
-      description: oldCollection.description,
-      libraryId: oldCollection.libraryId
-    }
-  }
-
-  static removeById(collectionId) {
-    return this.destroy({
-      where: {
-        id: collectionId
-      }
-    })
-  }
-
-  /**
-   * Get old collection by id
-   * @param {string} collectionId
-   * @returns {Promise<oldCollection|null>} returns null if not found
-   */
-  static async getOldById(collectionId) {
-    if (!collectionId) return null
-    const collection = await this.findByPk(collectionId, {
-      include: {
-        model: this.sequelize.models.book,
-        include: this.sequelize.models.libraryItem
-      },
-      order: [[this.sequelize.models.book, this.sequelize.models.collectionBook, 'order', 'ASC']]
-    })
-    if (!collection) return null
-    return this.getOldCollection(collection)
-  }
-
   /**
    * Remove all collections belonging to library
    * @param {string} libraryId
@@ -286,64 +213,37 @@ class Collection extends Model {
   }
 
   /**
-   * Get old collection toJSONExpanded, items filtered for user permissions
+   * Get toOldJSONExpanded, items filtered for user permissions
    *
    * @param {import('./User')|null} user
    * @param {string[]} [include]
-   * @returns {Promise<oldCollection>} oldCollection.toJSONExpanded
+   * @async
    */
   async getOldJsonExpanded(user, include) {
-    this.books =
-      (await this.getBooks({
-        include: [
-          {
-            model: this.sequelize.models.libraryItem
-          },
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ],
-        order: [Sequelize.literal('`collectionBook.order` ASC')]
-      })) || []
+    this.books = await this.getBooksExpandedWithLibraryItem()
 
     // Filter books using user permissions
     // TODO: Handle user permission restrictions on initial query
-    const books =
-      this.books?.filter((b) => {
-        if (user) {
-          if (b.tags?.length && !user.checkCanAccessLibraryItemWithTags(b.tags)) {
-            return false
-          }
-          if (b.explicit === true && !user.canAccessExplicitContent) {
-            return false
-          }
+    if (user) {
+      const books = this.books.filter((b) => {
+        if (b.tags?.length && !user.checkCanAccessLibraryItemWithTags(b.tags)) {
+          return false
+        }
+        if (b.explicit === true && !user.canAccessExplicitContent) {
+          return false
         }
         return true
-      }) || []
+      })
 
-    // Map to library items
-    const libraryItems = books.map((b) => {
-      const libraryItem = b.libraryItem
-      delete b.libraryItem
-      libraryItem.media = b
-      return this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-    })
+      // Users with restricted permissions will not see this collection
+      if (!books.length && this.books.length) {
+        return null
+      }
 
-    // Users with restricted permissions will not see this collection
-    if (!books.length && this.books.length) {
-      return null
+      this.books = books
     }
 
-    const collectionExpanded = this.toOldJSONExpanded(libraryItems)
+    const collectionExpanded = this.toOldJSONExpanded()
 
     if (include?.includes('rssfeed')) {
       const feeds = await this.getFeeds()
@@ -357,10 +257,10 @@ class Collection extends Model {
 
   /**
    *
-   * @param {string[]} libraryItemIds
+   * @param {string[]} [libraryItemIds=[]]
    * @returns
    */
-  toOldJSON(libraryItemIds) {
+  toOldJSON(libraryItemIds = []) {
     return {
       id: this.id,
       libraryId: this.libraryId,
@@ -372,19 +272,19 @@ class Collection extends Model {
     }
   }
 
-  /**
-   *
-   * @param {import('../objects/LibraryItem')} oldLibraryItems
-   * @returns
-   */
-  toOldJSONExpanded(oldLibraryItems) {
-    const json = this.toOldJSON(oldLibraryItems.map((li) => li.id))
-    json.books = json.books
-      .map((libraryItemId) => {
-        const book = oldLibraryItems.find((li) => li.id === libraryItemId)
-        return book ? book.toJSONExpanded() : null
-      })
-      .filter((b) => !!b)
+  toOldJSONExpanded() {
+    if (!this.books) {
+      throw new Error('Books are required to expand Collection')
+    }
+
+    const json = this.toOldJSON()
+    json.books = this.books.map((book) => {
+      const libraryItem = book.libraryItem
+      delete book.libraryItem
+      libraryItem.media = book
+      return this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONExpanded()
+    })
+
     return json
   }
 }
diff --git a/server/models/CollectionBook.js b/server/models/CollectionBook.js
index e04da3b2..e706d68c 100644
--- a/server/models/CollectionBook.js
+++ b/server/models/CollectionBook.js
@@ -16,15 +16,6 @@ class CollectionBook extends Model {
     this.createdAt
   }
 
-  static removeByIds(collectionId, bookId) {
-    return this.destroy({
-      where: {
-        bookId,
-        collectionId
-      }
-    })
-  }
-
   static init(sequelize) {
     super.init(
       {
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 8ebed1d5..bed96631 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -123,7 +123,7 @@ class LibraryItem extends Model {
   }
 
   /**
-   * Currently unused because this is too slow and uses too much mem
+   *
    * @param {import('sequelize').WhereOptions} [where]
    * @returns {Array<objects.LibraryItem>} old library items
    */
diff --git a/server/objects/Collection.js b/server/objects/Collection.js
deleted file mode 100644
index 970d714b..00000000
--- a/server/objects/Collection.js
+++ /dev/null
@@ -1,115 +0,0 @@
-const uuidv4 = require("uuid").v4
-
-class Collection {
-  constructor(collection) {
-    this.id = null
-    this.libraryId = null
-
-    this.name = null
-    this.description = null
-
-    this.cover = null
-    this.coverFullPath = null
-    this.books = []
-
-    this.lastUpdate = null
-    this.createdAt = null
-
-    if (collection) {
-      this.construct(collection)
-    }
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      libraryId: this.libraryId,
-      name: this.name,
-      description: this.description,
-      cover: this.cover,
-      coverFullPath: this.coverFullPath,
-      books: [...this.books],
-      lastUpdate: this.lastUpdate,
-      createdAt: this.createdAt
-    }
-  }
-
-  toJSONExpanded(libraryItems, minifiedBooks = false) {
-    const json = this.toJSON()
-    json.books = json.books.map(bookId => {
-      const book = libraryItems.find(li => li.id === bookId)
-      return book ? minifiedBooks ? book.toJSONMinified() : book.toJSONExpanded() : null
-    }).filter(b => !!b)
-    return json
-  }
-
-  // Expanded and filtered out items not accessible to user
-  toJSONExpandedForUser(user, libraryItems) {
-    const json = this.toJSON()
-    json.books = json.books.map(libraryItemId => {
-      const libraryItem = libraryItems.find(li => li.id === libraryItemId)
-      return libraryItem ? libraryItem.toJSONExpanded() : null
-    }).filter(li => {
-      return li && user.checkCanAccessLibraryItem(li)
-    })
-    return json
-  }
-
-  construct(collection) {
-    this.id = collection.id
-    this.libraryId = collection.libraryId
-    this.name = collection.name
-    this.description = collection.description || null
-    this.cover = collection.cover || null
-    this.coverFullPath = collection.coverFullPath || null
-    this.books = collection.books ? [...collection.books] : []
-    this.lastUpdate = collection.lastUpdate || null
-    this.createdAt = collection.createdAt || null
-  }
-
-  setData(data) {
-    if (!data.libraryId || !data.name) {
-      return false
-    }
-    this.id = uuidv4()
-    this.libraryId = data.libraryId
-    this.name = data.name
-    this.description = data.description || null
-    this.cover = data.cover || null
-    this.coverFullPath = data.coverFullPath || null
-    this.books = data.books ? [...data.books] : []
-    this.lastUpdate = Date.now()
-    this.createdAt = Date.now()
-    return true
-  }
-
-  addBook(bookId) {
-    this.books.push(bookId)
-    this.lastUpdate = Date.now()
-  }
-
-  removeBook(bookId) {
-    this.books = this.books.filter(bid => bid !== bookId)
-    this.lastUpdate = Date.now()
-  }
-
-  update(payload) {
-    let hasUpdates = false
-    for (const key in payload) {
-      if (key === 'books') {
-        if (payload.books && this.books.join(',') !== payload.books.join(',')) {
-          this.books = [...payload.books]
-          hasUpdates = true
-        }
-      } else if (this[key] !== undefined && this[key] !== payload[key]) {
-        hasUpdates = true
-        this[key] = payload[key]
-      }
-    }
-    if (hasUpdates) {
-      this.lastUpdate = Date.now()
-    }
-    return hasUpdates
-  }
-}
-module.exports = Collection
\ No newline at end of file

From 88a0e75576902f25635784328693591f2f7149af Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 30 Dec 2024 17:07:41 -0600
Subject: [PATCH 097/143] Remove collection add/create modal toasts

---
 client/components/modals/collections/AddCreateModal.vue | 7 +------
 client/strings/bg.json                                  | 1 -
 client/strings/bn.json                                  | 2 --
 client/strings/ca.json                                  | 2 --
 client/strings/cs.json                                  | 1 -
 client/strings/da.json                                  | 1 -
 client/strings/de.json                                  | 2 --
 client/strings/en-us.json                               | 2 --
 client/strings/es.json                                  | 2 --
 client/strings/et.json                                  | 1 -
 client/strings/fr.json                                  | 2 --
 client/strings/he.json                                  | 1 -
 client/strings/hr.json                                  | 2 --
 client/strings/hu.json                                  | 1 -
 client/strings/it.json                                  | 2 --
 client/strings/lt.json                                  | 2 --
 client/strings/nl.json                                  | 2 --
 client/strings/no.json                                  | 2 --
 client/strings/pl.json                                  | 1 -
 client/strings/pt-br.json                               | 1 -
 client/strings/ru.json                                  | 2 --
 client/strings/sl.json                                  | 2 --
 client/strings/sv.json                                  | 1 -
 client/strings/uk.json                                  | 2 --
 client/strings/vi-vn.json                               | 1 -
 client/strings/zh-cn.json                               | 2 --
 client/strings/zh-tw.json                               | 1 -
 27 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/client/components/modals/collections/AddCreateModal.vue b/client/components/modals/collections/AddCreateModal.vue
index 7c22525f..94a7f0e7 100644
--- a/client/components/modals/collections/AddCreateModal.vue
+++ b/client/components/modals/collections/AddCreateModal.vue
@@ -138,7 +138,6 @@ export default {
           .$post(`/api/collections/${collection.id}/batch/remove`, { books: this.selectedBookIds })
           .then((updatedCollection) => {
             console.log(`Books removed from collection`, updatedCollection)
-            this.$toast.success(this.$strings.ToastCollectionItemsRemoveSuccess)
             this.processing = false
           })
           .catch((error) => {
@@ -152,7 +151,6 @@ export default {
           .$delete(`/api/collections/${collection.id}/book/${this.selectedLibraryItemId}`)
           .then((updatedCollection) => {
             console.log(`Book removed from collection`, updatedCollection)
-            this.$toast.success(this.$strings.ToastCollectionItemsRemoveSuccess)
             this.processing = false
           })
           .catch((error) => {
@@ -167,12 +165,11 @@ export default {
       this.processing = true
 
       if (this.showBatchCollectionModal) {
-        // BATCH Remove books
+        // BATCH Add books
         this.$axios
           .$post(`/api/collections/${collection.id}/batch/add`, { books: this.selectedBookIds })
           .then((updatedCollection) => {
             console.log(`Books added to collection`, updatedCollection)
-            this.$toast.success(this.$strings.ToastCollectionItemsAddSuccess)
             this.processing = false
           })
           .catch((error) => {
@@ -187,7 +184,6 @@ export default {
           .$post(`/api/collections/${collection.id}/book`, { id: this.selectedLibraryItemId })
           .then((updatedCollection) => {
             console.log(`Book added to collection`, updatedCollection)
-            this.$toast.success(this.$strings.ToastCollectionItemsAddSuccess)
             this.processing = false
           })
           .catch((error) => {
@@ -214,7 +210,6 @@ export default {
         .$post('/api/collections', newCollection)
         .then((data) => {
           console.log('New Collection Created', data)
-          this.$toast.success(`Collection "${data.name}" created`)
           this.processing = false
           this.newCollectionName = ''
         })
diff --git a/client/strings/bg.json b/client/strings/bg.json
index 8e124d06..bc4db4f6 100644
--- a/client/strings/bg.json
+++ b/client/strings/bg.json
@@ -729,7 +729,6 @@
   "ToastBookmarkUpdateSuccess": "Отметката е обновена",
   "ToastChaptersHaveErrors": "Главите имат грешки",
   "ToastChaptersMustHaveTitles": "Главите трябва да имат заглавия",
-  "ToastCollectionItemsRemoveSuccess": "Елемент(и) премахнати от колекция",
   "ToastCollectionRemoveSuccess": "Колекцията е премахната",
   "ToastCollectionUpdateSuccess": "Колекцията е обновена",
   "ToastItemCoverUpdateSuccess": "Корицата на елемента е обновена",
diff --git a/client/strings/bn.json b/client/strings/bn.json
index 16f8a447..e88db2e5 100644
--- a/client/strings/bn.json
+++ b/client/strings/bn.json
@@ -951,8 +951,6 @@
   "ToastChaptersRemoved": "অধ্যায়গুলো মুছে ফেলা হয়েছে",
   "ToastChaptersUpdated": "অধ্যায় আপডেট করা হয়েছে",
   "ToastCollectionItemsAddFailed": "আইটেম(গুলি) সংগ্রহে যোগ করা ব্যর্থ হয়েছে",
-  "ToastCollectionItemsAddSuccess": "আইটেম(গুলি) সংগ্রহে যোগ করা সফল হয়েছে",
-  "ToastCollectionItemsRemoveSuccess": "আইটেম(গুলি) সংগ্রহ থেকে সরানো হয়েছে",
   "ToastCollectionRemoveSuccess": "সংগ্রহ সরানো হয়েছে",
   "ToastCollectionUpdateSuccess": "সংগ্রহ আপডেট করা হয়েছে",
   "ToastCoverUpdateFailed": "কভার আপডেট ব্যর্থ হয়েছে",
diff --git a/client/strings/ca.json b/client/strings/ca.json
index f7e85ae2..bebb17e9 100644
--- a/client/strings/ca.json
+++ b/client/strings/ca.json
@@ -904,8 +904,6 @@
   "ToastChaptersRemoved": "Capítols eliminats",
   "ToastChaptersUpdated": "Capítols actualitzats",
   "ToastCollectionItemsAddFailed": "Error en afegir elements a la col·lecció",
-  "ToastCollectionItemsAddSuccess": "Elements afegits a la col·lecció",
-  "ToastCollectionItemsRemoveSuccess": "Elements eliminats de la col·lecció",
   "ToastCollectionRemoveSuccess": "Col·lecció eliminada",
   "ToastCollectionUpdateSuccess": "Col·lecció actualitzada",
   "ToastCoverUpdateFailed": "Error en actualitzar la portada",
diff --git a/client/strings/cs.json b/client/strings/cs.json
index 684a25e1..3db3ddaa 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -943,7 +943,6 @@
   "ToastChaptersHaveErrors": "Kapitoly obsahují chyby",
   "ToastChaptersMustHaveTitles": "Kapitoly musí mít názvy",
   "ToastChaptersRemoved": "Kapitoly odstraněny",
-  "ToastCollectionItemsRemoveSuccess": "Položky odstraněny z kolekce",
   "ToastCollectionRemoveSuccess": "Kolekce odstraněna",
   "ToastCollectionUpdateSuccess": "Kolekce aktualizována",
   "ToastCoverUpdateFailed": "Aktualizace obálky selhala",
diff --git a/client/strings/da.json b/client/strings/da.json
index 0f7af2c4..0f7b1eed 100644
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -640,7 +640,6 @@
   "ToastBookmarkUpdateSuccess": "Bogmærke opdateret",
   "ToastChaptersHaveErrors": "Kapitler har fejl",
   "ToastChaptersMustHaveTitles": "Kapitler skal have titler",
-  "ToastCollectionItemsRemoveSuccess": "Element(er) fjernet fra samlingen",
   "ToastCollectionRemoveSuccess": "Samling fjernet",
   "ToastCollectionUpdateSuccess": "Samling opdateret",
   "ToastItemCoverUpdateSuccess": "Varens omslag opdateret",
diff --git a/client/strings/de.json b/client/strings/de.json
index db298c75..6ac20fab 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Kapitel entfernt",
   "ToastChaptersUpdated": "Kapitel aktualisiert",
   "ToastCollectionItemsAddFailed": "Das Hinzufügen von Element(en) zur Sammlung ist fehlgeschlagen",
-  "ToastCollectionItemsAddSuccess": "Element(e) erfolgreich zur Sammlung hinzugefügt",
-  "ToastCollectionItemsRemoveSuccess": "Medien aus der Sammlung entfernt",
   "ToastCollectionRemoveSuccess": "Sammlung entfernt",
   "ToastCollectionUpdateSuccess": "Sammlung aktualisiert",
   "ToastCoverUpdateFailed": "Cover-Update fehlgeschlagen",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index eee94abf..e94e5197 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -961,8 +961,6 @@
   "ToastChaptersRemoved": "Chapters removed",
   "ToastChaptersUpdated": "Chapters updated",
   "ToastCollectionItemsAddFailed": "Item(s) added to collection failed",
-  "ToastCollectionItemsAddSuccess": "Item(s) added to collection success",
-  "ToastCollectionItemsRemoveSuccess": "Item(s) removed from collection",
   "ToastCollectionRemoveSuccess": "Collection removed",
   "ToastCollectionUpdateSuccess": "Collection updated",
   "ToastCoverUpdateFailed": "Cover update failed",
diff --git a/client/strings/es.json b/client/strings/es.json
index fa4f8c45..4196b6dd 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Capítulos eliminados",
   "ToastChaptersUpdated": "Capítulos actualizados",
   "ToastCollectionItemsAddFailed": "Artículo(s) añadido(s) a la colección fallido(s)",
-  "ToastCollectionItemsAddSuccess": "Artículo(s) añadido(s) a la colección correctamente",
-  "ToastCollectionItemsRemoveSuccess": "Elementos(s) removidos de la colección",
   "ToastCollectionRemoveSuccess": "Colección removida",
   "ToastCollectionUpdateSuccess": "Colección actualizada",
   "ToastCoverUpdateFailed": "Error al actualizar la cubierta",
diff --git a/client/strings/et.json b/client/strings/et.json
index 8d256c01..835666f8 100644
--- a/client/strings/et.json
+++ b/client/strings/et.json
@@ -713,7 +713,6 @@
   "ToastBookmarkUpdateSuccess": "Järjehoidja värskendatud",
   "ToastChaptersHaveErrors": "Peatükkidel on vigu",
   "ToastChaptersMustHaveTitles": "Peatükkidel peab olema pealkiri",
-  "ToastCollectionItemsRemoveSuccess": "Üksus(ed) eemaldatud kogumist",
   "ToastCollectionRemoveSuccess": "Kogum eemaldatud",
   "ToastCollectionUpdateSuccess": "Kogum värskendatud",
   "ToastItemCoverUpdateSuccess": "Üksuse kaas värskendatud",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index 2c92bf7c..2dfe5b0b 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -953,8 +953,6 @@
   "ToastChaptersRemoved": "Chapitres supprimés",
   "ToastChaptersUpdated": "Chapitres mis à jour",
   "ToastCollectionItemsAddFailed": "Échec de l’ajout de(s) élément(s) à la collection",
-  "ToastCollectionItemsAddSuccess": "Ajout de(s) élément(s) à la collection réussi",
-  "ToastCollectionItemsRemoveSuccess": "Élément(s) supprimé(s) de la collection",
   "ToastCollectionRemoveSuccess": "Collection supprimée",
   "ToastCollectionUpdateSuccess": "Collection mise à jour",
   "ToastCoverUpdateFailed": "Échec de la mise à jour de la couverture",
diff --git a/client/strings/he.json b/client/strings/he.json
index a93d3f05..71a6df9e 100644
--- a/client/strings/he.json
+++ b/client/strings/he.json
@@ -744,7 +744,6 @@
   "ToastBookmarkUpdateSuccess": "הסימניה עודכנה בהצלחה",
   "ToastChaptersHaveErrors": "פרקים מכילים שגיאות",
   "ToastChaptersMustHaveTitles": "פרקים חייבים לכלול כותרות",
-  "ToastCollectionItemsRemoveSuccess": "הפריט(ים) הוסרו מהאוסף בהצלחה",
   "ToastCollectionRemoveSuccess": "האוסף הוסר בהצלחה",
   "ToastCollectionUpdateSuccess": "האוסף עודכן בהצלחה",
   "ToastItemCoverUpdateSuccess": "כריכת הפריט עודכנה בהצלחה",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index bc66b8a5..8b824128 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Poglavlja uklonjena",
   "ToastChaptersUpdated": "Poglavlja su ažurirana",
   "ToastCollectionItemsAddFailed": "Neuspješno dodavanje stavki u zbirku",
-  "ToastCollectionItemsAddSuccess": "Uspješno dodavanje stavki u zbirku",
-  "ToastCollectionItemsRemoveSuccess": "Stavke izbrisane iz zbirke",
   "ToastCollectionRemoveSuccess": "Zbirka izbrisana",
   "ToastCollectionUpdateSuccess": "Zbirka ažurirana",
   "ToastCoverUpdateFailed": "Ažuriranje naslovnice nije uspjelo",
diff --git a/client/strings/hu.json b/client/strings/hu.json
index 10807375..25f9a9be 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -945,7 +945,6 @@
   "ToastChaptersMustHaveTitles": "A fejezeteknek címekkel kell rendelkezniük",
   "ToastChaptersRemoved": "Fejezetek eltávolítva",
   "ToastChaptersUpdated": "Fejezetek frissítve",
-  "ToastCollectionItemsRemoveSuccess": "Elem(ek) eltávolítva a gyűjteményből",
   "ToastCollectionRemoveSuccess": "Gyűjtemény eltávolítva",
   "ToastCollectionUpdateSuccess": "Gyűjtemény frissítve",
   "ToastCoverUpdateFailed": "A borító frissítése nem sikerült",
diff --git a/client/strings/it.json b/client/strings/it.json
index 70490e3b..633dea89 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -950,8 +950,6 @@
   "ToastChaptersRemoved": "Capitoli rimossi",
   "ToastChaptersUpdated": "Capitoli aggiornati",
   "ToastCollectionItemsAddFailed": "l'aggiunta dell'elemento(i) alla raccolta non è riuscito",
-  "ToastCollectionItemsAddSuccess": "L'aggiunta dell'elemento(i) alla raccolta è riuscito",
-  "ToastCollectionItemsRemoveSuccess": "Oggetto(i) rimossi dalla Raccolta",
   "ToastCollectionRemoveSuccess": "Collezione rimossa",
   "ToastCollectionUpdateSuccess": "Raccolta aggiornata",
   "ToastCoverUpdateFailed": "Aggiornamento cover fallito",
diff --git a/client/strings/lt.json b/client/strings/lt.json
index e1a63510..8c902f5a 100644
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -666,8 +666,6 @@
   "ToastChaptersMustHaveTitles": "Skyriai turi turėti pavadinimus",
   "ToastChaptersRemoved": "Skyriai pašalinti",
   "ToastCollectionItemsAddFailed": "Nepavyko pridėti į kolekciją",
-  "ToastCollectionItemsAddSuccess": "Pridėta į kolekciją",
-  "ToastCollectionItemsRemoveSuccess": "Elementai pašalinti iš kolekcijos",
   "ToastCollectionRemoveSuccess": "Kolekcija pašalinta",
   "ToastCollectionUpdateSuccess": "Kolekcija atnaujinta",
   "ToastCoverUpdateFailed": "Viršelio atnaujinimas nepavyko",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index bc5a40ca..97bb1d01 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -946,8 +946,6 @@
   "ToastChaptersRemoved": "Hoofdstukken verwijderd",
   "ToastChaptersUpdated": "Hoofdstukken bijgewerkt",
   "ToastCollectionItemsAddFailed": "Item(s) toegevoegd aan collectie mislukt",
-  "ToastCollectionItemsAddSuccess": "Item(s) toegevoegd aan collectie gelukt",
-  "ToastCollectionItemsRemoveSuccess": "Onderdeel (of onderdelen) verwijderd uit collectie",
   "ToastCollectionRemoveSuccess": "Collectie verwijderd",
   "ToastCollectionUpdateSuccess": "Collectie bijgewerkt",
   "ToastCoverUpdateFailed": "Cover update mislukt",
diff --git a/client/strings/no.json b/client/strings/no.json
index ddfc2489..553a852e 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -882,8 +882,6 @@
   "ToastChaptersRemoved": "Kapitler fjernet",
   "ToastChaptersUpdated": "Kapitler oppdatert",
   "ToastCollectionItemsAddFailed": "Feil med å legge til element(er)",
-  "ToastCollectionItemsAddSuccess": "Element(er) lagt til samlingen",
-  "ToastCollectionItemsRemoveSuccess": "Gjenstand(er) fjernet fra samling",
   "ToastCollectionRemoveSuccess": "Samling fjernet",
   "ToastCollectionUpdateSuccess": "samlingupdated",
   "ToastCoverUpdateFailed": "Oppdatering av bilde feilet",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index 85c7b769..d8cf9848 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -772,7 +772,6 @@
   "ToastBookmarkCreateSuccess": "Dodano zakładkę",
   "ToastBookmarkRemoveSuccess": "Zakładka została usunięta",
   "ToastBookmarkUpdateSuccess": "Zaktualizowano zakładkę",
-  "ToastCollectionItemsRemoveSuccess": "Przedmiot(y) zostały usunięte z kolekcji",
   "ToastCollectionRemoveSuccess": "Kolekcja usunięta",
   "ToastCollectionUpdateSuccess": "Zaktualizowano kolekcję",
   "ToastItemCoverUpdateSuccess": "Zaktualizowano okładkę",
diff --git a/client/strings/pt-br.json b/client/strings/pt-br.json
index 7df7c47d..b6d7e7e3 100644
--- a/client/strings/pt-br.json
+++ b/client/strings/pt-br.json
@@ -735,7 +735,6 @@
   "ToastCachePurgeSuccess": "Cache apagado com sucesso",
   "ToastChaptersHaveErrors": "Capítulos com erro",
   "ToastChaptersMustHaveTitles": "Capítulos precisam ter títulos",
-  "ToastCollectionItemsRemoveSuccess": "Item(ns) removidos da coleção",
   "ToastCollectionRemoveSuccess": "Coleção removida",
   "ToastCollectionUpdateSuccess": "Coleção atualizada",
   "ToastDeleteFileFailed": "Falha ao apagar arquivo",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index 3e07ea02..41129bde 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Удалены главы",
   "ToastChaptersUpdated": "Обновленные главы",
   "ToastCollectionItemsAddFailed": "Не удалось добавить элемент(ы) в коллекцию",
-  "ToastCollectionItemsAddSuccess": "Элемент(ы) добавлены в коллекцию",
-  "ToastCollectionItemsRemoveSuccess": "Элемент(ы), удалены из коллекции",
   "ToastCollectionRemoveSuccess": "Коллекция удалена",
   "ToastCollectionUpdateSuccess": "Коллекция обновлена",
   "ToastCoverUpdateFailed": "Не удалось обновить обложку",
diff --git a/client/strings/sl.json b/client/strings/sl.json
index a12643f4..3c304eaa 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Poglavja so odstranjena",
   "ToastChaptersUpdated": "Poglavja so posodobljena",
   "ToastCollectionItemsAddFailed": "Dodajanje elementov v zbirko ni uspelo",
-  "ToastCollectionItemsAddSuccess": "Dodajanje elementov v zbirko je bilo uspešno",
-  "ToastCollectionItemsRemoveSuccess": "Elementi so bili odstranjeni iz zbirke",
   "ToastCollectionRemoveSuccess": "Zbirka je bila odstranjena",
   "ToastCollectionUpdateSuccess": "Zbirka je bila posodobljena",
   "ToastCoverUpdateFailed": "Posodobitev naslovnice ni uspela",
diff --git a/client/strings/sv.json b/client/strings/sv.json
index 7513e8db..8e60e2cd 100644
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -705,7 +705,6 @@
   "ToastBookmarkUpdateSuccess": "Bokmärket har uppdaterats",
   "ToastChaptersHaveErrors": "Kapitlen har fel",
   "ToastChaptersMustHaveTitles": "Kapitel måste ha titlar",
-  "ToastCollectionItemsRemoveSuccess": "Objekt borttagna från samlingen",
   "ToastCollectionRemoveSuccess": "Samlingen har raderats",
   "ToastCollectionUpdateSuccess": "Samlingen har uppdaterats",
   "ToastItemCoverUpdateSuccess": "Objektets omslag uppdaterat",
diff --git a/client/strings/uk.json b/client/strings/uk.json
index 3d0150f5..4b745264 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "Розділи видалені",
   "ToastChaptersUpdated": "Розділи оновлені",
   "ToastCollectionItemsAddFailed": "Не вдалося додати елемент(и) до колекції",
-  "ToastCollectionItemsAddSuccess": "Елемент(и) успішно додано до колекції",
-  "ToastCollectionItemsRemoveSuccess": "Елемент(и) видалено з добірки",
   "ToastCollectionRemoveSuccess": "Добірку видалено",
   "ToastCollectionUpdateSuccess": "Добірку оновлено",
   "ToastCoverUpdateFailed": "Не вдалося оновити обкладинку",
diff --git a/client/strings/vi-vn.json b/client/strings/vi-vn.json
index 8b0ca165..a176dba3 100644
--- a/client/strings/vi-vn.json
+++ b/client/strings/vi-vn.json
@@ -683,7 +683,6 @@
   "ToastBookmarkUpdateSuccess": "Đánh dấu đã được cập nhật",
   "ToastChaptersHaveErrors": "Các chương có lỗi",
   "ToastChaptersMustHaveTitles": "Các chương phải có tiêu đề",
-  "ToastCollectionItemsRemoveSuccess": "Mục đã được xóa khỏi bộ sưu tập",
   "ToastCollectionRemoveSuccess": "Bộ sưu tập đã được xóa",
   "ToastCollectionUpdateSuccess": "Bộ sưu tập đã được cập nhật",
   "ToastItemCoverUpdateSuccess": "Ảnh bìa mục đã được cập nhật",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 3a8b432f..472ef84e 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -959,8 +959,6 @@
   "ToastChaptersRemoved": "已删除章节",
   "ToastChaptersUpdated": "章节已更新",
   "ToastCollectionItemsAddFailed": "项目添加到收藏夹失败",
-  "ToastCollectionItemsAddSuccess": "项目添加到收藏夹成功",
-  "ToastCollectionItemsRemoveSuccess": "项目从收藏夹移除",
   "ToastCollectionRemoveSuccess": "收藏夹已删除",
   "ToastCollectionUpdateSuccess": "收藏夹已更新",
   "ToastCoverUpdateFailed": "封面更新失败",
diff --git a/client/strings/zh-tw.json b/client/strings/zh-tw.json
index 080d1bac..96f878c2 100644
--- a/client/strings/zh-tw.json
+++ b/client/strings/zh-tw.json
@@ -727,7 +727,6 @@
   "ToastBookmarkUpdateSuccess": "書籤已更新",
   "ToastChaptersHaveErrors": "章節有錯誤",
   "ToastChaptersMustHaveTitles": "章節必須有標題",
-  "ToastCollectionItemsRemoveSuccess": "項目從收藏夾移除",
   "ToastCollectionRemoveSuccess": "收藏夾已刪除",
   "ToastCollectionUpdateSuccess": "收藏夾已更新",
   "ToastItemCoverUpdateSuccess": "項目封面已更新",

From 9785bc02ea8085f3981b8797635179eb11cdfec0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 31 Dec 2024 17:01:42 -0600
Subject: [PATCH 098/143] Update Playlist model & controller to remove usage of
 old Playlist object, remove old Playlist

---
 server/Database.js                         |  10 -
 server/controllers/CollectionController.js |   3 +
 server/controllers/PlaylistController.js   | 495 ++++++++++++---------
 server/models/Playlist.js                  | 297 ++++++-------
 server/models/PlaylistMediaItem.js         |   5 +
 server/models/PodcastEpisode.js            |  56 +++
 server/objects/Playlist.js                 | 148 ------
 7 files changed, 501 insertions(+), 513 deletions(-)
 delete mode 100644 server/objects/Playlist.js

diff --git a/server/Database.js b/server/Database.js
index 070c89d7..bd14fbd5 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -406,16 +406,6 @@ class Database {
     return Promise.all(oldBooks.map((oldBook) => this.models.book.saveFromOld(oldBook)))
   }
 
-  createPlaylistMediaItem(playlistMediaItem) {
-    if (!this.sequelize) return false
-    return this.models.playlistMediaItem.create(playlistMediaItem)
-  }
-
-  createBulkPlaylistMediaItems(playlistMediaItems) {
-    if (!this.sequelize) return false
-    return this.models.playlistMediaItem.bulkCreate(playlistMediaItems)
-  }
-
   async createLibraryItem(oldLibraryItem) {
     if (!this.sequelize) return false
     await oldLibraryItem.saveMetadata()
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 23f8796f..6986f2b7 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -35,6 +35,9 @@ class CollectionController {
     if (!reqBody.name || !reqBody.libraryId) {
       return res.status(400).send('Invalid collection data')
     }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid collection description')
+    }
     const libraryItemIds = (reqBody.books || []).filter((b) => !!b && typeof b == 'string')
     if (!libraryItemIds.length) {
       return res.status(400).send('Invalid collection data. No books')
diff --git a/server/controllers/PlaylistController.js b/server/controllers/PlaylistController.js
index 5b84fe16..ee4fef5e 100644
--- a/server/controllers/PlaylistController.js
+++ b/server/controllers/PlaylistController.js
@@ -3,13 +3,16 @@ const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
-const Playlist = require('../objects/Playlist')
-
 /**
  * @typedef RequestUserObject
  * @property {import('../models/User')} user
  *
  * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/Playlist')} playlist
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} PlaylistControllerRequest
  */
 
 class PlaylistController {
@@ -23,48 +26,103 @@ class PlaylistController {
    * @param {Response} res
    */
   async create(req, res) {
-    const oldPlaylist = new Playlist()
-    req.body.userId = req.user.id
-    const success = oldPlaylist.setData(req.body)
-    if (!success) {
-      return res.status(400).send('Invalid playlist request data')
+    const reqBody = req.body || {}
+
+    // Validation
+    if (!reqBody.name || !reqBody.libraryId) {
+      return res.status(400).send('Invalid playlist data')
+    }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid playlist description')
+    }
+    const items = reqBody.items || []
+    const isPodcast = items.some((i) => i.episodeId)
+    const libraryItemIds = new Set()
+    for (const item of items) {
+      if (!item.libraryItemId || typeof item.libraryItemId !== 'string') {
+        return res.status(400).send('Invalid playlist item')
+      }
+      if (isPodcast && (!item.episodeId || typeof item.episodeId !== 'string')) {
+        return res.status(400).send('Invalid playlist item episodeId')
+      } else if (!isPodcast && item.episodeId) {
+        return res.status(400).send('Invalid playlist item episodeId')
+      }
+      libraryItemIds.add(item.libraryItemId)
     }
 
-    // Create Playlist record
-    const newPlaylist = await Database.playlistModel.createFromOld(oldPlaylist)
-
-    // Lookup all library items in playlist
-    const libraryItemIds = oldPlaylist.items.map((i) => i.libraryItemId).filter((i) => i)
-    const libraryItemsInPlaylist = await Database.libraryItemModel.findAll({
+    // Load library items
+    const libraryItems = await Database.libraryItemModel.findAll({
+      attributes: ['id', 'mediaId', 'mediaType', 'libraryId'],
       where: {
-        id: libraryItemIds
+        id: Array.from(libraryItemIds),
+        libraryId: reqBody.libraryId,
+        mediaType: isPodcast ? 'podcast' : 'book'
       }
     })
+    if (libraryItems.length !== libraryItemIds.size) {
+      return res.status(400).send('Invalid playlist data. Invalid items')
+    }
 
-    // Create playlistMediaItem records
-    const mediaItemsToAdd = []
-    let order = 1
-    for (const mediaItemObj of oldPlaylist.items) {
-      const libraryItem = libraryItemsInPlaylist.find((li) => li.id === mediaItemObj.libraryItemId)
-      if (!libraryItem) continue
-
-      mediaItemsToAdd.push({
-        mediaItemId: mediaItemObj.episodeId || libraryItem.mediaId,
-        mediaItemType: mediaItemObj.episodeId ? 'podcastEpisode' : 'book',
-        playlistId: oldPlaylist.id,
-        order: order++
+    // Validate podcast episodes
+    if (isPodcast) {
+      const podcastEpisodeIds = items.map((i) => i.episodeId)
+      const podcastEpisodes = await Database.podcastEpisodeModel.findAll({
+        attributes: ['id'],
+        where: {
+          id: podcastEpisodeIds
+        }
       })
-    }
-    if (mediaItemsToAdd.length) {
-      await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
+      if (podcastEpisodes.length !== podcastEpisodeIds.length) {
+        return res.status(400).send('Invalid playlist data. Invalid podcast episodes')
+      }
     }
 
-    const jsonExpanded = await newPlaylist.getOldJsonExpanded()
-    SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
-    res.json(jsonExpanded)
+    const transaction = await Database.sequelize.transaction()
+    try {
+      // Create playlist
+      const newPlaylist = await Database.playlistModel.create(
+        {
+          libraryId: reqBody.libraryId,
+          userId: req.user.id,
+          name: reqBody.name,
+          description: reqBody.description || null
+        },
+        { transaction }
+      )
+
+      // Create playlistMediaItems
+      const playlistItemPayloads = []
+      for (const [index, item] of items.entries()) {
+        const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
+        playlistItemPayloads.push({
+          playlistId: newPlaylist.id,
+          mediaItemId: item.episodeId || libraryItem.mediaId,
+          mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
+          order: index + 1
+        })
+      }
+
+      await Database.playlistMediaItemModel.bulkCreate(playlistItemPayloads, { transaction })
+
+      await transaction.commit()
+
+      newPlaylist.playlistMediaItems = await newPlaylist.getMediaItemsExpandedWithLibraryItem()
+
+      const jsonExpanded = newPlaylist.toOldJSONExpanded()
+      SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
+      res.json(jsonExpanded)
+    } catch (error) {
+      await transaction.rollback()
+      Logger.error('[PlaylistController] create:', error)
+      res.status(500).send('Failed to create playlist')
+    }
   }
 
   /**
+   * @deprecated - Use /api/libraries/:libraryId/playlists
+   * This is not used by Abs web client or mobile apps
+   * TODO: Remove this endpoint or refactor it and make it the primary
+   *
    * GET: /api/playlists
    * Get all playlists for user
    *
@@ -72,68 +130,89 @@ class PlaylistController {
    * @param {Response} res
    */
   async findAllForUser(req, res) {
-    const playlistsForUser = await Database.playlistModel.findAll({
-      where: {
-        userId: req.user.id
-      }
-    })
-    const playlists = []
-    for (const playlist of playlistsForUser) {
-      const jsonExpanded = await playlist.getOldJsonExpanded()
-      playlists.push(jsonExpanded)
-    }
+    const playlistsForUser = await Database.playlistModel.getOldPlaylistsForUserAndLibrary(req.user.id, req.params.libraryId)
     res.json({
-      playlists
+      playlists: playlistsForUser
     })
   }
 
   /**
    * GET: /api/playlists/:id
    *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async findOne(req, res) {
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
-    res.json(jsonExpanded)
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+    res.json(req.playlist.toOldJSONExpanded())
   }
 
   /**
    * PATCH: /api/playlists/:id
    * Update playlist
    *
-   * @param {RequestWithUser} req
+   * Used for updating name and description or reordering items
+   *
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async update(req, res) {
-    const updatedPlaylist = req.playlist.set(req.body)
-    let wasUpdated = false
-    const changed = updatedPlaylist.changed()
-    if (changed?.length) {
-      await req.playlist.save()
-      Logger.debug(`[PlaylistController] Updated playlist ${req.playlist.id} keys [${changed.join(',')}]`)
-      wasUpdated = true
+    // Validation
+    const reqBody = req.body || {}
+    if (reqBody.libraryId || reqBody.userId) {
+      // Could allow support for this if needed with additional validation
+      return res.status(400).send('Invalid playlist data. Cannot update libraryId or userId')
+    }
+    if (reqBody.name && typeof reqBody.name !== 'string') {
+      return res.status(400).send('Invalid playlist name')
+    }
+    if (reqBody.description && typeof reqBody.description !== 'string') {
+      return res.status(400).send('Invalid playlist description')
+    }
+    if (reqBody.items && (!Array.isArray(reqBody.items) || reqBody.items.some((i) => !i.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string')))) {
+      return res.status(400).send('Invalid playlist items')
     }
 
-    // If array of items is passed in then update order of playlist media items
-    const libraryItemIds = req.body.items?.map((i) => i.libraryItemId).filter((i) => i) || []
-    if (libraryItemIds.length) {
+    const playlistUpdatePayload = {}
+    if (reqBody.name) playlistUpdatePayload.name = reqBody.name
+    if (reqBody.description) playlistUpdatePayload.description = reqBody.description
+
+    // Update name and description
+    let wasUpdated = false
+    if (Object.keys(playlistUpdatePayload).length) {
+      req.playlist.set(playlistUpdatePayload)
+      const changed = req.playlist.changed()
+      if (changed?.length) {
+        await req.playlist.save()
+        Logger.debug(`[PlaylistController] Updated playlist ${req.playlist.id} keys [${changed.join(',')}]`)
+        wasUpdated = true
+      }
+    }
+
+    // If array of items is set then update order of playlist media items
+    if (reqBody.items?.length) {
+      const libraryItemIds = Array.from(new Set(reqBody.items.map((i) => i.libraryItemId)))
       const libraryItems = await Database.libraryItemModel.findAll({
+        attributes: ['id', 'mediaId', 'mediaType'],
         where: {
           id: libraryItemIds
         }
       })
-      const existingPlaylistMediaItems = await updatedPlaylist.getPlaylistMediaItems({
+      if (libraryItems.length !== libraryItemIds.length) {
+        return res.status(400).send('Invalid playlist items. Items not found')
+      }
+      /** @type {import('../models/PlaylistMediaItem')[]} */
+      const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
         order: [['order', 'ASC']]
       })
+      if (existingPlaylistMediaItems.length !== reqBody.items.length) {
+        return res.status(400).send('Invalid playlist items. Length mismatch')
+      }
 
       // Set an array of mediaItemId
       const newMediaItemIdOrder = []
-      for (const item of req.body.items) {
+      for (const item of reqBody.items) {
         const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-        if (!libraryItem) {
-          continue
-        }
         const mediaItemId = item.episodeId || libraryItem.mediaId
         newMediaItemIdOrder.push(mediaItemId)
       }
@@ -146,21 +225,21 @@ class PlaylistController {
       })
 
       // Update order on playlistMediaItem records
-      let order = 1
-      for (const playlistMediaItem of existingPlaylistMediaItems) {
-        if (playlistMediaItem.order !== order) {
+      for (const [index, playlistMediaItem] of existingPlaylistMediaItems.entries()) {
+        if (playlistMediaItem.order !== index + 1) {
           await playlistMediaItem.update({
-            order
+            order: index + 1
           })
           wasUpdated = true
         }
-        order++
       }
     }
 
-    const jsonExpanded = await updatedPlaylist.getOldJsonExpanded()
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
     if (wasUpdated) {
-      SocketAuthority.clientEmitter(updatedPlaylist.userId, 'playlist_updated', jsonExpanded)
+      SocketAuthority.clientEmitter(req.playlist.userId, 'playlist_updated', jsonExpanded)
     }
     res.json(jsonExpanded)
   }
@@ -169,11 +248,13 @@ class PlaylistController {
    * DELETE: /api/playlists/:id
    * Remove playlist
    *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async delete(req, res) {
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
+
     await req.playlist.destroy()
     SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_removed', jsonExpanded)
     res.sendStatus(200)
@@ -183,12 +264,13 @@ class PlaylistController {
    * POST: /api/playlists/:id/item
    * Add item to playlist
    *
-   * @param {RequestWithUser} req
+   * This is not used by Abs web client or mobile apps. Only the batch endpoints are used.
+   *
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async addItem(req, res) {
-    const oldPlaylist = await Database.playlistModel.getById(req.playlist.id)
-    const itemToAdd = req.body
+    const itemToAdd = req.body || {}
 
     if (!itemToAdd.libraryItemId) {
       return res.status(400).send('Request body has no libraryItemId')
@@ -198,12 +280,9 @@ class PlaylistController {
     if (!libraryItem) {
       return res.status(400).send('Library item not found')
     }
-    if (libraryItem.libraryId !== oldPlaylist.libraryId) {
+    if (libraryItem.libraryId !== req.playlist.libraryId) {
       return res.status(400).send('Library item in different library')
     }
-    if (oldPlaylist.containsItem(itemToAdd)) {
-      return res.status(400).send('Item already in playlist')
-    }
     if ((itemToAdd.episodeId && !libraryItem.isPodcast) || (libraryItem.isPodcast && !itemToAdd.episodeId)) {
       return res.status(400).send('Invalid item to add for this library type')
     }
@@ -211,15 +290,38 @@ class PlaylistController {
       return res.status(400).send('Episode not found in library item')
     }
 
-    const playlistMediaItem = {
-      playlistId: oldPlaylist.id,
-      mediaItemId: itemToAdd.episodeId || libraryItem.media.id,
-      mediaItemType: itemToAdd.episodeId ? 'podcastEpisode' : 'book',
-      order: oldPlaylist.items.length + 1
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    if (req.playlist.checkHasMediaItem(itemToAdd.libraryItemId, itemToAdd.episodeId)) {
+      return res.status(400).send('Item already in playlist')
+    }
+
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
+
+    const playlistMediaItem = {
+      playlistId: req.playlist.id,
+      mediaItemId: itemToAdd.episodeId || libraryItem.media.id,
+      mediaItemType: itemToAdd.episodeId ? 'podcastEpisode' : 'book',
+      order: req.playlist.playlistMediaItems.length + 1
+    }
+    await Database.playlistMediaItemModel.create(playlistMediaItem)
+
+    // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
+    if (itemToAdd.episodeId) {
+      const episode = libraryItem.media.episodes.find((ep) => ep.id === itemToAdd.episodeId)
+      jsonExpanded.items.push({
+        episodeId: itemToAdd.episodeId,
+        episode: episode.toJSONExpanded(),
+        libraryItemId: libraryItem.id,
+        libraryItem: libraryItem.toJSONMinified()
+      })
+    } else {
+      jsonExpanded.items.push({
+        libraryItemId: libraryItem.id,
+        libraryItem: libraryItem.toJSONExpanded()
+      })
     }
 
-    await Database.createPlaylistMediaItem(playlistMediaItem)
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
     SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_updated', jsonExpanded)
     res.json(jsonExpanded)
   }
@@ -228,43 +330,36 @@ class PlaylistController {
    * DELETE: /api/playlists/:id/item/:libraryItemId/:episodeId?
    * Remove item from playlist
    *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async removeItem(req, res) {
-    const oldLibraryItem = await Database.libraryItemModel.getOldById(req.params.libraryItemId)
-    if (!oldLibraryItem) {
-      return res.status(404).send('Library item not found')
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
+
+    let playlistMediaItem = null
+    if (req.params.episodeId) {
+      playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItemId === req.params.episodeId)
+    } else {
+      playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItem.libraryItem?.id === req.params.libraryItemId)
     }
-
-    // Get playlist media items
-    const mediaItemId = req.params.episodeId || oldLibraryItem.media.id
-    const playlistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
-
-    // Check if media item to delete is in playlist
-    const mediaItemToRemove = playlistMediaItems.find((pmi) => pmi.mediaItemId === mediaItemId)
-    if (!mediaItemToRemove) {
+    if (!playlistMediaItem) {
       return res.status(404).send('Media item not found in playlist')
     }
 
     // Remove record
-    await mediaItemToRemove.destroy()
+    await playlistMediaItem.destroy()
+    req.playlist.playlistMediaItems = req.playlist.playlistMediaItems.filter((pmi) => pmi.id !== playlistMediaItem.id)
 
     // Update playlist media items order
-    let order = 1
-    for (const mediaItem of playlistMediaItems) {
-      if (mediaItem.mediaItemId === mediaItemId) continue
-      if (mediaItem.order !== order) {
+    for (const [index, mediaItem] of req.playlist.playlistMediaItems.entries()) {
+      if (mediaItem.order !== index + 1) {
         await mediaItem.update({
-          order
+          order: index + 1
         })
       }
-      order++
     }
 
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
 
     // Playlist is removed when there are no items
     if (!jsonExpanded.items.length) {
@@ -282,64 +377,68 @@ class PlaylistController {
    * POST: /api/playlists/:id/batch/add
    * Batch add playlist items
    *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async addBatch(req, res) {
-    if (!req.body.items?.length) {
-      return res.status(400).send('Invalid request body')
-    }
-    const itemsToAdd = req.body.items
-
-    const libraryItemIds = itemsToAdd.map((i) => i.libraryItemId).filter((i) => i)
-    if (!libraryItemIds.length) {
-      return res.status(400).send('Invalid request body')
+    if (!req.body.items?.length || !Array.isArray(req.body.items) || req.body.items.some((i) => !i?.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string'))) {
+      return res.status(400).send('Invalid request body items')
     }
 
     // Find all library items
-    const libraryItems = await Database.libraryItemModel.findAll({
-      where: {
-        id: libraryItemIds
-      }
-    })
+    const libraryItemIds = new Set(req.body.items.map((i) => i.libraryItemId).filter((i) => i))
 
-    // Get all existing playlist media items
-    const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
+    const oldLibraryItems = await Database.libraryItemModel.getAllOldLibraryItems({ id: Array.from(libraryItemIds) })
+    if (oldLibraryItems.length !== libraryItemIds.size) {
+      return res.status(400).send('Invalid request body items')
+    }
+
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
 
     const mediaItemsToAdd = []
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
 
     // Setup array of playlistMediaItem records to add
-    let order = existingPlaylistMediaItems.length + 1
-    for (const item of itemsToAdd) {
-      const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-      if (!libraryItem) {
-        return res.status(404).send('Item not found with id ' + item.libraryItemId)
+    let order = req.playlist.playlistMediaItems.length + 1
+    for (const item of req.body.items) {
+      const libraryItem = oldLibraryItems.find((li) => li.id === item.libraryItemId)
+
+      const mediaItemId = item.episodeId || libraryItem.media.id
+      if (req.playlist.playlistMediaItems.some((pmi) => pmi.mediaItemId === mediaItemId)) {
+        // Already exists in playlist
+        continue
       } else {
-        const mediaItemId = item.episodeId || libraryItem.mediaId
-        if (existingPlaylistMediaItems.some((pmi) => pmi.mediaItemId === mediaItemId)) {
-          // Already exists in playlist
-          continue
+        mediaItemsToAdd.push({
+          playlistId: req.playlist.id,
+          mediaItemId,
+          mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
+          order: order++
+        })
+
+        // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
+        if (item.episodeId) {
+          const episode = libraryItem.media.episodes.find((ep) => ep.id === item.episodeId)
+          jsonExpanded.items.push({
+            episodeId: item.episodeId,
+            episode: episode.toJSONExpanded(),
+            libraryItemId: libraryItem.id,
+            libraryItem: libraryItem.toJSONMinified()
+          })
         } else {
-          mediaItemsToAdd.push({
-            playlistId: req.playlist.id,
-            mediaItemId,
-            mediaItemType: item.episodeId ? 'podcastEpisode' : 'book',
-            order: order++
+          jsonExpanded.items.push({
+            libraryItemId: libraryItem.id,
+            libraryItem: libraryItem.toJSONExpanded()
           })
         }
       }
     }
 
-    let jsonExpanded = null
     if (mediaItemsToAdd.length) {
-      await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
-      jsonExpanded = await req.playlist.getOldJsonExpanded()
+      await Database.playlistMediaItemModel.bulkCreate(mediaItemsToAdd)
+
       SocketAuthority.clientEmitter(req.playlist.userId, 'playlist_updated', jsonExpanded)
-    } else {
-      jsonExpanded = await req.playlist.getOldJsonExpanded()
     }
+
     res.json(jsonExpanded)
   }
 
@@ -347,50 +446,40 @@ class PlaylistController {
    * POST: /api/playlists/:id/batch/remove
    * Batch remove playlist items
    *
-   * @param {RequestWithUser} req
+   * @param {PlaylistControllerRequest} req
    * @param {Response} res
    */
   async removeBatch(req, res) {
-    if (!req.body.items?.length) {
-      return res.status(400).send('Invalid request body')
+    if (!req.body.items?.length || !Array.isArray(req.body.items) || req.body.items.some((i) => !i?.libraryItemId || typeof i.libraryItemId !== 'string' || (i.episodeId && typeof i.episodeId !== 'string'))) {
+      return res.status(400).send('Invalid request body items')
     }
 
-    const itemsToRemove = req.body.items
-    const libraryItemIds = itemsToRemove.map((i) => i.libraryItemId).filter((i) => i)
-    if (!libraryItemIds.length) {
-      return res.status(400).send('Invalid request body')
-    }
-
-    // Find all library items
-    const libraryItems = await Database.libraryItemModel.findAll({
-      where: {
-        id: libraryItemIds
-      }
-    })
-
-    // Get all existing playlist media items for playlist
-    const existingPlaylistMediaItems = await req.playlist.getPlaylistMediaItems({
-      order: [['order', 'ASC']]
-    })
-    let numMediaItems = existingPlaylistMediaItems.length
+    req.playlist.playlistMediaItems = await req.playlist.getMediaItemsExpandedWithLibraryItem()
 
     // Remove playlist media items
     let hasUpdated = false
-    for (const item of itemsToRemove) {
-      const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
-      if (!libraryItem) continue
-      const mediaItemId = item.episodeId || libraryItem.mediaId
-      const existingMediaItem = existingPlaylistMediaItems.find((pmi) => pmi.mediaItemId === mediaItemId)
-      if (!existingMediaItem) continue
-      await existingMediaItem.destroy()
+    for (const item of req.body.items) {
+      let playlistMediaItem = null
+      if (item.episodeId) {
+        playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItemId === item.episodeId)
+      } else {
+        playlistMediaItem = req.playlist.playlistMediaItems.find((pmi) => pmi.mediaItem.libraryItem?.id === item.libraryItemId)
+      }
+      if (!playlistMediaItem) {
+        Logger.warn(`[PlaylistController] Playlist item not found in playlist ${req.playlist.id}`, item)
+        continue
+      }
+
+      await playlistMediaItem.destroy()
+      req.playlist.playlistMediaItems = req.playlist.playlistMediaItems.filter((pmi) => pmi.id !== playlistMediaItem.id)
+
       hasUpdated = true
-      numMediaItems--
     }
 
-    const jsonExpanded = await req.playlist.getOldJsonExpanded()
+    const jsonExpanded = req.playlist.toOldJSONExpanded()
     if (hasUpdated) {
       // Playlist is removed when there are no items
-      if (!numMediaItems) {
+      if (!req.playlist.playlistMediaItems.length) {
         Logger.info(`[PlaylistController] Playlist "${req.playlist.name}" has no more items - removing it`)
         await req.playlist.destroy()
         SocketAuthority.clientEmitter(jsonExpanded.userId, 'playlist_removed', jsonExpanded)
@@ -425,33 +514,41 @@ class PlaylistController {
       return res.status(400).send('Collection has no books')
     }
 
-    const oldPlaylist = new Playlist()
-    oldPlaylist.setData({
-      userId: req.user.id,
-      libraryId: collection.libraryId,
-      name: collection.name,
-      description: collection.description || null
-    })
+    const transaction = await Database.sequelize.transaction()
+    try {
+      const playlist = await Database.playlistModel.create(
+        {
+          userId: req.user.id,
+          libraryId: collection.libraryId,
+          name: collection.name,
+          description: collection.description || null
+        },
+        { transaction }
+      )
 
-    // Create Playlist record
-    const newPlaylist = await Database.playlistModel.createFromOld(oldPlaylist)
+      const mediaItemsToAdd = []
+      for (const [index, libraryItem] of collectionExpanded.books.entries()) {
+        mediaItemsToAdd.push({
+          playlistId: playlist.id,
+          mediaItemId: libraryItem.media.id,
+          mediaItemType: 'book',
+          order: index + 1
+        })
+      }
+      await Database.playlistMediaItemModel.bulkCreate(mediaItemsToAdd, { transaction })
 
-    // Create PlaylistMediaItem records
-    const mediaItemsToAdd = []
-    let order = 1
-    for (const libraryItem of collectionExpanded.books) {
-      mediaItemsToAdd.push({
-        playlistId: newPlaylist.id,
-        mediaItemId: libraryItem.media.id,
-        mediaItemType: 'book',
-        order: order++
-      })
+      await transaction.commit()
+
+      playlist.playlistMediaItems = await playlist.getMediaItemsExpandedWithLibraryItem()
+
+      const jsonExpanded = playlist.toOldJSONExpanded()
+      SocketAuthority.clientEmitter(playlist.userId, 'playlist_added', jsonExpanded)
+      res.json(jsonExpanded)
+    } catch (error) {
+      await transaction.rollback()
+      Logger.error('[PlaylistController] createFromCollection:', error)
+      res.status(500).send('Failed to create playlist')
     }
-    await Database.createBulkPlaylistMediaItems(mediaItemsToAdd)
-
-    const jsonExpanded = await newPlaylist.getOldJsonExpanded()
-    SocketAuthority.clientEmitter(newPlaylist.userId, 'playlist_added', jsonExpanded)
-    res.json(jsonExpanded)
   }
 
   /**
diff --git a/server/models/Playlist.js b/server/models/Playlist.js
index 490e8087..7817211f 100644
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -1,8 +1,6 @@
-const { DataTypes, Model, Op, literal } = require('sequelize')
+const { DataTypes, Model, Op } = require('sequelize')
 const Logger = require('../Logger')
 
-const oldPlaylist = require('../objects/Playlist')
-
 class Playlist extends Model {
   constructor(values, options) {
     super(values, options)
@@ -21,134 +19,23 @@ class Playlist extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
-  }
 
-  static getOldPlaylist(playlistExpanded) {
-    const items = playlistExpanded.playlistMediaItems
-      .map((pmi) => {
-        const mediaItem = pmi.mediaItem || pmi.dataValues?.mediaItem
-        const libraryItemId = mediaItem?.podcast?.libraryItem?.id || mediaItem?.libraryItem?.id || null
-        if (!libraryItemId) {
-          Logger.error(`[Playlist] Invalid playlist media item - No library item id found`, JSON.stringify(pmi, null, 2))
-          return null
-        }
-        return {
-          episodeId: pmi.mediaItemType === 'podcastEpisode' ? pmi.mediaItemId : '',
-          libraryItemId
-        }
-      })
-      .filter((pmi) => pmi)
+    // Expanded properties
 
-    return new oldPlaylist({
-      id: playlistExpanded.id,
-      libraryId: playlistExpanded.libraryId,
-      userId: playlistExpanded.userId,
-      name: playlistExpanded.name,
-      description: playlistExpanded.description,
-      items,
-      lastUpdate: playlistExpanded.updatedAt.valueOf(),
-      createdAt: playlistExpanded.createdAt.valueOf()
-    })
+    /** @type {import('./PlaylistMediaItem')[]} - only set when expanded */
+    this.playlistMediaItems
   }
 
   /**
-   * Get old playlist toJSONExpanded
-   * @param {string[]} [include]
-   * @returns {Promise<oldPlaylist>} oldPlaylist.toJSONExpanded
-   */
-  async getOldJsonExpanded(include) {
-    this.playlistMediaItems =
-      (await this.getPlaylistMediaItems({
-        include: [
-          {
-            model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
-          },
-          {
-            model: this.sequelize.models.podcastEpisode,
-            include: {
-              model: this.sequelize.models.podcast,
-              include: this.sequelize.models.libraryItem
-            }
-          }
-        ],
-        order: [['order', 'ASC']]
-      })) || []
-
-    const oldPlaylist = this.sequelize.models.playlist.getOldPlaylist(this)
-    const libraryItemIds = oldPlaylist.items.map((i) => i.libraryItemId)
-
-    let libraryItems = await this.sequelize.models.libraryItem.getAllOldLibraryItems({
-      id: libraryItemIds
-    })
-
-    const playlistExpanded = oldPlaylist.toJSONExpanded(libraryItems)
-
-    return playlistExpanded
-  }
-
-  static createFromOld(oldPlaylist) {
-    const playlist = this.getFromOld(oldPlaylist)
-    return this.create(playlist)
-  }
-
-  static getFromOld(oldPlaylist) {
-    return {
-      id: oldPlaylist.id,
-      name: oldPlaylist.name,
-      description: oldPlaylist.description,
-      userId: oldPlaylist.userId,
-      libraryId: oldPlaylist.libraryId
-    }
-  }
-
-  static removeById(playlistId) {
-    return this.destroy({
-      where: {
-        id: playlistId
-      }
-    })
-  }
-
-  /**
-   * Get playlist by id
-   * @param {string} playlistId
-   * @returns {Promise<oldPlaylist|null>} returns null if not found
-   */
-  static async getById(playlistId) {
-    if (!playlistId) return null
-    const playlist = await this.findByPk(playlistId, {
-      include: {
-        model: this.sequelize.models.playlistMediaItem,
-        include: [
-          {
-            model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
-          },
-          {
-            model: this.sequelize.models.podcastEpisode,
-            include: {
-              model: this.sequelize.models.podcast,
-              include: this.sequelize.models.libraryItem
-            }
-          }
-        ]
-      },
-      order: [['playlistMediaItems', 'order', 'ASC']]
-    })
-    if (!playlist) return null
-    return this.getOldPlaylist(playlist)
-  }
-
-  /**
-   * Get old playlists for user and optionally for library
+   * Get old playlists for user and library
    *
    * @param {string} userId
-   * @param {string} [libraryId]
-   * @returns {Promise<oldPlaylist[]>}
+   * @param {string} libraryId
+   * @async
    */
-  static async getOldPlaylistsForUserAndLibrary(userId, libraryId = null) {
+  static async getOldPlaylistsForUserAndLibrary(userId, libraryId) {
     if (!userId && !libraryId) return []
+
     const whereQuery = {}
     if (userId) {
       whereQuery.userId = userId
@@ -163,7 +50,23 @@ class Playlist extends Model {
         include: [
           {
             model: this.sequelize.models.book,
-            include: this.sequelize.models.libraryItem
+            include: [
+              {
+                model: this.sequelize.models.libraryItem
+              },
+              {
+                model: this.sequelize.models.author,
+                through: {
+                  attributes: []
+                }
+              },
+              {
+                model: this.sequelize.models.series,
+                through: {
+                  attributes: ['sequence']
+                }
+              }
+            ]
           },
           {
             model: this.sequelize.models.podcastEpisode,
@@ -174,42 +77,13 @@ class Playlist extends Model {
           }
         ]
       },
-      order: [
-        [literal('name COLLATE NOCASE'), 'ASC'],
-        ['playlistMediaItems', 'order', 'ASC']
-      ]
+      order: [['playlistMediaItems', 'order', 'ASC']]
     })
 
-    const oldPlaylists = []
-    for (const playlistExpanded of playlistsExpanded) {
-      const oldPlaylist = this.getOldPlaylist(playlistExpanded)
-      const libraryItems = []
-      for (const pmi of playlistExpanded.playlistMediaItems) {
-        let mediaItem = pmi.mediaItem || pmi.dataValues.mediaItem
+    // Sort by name asc
+    playlistsExpanded.sort((a, b) => a.name.localeCompare(b.name))
 
-        if (!mediaItem) {
-          Logger.error(`[Playlist] Invalid playlist media item - No media item found`, JSON.stringify(mediaItem, null, 2))
-          continue
-        }
-        let libraryItem = mediaItem.libraryItem || mediaItem.podcast?.libraryItem
-
-        if (mediaItem.podcast) {
-          libraryItem.media = mediaItem.podcast
-          libraryItem.media.podcastEpisodes = [mediaItem]
-          delete mediaItem.podcast.libraryItem
-        } else {
-          libraryItem.media = mediaItem
-          delete mediaItem.libraryItem
-        }
-
-        const oldLibraryItem = this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-        libraryItems.push(oldLibraryItem)
-      }
-      const oldPlaylistJson = oldPlaylist.toJSONExpanded(libraryItems)
-      oldPlaylists.push(oldPlaylistJson)
-    }
-
-    return oldPlaylists
+    return playlistsExpanded.map((playlist) => playlist.toOldJSONExpanded())
   }
 
   /**
@@ -345,6 +219,117 @@ class Playlist extends Model {
       }
     })
   }
+
+  /**
+   * Get all media items in playlist expanded with library item
+   *
+   * @returns {Promise<import('./PlaylistMediaItem')[]>}
+   */
+  getMediaItemsExpandedWithLibraryItem() {
+    return this.getPlaylistMediaItems({
+      include: [
+        {
+          model: this.sequelize.models.book,
+          include: [
+            {
+              model: this.sequelize.models.libraryItem
+            },
+            {
+              model: this.sequelize.models.author,
+              through: {
+                attributes: []
+              }
+            },
+            {
+              model: this.sequelize.models.series,
+              through: {
+                attributes: ['sequence']
+              }
+            }
+          ]
+        },
+        {
+          model: this.sequelize.models.podcastEpisode,
+          include: [
+            {
+              model: this.sequelize.models.podcast,
+              include: this.sequelize.models.libraryItem
+            }
+          ]
+        }
+      ],
+      order: [['order', 'ASC']]
+    })
+  }
+
+  /**
+   * Get playlists toOldJSONExpanded
+   *
+   * @async
+   */
+  async getOldJsonExpanded() {
+    this.playlistMediaItems = await this.getMediaItemsExpandedWithLibraryItem()
+    return this.toOldJSONExpanded()
+  }
+
+  /**
+   * Old model used libraryItemId instead of bookId
+   *
+   * @param {string} libraryItemId
+   * @param {string} [episodeId]
+   */
+  checkHasMediaItem(libraryItemId, episodeId) {
+    if (!this.playlistMediaItems) {
+      throw new Error('playlistMediaItems are required to check Playlist')
+    }
+    if (episodeId) {
+      return this.playlistMediaItems.some((pmi) => pmi.mediaItemId === episodeId)
+    }
+    return this.playlistMediaItems.some((pmi) => pmi.mediaItem.libraryItem.id === libraryItemId)
+  }
+
+  toOldJSON() {
+    return {
+      id: this.id,
+      name: this.name,
+      libraryId: this.libraryId,
+      userId: this.userId,
+      description: this.description,
+      lastUpdate: this.updatedAt.valueOf(),
+      createdAt: this.createdAt.valueOf()
+    }
+  }
+
+  toOldJSONExpanded() {
+    if (!this.playlistMediaItems) {
+      throw new Error('playlistMediaItems are required to expand Playlist')
+    }
+
+    const json = this.toOldJSON()
+    json.items = this.playlistMediaItems.map((pmi) => {
+      if (pmi.mediaItemType === 'book') {
+        const libraryItem = pmi.mediaItem.libraryItem
+        delete pmi.mediaItem.libraryItem
+        libraryItem.media = pmi.mediaItem
+        return {
+          libraryItemId: libraryItem.id,
+          libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONExpanded()
+        }
+      }
+
+      const libraryItem = pmi.mediaItem.podcast.libraryItem
+      delete pmi.mediaItem.podcast.libraryItem
+      libraryItem.media = pmi.mediaItem.podcast
+      return {
+        episodeId: pmi.mediaItemId,
+        episode: pmi.mediaItem.toOldJSONExpanded(libraryItem.id),
+        libraryItemId: libraryItem.id,
+        libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONMinified()
+      }
+    })
+
+    return json
+  }
 }
 
 module.exports = Playlist
diff --git a/server/models/PlaylistMediaItem.js b/server/models/PlaylistMediaItem.js
index 1c53bea1..b9f76c5e 100644
--- a/server/models/PlaylistMediaItem.js
+++ b/server/models/PlaylistMediaItem.js
@@ -16,6 +16,11 @@ class PlaylistMediaItem extends Model {
     this.playlistId
     /** @type {Date} */
     this.createdAt
+
+    // Expanded properties
+
+    /** @type {import('./Book')|import('./PodcastEpisode')} - only set when expanded */
+    this.mediaItem
   }
 
   static removeByIds(playlistId, mediaItemId) {
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 1f99361a..1fa32da7 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -170,6 +170,62 @@ class PodcastEpisode extends Model {
     })
     PodcastEpisode.belongsTo(podcast)
   }
+
+  /**
+   * AudioTrack object used in old model
+   *
+   * @returns {import('./Book').AudioFileObject|null}
+   */
+  get track() {
+    if (!this.audioFile) return null
+    const track = structuredClone(this.audioFile)
+    track.startOffset = 0
+    track.title = this.audioFile.metadata.title
+    return track
+  }
+
+  toOldJSON(libraryItemId) {
+    let enclosure = null
+    if (this.enclosureURL) {
+      enclosure = {
+        url: this.enclosureURL,
+        type: this.enclosureType,
+        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
+      }
+    }
+
+    return {
+      libraryItemId: libraryItemId,
+      podcastId: this.podcastId,
+      id: this.id,
+      oldEpisodeId: this.extraData?.oldEpisodeId || null,
+      index: this.index,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      title: this.title,
+      subtitle: this.subtitle,
+      description: this.description,
+      enclosure,
+      guid: this.extraData?.guid || null,
+      pubDate: this.pubDate,
+      chapters: this.chapters?.map((ch) => ({ ...ch })) || [],
+      audioFile: this.audioFile || null,
+      publishedAt: this.publishedAt?.valueOf() || null,
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    const json = this.toOldJSON(libraryItemId)
+
+    json.audioTrack = this.track
+    json.size = this.audioFile?.metadata.size || 0
+    json.duration = this.audioFile?.duration || 0
+
+    return json
+  }
 }
 
 module.exports = PodcastEpisode
diff --git a/server/objects/Playlist.js b/server/objects/Playlist.js
deleted file mode 100644
index c4b3357b..00000000
--- a/server/objects/Playlist.js
+++ /dev/null
@@ -1,148 +0,0 @@
-const uuidv4 = require("uuid").v4
-
-class Playlist {
-  constructor(playlist) {
-    this.id = null
-    this.libraryId = null
-    this.userId = null
-
-    this.name = null
-    this.description = null
-
-    this.coverPath = null
-
-    // Array of objects like { libraryItemId: "", episodeId: "" } (episodeId optional)
-    this.items = []
-
-    this.lastUpdate = null
-    this.createdAt = null
-
-    if (playlist) {
-      this.construct(playlist)
-    }
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      libraryId: this.libraryId,
-      userId: this.userId,
-      name: this.name,
-      description: this.description,
-      coverPath: this.coverPath,
-      items: [...this.items],
-      lastUpdate: this.lastUpdate,
-      createdAt: this.createdAt
-    }
-  }
-
-  // Expands the items array
-  toJSONExpanded(libraryItems) {
-    var json = this.toJSON()
-    json.items = json.items.map(item => {
-      const libraryItem = libraryItems.find(li => li.id === item.libraryItemId)
-      if (!libraryItem) {
-        // Not found
-        return null
-      }
-      if (item.episodeId) {
-        if (!libraryItem.isPodcast) {
-          // Invalid
-          return null
-        }
-        const episode = libraryItem.media.episodes.find(ep => ep.id === item.episodeId)
-        if (!episode) {
-          // Not found
-          return null
-        }
-
-        return {
-          ...item,
-          episode: episode.toJSONExpanded(),
-          libraryItem: libraryItem.toJSONMinified()
-        }
-      } else {
-        return {
-          ...item,
-          libraryItem: libraryItem.toJSONExpanded()
-        }
-      }
-    }).filter(i => i)
-    return json
-  }
-
-  construct(playlist) {
-    this.id = playlist.id
-    this.libraryId = playlist.libraryId
-    this.userId = playlist.userId
-    this.name = playlist.name
-    this.description = playlist.description || null
-    this.coverPath = playlist.coverPath || null
-    this.items = playlist.items ? playlist.items.map(i => ({ ...i })) : []
-    this.lastUpdate = playlist.lastUpdate || null
-    this.createdAt = playlist.createdAt || null
-  }
-
-  setData(data) {
-    if (!data.userId || !data.libraryId || !data.name) {
-      return false
-    }
-    this.id = uuidv4()
-    this.userId = data.userId
-    this.libraryId = data.libraryId
-    this.name = data.name
-    this.description = data.description || null
-    this.coverPath = data.coverPath || null
-    this.items = data.items ? data.items.map(i => ({ ...i })) : []
-    this.lastUpdate = Date.now()
-    this.createdAt = Date.now()
-    return true
-  }
-
-  addItem(libraryItemId, episodeId = null) {
-    this.items.push({
-      libraryItemId,
-      episodeId: episodeId || null
-    })
-    this.lastUpdate = Date.now()
-  }
-
-  removeItem(libraryItemId, episodeId = null) {
-    if (episodeId) this.items = this.items.filter(i => i.libraryItemId !== libraryItemId || i.episodeId !== episodeId)
-    else this.items = this.items.filter(i => i.libraryItemId !== libraryItemId)
-    this.lastUpdate = Date.now()
-  }
-
-  update(payload) {
-    let hasUpdates = false
-    for (const key in payload) {
-      if (key === 'items') {
-        if (payload.items && JSON.stringify(payload.items) !== JSON.stringify(this.items)) {
-          this.items = payload.items.map(i => ({ ...i }))
-          hasUpdates = true
-        }
-      } else if (this[key] !== undefined && this[key] !== payload[key]) {
-        hasUpdates = true
-        this[key] = payload[key]
-      }
-    }
-    if (hasUpdates) {
-      this.lastUpdate = Date.now()
-    }
-    return hasUpdates
-  }
-
-  containsItem(item) {
-    if (item.episodeId) return this.items.some(i => i.libraryItemId === item.libraryItemId && i.episodeId === item.episodeId)
-    return this.items.some(i => i.libraryItemId === item.libraryItemId)
-  }
-
-  hasItemsForLibraryItem(libraryItemId) {
-    return this.items.some(i => i.libraryItemId === libraryItemId)
-  }
-
-  removeItemsForLibraryItem(libraryItemId) {
-    this.items = this.items.filter(i => i.libraryItemId !== libraryItemId)
-  }
-}
-module.exports = Playlist
\ No newline at end of file

From 777c59458dda17f4923d0d07829ac488e8e0db18 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 31 Dec 2024 17:11:31 -0600
Subject: [PATCH 099/143] Fix find all playlist endpoint

---
 server/controllers/PlaylistController.js | 4 ++--
 server/models/PlaylistMediaItem.js       | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/server/controllers/PlaylistController.js b/server/controllers/PlaylistController.js
index ee4fef5e..8c13ecb2 100644
--- a/server/controllers/PlaylistController.js
+++ b/server/controllers/PlaylistController.js
@@ -121,7 +121,7 @@ class PlaylistController {
   /**
    * @deprecated - Use /api/libraries/:libraryId/playlists
    * This is not used by Abs web client or mobile apps
-   * TODO: Remove this endpoint or refactor it and make it the primary
+   * TODO: Remove this endpoint or make it the primary
    *
    * GET: /api/playlists
    * Get all playlists for user
@@ -130,7 +130,7 @@ class PlaylistController {
    * @param {Response} res
    */
   async findAllForUser(req, res) {
-    const playlistsForUser = await Database.playlistModel.getOldPlaylistsForUserAndLibrary(req.user.id, req.params.libraryId)
+    const playlistsForUser = await Database.playlistModel.getOldPlaylistsForUserAndLibrary(req.user.id)
     res.json({
       playlists: playlistsForUser
     })
diff --git a/server/models/PlaylistMediaItem.js b/server/models/PlaylistMediaItem.js
index b9f76c5e..2eac036b 100644
--- a/server/models/PlaylistMediaItem.js
+++ b/server/models/PlaylistMediaItem.js
@@ -23,15 +23,6 @@ class PlaylistMediaItem extends Model {
     this.mediaItem
   }
 
-  static removeByIds(playlistId, mediaItemId) {
-    return this.destroy({
-      where: {
-        playlistId,
-        mediaItemId
-      }
-    })
-  }
-
   getMediaItem(options) {
     if (!this.mediaItemType) return Promise.resolve(null)
     const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaItemType)}`

From 25b7f005c64bf0b3523228e242d958e5e81bbf9a Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 31 Dec 2024 17:15:11 -0600
Subject: [PATCH 100/143] Remove unnecessary playlist toasts

---
 client/components/modals/playlists/AddCreateModal.vue | 3 ---
 client/components/tables/playlist/ItemTableRow.vue    | 1 -
 2 files changed, 4 deletions(-)

diff --git a/client/components/modals/playlists/AddCreateModal.vue b/client/components/modals/playlists/AddCreateModal.vue
index e089324f..d1f910b8 100644
--- a/client/components/modals/playlists/AddCreateModal.vue
+++ b/client/components/modals/playlists/AddCreateModal.vue
@@ -130,7 +130,6 @@ export default {
         .$post(`/api/playlists/${playlist.id}/batch/remove`, { items: itemObjects })
         .then((updatedPlaylist) => {
           console.log(`Items removed from playlist`, updatedPlaylist)
-          this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
           this.processing = false
         })
         .catch((error) => {
@@ -148,7 +147,6 @@ export default {
         .$post(`/api/playlists/${playlist.id}/batch/add`, { items: itemObjects })
         .then((updatedPlaylist) => {
           console.log(`Items added to playlist`, updatedPlaylist)
-          this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
           this.processing = false
         })
         .catch((error) => {
@@ -174,7 +172,6 @@ export default {
         .$post('/api/playlists', newPlaylist)
         .then((data) => {
           console.log('New playlist created', data)
-          this.$toast.success(this.$strings.ToastPlaylistCreateSuccess + ': ' + data.name)
           this.processing = false
           this.newPlaylistName = ''
         })
diff --git a/client/components/tables/playlist/ItemTableRow.vue b/client/components/tables/playlist/ItemTableRow.vue
index 9f1a7e87..0cb73f9c 100644
--- a/client/components/tables/playlist/ItemTableRow.vue
+++ b/client/components/tables/playlist/ItemTableRow.vue
@@ -218,7 +218,6 @@ export default {
             this.$toast.success(this.$strings.ToastPlaylistRemoveSuccess)
           } else {
             console.log(`Item removed from playlist`, updatedPlaylist)
-            this.$toast.success(this.$strings.ToastPlaylistUpdateSuccess)
           }
         })
         .catch((error) => {

From 1c2ee09f1868ca47c4eb45d1dbb83ee3f854a58e Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 31 Dec 2024 17:41:09 -0600
Subject: [PATCH 101/143] Fix user stats heatmap to use range of currently
 showing data only

---
 client/components/stats/Heatmap.vue | 60 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/client/components/stats/Heatmap.vue b/client/components/stats/Heatmap.vue
index fe235bdd..46ac9609 100644
--- a/client/components/stats/Heatmap.vue
+++ b/client/components/stats/Heatmap.vue
@@ -193,46 +193,46 @@ export default {
     buildData() {
       this.data = []
 
-      var maxValue = 0
-      var minValue = 0
-      Object.values(this.daysListening).forEach((val) => {
-        if (val > maxValue) maxValue = val
-        if (!minValue || val < minValue) minValue = val
-      })
-      const range = maxValue - minValue + 0.01
+      let maxValue = 0
+      let minValue = 0
 
+      const dates = []
       for (let i = 0; i < this.daysToShow + 1; i++) {
-        const col = Math.floor(i / 7)
-        const row = i % 7
-
         const date = i === 0 ? this.firstWeekStart : this.$addDaysToDate(this.firstWeekStart, i)
         const dateString = this.$formatJsDate(date, 'yyyy-MM-dd')
-        const datePretty = this.$formatJsDate(date, 'MMM d, yyyy')
-        const monthString = this.$formatJsDate(date, 'MMM')
-        const value = this.daysListening[dateString] || 0
-        const x = col * 13
-        const y = row * 13
+        const dateObj = {
+          col: Math.floor(i / 7),
+          row: i % 7,
+          date,
+          dateString,
+          datePretty: this.$formatJsDate(date, 'MMM d, yyyy'),
+          monthString: this.$formatJsDate(date, 'MMM'),
+          dayOfMonth: Number(dateString.split('-').pop()),
+          yearString: dateString.split('-').shift(),
+          value: this.daysListening[dateString] || 0
+        }
+        dates.push(dateObj)
 
-        var bgColor = this.bgColors[0]
-        var outlineColor = this.outlineColors[0]
-        if (value) {
+        if (dateObj.value) {
+          if (dateObj.value > maxValue) maxValue = dateObj.value
+          if (!minValue || dateObj.value < minValue) minValue = dateObj.value
+        }
+      }
+      const range = maxValue - minValue + 0.01
+
+      for (const dateObj of dates) {
+        let bgColor = this.bgColors[0]
+        let outlineColor = this.outlineColors[0]
+        if (dateObj.value) {
           outlineColor = this.outlineColors[1]
-          var percentOfAvg = (value - minValue) / range
-          var bgIndex = Math.floor(percentOfAvg * 4) + 1
+          const percentOfAvg = (dateObj.value - minValue) / range
+          const bgIndex = Math.floor(percentOfAvg * 4) + 1
           bgColor = this.bgColors[bgIndex] || 'red'
         }
 
         this.data.push({
-          date,
-          dateString,
-          datePretty,
-          monthString,
-          dayOfMonth: Number(dateString.split('-').pop()),
-          yearString: dateString.split('-').shift(),
-          value,
-          col,
-          row,
-          style: `transform:translate(${x}px,${y}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
+          ...dateObj,
+          style: `transform:translate(${dateObj.col * 13}px,${dateObj.row * 13}px);background-color:${bgColor};outline:1px solid ${outlineColor};outline-offset:-1px;`
         })
       }
 

From 754c1211683b1587e3a9296e5778a193176d4f53 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Wed, 1 Jan 2025 07:34:29 +0200
Subject: [PATCH 102/143] Add libraryItem size index

---
 server/migrations/v2.17.7-add-indices.js | 81 ++++++++++++++++++++++++
 server/models/LibraryItem.js             |  3 +
 2 files changed, 84 insertions(+)
 create mode 100644 server/migrations/v2.17.7-add-indices.js

diff --git a/server/migrations/v2.17.7-add-indices.js b/server/migrations/v2.17.7-add-indices.js
new file mode 100644
index 00000000..3d70ba20
--- /dev/null
+++ b/server/migrations/v2.17.7-add-indices.js
@@ -0,0 +1,81 @@
+/**
+ * @typedef MigrationContext
+ * @property {import('sequelize').QueryInterface} queryInterface - a suquelize QueryInterface object.
+ * @property {import('../Logger')} logger - a Logger object.
+ *
+ * @typedef MigrationOptions
+ * @property {MigrationContext} context - an object containing the migration context.
+ */
+
+const migrationVersion = '2.17.7'
+const migrationName = `${migrationVersion}-add-indices`
+const loggerPrefix = `[${migrationVersion} migration]`
+
+/**
+ * This upward migration adds some indices to the libraryItems and books tables to improve query performance
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function up({ context: { queryInterface, logger } }) {
+  // Upwards migration script
+  logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
+
+  await addIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+
+  logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
+}
+
+/**
+ * This downward migration script removes the indices added in the upward migration script
+ *
+ * @param {MigrationOptions} options - an object containing the migration context.
+ * @returns {Promise<void>} - A promise that resolves when the migration is complete.
+ */
+async function down({ context: { queryInterface, logger } }) {
+  // Downward migration script
+  logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
+
+  await removeIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+
+  logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
+}
+
+/**
+ * Utility function to add an index to a table. If the index already exists, it logs a message and continues.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function addIndex(queryInterface, logger, tableName, columns) {
+  try {
+    logger.info(`${loggerPrefix} adding index [${columns.join(', ')}] to table "${tableName}"`)
+    await queryInterface.addIndex(tableName, columns)
+    logger.info(`${loggerPrefix} added index [${columns.join(', ')}] to table "${tableName}"`)
+  } catch (error) {
+    if (error.name === 'SequelizeDatabaseError' && error.message.includes('already exists')) {
+      logger.info(`${loggerPrefix} index [${columns.join(', ')}] for table "${tableName}" already exists`)
+    } else {
+      throw error
+    }
+  }
+}
+
+/**
+ * Utility function to remove an index from a table.
+ * Sequelize implemets it using DROP INDEX IF EXISTS, so it won't throw an error if the index doesn't exist.
+ *
+ * @param {import('sequelize').QueryInterface} queryInterface
+ * @param {import ('../Logger')} logger
+ * @param {string} tableName
+ * @param {string[]} columns
+ */
+async function removeIndex(queryInterface, logger, tableName, columns) {
+  logger.info(`${loggerPrefix} removing index [${columns.join(', ')}] from table "${tableName}"`)
+  await queryInterface.removeIndex(tableName, columns)
+  logger.info(`${loggerPrefix} removed index [${columns.join(', ')}] from table "${tableName}"`)
+}
+
+module.exports = { up, down }
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index bed96631..2aa41b70 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -1061,6 +1061,9 @@ class LibraryItem extends Model {
           {
             fields: ['libraryId', 'mediaType']
           },
+          {
+            fields: ['libraryId', 'mediaType', 'size']
+          },
           {
             fields: ['libraryId', 'mediaId', 'mediaType']
           },

From 0444829a9f99b1d42ec00ce228f8c22eaa116e05 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Wed, 1 Jan 2025 08:37:57 +0200
Subject: [PATCH 103/143] Add index on duration

---
 server/migrations/v2.17.7-add-indices.js | 2 ++
 server/models/Book.js                    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/migrations/v2.17.7-add-indices.js b/server/migrations/v2.17.7-add-indices.js
index 3d70ba20..b3821de8 100644
--- a/server/migrations/v2.17.7-add-indices.js
+++ b/server/migrations/v2.17.7-add-indices.js
@@ -22,6 +22,7 @@ async function up({ context: { queryInterface, logger } }) {
   logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
 
   await addIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await addIndex(queryInterface, logger, 'books', ['duration'])
 
   logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
 }
@@ -37,6 +38,7 @@ async function down({ context: { queryInterface, logger } }) {
   logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
 
   await removeIndex(queryInterface, logger, 'libraryItems', ['libraryId', 'mediaType', 'size'])
+  await removeIndex(queryInterface, logger, 'books', ['duration'])
 
   logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
 }
diff --git a/server/models/Book.js b/server/models/Book.js
index f7341db9..a904f536 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -321,10 +321,10 @@ class Book extends Model {
           // },
           {
             fields: ['publishedYear']
+          },
+          {
+            fields: ['duration']
           }
-          // {
-          //   fields: ['duration']
-          // }
         ]
       }
     )

From 46247ecf7897af954c965d58ca25b37bda72f4da Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Wed, 1 Jan 2025 08:41:27 +0200
Subject: [PATCH 104/143] Update migrations changelog

---
 server/migrations/changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/migrations/changelog.md b/server/migrations/changelog.md
index c2de4693..3b5a5626 100644
--- a/server/migrations/changelog.md
+++ b/server/migrations/changelog.md
@@ -12,3 +12,4 @@ Please add a record of every database migration that you create to this file. Th
 | v2.17.4        | v2.17.4-use-subfolder-for-oidc-redirect-uris | Save subfolder to OIDC redirect URIs to support existing installations                                        |
 | v2.17.5        | v2.17.5-remove-host-from-feed-urls           | removes the host (serverAddress) from URL columns in the feeds and feedEpisodes tables                        |
 | v2.17.6        | v2.17.6-share-add-isdownloadable             | Adds the isDownloadable column to the mediaItemShares table                                                   |
+| v2.17.7        | v2.17.7-add-indices                          | Adds indices to the libraryItems and books tables to reduce query times                                       |

From 9fa00a1904b2aae7c9f633bcb00e6a15a28d1665 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 08:55:40 -0600
Subject: [PATCH 105/143] Fix Share media player not using media session API
 #3768

---
 client/pages/share/_slug.vue | 94 +++++++++++++++++++++++++++++++++++-
 1 file changed, 93 insertions(+), 1 deletion(-)

diff --git a/client/pages/share/_slug.vue b/client/pages/share/_slug.vue
index 6bce2f8a..e7d00f00 100644
--- a/client/pages/share/_slug.vue
+++ b/client/pages/share/_slug.vue
@@ -110,6 +110,84 @@ export default {
     }
   },
   methods: {
+    mediaSessionPlay() {
+      console.log('Media session play')
+      this.play()
+    },
+    mediaSessionPause() {
+      console.log('Media session pause')
+      this.pause()
+    },
+    mediaSessionStop() {
+      console.log('Media session stop')
+      this.pause()
+    },
+    mediaSessionSeekBackward() {
+      console.log('Media session seek backward')
+      this.jumpBackward()
+    },
+    mediaSessionSeekForward() {
+      console.log('Media session seek forward')
+      this.jumpForward()
+    },
+    mediaSessionSeekTo(e) {
+      console.log('Media session seek to', e)
+      if (e.seekTime !== null && !isNaN(e.seekTime)) {
+        this.seek(e.seekTime)
+      }
+    },
+    mediaSessionPreviousTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.prevChapter()
+      }
+    },
+    mediaSessionNextTrack() {
+      if (this.$refs.audioPlayer) {
+        this.$refs.audioPlayer.nextChapter()
+      }
+    },
+    updateMediaSessionPlaybackState() {
+      if ('mediaSession' in navigator) {
+        navigator.mediaSession.playbackState = this.isPlaying ? 'playing' : 'paused'
+      }
+    },
+    setMediaSession() {
+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
+      if ('mediaSession' in navigator) {
+        const chapterInfo = []
+        if (this.chapters.length > 0) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }
+
+        navigator.mediaSession.metadata = new MediaMetadata({
+          title: this.mediaItemShare.playbackSession.displayTitle || 'No title',
+          artist: this.mediaItemShare.playbackSession.displayAuthor || 'Unknown',
+          artwork: [
+            {
+              src: this.coverUrl
+            }
+          ],
+          chapterInfo
+        })
+        console.log('Set media session metadata', navigator.mediaSession.metadata)
+
+        navigator.mediaSession.setActionHandler('play', this.mediaSessionPlay)
+        navigator.mediaSession.setActionHandler('pause', this.mediaSessionPause)
+        navigator.mediaSession.setActionHandler('stop', this.mediaSessionStop)
+        navigator.mediaSession.setActionHandler('seekbackward', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('seekforward', this.mediaSessionSeekForward)
+        navigator.mediaSession.setActionHandler('seekto', this.mediaSessionSeekTo)
+        navigator.mediaSession.setActionHandler('previoustrack', this.mediaSessionSeekBackward)
+        navigator.mediaSession.setActionHandler('nexttrack', this.mediaSessionSeekForward)
+      } else {
+        console.warn('Media session not available')
+      }
+    },
     async coverImageLoaded(e) {
       if (!this.playbackSession.coverPath) return
       const fac = new FastAverageColor()
@@ -126,8 +204,19 @@ export default {
         })
     },
     playPause() {
+      if (this.isPlaying) {
+        this.pause()
+      } else {
+        this.play()
+      }
+    },
+    play() {
       if (!this.localAudioPlayer || !this.hasLoaded) return
-      this.localAudioPlayer.playPause()
+      this.localAudioPlayer.play()
+    },
+    pause() {
+      if (!this.localAudioPlayer || !this.hasLoaded) return
+      this.localAudioPlayer.pause()
     },
     jumpForward() {
       if (!this.localAudioPlayer || !this.hasLoaded) return
@@ -213,6 +302,7 @@ export default {
       } else {
         this.stopPlayInterval()
       }
+      this.updateMediaSessionPlaybackState()
     },
     playerTimeUpdate(time) {
       this.setCurrentTime(time)
@@ -276,6 +366,8 @@ export default {
     this.localAudioPlayer.on('timeupdate', this.playerTimeUpdate.bind(this))
     this.localAudioPlayer.on('error', this.playerError.bind(this))
     this.localAudioPlayer.on('finished', this.playerFinished.bind(this))
+
+    this.setMediaSession()
   },
   beforeDestroy() {
     window.removeEventListener('resize', this.resize)

From 86809dcc62bcd422976c06e758edb1924c178c86 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 09:02:31 -0600
Subject: [PATCH 106/143] Update audio player to pass chapterInfo to media
 session API

---
 .../components/app/MediaPlayerContainer.vue   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/components/app/MediaPlayerContainer.vue b/client/components/app/MediaPlayerContainer.vue
index ed8971f7..989fc062 100644
--- a/client/components/app/MediaPlayerContainer.vue
+++ b/client/components/app/MediaPlayerContainer.vue
@@ -374,19 +374,27 @@ export default {
         return
       }
 
+      // https://developer.mozilla.org/en-US/docs/Web/API/Media_Session_API
       if ('mediaSession' in navigator) {
-        var coverImageSrc = this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
-        const artwork = [
-          {
-            src: coverImageSrc
-          }
-        ]
+        const chapterInfo = []
+        if (this.chapters.length) {
+          this.chapters.forEach((chapter) => {
+            chapterInfo.push({
+              title: chapter.title,
+              startTime: chapter.start
+            })
+          })
+        }
 
         navigator.mediaSession.metadata = new MediaMetadata({
           title: this.title,
           artist: this.playerHandler.displayAuthor || this.mediaMetadata.authorName || 'Unknown',
           album: this.mediaMetadata.seriesName || '',
-          artwork
+          artwork: [
+            {
+              src: this.$store.getters['globals/getLibraryItemCoverSrc'](this.streamLibraryItem, '/Logo.png', true)
+            }
+          ]
         })
         console.log('Set media session metadata', navigator.mediaSession.metadata)
 

From 5201625d38aa2dcda85fb3df3b270ae9adb3c021 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 11:32:39 -0600
Subject: [PATCH 107/143] Fix FeedEpisodes using a new ID when updating #3757

---
 server/managers/RssFeedManager.js | 20 ++++++++++---
 server/models/Feed.js             | 26 +++++++++++-----
 server/models/FeedEpisode.js      | 49 +++++++++++++++++++++++--------
 3 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index cedf0dfb..abfa445f 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -98,11 +98,22 @@ class RssFeedManager {
             podcastId: feed.entity.mediaId
           },
           attributes: ['id', 'updatedAt'],
-          order: [['createdAt', 'DESC']]
+          order: [['updatedAt', 'DESC']]
         })
+
         if (mostRecentPodcastEpisode && mostRecentPodcastEpisode.updatedAt > newEntityUpdatedAt) {
           newEntityUpdatedAt = mostRecentPodcastEpisode.updatedAt
         }
+      } else {
+        const book = await Database.bookModel.findOne({
+          where: {
+            id: feed.entity.mediaId
+          },
+          attributes: ['id', 'updatedAt']
+        })
+        if (book && book.updatedAt > newEntityUpdatedAt) {
+          newEntityUpdatedAt = book.updatedAt
+        }
       }
 
       return newEntityUpdatedAt > feed.entityUpdatedAt
@@ -111,7 +122,7 @@ class RssFeedManager {
         attributes: ['id', 'updatedAt'],
         include: {
           model: Database.bookModel,
-          attributes: ['id'],
+          attributes: ['id', 'updatedAt'],
           through: {
             attributes: []
           },
@@ -125,8 +136,9 @@ class RssFeedManager {
       let newEntityUpdatedAt = feed.entity.updatedAt
 
       const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
-        if (book.libraryItem.updatedAt > mostRecent) {
-          return book.libraryItem.updatedAt
+        let updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+        if (updatedAt > mostRecent) {
+          return updatedAt
         }
         return mostRecent
       }, 0)
diff --git a/server/models/Feed.js b/server/models/Feed.js
index d8f8553c..a6ccff22 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -107,6 +107,9 @@ class Feed extends Model {
       entityUpdatedAt = libraryItem.media.podcastEpisodes.reduce((mostRecent, episode) => {
         return episode.updatedAt > mostRecent ? episode.updatedAt : mostRecent
       }, entityUpdatedAt)
+    } else if (libraryItem.media.updatedAt > entityUpdatedAt) {
+      // Book feeds will use Book.updatedAt if more recent
+      entityUpdatedAt = libraryItem.media.updatedAt
     }
 
     const feedObj = {
@@ -472,6 +475,8 @@ class Feed extends Model {
     /** @type {typeof import('./FeedEpisode')} */
     const feedEpisodeModel = this.sequelize.models.feedEpisode
 
+    this.feedEpisodes = await this.getFeedEpisodes()
+
     let feedObj = null
     let feedEpisodeCreateFunc = null
     let feedEpisodeCreateFuncEntity = null
@@ -516,17 +521,24 @@ class Feed extends Model {
     try {
       const updatedFeed = await this.update(feedObj, { transaction })
 
-      // Remove existing feed episodes
-      await feedEpisodeModel.destroy({
-        where: {
-          feedId: this.id
-        },
-        transaction
-      })
+      const existingFeedEpisodeIds = this.feedEpisodes.map((ep) => ep.id)
 
       // Create new feed episodes
       updatedFeed.feedEpisodes = await feedEpisodeCreateFunc(feedEpisodeCreateFuncEntity, updatedFeed, this.slug, transaction)
 
+      const newFeedEpisodeIds = updatedFeed.feedEpisodes.map((ep) => ep.id)
+      const feedEpisodeIdsToRemove = existingFeedEpisodeIds.filter((epid) => !newFeedEpisodeIds.includes(epid))
+
+      if (feedEpisodeIdsToRemove.length) {
+        Logger.info(`[Feed] Removing ${feedEpisodeIdsToRemove.length} episodes from feed ${this.id}`)
+        await feedEpisodeModel.destroy({
+          where: {
+            id: feedEpisodeIdsToRemove
+          },
+          transaction
+        })
+      }
+
       await transaction.commit()
 
       return updatedFeed
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 0d1a3a48..5825dd4e 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -53,9 +53,10 @@ class FeedEpisode extends Model {
    * @param {import('./Feed')} feed
    * @param {string} slug
    * @param {import('./PodcastEpisode')} episode
+   * @param {string} [existingEpisodeId]
    */
-  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
-    const episodeId = uuidv4()
+  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisodeId = null) {
+    const episodeId = existingEpisodeId || uuidv4()
     return {
       id: episodeId,
       title: episode.title,
@@ -94,11 +95,18 @@ class FeedEpisode extends Model {
       libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
     }
 
+    let numExisting = 0
     for (const episode of libraryItemExpanded.media.podcastEpisodes) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((feedEpisode) => {
+        return feedEpisode.filePath === episode.audioFile.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode, existingEpisode?.id))
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**
@@ -127,11 +135,12 @@ class FeedEpisode extends Model {
    * @param {string} slug
    * @param {import('./Book').AudioFileObject} audioTrack
    * @param {boolean} useChapterTitles
+   * @param {string} [existingEpisodeId]
    */
-  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles) {
+  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles, existingEpisodeId = null) {
     // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
     let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
-    let episodeId = uuidv4()
+    let episodeId = existingEpisodeId || uuidv4()
 
     // e.g. Track 1 will have a pub date before Track 2
     const audiobookPubDate = date.format(new Date(pubDateStart.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
@@ -179,11 +188,18 @@ class FeedEpisode extends Model {
     const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
 
     const feedEpisodeObjs = []
+    let numExisting = 0
     for (const track of libraryItemExpanded.media.trackList) {
-      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles))
+      // Check for existing episode by filepath
+      const existingEpisode = feed.feedEpisodes?.find((episode) => {
+        return episode.filePath === track.metadata.path
+      })
+      numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**
@@ -200,14 +216,21 @@ class FeedEpisode extends Model {
     }).libraryItem.createdAt
 
     const feedEpisodeObjs = []
+    let numExisting = 0
     for (const book of books) {
       const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
       for (const track of book.trackList) {
-        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
+        // Check for existing episode by filepath
+        const existingEpisode = feed.feedEpisodes?.find((episode) => {
+          return episode.filePath === track.metadata.path
+        })
+        numExisting = existingEpisode ? numExisting + 1 : numExisting
+
+        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles, existingEpisode?.id))
       }
     }
-    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
-    return this.bulkCreate(feedEpisodeObjs, { transaction })
+    Logger.info(`[FeedEpisode] Upserting ${feedEpisodeObjs.length} episodes for feed ${feed.id} (${numExisting} existing)`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction, updateOnDuplicate: ['title', 'author', 'description', 'siteURL', 'enclosureURL', 'enclosureType', 'enclosureSize', 'pubDate', 'season', 'episode', 'episodeType', 'duration', 'filePath', 'explicit'] })
   }
 
   /**

From e7f7d1a573bd88e6d7d7fa5514a6178d91aaea92 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 12:06:01 -0600
Subject: [PATCH 108/143] Fix refresh feed when book is deleted and belonged to
 a series/collection

---
 server/managers/RssFeedManager.js | 17 ++++++++++-------
 server/models/Feed.js             |  8 ++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index abfa445f..de009c3d 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -122,7 +122,7 @@ class RssFeedManager {
         attributes: ['id', 'updatedAt'],
         include: {
           model: Database.bookModel,
-          attributes: ['id', 'updatedAt'],
+          attributes: ['id', 'audioFiles', 'updatedAt'],
           through: {
             attributes: []
           },
@@ -133,14 +133,16 @@ class RssFeedManager {
         }
       })
 
+      const totalBookTracks = feed.entity.books.reduce((total, book) => total + book.includedAudioFiles.length, 0)
+      if (feed.feedEpisodes.length !== totalBookTracks) {
+        return true
+      }
+
       let newEntityUpdatedAt = feed.entity.updatedAt
 
       const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
         let updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
-        if (updatedAt > mostRecent) {
-          return updatedAt
-        }
-        return mostRecent
+        return updatedAt > mostRecent ? updatedAt : mostRecent
       }, 0)
 
       if (mostRecentItemUpdatedAt > newEntityUpdatedAt) {
@@ -163,6 +165,9 @@ class RssFeedManager {
     let feed = await Database.feedModel.findOne({
       where: {
         slug: req.params.slug
+      },
+      include: {
+        model: Database.feedEpisodeModel
       }
     })
     if (!feed) {
@@ -175,8 +180,6 @@ class RssFeedManager {
     if (feedRequiresUpdate) {
       Logger.info(`[RssFeedManager] Feed "${feed.title}" requires update - updating feed`)
       feed = await feed.updateFeedForEntity()
-    } else {
-      feed.feedEpisodes = await feed.getFeedEpisodes()
     }
 
     const xml = feed.buildXml(req.originalHostPrefix)
diff --git a/server/models/Feed.js b/server/models/Feed.js
index a6ccff22..41bca449 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -190,7 +190,8 @@ class Feed extends Model {
     const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
 
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
     }, collectionExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -278,7 +279,8 @@ class Feed extends Model {
   static getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions = null) {
     const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
     const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
-      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+      const updatedAt = book.libraryItem.updatedAt > book.updatedAt ? book.libraryItem.updatedAt : book.updatedAt
+      return updatedAt > mostRecent ? updatedAt : mostRecent
     }, seriesExpanded.updatedAt)
 
     const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
@@ -475,8 +477,6 @@ class Feed extends Model {
     /** @type {typeof import('./FeedEpisode')} */
     const feedEpisodeModel = this.sequelize.models.feedEpisode
 
-    this.feedEpisodes = await this.getFeedEpisodes()
-
     let feedObj = null
     let feedEpisodeCreateFunc = null
     let feedEpisodeCreateFuncEntity = null

From f3918a47e14160ce02c79364cc8c04d10023b8c0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 12:48:58 -0600
Subject: [PATCH 109/143] Auto formatting

---
 server/Server.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index 9bbdb486..e9e77f00 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -56,23 +56,24 @@ class Server {
     global.AllowCors = process.env.ALLOW_CORS === '1'
 
     if (process.env.EXP_PROXY_SUPPORT === '1') {
-      Logger.info(`[Server] Experimental Proxy Support Enabled, SSRF Request Filter was Disabled`);
+      // https://github.com/advplyr/audiobookshelf/pull/3754
+      Logger.info(`[Server] Experimental Proxy Support Enabled, SSRF Request Filter was Disabled`)
       global.DisableSsrfRequestFilter = () => true
-      
-      axios.defaults.maxRedirects = 0;
+
+      axios.defaults.maxRedirects = 0
       axios.interceptors.response.use(
-        response => response,
-        error => {
+        (response) => response,
+        (error) => {
           if ([301, 302].includes(error.response?.status)) {
             return axios({
               ...error.config,
-              url: error.response.headers.location,
-            });
+              url: error.response.headers.location
+            })
           }
-    
-          return Promise.reject(error);
+
+          return Promise.reject(error)
         }
-      );
+      )
     } else if (process.env.DISABLE_SSRF_REQUEST_FILTER === '1') {
       Logger.info(`[Server] SSRF Request Filter Disabled`)
       global.DisableSsrfRequestFilter = () => true

From ed17dd9b512f5813b9df41b64e86a74ed097bdf0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 13:49:22 -0600
Subject: [PATCH 110/143] Fix user stats heatmap caption text to be accurate

---
 client/components/stats/Heatmap.vue | 7 +++++--
 client/strings/bg.json              | 1 -
 client/strings/bn.json              | 1 -
 client/strings/cs.json              | 1 -
 client/strings/da.json              | 1 -
 client/strings/de.json              | 1 -
 client/strings/en-us.json           | 2 +-
 client/strings/es.json              | 1 -
 client/strings/et.json              | 1 -
 client/strings/fr.json              | 1 -
 client/strings/he.json              | 1 -
 client/strings/hr.json              | 1 -
 client/strings/hu.json              | 1 -
 client/strings/it.json              | 1 -
 client/strings/lt.json              | 1 -
 client/strings/nl.json              | 1 -
 client/strings/no.json              | 1 -
 client/strings/pl.json              | 1 -
 client/strings/pt-br.json           | 1 -
 client/strings/ru.json              | 1 -
 client/strings/sl.json              | 1 -
 client/strings/sv.json              | 1 -
 client/strings/uk.json              | 1 -
 client/strings/vi-vn.json           | 1 -
 client/strings/zh-cn.json           | 1 -
 client/strings/zh-tw.json           | 1 -
 26 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/client/components/stats/Heatmap.vue b/client/components/stats/Heatmap.vue
index 46ac9609..4e491621 100644
--- a/client/components/stats/Heatmap.vue
+++ b/client/components/stats/Heatmap.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="heatmap" class="w-full">
     <div class="mx-auto" :style="{ height: innerHeight + 160 + 'px', width: innerWidth + 52 + 'px' }" style="background-color: rgba(13, 17, 23, 0)">
-      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageListeningSessionsInTheLastYear', [Object.values(daysListening).length]) }}</p>
+      <p class="mb-2 px-1 text-sm text-gray-200">{{ $getString('MessageDaysListenedInTheLastYear', [daysListenedInTheLastYear]) }}</p>
       <div class="border border-white border-opacity-25 rounded py-2 w-full" style="background-color: #232323" :style="{ height: innerHeight + 80 + 'px' }">
         <div :style="{ width: innerWidth + 'px', height: innerHeight + 'px' }" class="ml-10 mt-5 absolute" @mouseover="mouseover" @mouseout="mouseout">
           <div v-for="dayLabel in dayLabels" :key="dayLabel.label" :style="dayLabel.style" class="absolute top-0 left-0 text-gray-300">{{ dayLabel.label }}</div>
@@ -37,6 +37,7 @@ export default {
       innerHeight: 13 * 7,
       blockWidth: 13,
       data: [],
+      daysListenedInTheLastYear: 0,
       monthLabels: [],
       tooltipEl: null,
       tooltipTextEl: null,
@@ -213,7 +214,8 @@ export default {
         }
         dates.push(dateObj)
 
-        if (dateObj.value) {
+        if (dateObj.value > 0) {
+          this.daysListenedInTheLastYear++
           if (dateObj.value > maxValue) maxValue = dateObj.value
           if (!minValue || dateObj.value < minValue) minValue = dateObj.value
         }
@@ -260,6 +262,7 @@ export default {
       const heatmapEl = document.getElementById('heatmap')
       this.contentWidth = heatmapEl.clientWidth
       this.maxInnerWidth = this.contentWidth - 52
+      this.daysListenedInTheLastYear = 0
       this.buildData()
     }
   },
diff --git a/client/strings/bg.json b/client/strings/bg.json
index bc4db4f6..b6aff288 100644
--- a/client/strings/bg.json
+++ b/client/strings/bg.json
@@ -629,7 +629,6 @@
   "MessageItemsSelected": "{0} избрани",
   "MessageItemsUpdated": "{0} елемента обновени",
   "MessageJoinUsOn": "Присъединете се към нас",
-  "MessageListeningSessionsInTheLastYear": "{0} слушателски сесии през последната година",
   "MessageLoading": "Зареждане...",
   "MessageLoadingFolders": "Зареждане на Папки...",
   "MessageM4BFailed": "M4B Провалено!",
diff --git a/client/strings/bn.json b/client/strings/bn.json
index e88db2e5..9b7f6d18 100644
--- a/client/strings/bn.json
+++ b/client/strings/bn.json
@@ -763,7 +763,6 @@
   "MessageItemsSelected": "{0}টি আইটেম নির্বাচিত",
   "MessageItemsUpdated": "{0}টি আইটেম আপডেট করা হয়েছে",
   "MessageJoinUsOn": "আমাদের সাথে যোগ দিন",
-  "MessageListeningSessionsInTheLastYear": "গত বছরে {0}টি শোনার সেশন",
   "MessageLoading": "লোড হচ্ছে.।",
   "MessageLoadingFolders": "ফোল্ডার লোড হচ্ছে...",
   "MessageLogsDescription": "লগগুলি JSON ফাইল হিসাবে <code>/metadata/logs</code>-এ সংরক্ষণ করা হয়। ক্র্যাশ লগগুলি <code>/metadata/logs/crash_logs.txt</code>-এ সংরক্ষণ করা হয়।",
diff --git a/client/strings/cs.json b/client/strings/cs.json
index 3db3ddaa..30614fbd 100644
--- a/client/strings/cs.json
+++ b/client/strings/cs.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} vybraných položek",
   "MessageItemsUpdated": "{0} položky byly aktualizovány",
   "MessageJoinUsOn": "Přidejte se k nám",
-  "MessageListeningSessionsInTheLastYear": "{0} poslechových relací za poslední rok",
   "MessageLoading": "Načítá se...",
   "MessageLoadingFolders": "Načítám složky...",
   "MessageLogsDescription": "Protokoly se ukládají do souborů JSON v <code>/metadata/logs</code>. Protokoly o pádech jsou uloženy v <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/da.json b/client/strings/da.json
index 0f7b1eed..d9c510af 100644
--- a/client/strings/da.json
+++ b/client/strings/da.json
@@ -539,7 +539,6 @@
   "MessageItemsSelected": "{0} elementer valgt",
   "MessageItemsUpdated": "{0} elementer opdateret",
   "MessageJoinUsOn": "Deltag i os på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyttesessioner i det sidste år",
   "MessageLoading": "Indlæser...",
   "MessageLoadingFolders": "Indlæser mapper...",
   "MessageM4BFailed": "M4B mislykkedes!",
diff --git a/client/strings/de.json b/client/strings/de.json
index 6ac20fab..9e276f18 100644
--- a/client/strings/de.json
+++ b/client/strings/de.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} ausgewählte Medien",
   "MessageItemsUpdated": "{0} Medien aktualisiert",
   "MessageJoinUsOn": "Besuche uns auf",
-  "MessageListeningSessionsInTheLastYear": "{0} Ereignisse im letzten Jahr",
   "MessageLoading": "Wird geladen …",
   "MessageLoadingFolders": "Lade Ordner...",
   "MessageLogsDescription": "Die Logs werdern in <code>/metadata/logs</code> als JSON Dateien gespeichert. Crash logs werden in <code>/metadata/logs/crash_logs.txt</code> gespeichert.",
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index e94e5197..f7af6aed 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -758,6 +758,7 @@
   "MessageConfirmResetProgress": "Are you sure you want to reset your progress?",
   "MessageConfirmSendEbookToDevice": "Are you sure you want to send {0} ebook \"{1}\" to device \"{2}\"?",
   "MessageConfirmUnlinkOpenId": "Are you sure you want to unlink this user from OpenID?",
+  "MessageDaysListenedInTheLastYear": "{0} days listened in the last year",
   "MessageDownloadingEpisode": "Downloading episode",
   "MessageDragFilesIntoTrackOrder": "Drag files into correct track order",
   "MessageEmbedFailed": "Embed Failed!",
@@ -773,7 +774,6 @@
   "MessageItemsSelected": "{0} Items Selected",
   "MessageItemsUpdated": "{0} Items Updated",
   "MessageJoinUsOn": "Join us on",
-  "MessageListeningSessionsInTheLastYear": "{0} listening sessions in the last year",
   "MessageLoading": "Loading...",
   "MessageLoadingFolders": "Loading folders...",
   "MessageLogsDescription": "Logs are stored in <code>/metadata/logs</code> as JSON files. Crash logs are stored in <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/es.json b/client/strings/es.json
index 4196b6dd..6ef7ee8c 100644
--- a/client/strings/es.json
+++ b/client/strings/es.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} Elementos Seleccionados",
   "MessageItemsUpdated": "{0} Elementos Actualizados",
   "MessageJoinUsOn": "Únetenos en",
-  "MessageListeningSessionsInTheLastYear": "{0} sesiones de escucha en el último año",
   "MessageLoading": "Cargando...",
   "MessageLoadingFolders": "Cargando archivos...",
   "MessageLogsDescription": "Logs son almacenados en <code>/metadata/logs</code> en archivos bajo formato JSON. Logs de fallos son almacenados en <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/et.json b/client/strings/et.json
index 835666f8..bb1b0182 100644
--- a/client/strings/et.json
+++ b/client/strings/et.json
@@ -611,7 +611,6 @@
   "MessageItemsSelected": "{0} Valitud üksust",
   "MessageItemsUpdated": "{0} Üksust on uuendatud",
   "MessageJoinUsOn": "Liitu meiega",
-  "MessageListeningSessionsInTheLastYear": "Kuulamissessioone viimase aasta jooksul: {0}",
   "MessageLoading": "Laadimine...",
   "MessageLoadingFolders": "Kaustade laadimine...",
   "MessageM4BFailed": "M4B ebaõnnestus!",
diff --git a/client/strings/fr.json b/client/strings/fr.json
index 2dfe5b0b..544bcc9b 100644
--- a/client/strings/fr.json
+++ b/client/strings/fr.json
@@ -765,7 +765,6 @@
   "MessageItemsSelected": "{0} éléments sélectionnés",
   "MessageItemsUpdated": "{0} éléments mis à jour",
   "MessageJoinUsOn": "Rejoignez-nous sur",
-  "MessageListeningSessionsInTheLastYear": "{0} sessions d’écoute l’an dernier",
   "MessageLoading": "Chargement…",
   "MessageLoadingFolders": "Chargement des dossiers…",
   "MessageLogsDescription": "Les journaux sont stockés dans <code>/metadata/logs</code> sous forme de fichiers JSON. Les journaux d’incidents sont stockés dans <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/he.json b/client/strings/he.json
index 71a6df9e..1bc87ace 100644
--- a/client/strings/he.json
+++ b/client/strings/he.json
@@ -642,7 +642,6 @@
   "MessageItemsSelected": "{0} פריטים נבחרו",
   "MessageItemsUpdated": "{0} פריטים עודכנו",
   "MessageJoinUsOn": "הצטרף אלינו ב-",
-  "MessageListeningSessionsInTheLastYear": "{0} מפגשי האזנה בשנה האחרונה",
   "MessageLoading": "טוען...",
   "MessageLoadingFolders": "טוען תיקיות...",
   "MessageM4BFailed": "M4B נכשל!",
diff --git a/client/strings/hr.json b/client/strings/hr.json
index 8b824128..f3946c58 100644
--- a/client/strings/hr.json
+++ b/client/strings/hr.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} odabranih stavki",
   "MessageItemsUpdated": "{0} stavki ažurirano",
   "MessageJoinUsOn": "Pridruži nam se na",
-  "MessageListeningSessionsInTheLastYear": "{0} slušanja u prošloj godini",
   "MessageLoading": "Učitavam...",
   "MessageLoadingFolders": "Učitavam mape...",
   "MessageLogsDescription": "Zapisnici se čuvaju u <code>/metadata/logs</code> u obliku JSON datoteka. Zapisnici pada sustava čuvaju se u datoteci <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/hu.json b/client/strings/hu.json
index 25f9a9be..492bddfb 100644
--- a/client/strings/hu.json
+++ b/client/strings/hu.json
@@ -764,7 +764,6 @@
   "MessageItemsSelected": "{0} kiválasztott elem",
   "MessageItemsUpdated": "{0} frissített elem",
   "MessageJoinUsOn": "Csatlakozzon hozzánk a",
-  "MessageListeningSessionsInTheLastYear": "{0} hallgatási munkamenet az elmúlt évben",
   "MessageLoading": "Betöltés...",
   "MessageLoadingFolders": "Mappák betöltése...",
   "MessageLogsDescription": "A naplók a <code>/metadata/logs</code> mappában JSON-fájlokként tárolódnak. Az összeomlási naplók a <code>/metadata/logs/crash_logs.txt</code> fájlban tárolódnak.",
diff --git a/client/strings/it.json b/client/strings/it.json
index 633dea89..1fdb3ac5 100644
--- a/client/strings/it.json
+++ b/client/strings/it.json
@@ -762,7 +762,6 @@
   "MessageItemsSelected": "{0} oggetti Selezionati",
   "MessageItemsUpdated": "{0} Oggetti aggiornati",
   "MessageJoinUsOn": "Unisciti a noi su",
-  "MessageListeningSessionsInTheLastYear": "{0} sessioni di ascolto nell'ultimo anno",
   "MessageLoading": "Caricamento…",
   "MessageLoadingFolders": "Caricamento Cartelle...",
   "MessageLogsDescription": "I log vengono archiviati nel percorso <code>/metadata/logs</code> as JSON files. I registri degli arresti anomali vengono archiviati nel percorso <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/lt.json b/client/strings/lt.json
index 8c902f5a..41718145 100644
--- a/client/strings/lt.json
+++ b/client/strings/lt.json
@@ -563,7 +563,6 @@
   "MessageItemsSelected": "Pasirinkti {0} elementai (-ų)",
   "MessageItemsUpdated": "Atnaujinti {0} elementai (-ų)",
   "MessageJoinUsOn": "Prisijunkite prie mūsų",
-  "MessageListeningSessionsInTheLastYear": "{0} klausymo sesijų per paskutinius metus",
   "MessageLoading": "Kraunama...",
   "MessageLoadingFolders": "Kraunami aplankai...",
   "MessageM4BFailed": "M4B Nepavyko!",
diff --git a/client/strings/nl.json b/client/strings/nl.json
index 97bb1d01..33e330e1 100644
--- a/client/strings/nl.json
+++ b/client/strings/nl.json
@@ -758,7 +758,6 @@
   "MessageItemsSelected": "{0} onderdelen geselecteerd",
   "MessageItemsUpdated": "{0} onderdelen bijgewerkt",
   "MessageJoinUsOn": "Doe mee op",
-  "MessageListeningSessionsInTheLastYear": "{0} luistersessies in het laatste jaar",
   "MessageLoading": "Aan het laden...",
   "MessageLoadingFolders": "Mappen aan het laden...",
   "MessageLogsDescription": "Logs worden opgeslagen in <code>/metadata/logs</code> als JSON-bestanden. Crashlogs worden opgeslagen in <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/no.json b/client/strings/no.json
index 553a852e..592a8ee4 100644
--- a/client/strings/no.json
+++ b/client/strings/no.json
@@ -769,7 +769,6 @@
   "MessageItemsSelected": "{0} Gjenstander valgt",
   "MessageItemsUpdated": "{0} Gjenstander oppdatert",
   "MessageJoinUsOn": "Følg oss nå",
-  "MessageListeningSessionsInTheLastYear": "{0} Lyttesesjoner iløpet av siste året",
   "MessageLoading": "Laster...",
   "MessageLoadingFolders": "Laster mapper...",
   "MessageM4BFailed": "M4B mislykkes!",
diff --git a/client/strings/pl.json b/client/strings/pl.json
index d8cf9848..ce0eaa16 100644
--- a/client/strings/pl.json
+++ b/client/strings/pl.json
@@ -657,7 +657,6 @@
   "MessageInsertChapterBelow": "Wstaw rozdział poniżej",
   "MessageItemsSelected": "{0} zaznaczone elementy",
   "MessageJoinUsOn": "Dołącz do nas na",
-  "MessageListeningSessionsInTheLastYear": "Sesje słuchania w ostatnim roku: {0}",
   "MessageLoading": "Ładowanie...",
   "MessageLoadingFolders": "Ładowanie folderów...",
   "MessageLogsDescription": "Logi zapisane są w <code>/metadata/logs</code> jako pliki JSON. Logi awaryjne są zapisane w <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/pt-br.json b/client/strings/pt-br.json
index b6d7e7e3..07a1c79f 100644
--- a/client/strings/pt-br.json
+++ b/client/strings/pt-br.json
@@ -630,7 +630,6 @@
   "MessageItemsSelected": "{0} Itens Selecionados",
   "MessageItemsUpdated": "{0} Itens Atualizados",
   "MessageJoinUsOn": "Junte-se a nós",
-  "MessageListeningSessionsInTheLastYear": "{0} sessões de escuta no ano anterior",
   "MessageLoading": "Carregando...",
   "MessageLoadingFolders": "Carregando pastas...",
   "MessageLogsDescription": "Os logs estão armazenados em <code>/metadata/logs</code> como arquivos JSON. Logs de crash estão armazenados em <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/ru.json b/client/strings/ru.json
index 41129bde..be15a463 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} Элементов выделено",
   "MessageItemsUpdated": "{0} Элементов обновлено",
   "MessageJoinUsOn": "Присоединяйтесь к нам в",
-  "MessageListeningSessionsInTheLastYear": "{0} сеансов прослушивания в прошлом году",
   "MessageLoading": "Загрузка...",
   "MessageLoadingFolders": "Загрузка каталогов...",
   "MessageLogsDescription": "Журналы хранятся в <code>/metadata/logs</code> в виде JSON-файлов. Журналы сбоев хранятся в <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/sl.json b/client/strings/sl.json
index 3c304eaa..d2fa86d6 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "{0} izbranih elementov",
   "MessageItemsUpdated": "Št. posodobljenih elementov: {0}",
   "MessageJoinUsOn": "Pridružite se nam",
-  "MessageListeningSessionsInTheLastYear": "{0} sej poslušanja v zadnjem letu",
   "MessageLoading": "Nalagam...",
   "MessageLoadingFolders": "Nalagam mape...",
   "MessageLogsDescription": "Dnevniki so shranjeni v <code>/metadata/logs</code> kot datoteke JSON. Dnevniki zrušitev so shranjeni v <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/sv.json b/client/strings/sv.json
index 8e60e2cd..9ee4c1dc 100644
--- a/client/strings/sv.json
+++ b/client/strings/sv.json
@@ -590,7 +590,6 @@
   "MessageItemsSelected": "{0} Objekt markerade",
   "MessageItemsUpdated": "{0} Objekt uppdaterade",
   "MessageJoinUsOn": "Anslut dig till oss på",
-  "MessageListeningSessionsInTheLastYear": "{0} lyssningssessioner det senaste året",
   "MessageLoading": "Laddar...",
   "MessageLoadingFolders": "Laddar mappar...",
   "MessageM4BFailed": "M4B misslyckades!",
diff --git a/client/strings/uk.json b/client/strings/uk.json
index 4b745264..c55421f0 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "Обрано елементів: {0}",
   "MessageItemsUpdated": "Оновлено елементів: {0}",
   "MessageJoinUsOn": "Приєднуйтесь до",
-  "MessageListeningSessionsInTheLastYear": "Сесій прослуховування минулого року: {0}",
   "MessageLoading": "Завантаження...",
   "MessageLoadingFolders": "Завантаження тек...",
   "MessageLogsDescription": "Журнали зберігаються у <code>/metadata/logs</code> як JSON-файли. Журнали збоїв зберігаються у <code>/metadata/logs/crash_logs.txt</code>.",
diff --git a/client/strings/vi-vn.json b/client/strings/vi-vn.json
index a176dba3..07ef1751 100644
--- a/client/strings/vi-vn.json
+++ b/client/strings/vi-vn.json
@@ -581,7 +581,6 @@
   "MessageItemsSelected": "{0} Mục Đã Chọn",
   "MessageItemsUpdated": "{0} Mục Đã Cập Nhật",
   "MessageJoinUsOn": "Tham gia cùng chúng tôi trên",
-  "MessageListeningSessionsInTheLastYear": "{0} phiên nghe trong năm qua",
   "MessageLoading": "Đang tải...",
   "MessageLoadingFolders": "Đang tải các thư mục...",
   "MessageM4BFailed": "M4B thất bại!",
diff --git a/client/strings/zh-cn.json b/client/strings/zh-cn.json
index 472ef84e..fad6fc7a 100644
--- a/client/strings/zh-cn.json
+++ b/client/strings/zh-cn.json
@@ -771,7 +771,6 @@
   "MessageItemsSelected": "已选定 {0} 个项目",
   "MessageItemsUpdated": "已更新 {0} 个项目",
   "MessageJoinUsOn": "加入我们",
-  "MessageListeningSessionsInTheLastYear": "去年收听 {0} 个会话",
   "MessageLoading": "正在加载...",
   "MessageLoadingFolders": "加载文件夹...",
   "MessageLogsDescription": "日志以 JSON 文件形式存储在 <code>/metadata/logs</code> 目录中. 崩溃日志存储在 <code>/metadata/logs/crash_logs.txt</code> 目录中.",
diff --git a/client/strings/zh-tw.json b/client/strings/zh-tw.json
index 96f878c2..3f7e4c9c 100644
--- a/client/strings/zh-tw.json
+++ b/client/strings/zh-tw.json
@@ -625,7 +625,6 @@
   "MessageItemsSelected": "已選定 {0} 個項目",
   "MessageItemsUpdated": "已更新 {0} 個項目",
   "MessageJoinUsOn": "加入我們",
-  "MessageListeningSessionsInTheLastYear": "去年收聽 {0} 個會話",
   "MessageLoading": "讀取...",
   "MessageLoadingFolders": "讀取資料夾...",
   "MessageM4BFailed": "M4B 失敗!",

From e175a9c53306ffd9b3de017efc3c5cff38ee38dd Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 14:31:24 -0600
Subject: [PATCH 111/143] Revert book cards, author cards and series cards to
 div #2268

---
 client/components/cards/AuthorCard.vue     | 4 ++--
 client/components/cards/LazyBookCard.vue   | 6 +++---
 client/components/cards/LazySeriesCard.vue | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/components/cards/AuthorCard.vue b/client/components/cards/AuthorCard.vue
index 7ffcde73..27e67725 100644
--- a/client/components/cards/AuthorCard.vue
+++ b/client/components/cards/AuthorCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <article class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
+  <div class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
     <nuxt-link :to="`/author/${author?.id}`">
       <div cy-id="card" @mouseover="mouseover" @mouseleave="mouseleave">
         <div cy-id="imageArea" :style="{ height: cardHeight + 'px' }" class="bg-primary box-shadow-book rounded-md relative overflow-hidden">
@@ -34,7 +34,7 @@
         </div>
       </div>
     </nuxt-link>
-  </article>
+  </div>
 </template>
 
 <script>
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 1791971e..884e54b6 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <article ref="card" :id="`book-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`book-card-${index}`" tabindex="0" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div :id="`cover-area-${index}`" class="relative w-full top-0 left-0 rounded overflow-hidden z-10 bg-primary box-shadow-book" :style="{ height: coverHeight + 'px ' }">
       <!-- When cover image does not fill -->
       <div cy-id="coverBg" v-show="showCoverBg" class="absolute top-0 left-0 w-full h-full overflow-hidden rounded-sm bg-primary">
@@ -128,7 +128,7 @@
     <div cy-id="detailBottom" :id="`description-area-${index}`" v-if="isAlternativeBookshelfView || isAuthorBookshelfView" dir="auto" class="relative mt-2e mb-2e left-0 z-50 w-full">
       <div :style="{ fontSize: 0.9 + 'em' }">
         <ui-tooltip v-if="displayTitle" :text="displayTitle" :disabled="!displayTitleTruncated" direction="bottom" :delayOnShow="500" class="flex items-center">
-          <p cy-id="title" ref="displayTitle" aria-hidden="true" class="truncate">{{ displayTitle }}</p>
+          <p cy-id="title" ref="displayTitle" class="truncate">{{ displayTitle }}</p>
           <widgets-explicit-indicator cy-id="explicitIndicator" v-if="isExplicit" />
         </ui-tooltip>
       </div>
@@ -138,7 +138,7 @@
       <p cy-id="line2" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displayLineTwo || '&nbsp;' }}</p>
       <p cy-id="line3" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </article>
+  </div>
 </template>
 
 <script>
diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 57d2a4f8..6b1633c4 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <article cy-id="card" ref="card" :id="`series-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div cy-id="card" ref="card" :id="`series-card-${index}`" tabindex="0" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div cy-id="covers-area" class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden z-0">
@@ -21,14 +21,14 @@
 
     <div cy-id="standardBottomText" v-if="!isAlternativeBookshelfView" class="categoryPlacard absolute z-10 left-0 right-0 mx-auto -bottom-6e h-6e rounded-md text-center" :style="{ width: Math.min(200, cardWidth) + 'px' }">
       <div class="w-full h-full shinyBlack flex items-center justify-center rounded-sm border" :style="{ padding: `0em 0.5em` }">
-        <p cy-id="standardBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+        <p cy-id="standardBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       </div>
     </div>
     <div cy-id="detailBottomText" v-else class="relative z-30 left-0 right-0 mx-auto py-1e rounded-md text-center">
-      <p cy-id="detailBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+      <p cy-id="detailBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       <p cy-id="detailBottomSortLine" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </article>
+  </div>
 </template>
 
 <script>

From f9f8c6d751670574257a666b8278e8e8bfa6d7cd Mon Sep 17 00:00:00 2001
From: Dmitry <dmitry@naboychenko.ru>
Date: Mon, 30 Dec 2024 10:49:46 +0000
Subject: [PATCH 112/143] Translated using Weblate (Russian)

Currently translated at 100.0% (1082 of 1082 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/ru/
---
 client/strings/ru.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/ru.json b/client/strings/ru.json
index be15a463..c32a1f56 100644
--- a/client/strings/ru.json
+++ b/client/strings/ru.json
@@ -300,6 +300,7 @@
   "LabelDiscover": "Не начато",
   "LabelDownload": "Скачать",
   "LabelDownloadNEpisodes": "Скачать {0} эпизодов",
+  "LabelDownloadable": "Загружаемый",
   "LabelDuration": "Длина",
   "LabelDurationComparisonExactMatch": "(точное совпадение)",
   "LabelDurationComparisonLonger": "({0} дольше)",
@@ -588,6 +589,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "По умолчанию метаинформация сохраняется в папке /metadata/items, при включении этой настройки метаинформация будет храниться в папке элемента",
   "LabelSettingsTimeFormat": "Формат времени",
   "LabelShare": "Поделиться",
+  "LabelShareDownloadableHelp": "Позволяет пользователям с помощью ссылки загрузить zip-файл элемента библиотеки.",
   "LabelShareOpen": "Общедоступно",
   "LabelShareURL": "Общедоступный URL",
   "LabelShowAll": "Показать все",

From 235d05eff3422efecc6e3a8b96d583d91eeca6e9 Mon Sep 17 00:00:00 2001
From: Deleted User <mgorpinic2005@gmail.com>
Date: Mon, 30 Dec 2024 04:52:17 +0000
Subject: [PATCH 113/143] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1082 of 1082 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/uk/
---
 client/strings/uk.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/uk.json b/client/strings/uk.json
index c55421f0..d372ef55 100644
--- a/client/strings/uk.json
+++ b/client/strings/uk.json
@@ -300,6 +300,7 @@
   "LabelDiscover": "Огляд",
   "LabelDownload": "Завантажити",
   "LabelDownloadNEpisodes": "Завантажити епізодів: {0}",
+  "LabelDownloadable": "Можна завантажити",
   "LabelDuration": "Тривалість",
   "LabelDurationComparisonExactMatch": "(повний збіг)",
   "LabelDurationComparisonLonger": "(на {0} довше)",
@@ -588,6 +589,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "За замовчуванням файли метаданих зберігаються у /metadata/items. Цей параметр увімкне збереження метаданих у теці елемента бібліотеки",
   "LabelSettingsTimeFormat": "Формат часу",
   "LabelShare": "Поділитися",
+  "LabelShareDownloadableHelp": "Дозволяє користувачам із посиланням для спільного доступу завантажувати zip-файл елемента бібліотеки.",
   "LabelShareOpen": "Поділитися відкрито",
   "LabelShareURL": "Поділитися URL",
   "LabelShowAll": "Показати все",

From e9eeab6fb58b896456c761eb1086cf97bd89f70f Mon Sep 17 00:00:00 2001
From: thehijacker <thehijacker@gmail.com>
Date: Mon, 30 Dec 2024 05:08:08 +0000
Subject: [PATCH 114/143] Translated using Weblate (Slovenian)

Currently translated at 100.0% (1082 of 1082 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/sl/
---
 client/strings/sl.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/strings/sl.json b/client/strings/sl.json
index d2fa86d6..59f5f530 100644
--- a/client/strings/sl.json
+++ b/client/strings/sl.json
@@ -300,6 +300,7 @@
   "LabelDiscover": "Odkrij",
   "LabelDownload": "Prenos",
   "LabelDownloadNEpisodes": "Prenesi {0} epizod",
+  "LabelDownloadable": "Možen prenos",
   "LabelDuration": "Trajanje",
   "LabelDurationComparisonExactMatch": "(natančno ujemanje)",
   "LabelDurationComparisonLonger": "({0} dlje)",
@@ -588,6 +589,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "Datoteke z metapodatki so privzeto shranjene v /metadata/items, če omogočite to nastavitev, boste datoteke z metapodatki shranili v mape elementov vaše knjižnice",
   "LabelSettingsTimeFormat": "Oblika časa",
   "LabelShare": "Deli",
+  "LabelShareDownloadableHelp": "Omogoča uporabnikom s povezavo skupne rabe, da prenesejo zip datoteko elementa knjižnice.",
   "LabelShareOpen": "Deli odprto",
   "LabelShareURL": "Deli URL",
   "LabelShowAll": "Prikaži vse",

From 87bac1e33b4598f53bd65c59a7964740959a9ce0 Mon Sep 17 00:00:00 2001
From: Soaibuzzaman <soaib.safi@gmail.com>
Date: Tue, 31 Dec 2024 11:11:24 +0000
Subject: [PATCH 115/143] Translated using Weblate (Bengali)

Currently translated at 100.0% (1080 of 1080 strings)

Translation: Audiobookshelf/Abs Web Client
Translate-URL: https://hosted.weblate.org/projects/audiobookshelf/abs-web-client/bn/
---
 client/strings/bn.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/client/strings/bn.json b/client/strings/bn.json
index 9b7f6d18..fe758a0c 100644
--- a/client/strings/bn.json
+++ b/client/strings/bn.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "ট্র্যাকলিস্ট সংরক্ষণ করুন",
   "ButtonScan": "স্ক্যান",
   "ButtonScanLibrary": "স্ক্যান লাইব্রেরি",
+  "ButtonScrollLeft": "বাম দিকে স্ক্রল করুন",
+  "ButtonScrollRight": "ডানদিকে স্ক্রল করুন",
   "ButtonSearch": "অনুসন্ধান",
   "ButtonSelectFolderPath": "ফোল্ডারের পথ নির্বাচন করুন",
   "ButtonSeries": "সিরিজ",
@@ -190,6 +192,7 @@
   "HeaderSettingsExperimental": "পরীক্ষামূলক ফিচার",
   "HeaderSettingsGeneral": "সাধারণ",
   "HeaderSettingsScanner": "স্ক্যানার",
+  "HeaderSettingsWebClient": "ওয়েব ক্লায়েন্ট",
   "HeaderSleepTimer": "স্লিপ টাইমার",
   "HeaderStatsLargestItems": "সবচেয়ে বড় আইটেম",
   "HeaderStatsLongestItems": "দীর্ঘতম আইটেম (ঘন্টা)",
@@ -297,6 +300,7 @@
   "LabelDiscover": "আবিষ্কার",
   "LabelDownload": "ডাউনলোড করুন",
   "LabelDownloadNEpisodes": "{0}টি পর্ব ডাউনলোড করুন",
+  "LabelDownloadable": "ডাউনলোডযোগ্য",
   "LabelDuration": "সময়কাল",
   "LabelDurationComparisonExactMatch": "(সঠিক মিল)",
   "LabelDurationComparisonLonger": "({0} দীর্ঘ)",
@@ -542,6 +546,7 @@
   "LabelServerYearReview": "সার্ভারের বাৎসরিক পর্যালোচনা ({0})",
   "LabelSetEbookAsPrimary": "প্রাথমিক হিসাবে সেট করুন",
   "LabelSetEbookAsSupplementary": "পরিপূরক হিসেবে সেট করুন",
+  "LabelSettingsAllowIframe": "আইফ্রেমে এম্বেড করার অনুমতি দিন",
   "LabelSettingsAudiobooksOnly": "শুধুমাত্র অডিও বই",
   "LabelSettingsAudiobooksOnlyHelp": "এই সেটিংটি সক্ষম করা ই-বই ফাইলগুলিকে উপেক্ষা করবে যদি না সেগুলি একটি অডিওবই ফোল্ডারের মধ্যে থাকে যে ক্ষেত্রে সেগুলিকে সম্পূরক ই-বই হিসাবে সেট করা হবে",
   "LabelSettingsBookshelfViewHelp": "কাঠের তাক সহ স্কুমরফিক ডিজাইন",
@@ -584,6 +589,7 @@
   "LabelSettingsStoreMetadataWithItemHelp": "ডিফল্টরূপে মেটাডেটা ফাইলগুলি /মেটাডাটা/আইটেমগুলি -এ সংরক্ষণ করা হয়, এই সেটিংটি সক্ষম করলে মেটাডেটা ফাইলগুলি আপনার লাইব্রেরি আইটেম ফোল্ডারে সংরক্ষণ করা হবে",
   "LabelSettingsTimeFormat": "সময় বিন্যাস",
   "LabelShare": "শেয়ার করুন",
+  "LabelShareDownloadableHelp": "শেয়ার লিঙ্ক সহ ব্যবহারকারীদের লাইব্রেরি আইটেমের একটি জিপ ফাইল ডাউনলোড করার অনুমতি দিন।",
   "LabelShareOpen": "শেয়ার খোলা",
   "LabelShareURL": "শেয়ার ইউআরএল",
   "LabelShowAll": "সব দেখান",
@@ -592,6 +598,8 @@
   "LabelSize": "আকার",
   "LabelSleepTimer": "স্লিপ টাইমার",
   "LabelSlug": "স্লাগ",
+  "LabelSortAscending": "আরোহী",
+  "LabelSortDescending": "অবরোহী",
   "LabelStart": "শুরু",
   "LabelStartTime": "শুরুর সময়",
   "LabelStarted": "শুরু হয়েছে",
@@ -679,6 +687,8 @@
   "LabelViewPlayerSettings": "প্লেয়ার সেটিংস দেখুন",
   "LabelViewQueue": "প্লেয়ার সারি দেখুন",
   "LabelVolume": "ভলিউম",
+  "LabelWebRedirectURLsDescription": "লগইন করার পরে ওয়েব অ্যাপে পুনঃনির্দেশের অনুমতি দেওয়ার জন্য আপনার OAuth প্রদানকারীতে এই URLগুলোকে অনুমোদন করুন:",
+  "LabelWebRedirectURLsSubfolder": "রিডাইরেক্ট URL এর জন্য সাবফোল্ডার",
   "LabelWeekdaysToRun": "চলতে হবে সপ্তাহের দিন",
   "LabelXBooks": "{0}টি বই",
   "LabelXItems": "{0}টি আইটেম",

From de8b0abc3af740148bddde462fe809f03159d678 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Wed, 1 Jan 2025 14:52:25 -0600
Subject: [PATCH 116/143] Version bump v2.17.7

---
 client/package-lock.json | 4 ++--
 client/package.json      | 2 +-
 package-lock.json        | 4 ++--
 package.json             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 992600cd..822fe2cf 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf-client",
-      "version": "2.17.6",
+      "version": "2.17.7",
       "license": "ISC",
       "dependencies": {
         "@nuxtjs/axios": "^5.13.6",
diff --git a/client/package.json b/client/package.json
index 6338c1b1..8a90d68e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",
diff --git a/package-lock.json b/package-lock.json
index c3452537..31d9d0c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "audiobookshelf",
-      "version": "2.17.6",
+      "version": "2.17.7",
       "license": "GPL-3.0",
       "dependencies": {
         "axios": "^0.27.2",
diff --git a/package.json b/package.json
index d7b19037..f6729ef6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.6",
+  "version": "2.17.7",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

From fe2ba083be74de090f359c544f8e03bfe542dd34 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 2 Jan 2025 13:34:25 +0200
Subject: [PATCH 117/143] Fix ffmpeg concat file escaping

---
 server/utils/ffmpegHelpers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index c7024225..db0f23a0 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -8,8 +8,8 @@ const { filePathToPOSIX, copyToExisting } = require('./fileUtils')
 const LibraryItem = require('../objects/LibraryItem')
 
 function escapeSingleQuotes(path) {
-  // return path.replace(/'/g, '\'\\\'\'')
-  return filePathToPOSIX(path).replace(/ /g, '\\ ').replace(/'/g, "\\'")
+  // A ' within a quoted string is escaped with '\'' in ffmpeg (see https://www.ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping)
+  return filePathToPOSIX(path).replace(/'/g, "'\\''")
 }
 
 // Returns first track start time
@@ -33,7 +33,7 @@ async function writeConcatFile(tracks, outputPath, startTime = 0) {
 
   var tracksToInclude = tracks.filter((t) => t.index >= trackToStartWithIndex)
   var trackPaths = tracksToInclude.map((t) => {
-    var line = 'file ' + escapeSingleQuotes(t.metadata.path) + '\n' + `duration ${t.duration}`
+    var line = "file '" + escapeSingleQuotes(t.metadata.path) + "'\n" + `duration ${t.duration}`
     return line
   })
   var inputstr = trackPaths.join('\n\n')

From dd0ebdf2d8db0bed7403d2c93e8b358c26dc7893 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 12:49:58 -0600
Subject: [PATCH 118/143] Implementing toOld functions for
 LibraryItem/Book/Podcast

---
 server/controllers/LibraryItemController.js | 245 ++++++++++---------
 server/managers/PlaybackSessionManager.js   |   6 +-
 server/models/Book.js                       | 256 ++++++++++++++++++--
 server/models/LibraryItem.js                | 189 +++++++++++----
 server/models/Podcast.js                    | 153 ++++++++++--
 server/models/PodcastEpisode.js             |  86 ++++---
 6 files changed, 682 insertions(+), 253 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 17c7be83..8a5ab860 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -24,6 +24,17 @@ const ShareManager = require('../managers/ShareManager')
  * @property {import('../models/User')} user
  *
  * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/LibraryItem')} libraryItem
+ * @property {Object} oldLibraryItem - To be removed
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} LibraryItemControllerRequest
+ *
+ * @typedef RequestLibraryFileObject
+ * @property {import('../models/LibraryItem').LibraryFileObject} libraryFile
+ *
+ * @typedef {RequestWithUser & RequestEntityObject & RequestLibraryFileObject} LibraryItemControllerRequestWithFile
  */
 
 class LibraryItemController {
@@ -35,17 +46,17 @@ class LibraryItemController {
    * ?include=progress,rssfeed,downloads,share
    * ?expanded=1
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async findOne(req, res) {
     const includeEntities = (req.query.include || '').split(',')
     if (req.query.expanded == 1) {
-      var item = req.libraryItem.toJSONExpanded()
+      const item = req.libraryItem.toOldJSONExpanded()
 
       // Include users media progress
       if (includeEntities.includes('progress')) {
-        var episodeId = req.query.episode || null
+        const episodeId = req.query.episode || null
         item.userMediaProgress = req.user.getOldMediaProgress(item.id, episodeId)
       }
 
@@ -68,28 +79,27 @@ class LibraryItemController {
 
       return res.json(item)
     }
-    res.json(req.libraryItem)
+    res.json(req.libraryItem.toOldJSON())
   }
 
   /**
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async update(req, res) {
-    var libraryItem = req.libraryItem
     // Item has cover and update is removing cover so purge it from cache
-    if (libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
-      await CacheManager.purgeCoverCache(libraryItem.id)
+    if (req.libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
+      await CacheManager.purgeCoverCache(req.libraryItem.id)
     }
 
-    const hasUpdates = libraryItem.update(req.body)
+    const hasUpdates = req.oldLibraryItem.update(req.body)
     if (hasUpdates) {
       Logger.debug(`[LibraryItemController] Updated now saving`)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     }
-    res.json(libraryItem.toJSON())
+    res.json(req.oldLibraryItem.toJSON())
   }
 
   /**
@@ -100,7 +110,7 @@ class LibraryItemController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async delete(req, res) {
@@ -111,14 +121,14 @@ class LibraryItemController {
     const authorIds = []
     const seriesIds = []
     if (req.libraryItem.isPodcast) {
-      mediaItemIds.push(...req.libraryItem.media.episodes.map((ep) => ep.id))
+      mediaItemIds.push(...req.libraryItem.media.podcastEpisodes.map((ep) => ep.id))
     } else {
       mediaItemIds.push(req.libraryItem.media.id)
-      if (req.libraryItem.media.metadata.authors?.length) {
-        authorIds.push(...req.libraryItem.media.metadata.authors.map((au) => au.id))
+      if (req.libraryItem.media.authors?.length) {
+        authorIds.push(...req.libraryItem.media.authors.map((au) => au.id))
       }
-      if (req.libraryItem.media.metadata.series?.length) {
-        seriesIds.push(...req.libraryItem.media.metadata.series.map((se) => se.id))
+      if (req.libraryItem.media.series?.length) {
+        seriesIds.push(...req.libraryItem.media.series.map((se) => se.id))
       }
     }
 
@@ -155,7 +165,7 @@ class LibraryItemController {
    * GET: /api/items/:id/download
    * Download library item. Zip file if multiple files.
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async download(req, res) {
@@ -164,7 +174,7 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
     const libraryItemPath = req.libraryItem.path
-    const itemTitle = req.libraryItem.media.metadata.title
+    const itemTitle = req.libraryItem.media.title
 
     Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${itemTitle}" at "${libraryItemPath}"`)
 
@@ -194,11 +204,10 @@ class LibraryItemController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async updateMedia(req, res) {
-    const libraryItem = req.libraryItem
     const mediaPayload = req.body
 
     if (mediaPayload.url) {
@@ -207,44 +216,44 @@ class LibraryItemController {
     }
 
     // Book specific
-    if (libraryItem.isBook) {
-      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, libraryItem.libraryId)
+    if (req.libraryItem.isBook) {
+      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, req.libraryItem.libraryId)
     }
 
     // Podcast specific
     let isPodcastAutoDownloadUpdated = false
-    if (libraryItem.isPodcast) {
-      if (mediaPayload.autoDownloadEpisodes !== undefined && libraryItem.media.autoDownloadEpisodes !== mediaPayload.autoDownloadEpisodes) {
+    if (req.libraryItem.isPodcast) {
+      if (mediaPayload.autoDownloadEpisodes !== undefined && req.libraryItem.media.autoDownloadEpisodes !== mediaPayload.autoDownloadEpisodes) {
         isPodcastAutoDownloadUpdated = true
-      } else if (mediaPayload.autoDownloadSchedule !== undefined && libraryItem.media.autoDownloadSchedule !== mediaPayload.autoDownloadSchedule) {
+      } else if (mediaPayload.autoDownloadSchedule !== undefined && req.libraryItem.media.autoDownloadSchedule !== mediaPayload.autoDownloadSchedule) {
         isPodcastAutoDownloadUpdated = true
       }
     }
 
     // Book specific - Get all series being removed from this item
     let seriesRemoved = []
-    if (libraryItem.isBook && mediaPayload.metadata?.series) {
+    if (req.libraryItem.isBook && mediaPayload.metadata?.series) {
       const seriesIdsInUpdate = mediaPayload.metadata.series?.map((se) => se.id) || []
-      seriesRemoved = libraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+      seriesRemoved = req.oldLibraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
     }
 
     let authorsRemoved = []
-    if (libraryItem.isBook && mediaPayload.metadata?.authors) {
+    if (req.libraryItem.isBook && mediaPayload.metadata?.authors) {
       const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-      authorsRemoved = libraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+      authorsRemoved = req.oldLibraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
     }
 
-    const hasUpdates = libraryItem.media.update(mediaPayload) || mediaPayload.url
+    const hasUpdates = req.oldLibraryItem.media.update(mediaPayload) || mediaPayload.url
     if (hasUpdates) {
-      libraryItem.updatedAt = Date.now()
+      req.oldLibraryItem.updatedAt = Date.now()
 
       if (isPodcastAutoDownloadUpdated) {
-        this.cronManager.checkUpdatePodcastCron(libraryItem)
+        this.cronManager.checkUpdatePodcastCron(req.oldLibraryItem)
       }
 
-      Logger.debug(`[LibraryItemController] Updated library item media ${libraryItem.media.metadata.title}`)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      Logger.debug(`[LibraryItemController] Updated library item media ${req.oldLibraryItem.media.metadata.title}`)
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
 
       if (authorsRemoved.length) {
         // Check remove empty authors
@@ -259,14 +268,14 @@ class LibraryItemController {
     }
     res.json({
       updated: hasUpdates,
-      libraryItem
+      libraryItem: req.oldLibraryItem
     })
   }
 
   /**
    * POST: /api/items/:id/cover
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    * @param {boolean} [updateAndReturnJson=true]
    */
@@ -276,15 +285,13 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
 
-    let libraryItem = req.libraryItem
-
     let result = null
     if (req.body?.url) {
       Logger.debug(`[LibraryItemController] Requesting download cover from url "${req.body.url}"`)
-      result = await CoverManager.downloadCoverFromUrl(libraryItem, req.body.url)
+      result = await CoverManager.downloadCoverFromUrl(req.oldLibraryItem, req.body.url)
     } else if (req.files?.cover) {
       Logger.debug(`[LibraryItemController] Handling uploaded cover`)
-      result = await CoverManager.uploadCover(libraryItem, req.files.cover)
+      result = await CoverManager.uploadCover(req.oldLibraryItem, req.files.cover)
     } else {
       return res.status(400).send('Invalid request no file or url')
     }
@@ -296,8 +303,8 @@ class LibraryItemController {
     }
 
     if (updateAndReturnJson) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
       res.json({
         success: true,
         cover: result.cover
@@ -308,22 +315,21 @@ class LibraryItemController {
   /**
    * PATCH: /api/items/:id/cover
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async updateCover(req, res) {
-    const libraryItem = req.libraryItem
     if (!req.body.cover) {
       return res.status(400).send('Invalid request no cover path')
     }
 
-    const validationResult = await CoverManager.validateCoverPath(req.body.cover, libraryItem)
+    const validationResult = await CoverManager.validateCoverPath(req.body.cover, req.oldLibraryItem)
     if (validationResult.error) {
       return res.status(500).send(validationResult.error)
     }
     if (validationResult.updated) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     }
     res.json({
       success: true,
@@ -334,17 +340,15 @@ class LibraryItemController {
   /**
    * DELETE: /api/items/:id/cover
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async removeCover(req, res) {
-    var libraryItem = req.libraryItem
-
-    if (libraryItem.media.coverPath) {
-      libraryItem.updateMediaCover('')
-      await CacheManager.purgeCoverCache(libraryItem.id)
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    if (req.libraryItem.media.coverPath) {
+      req.oldLibraryItem.updateMediaCover('')
+      await CacheManager.purgeCoverCache(req.libraryItem.id)
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     }
 
     res.sendStatus(200)
@@ -353,7 +357,7 @@ class LibraryItemController {
   /**
    * GET: /api/items/:id/cover
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async getCover(req, res) {
@@ -395,11 +399,11 @@ class LibraryItemController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   startPlaybackSession(req, res) {
-    if (!req.libraryItem.media.numTracks) {
+    if (!req.libraryItem.hasAudioTracks) {
       Logger.error(`[LibraryItemController] startPlaybackSession cannot playback ${req.libraryItem.id}`)
       return res.sendStatus(404)
     }
@@ -412,18 +416,18 @@ class LibraryItemController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   startEpisodePlaybackSession(req, res) {
-    var libraryItem = req.libraryItem
-    if (!libraryItem.media.numTracks) {
-      Logger.error(`[LibraryItemController] startPlaybackSession cannot playback ${libraryItem.id}`)
-      return res.sendStatus(404)
+    if (!req.libraryItem.isPodcast) {
+      Logger.error(`[LibraryItemController] startEpisodePlaybackSession invalid media type ${req.libraryItem.id}`)
+      return res.sendStatus(400)
     }
-    var episodeId = req.params.episodeId
-    if (!libraryItem.media.episodes.find((ep) => ep.id === episodeId)) {
-      Logger.error(`[LibraryItemController] startPlaybackSession episode ${episodeId} not found for item ${libraryItem.id}`)
+
+    const episodeId = req.params.episodeId
+    if (!req.libraryItem.media.podcastEpisodes.some((ep) => ep.id === episodeId)) {
+      Logger.error(`[LibraryItemController] startPlaybackSession episode ${episodeId} not found for item ${req.libraryItem.id}`)
       return res.sendStatus(404)
     }
 
@@ -433,30 +437,34 @@ class LibraryItemController {
   /**
    * PATCH: /api/items/:id/tracks
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async updateTracks(req, res) {
-    var libraryItem = req.libraryItem
-    var orderedFileData = req.body.orderedFileData
-    if (!libraryItem.media.updateAudioTracks) {
-      Logger.error(`[LibraryItemController] updateTracks invalid media type ${libraryItem.id}`)
-      return res.sendStatus(500)
+    const orderedFileData = req.body?.orderedFileData
+
+    if (!req.libraryItem.isBook) {
+      Logger.error(`[LibraryItemController] updateTracks invalid media type ${req.libraryItem.id}`)
+      return res.sendStatus(400)
     }
-    libraryItem.media.updateAudioTracks(orderedFileData)
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    res.json(libraryItem.toJSON())
+    if (!Array.isArray(orderedFileData) || !orderedFileData.length) {
+      Logger.error(`[LibraryItemController] updateTracks invalid orderedFileData ${req.libraryItem.id}`)
+      return res.sendStatus(400)
+    }
+
+    req.oldLibraryItem.media.updateAudioTracks(orderedFileData)
+    await Database.updateLibraryItem(req.oldLibraryItem)
+    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+    res.json(req.oldLibraryItem.toJSON())
   }
 
   /**
    * POST /api/items/:id/match
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async match(req, res) {
-    const libraryItem = req.libraryItem
     const reqBody = req.body || {}
 
     const options = {}
@@ -473,7 +481,7 @@ class LibraryItemController {
       options.overrideDetails = !!reqBody.overrideDetails
     }
 
-    var matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
+    var matchResult = await Scanner.quickMatchLibraryItem(this, req.oldLibraryItem, options)
     res.json(matchResult)
   }
 
@@ -741,7 +749,7 @@ class LibraryItemController {
   /**
    * POST: /api/items/:id/scan
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async scan(req, res) {
@@ -765,7 +773,7 @@ class LibraryItemController {
   /**
    * GET: /api/items/:id/metadata-object
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   getMetadataObject(req, res) {
@@ -774,18 +782,18 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
 
-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.includedAudioFiles.length) {
       Logger.error(`[LibraryItemController] Invalid library item`)
       return res.sendStatus(500)
     }
 
-    res.json(this.audioMetadataManager.getMetadataObjectForApi(req.libraryItem))
+    res.json(this.audioMetadataManager.getMetadataObjectForApi(req.oldLibraryItem))
   }
 
   /**
    * POST: /api/items/:id/chapters
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async updateMediaChapters(req, res) {
@@ -794,7 +802,7 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
 
-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.includedAudioFiles.length) {
       Logger.error(`[LibraryItemController] Invalid library item`)
       return res.sendStatus(500)
     }
@@ -805,10 +813,10 @@ class LibraryItemController {
     }
 
     const chapters = req.body.chapters || []
-    const wasUpdated = req.libraryItem.media.updateChapters(chapters)
+    const wasUpdated = req.oldLibraryItem.media.updateChapters(chapters)
     if (wasUpdated) {
-      await Database.updateLibraryItem(req.libraryItem)
-      SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(req.oldLibraryItem)
+      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     }
 
     res.json({
@@ -821,7 +829,7 @@ class LibraryItemController {
    * GET: /api/items/:id/ffprobe/:fileid
    * FFProbe JSON result from audio file
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
    * @param {Response} res
    */
   async getFFprobeData(req, res) {
@@ -834,7 +842,7 @@ class LibraryItemController {
       return res.sendStatus(400)
     }
 
-    const audioFile = req.libraryItem.media.findFileWithInode(req.params.fileid)
+    const audioFile = req.oldLibraryItem.media.findFileWithInode(req.params.fileid)
     if (!audioFile) {
       Logger.error(`[LibraryItemController] Audio file not found with inode value ${req.params.fileid}`)
       return res.sendStatus(404)
@@ -847,7 +855,7 @@ class LibraryItemController {
   /**
    * GET api/items/:id/file/:fileid
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
    * @param {Response} res
    */
   async getLibraryFile(req, res) {
@@ -870,7 +878,7 @@ class LibraryItemController {
   /**
    * DELETE api/items/:id/file/:fileid
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
    * @param {Response} res
    */
   async deleteLibraryFile(req, res) {
@@ -881,17 +889,17 @@ class LibraryItemController {
     await fs.remove(libraryFile.metadata.path).catch((error) => {
       Logger.error(`[LibraryItemController] Failed to delete library file at "${libraryFile.metadata.path}"`, error)
     })
-    req.libraryItem.removeLibraryFile(req.params.fileid)
+    req.oldLibraryItem.removeLibraryFile(req.params.fileid)
 
-    if (req.libraryItem.media.removeFileWithInode(req.params.fileid)) {
+    if (req.oldLibraryItem.media.removeFileWithInode(req.params.fileid)) {
       // If book has no more media files then mark it as missing
-      if (req.libraryItem.mediaType === 'book' && !req.libraryItem.media.hasMediaEntities) {
-        req.libraryItem.setMissing()
+      if (req.libraryItem.mediaType === 'book' && !req.libraryItem.media.hasMediaFiles) {
+        req.oldLibraryItem.setMissing()
       }
     }
-    req.libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.libraryItem)
-    SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+    req.oldLibraryItem.updatedAt = Date.now()
+    await Database.updateLibraryItem(req.oldLibraryItem)
+    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     res.sendStatus(200)
   }
 
@@ -899,7 +907,7 @@ class LibraryItemController {
    * GET api/items/:id/file/:fileid/download
    * Same as GET api/items/:id/file/:fileid but allows logging and restricting downloads
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequestWithFile} req
    * @param {Response} res
    */
   async downloadLibraryFile(req, res) {
@@ -911,7 +919,7 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
 
-    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.metadata.title}" file at "${libraryFile.metadata.path}"`)
+    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.title}" file at "${libraryFile.metadata.path}"`)
 
     if (global.XAccel) {
       const encodedURI = encodeUriPath(global.XAccel + libraryFile.metadata.path)
@@ -947,28 +955,28 @@ class LibraryItemController {
    * fileid is only required when reading a supplementary ebook
    * when no fileid is passed in the primary ebook will be returned
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async getEBookFile(req, res) {
     let ebookFile = null
     if (req.params.fileid) {
-      ebookFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      ebookFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
       if (!ebookFile?.isEBookFile) {
         Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
         return res.status(400).send('Invalid ebook file id')
       }
     } else {
-      ebookFile = req.libraryItem.media.ebookFile
+      ebookFile = req.oldLibraryItem.media.ebookFile
     }
 
     if (!ebookFile) {
-      Logger.error(`[LibraryItemController] No ebookFile for library item "${req.libraryItem.media.metadata.title}"`)
+      Logger.error(`[LibraryItemController] No ebookFile for library item "${req.libraryItem.media.title}"`)
       return res.sendStatus(404)
     }
     const ebookFilePath = ebookFile.metadata.path
 
-    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.metadata.title}" ebook at "${ebookFilePath}"`)
+    Logger.info(`[LibraryItemController] User "${req.user.username}" requested download for item "${req.libraryItem.media.title}" ebook at "${ebookFilePath}"`)
 
     if (global.XAccel) {
       const encodedURI = encodeUriPath(global.XAccel + ebookFilePath)
@@ -991,11 +999,11 @@ class LibraryItemController {
    * if an ebook file is the primary ebook, then it will be changed to supplementary
    * if an ebook file is supplementary, then it will be changed to primary
    *
-   * @param {RequestWithUser} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async updateEbookFileStatus(req, res) {
-    const ebookLibraryFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+    const ebookLibraryFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
     if (!ebookLibraryFile?.isEBookFile) {
       Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
       return res.status(400).send('Invalid ebook file id')
@@ -1003,16 +1011,16 @@ class LibraryItemController {
 
     if (ebookLibraryFile.isSupplementary) {
       Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to primary`)
-      req.libraryItem.setPrimaryEbook(ebookLibraryFile)
+      req.oldLibraryItem.setPrimaryEbook(ebookLibraryFile)
     } else {
       Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to supplementary`)
       ebookLibraryFile.isSupplementary = true
-      req.libraryItem.setPrimaryEbook(null)
+      req.oldLibraryItem.setPrimaryEbook(null)
     }
 
-    req.libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.libraryItem)
-    SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+    req.oldLibraryItem.updatedAt = Date.now()
+    await Database.updateLibraryItem(req.oldLibraryItem)
+    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
     res.sendStatus(200)
   }
 
@@ -1023,7 +1031,8 @@ class LibraryItemController {
    * @param {NextFunction} next
    */
   async middleware(req, res, next) {
-    req.libraryItem = await Database.libraryItemModel.getOldById(req.params.id)
+    req.libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
+    req.oldLibraryItem = await Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
     if (!req.libraryItem?.media) return res.sendStatus(404)
 
     // Check user can access this library item
@@ -1033,7 +1042,7 @@ class LibraryItemController {
 
     // For library file routes, get the library file
     if (req.params.fileid) {
-      req.libraryFile = req.libraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      req.libraryFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
       if (!req.libraryFile) {
         Logger.error(`[LibraryItemController] Library file "${req.params.fileid}" does not exist for library item`)
         return res.sendStatus(404)
diff --git a/server/managers/PlaybackSessionManager.js b/server/managers/PlaybackSessionManager.js
index ce43fc8c..aace3df7 100644
--- a/server/managers/PlaybackSessionManager.js
+++ b/server/managers/PlaybackSessionManager.js
@@ -39,7 +39,7 @@ class PlaybackSessionManager {
 
   /**
    *
-   * @param {import('../controllers/SessionController').RequestWithUser} req
+   * @param {import('../controllers/LibraryItemController').LibraryItemControllerRequest} req
    * @param {Object} [clientDeviceInfo]
    * @returns {Promise<DeviceInfo>}
    */
@@ -67,14 +67,14 @@ class PlaybackSessionManager {
 
   /**
    *
-   * @param {import('../controllers/SessionController').RequestWithUser} req
+   * @param {import('../controllers/LibraryItemController').LibraryItemControllerRequest} req
    * @param {import('express').Response} res
    * @param {string} [episodeId]
    */
   async startSessionRequest(req, res, episodeId) {
     const deviceInfo = await this.getDeviceInfo(req, req.body?.deviceInfo)
     Logger.debug(`[PlaybackSessionManager] startSessionRequest for device ${deviceInfo.deviceDescription}`)
-    const { libraryItem, body: options } = req
+    const { oldLibraryItem: libraryItem, body: options } = req
     const session = await this.startSession(req.user, deviceInfo, libraryItem, episodeId, options)
     res.json(session.toJSONForClient(libraryItem))
   }
diff --git a/server/models/Book.js b/server/models/Book.js
index a904f536..8f3e1cae 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -1,5 +1,7 @@
 const { DataTypes, Model } = require('sequelize')
 const Logger = require('../Logger')
+const { getTitlePrefixAtEnd } = require('../utils')
+const parseNameString = require('../utils/parsers/parseNameString')
 
 /**
  * @typedef EBookFileObject
@@ -113,8 +115,12 @@ class Book extends Model {
     /** @type {Date} */
     this.createdAt
 
+    // Expanded properties
+
     /** @type {import('./Author')[]} - optional if expanded */
     this.authors
+    /** @type {import('./Series')[]} - optional if expanded */
+    this.series
   }
 
   static getOldBook(libraryItemExpanded) {
@@ -241,32 +247,6 @@ class Book extends Model {
     }
   }
 
-  getAbsMetadataJson() {
-    return {
-      tags: this.tags || [],
-      chapters: this.chapters?.map((c) => ({ ...c })) || [],
-      title: this.title,
-      subtitle: this.subtitle,
-      authors: this.authors.map((a) => a.name),
-      narrators: this.narrators,
-      series: this.series.map((se) => {
-        const sequence = se.bookSeries?.sequence || ''
-        if (!sequence) return se.name
-        return `${se.name} #${sequence}`
-      }),
-      genres: this.genres || [],
-      publishedYear: this.publishedYear,
-      publishedDate: this.publishedDate,
-      publisher: this.publisher,
-      description: this.description,
-      isbn: this.isbn,
-      asin: this.asin,
-      language: this.language,
-      explicit: !!this.explicit,
-      abridged: !!this.abridged
-    }
-  }
-
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
@@ -343,9 +323,50 @@ class Book extends Model {
     }
     return this.authors.map((au) => au.name).join(', ')
   }
+
+  /**
+   * Comma separated array of author names in Last, First format
+   * Requires authors to be loaded
+   *
+   * @returns {string}
+   */
+  get authorNameLF() {
+    if (this.authors === undefined) {
+      Logger.error(`[Book] authorNameLF: Cannot get authorNameLF because authors are not loaded`)
+      return ''
+    }
+
+    // Last, First
+    if (!this.authors.length) return ''
+    return this.authors.map((au) => parseNameString.nameToLastFirst(au.name)).join(', ')
+  }
+
+  /**
+   * Comma separated array of series with sequence
+   * Requires series to be loaded
+   *
+   * @returns {string}
+   */
+  get seriesName() {
+    if (this.series === undefined) {
+      Logger.error(`[Book] seriesName: Cannot get seriesName because series are not loaded`)
+      return ''
+    }
+
+    if (!this.series.length) return ''
+    return this.series
+      .map((se) => {
+        const sequence = se.bookSeries?.sequence || ''
+        if (!sequence) return se.name
+        return `${se.name} #${sequence}`
+      })
+      .join(', ')
+  }
+
   get includedAudioFiles() {
     return this.audioFiles.filter((af) => !af.exclude)
   }
+
   get trackList() {
     let startOffset = 0
     return this.includedAudioFiles.map((af) => {
@@ -355,6 +376,189 @@ class Book extends Model {
       return track
     })
   }
+
+  get hasMediaFiles() {
+    return !!this.hasAudioTracks || !!this.ebookFile
+  }
+
+  get hasAudioTracks() {
+    return !!this.includedAudioFiles.length
+  }
+
+  /**
+   * Total file size of all audio files and ebook file
+   *
+   * @returns {number}
+   */
+  get size() {
+    let total = 0
+    this.audioFiles.forEach((af) => (total += af.metadata.size))
+    if (this.ebookFile) {
+      total += this.ebookFile.metadata.size
+    }
+    return total
+  }
+
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      chapters: this.chapters?.map((c) => ({ ...c })) || [],
+      title: this.title,
+      subtitle: this.subtitle,
+      authors: this.authors.map((a) => a.name),
+      narrators: this.narrators,
+      series: this.series.map((se) => {
+        const sequence = se.bookSeries?.sequence || ''
+        if (!sequence) return se.name
+        return `${se.name} #${sequence}`
+      }),
+      genres: this.genres || [],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: !!this.explicit,
+      abridged: !!this.abridged
+    }
+  }
+
+  /**
+   * Old model kept metadata in a separate object
+   */
+  oldMetadataToJSON() {
+    const authors = this.authors.map((au) => ({ id: au.id, name: au.name }))
+    const series = this.series.map((se) => ({ id: se.id, name: se.name, sequence: se.bookSeries.sequence }))
+    return {
+      title: this.title,
+      subtitle: this.subtitle,
+      authors,
+      narrators: [...(this.narrators || [])],
+      series,
+      genres: [...(this.genres || [])],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: this.explicit,
+      abridged: this.abridged
+    }
+  }
+
+  oldMetadataToJSONMinified() {
+    return {
+      title: this.title,
+      titleIgnorePrefix: getTitlePrefixAtEnd(this.title),
+      subtitle: this.subtitle,
+      authorName: this.authorName,
+      authorNameLF: this.authorNameLF,
+      narratorName: (this.narrators || []).join(', '),
+      seriesName: this.seriesName,
+      genres: [...(this.genres || [])],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: this.explicit,
+      abridged: this.abridged
+    }
+  }
+
+  oldMetadataToJSONExpanded() {
+    const oldMetadataJSON = this.oldMetadataToJSON()
+    oldMetadataJSON.titleIgnorePrefix = getTitlePrefixAtEnd(this.title)
+    oldMetadataJSON.authorName = this.authorName
+    oldMetadataJSON.authorNameLF = this.authorNameLF
+    oldMetadataJSON.narratorName = (this.narrators || []).join(', ')
+    oldMetadataJSON.seriesName = this.seriesName
+    return oldMetadataJSON
+  }
+
+  /**
+   * The old model stored a minified series and authors array with the book object.
+   * Minified series is { id, name, sequence }
+   * Minified author is { id, name }
+   *
+   * @param {string} libraryItemId
+   */
+  toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Book] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSON(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      audioFiles: structuredClone(this.audioFiles),
+      chapters: structuredClone(this.chapters),
+      ebookFile: structuredClone(this.ebookFile)
+    }
+  }
+
+  toOldJSONMinified() {
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      metadata: this.oldMetadataToJSONMinified(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      numTracks: this.trackList.length,
+      numAudioFiles: this.audioFiles?.length || 0,
+      numChapters: this.chapters?.length || 0,
+      duration: this.duration,
+      size: this.size,
+      ebookFormat: this.ebookFile?.ebookFormat
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Book] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
+    }
+    if (!this.series) {
+      throw new Error(`[Book] Cannot convert to old JSON because series are not loaded`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      audioFiles: structuredClone(this.audioFiles),
+      chapters: structuredClone(this.chapters),
+      ebookFile: structuredClone(this.ebookFile),
+      duration: this.duration,
+      size: this.size,
+      tracks: structuredClone(this.trackList)
+    }
+  }
 }
 
 module.exports = Book
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 2aa41b70..412860d2 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -865,54 +865,6 @@ class LibraryItem extends Model {
     return libraryItem.media.coverPath
   }
 
-  /**
-   *
-   * @param {import('sequelize').FindOptions} options
-   * @returns {Promise<Book|Podcast>}
-   */
-  getMedia(options) {
-    if (!this.mediaType) return Promise.resolve(null)
-    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaType)}`
-    return this[mixinMethodName](options)
-  }
-
-  /**
-   *
-   * @returns {Promise<Book|Podcast>}
-   */
-  getMediaExpanded() {
-    if (this.mediaType === 'podcast') {
-      return this.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.podcastEpisode
-          }
-        ]
-      })
-    } else {
-      return this.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ],
-        order: [
-          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
-          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
-        ]
-      })
-    }
-  }
-
   /**
    *
    * @returns {Promise}
@@ -1131,6 +1083,64 @@ class LibraryItem extends Model {
     })
   }
 
+  get isBook() {
+    return this.mediaType === 'book'
+  }
+  get isPodcast() {
+    return this.mediaType === 'podcast'
+  }
+  get hasAudioTracks() {
+    return this.media.hasAudioTracks()
+  }
+
+  /**
+   *
+   * @param {import('sequelize').FindOptions} options
+   * @returns {Promise<Book|Podcast>}
+   */
+  getMedia(options) {
+    if (!this.mediaType) return Promise.resolve(null)
+    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaType)}`
+    return this[mixinMethodName](options)
+  }
+
+  /**
+   *
+   * @returns {Promise<Book|Podcast>}
+   */
+  getMediaExpanded() {
+    if (this.mediaType === 'podcast') {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.podcastEpisode
+          }
+        ]
+      })
+    } else {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.author,
+            through: {
+              attributes: []
+            }
+          },
+          {
+            model: this.sequelize.models.series,
+            through: {
+              attributes: ['sequence']
+            }
+          }
+        ],
+        order: [
+          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+        ]
+      })
+    }
+  }
+
   /**
    * Check if book or podcast library item has audio tracks
    * Requires expanded library item
@@ -1148,6 +1158,89 @@ class LibraryItem extends Model {
       return this.media.podcastEpisodes?.length > 0
     }
   }
+
+  toOldJSON() {
+    if (!this.media) {
+      throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
+    }
+
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      lastScan: this.lastScan?.valueOf(),
+      scanVersion: this.lastScanVersion,
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSON(this.id),
+      libraryFiles: structuredClone(this.libraryFiles)
+    }
+  }
+
+  toOldJSONMinified() {
+    if (!this.media) {
+      throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
+    }
+
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSONMinified(),
+      numFiles: this.libraryFiles.length,
+      size: this.size
+    }
+  }
+
+  toOldJSONExpanded() {
+    return {
+      id: this.id,
+      ino: this.ino,
+      oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+      libraryId: this.libraryId,
+      folderId: this.libraryFolderId,
+      path: this.path,
+      relPath: this.relPath,
+      isFile: this.isFile,
+      mtimeMs: this.mtime?.valueOf(),
+      ctimeMs: this.ctime?.valueOf(),
+      birthtimeMs: this.birthtime?.valueOf(),
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf(),
+      lastScan: this.lastScan?.valueOf(),
+      scanVersion: this.lastScanVersion,
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid,
+      mediaType: this.mediaType,
+      media: this.media.toOldJSONExpanded(this.id),
+      libraryFiles: structuredClone(this.libraryFiles),
+      size: this.size
+    }
+  }
 }
 
 module.exports = LibraryItem
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index 60f879d0..ec26e091 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -1,4 +1,5 @@
 const { DataTypes, Model } = require('sequelize')
+const { getTitlePrefixAtEnd } = require('../utils')
 
 /**
  * @typedef PodcastExpandedProperties
@@ -47,6 +48,8 @@ class Podcast extends Model {
     this.lastEpisodeCheck
     /** @type {number} */
     this.maxEpisodesToKeep
+    /** @type {number} */
+    this.maxNewEpisodesToDownload
     /** @type {string} */
     this.coverPath
     /** @type {string[]} */
@@ -57,6 +60,9 @@ class Podcast extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    /** @type {import('./PodcastEpisode')[]} */
+    this.podcastEpisodes
   }
 
   static getOldPodcast(libraryItemExpanded) {
@@ -119,25 +125,6 @@ class Podcast extends Model {
     }
   }
 
-  getAbsMetadataJson() {
-    return {
-      tags: this.tags || [],
-      title: this.title,
-      author: this.author,
-      description: this.description,
-      releaseDate: this.releaseDate,
-      genres: this.genres || [],
-      feedURL: this.feedURL,
-      imageURL: this.imageURL,
-      itunesPageURL: this.itunesPageURL,
-      itunesId: this.itunesId,
-      itunesArtistId: this.itunesArtistId,
-      language: this.language,
-      explicit: !!this.explicit,
-      podcastType: this.podcastType
-    }
-  }
-
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
@@ -179,6 +166,134 @@ class Podcast extends Model {
       }
     )
   }
+
+  get hasMediaFiles() {
+    return !!this.podcastEpisodes?.length
+  }
+
+  get hasAudioTracks() {
+    return this.hasMediaFiles
+  }
+
+  get size() {
+    if (!this.podcastEpisodes?.length) return 0
+    return this.podcastEpisodes.reduce((total, episode) => total + episode.size, 0)
+  }
+
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      title: this.title,
+      author: this.author,
+      description: this.description,
+      releaseDate: this.releaseDate,
+      genres: this.genres || [],
+      feedURL: this.feedURL,
+      imageURL: this.imageURL,
+      itunesPageURL: this.itunesPageURL,
+      itunesId: this.itunesId,
+      itunesArtistId: this.itunesArtistId,
+      language: this.language,
+      explicit: !!this.explicit,
+      podcastType: this.podcastType
+    }
+  }
+
+  /**
+   * Old model kept metadata in a separate object
+   */
+  oldMetadataToJSON() {
+    return {
+      title: this.title,
+      author: this.author,
+      description: this.description,
+      releaseDate: this.releaseDate,
+      genres: [...(this.genres || [])],
+      feedUrl: this.feedURL,
+      imageUrl: this.imageURL,
+      itunesPageUrl: this.itunesPageURL,
+      itunesId: this.itunesId,
+      itunesArtistId: this.itunesArtistId,
+      explicit: this.explicit,
+      language: this.language,
+      type: this.podcastType
+    }
+  }
+
+  oldMetadataToJSONExpanded() {
+    const oldMetadataJSON = this.oldMetadataToJSON()
+    oldMetadataJSON.titleIgnorePrefix = getTitlePrefixAtEnd(this.title)
+    return oldMetadataJSON
+  }
+
+  /**
+   * The old model stored episodes with the podcast object
+   *
+   * @param {string} libraryItemId
+   */
+  toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.podcastEpisodes) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because episodes are not provided`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSON(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      episodes: this.podcastEpisodes.map((episode) => episode.toOldJSON(libraryItemId)),
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload
+    }
+  }
+
+  toOldJSONMinified() {
+    return {
+      id: this.id,
+      // Minified metadata and expanded metadata are the same
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      numEpisodes: this.podcastEpisodes?.length || 0,
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
+      size: this.size
+    }
+  }
+
+  toOldJSONExpanded(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+    if (!this.podcastEpisodes) {
+      throw new Error(`[Podcast] Cannot convert to old JSON because episodes are not provided`)
+    }
+
+    return {
+      id: this.id,
+      libraryItemId: libraryItemId,
+      metadata: this.oldMetadataToJSONExpanded(),
+      coverPath: this.coverPath,
+      tags: [...(this.tags || [])],
+      episodes: this.podcastEpisodes.map((e) => e.toOldJSONExpanded(libraryItemId)),
+      autoDownloadEpisodes: this.autoDownloadEpisodes,
+      autoDownloadSchedule: this.autoDownloadSchedule,
+      lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+      maxEpisodesToKeep: this.maxEpisodesToKeep,
+      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
+      size: this.size
+    }
+  }
 }
 
 module.exports = Podcast
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 1fa32da7..23d237e0 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -53,42 +53,6 @@ class PodcastEpisode extends Model {
     this.updatedAt
   }
 
-  /**
-   * @param {string} libraryItemId
-   * @returns {oldPodcastEpisode}
-   */
-  getOldPodcastEpisode(libraryItemId = null) {
-    let enclosure = null
-    if (this.enclosureURL) {
-      enclosure = {
-        url: this.enclosureURL,
-        type: this.enclosureType,
-        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
-      }
-    }
-    return new oldPodcastEpisode({
-      libraryItemId: libraryItemId || null,
-      podcastId: this.podcastId,
-      id: this.id,
-      oldEpisodeId: this.extraData?.oldEpisodeId || null,
-      index: this.index,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      title: this.title,
-      subtitle: this.subtitle,
-      description: this.description,
-      enclosure,
-      guid: this.extraData?.guid || null,
-      pubDate: this.pubDate,
-      chapters: this.chapters,
-      audioFile: this.audioFile,
-      publishedAt: this.publishedAt?.valueOf() || null,
-      addedAt: this.createdAt.valueOf(),
-      updatedAt: this.updatedAt.valueOf()
-    })
-  }
-
   static createFromOld(oldEpisode) {
     const podcastEpisode = this.getFromOld(oldEpisode)
     return this.create(podcastEpisode)
@@ -184,7 +148,51 @@ class PodcastEpisode extends Model {
     return track
   }
 
+  get size() {
+    return this.audioFile?.metadata.size || 0
+  }
+
+  /**
+   * @param {string} libraryItemId
+   * @returns {oldPodcastEpisode}
+   */
+  getOldPodcastEpisode(libraryItemId = null) {
+    let enclosure = null
+    if (this.enclosureURL) {
+      enclosure = {
+        url: this.enclosureURL,
+        type: this.enclosureType,
+        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
+      }
+    }
+    return new oldPodcastEpisode({
+      libraryItemId: libraryItemId || null,
+      podcastId: this.podcastId,
+      id: this.id,
+      oldEpisodeId: this.extraData?.oldEpisodeId || null,
+      index: this.index,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      title: this.title,
+      subtitle: this.subtitle,
+      description: this.description,
+      enclosure,
+      guid: this.extraData?.guid || null,
+      pubDate: this.pubDate,
+      chapters: this.chapters,
+      audioFile: this.audioFile,
+      publishedAt: this.publishedAt?.valueOf() || null,
+      addedAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    })
+  }
+
   toOldJSON(libraryItemId) {
+    if (!libraryItemId) {
+      throw new Error(`[PodcastEpisode] Cannot convert to old JSON because libraryItemId is not provided`)
+    }
+
     let enclosure = null
     if (this.enclosureURL) {
       enclosure = {
@@ -209,8 +217,8 @@ class PodcastEpisode extends Model {
       enclosure,
       guid: this.extraData?.guid || null,
       pubDate: this.pubDate,
-      chapters: this.chapters?.map((ch) => ({ ...ch })) || [],
-      audioFile: this.audioFile || null,
+      chapters: structuredClone(this.chapters),
+      audioFile: structuredClone(this.audioFile),
       publishedAt: this.publishedAt?.valueOf() || null,
       addedAt: this.createdAt.valueOf(),
       updatedAt: this.updatedAt.valueOf()
@@ -221,7 +229,7 @@ class PodcastEpisode extends Model {
     const json = this.toOldJSON(libraryItemId)
 
     json.audioTrack = this.track
-    json.size = this.audioFile?.metadata.size || 0
+    json.size = this.size
     json.duration = this.audioFile?.duration || 0
 
     return json

From 4787e7fdb5f4bc209f978159c6f693d051faabd0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 15:42:52 -0600
Subject: [PATCH 119/143] Updates to LibraryItemController to use new model

---
 server/controllers/LibraryItemController.js | 212 +++++++++++++++-----
 server/managers/AudioMetadataManager.js     |   7 +-
 server/managers/CoverManager.js             |  23 ++-
 server/models/LibraryItem.js                |  44 +++-
 server/objects/LibraryItem.js               |  15 --
 server/objects/mediaTypes/Book.js           | 117 ++---------
 server/objects/mediaTypes/Podcast.js        |  14 --
 server/scanner/AudioFileScanner.js          |   8 +-
 8 files changed, 245 insertions(+), 195 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 8a5ab860..f1d11c15 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -32,7 +32,7 @@ const ShareManager = require('../managers/ShareManager')
  * @typedef {RequestWithUser & RequestEntityObject} LibraryItemControllerRequest
  *
  * @typedef RequestLibraryFileObject
- * @property {import('../models/LibraryItem').LibraryFileObject} libraryFile
+ * @property {import('../objects/files/LibraryFile')} libraryFile
  *
  * @typedef {RequestWithUser & RequestEntityObject & RequestLibraryFileObject} LibraryItemControllerRequestWithFile
  */
@@ -83,6 +83,10 @@ class LibraryItemController {
   }
 
   /**
+   * PATCH: /api/items/:id
+   *
+   * @deprecated
+   * Use the updateMedia /api/items/:id/media endpoint instead or updateCover /api/items/:id/cover
    *
    * @param {LibraryItemControllerRequest} req
    * @param {Response} res
@@ -288,10 +292,10 @@ class LibraryItemController {
     let result = null
     if (req.body?.url) {
       Logger.debug(`[LibraryItemController] Requesting download cover from url "${req.body.url}"`)
-      result = await CoverManager.downloadCoverFromUrl(req.oldLibraryItem, req.body.url)
+      result = await CoverManager.downloadCoverFromUrlNew(req.body.url, req.libraryItem.id, req.libraryItem.isFile ? null : req.libraryItem.path)
     } else if (req.files?.cover) {
       Logger.debug(`[LibraryItemController] Handling uploaded cover`)
-      result = await CoverManager.uploadCover(req.oldLibraryItem, req.files.cover)
+      result = await CoverManager.uploadCover(req.libraryItem, req.files.cover)
     } else {
       return res.status(400).send('Invalid request no file or url')
     }
@@ -303,8 +307,15 @@ class LibraryItemController {
     }
 
     if (updateAndReturnJson) {
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+      req.libraryItem.media.coverPath = result.cover
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()
+
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
       res.json({
         success: true,
         cover: result.cover
@@ -323,13 +334,20 @@ class LibraryItemController {
       return res.status(400).send('Invalid request no cover path')
     }
 
-    const validationResult = await CoverManager.validateCoverPath(req.body.cover, req.oldLibraryItem)
+    const validationResult = await CoverManager.validateCoverPath(req.body.cover, req.libraryItem)
     if (validationResult.error) {
       return res.status(500).send(validationResult.error)
     }
     if (validationResult.updated) {
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+      req.libraryItem.media.coverPath = validationResult.cover
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()
+
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     }
     res.json({
       success: true,
@@ -345,10 +363,17 @@ class LibraryItemController {
    */
   async removeCover(req, res) {
     if (req.libraryItem.media.coverPath) {
-      req.oldLibraryItem.updateMediaCover('')
+      req.libraryItem.media.coverPath = null
+      req.libraryItem.media.changed('coverPath', true)
+      await req.libraryItem.media.save()
+
+      // client uses updatedAt timestamp in URL to force refresh cover
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
       await CacheManager.purgeCoverCache(req.libraryItem.id)
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     }
 
     res.sendStatus(200)
@@ -451,11 +476,32 @@ class LibraryItemController {
       Logger.error(`[LibraryItemController] updateTracks invalid orderedFileData ${req.libraryItem.id}`)
       return res.sendStatus(400)
     }
+    // Ensure that each orderedFileData has a valid ino and is in the book audioFiles
+    if (orderedFileData.some((fileData) => !fileData?.ino || !req.libraryItem.media.audioFiles.some((af) => af.ino === fileData.ino))) {
+      Logger.error(`[LibraryItemController] updateTracks invalid orderedFileData ${req.libraryItem.id}`)
+      return res.sendStatus(400)
+    }
 
-    req.oldLibraryItem.media.updateAudioTracks(orderedFileData)
-    await Database.updateLibraryItem(req.oldLibraryItem)
-    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
-    res.json(req.oldLibraryItem.toJSON())
+    let index = 1
+    const updatedAudioFiles = orderedFileData.map((fileData) => {
+      const audioFile = req.libraryItem.media.audioFiles.find((af) => af.ino === fileData.ino)
+      audioFile.manuallyVerified = true
+      audioFile.exclude = !!fileData.exclude
+      if (audioFile.exclude) {
+        audioFile.index = -1
+      } else {
+        audioFile.index = index++
+      }
+      return audioFile
+    })
+    updatedAudioFiles.sort((a, b) => a.index - b.index)
+
+    req.libraryItem.media.audioFiles = updatedAudioFiles
+    req.libraryItem.media.changed('audioFiles', true)
+    await req.libraryItem.media.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+    res.json(req.libraryItem.toOldJSON())
   }
 
   /**
@@ -787,7 +833,7 @@ class LibraryItemController {
       return res.sendStatus(500)
     }
 
-    res.json(this.audioMetadataManager.getMetadataObjectForApi(req.oldLibraryItem))
+    res.json(this.audioMetadataManager.getMetadataObjectForApi(req.libraryItem))
   }
 
   /**
@@ -802,26 +848,51 @@ class LibraryItemController {
       return res.sendStatus(403)
     }
 
-    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.includedAudioFiles.length) {
+    if (req.libraryItem.isMissing || !req.libraryItem.isBook || !req.libraryItem.media.hasAudioTracks) {
       Logger.error(`[LibraryItemController] Invalid library item`)
       return res.sendStatus(500)
     }
 
-    if (!req.body.chapters) {
+    if (!Array.isArray(req.body.chapters) || req.body.chapters.some((c) => !c.title || typeof c.title !== 'string' || c.start === undefined || typeof c.start !== 'number' || c.end === undefined || typeof c.end !== 'number')) {
       Logger.error(`[LibraryItemController] Invalid payload`)
       return res.sendStatus(400)
     }
 
     const chapters = req.body.chapters || []
-    const wasUpdated = req.oldLibraryItem.media.updateChapters(chapters)
-    if (wasUpdated) {
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+
+    let hasUpdates = false
+    if (chapters.length !== req.libraryItem.media.chapters.length) {
+      req.libraryItem.media.chapters = chapters.map((c, index) => {
+        return {
+          id: index,
+          title: c.title,
+          start: c.start,
+          end: c.end
+        }
+      })
+      hasUpdates = true
+    } else {
+      for (const [index, chapter] of chapters.entries()) {
+        const currentChapter = req.libraryItem.media.chapters[index]
+        if (currentChapter.title !== chapter.title || currentChapter.start !== chapter.start || currentChapter.end !== chapter.end) {
+          currentChapter.title = chapter.title
+          currentChapter.start = chapter.start
+          currentChapter.end = chapter.end
+          hasUpdates = true
+        }
+      }
+    }
+
+    if (hasUpdates) {
+      req.libraryItem.media.changed('chapters', true)
+      await req.libraryItem.media.save()
+
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     }
 
     res.json({
       success: true,
-      updated: wasUpdated
+      updated: hasUpdates
     })
   }
 
@@ -829,7 +900,7 @@ class LibraryItemController {
    * GET: /api/items/:id/ffprobe/:fileid
    * FFProbe JSON result from audio file
    *
-   * @param {LibraryItemControllerRequestWithFile} req
+   * @param {LibraryItemControllerRequest} req
    * @param {Response} res
    */
   async getFFprobeData(req, res) {
@@ -837,18 +908,14 @@ class LibraryItemController {
       Logger.error(`[LibraryItemController] Non-admin user "${req.user.username}" attempted to get ffprobe data`)
       return res.sendStatus(403)
     }
-    if (req.libraryFile.fileType !== 'audio') {
-      Logger.error(`[LibraryItemController] Invalid filetype "${req.libraryFile.fileType}" for fileid "${req.params.fileid}". Expected audio file`)
-      return res.sendStatus(400)
-    }
 
-    const audioFile = req.oldLibraryItem.media.findFileWithInode(req.params.fileid)
+    const audioFile = req.libraryItem.getAudioFileWithIno(req.params.fileid)
     if (!audioFile) {
       Logger.error(`[LibraryItemController] Audio file not found with inode value ${req.params.fileid}`)
       return res.sendStatus(404)
     }
 
-    const ffprobeData = await AudioFileScanner.probeAudioFile(audioFile)
+    const ffprobeData = await AudioFileScanner.probeAudioFile(audioFile.metadata.path)
     res.json(ffprobeData)
   }
 
@@ -889,17 +956,35 @@ class LibraryItemController {
     await fs.remove(libraryFile.metadata.path).catch((error) => {
       Logger.error(`[LibraryItemController] Failed to delete library file at "${libraryFile.metadata.path}"`, error)
     })
-    req.oldLibraryItem.removeLibraryFile(req.params.fileid)
 
-    if (req.oldLibraryItem.media.removeFileWithInode(req.params.fileid)) {
-      // If book has no more media files then mark it as missing
-      if (req.libraryItem.mediaType === 'book' && !req.libraryItem.media.hasMediaFiles) {
-        req.oldLibraryItem.setMissing()
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.filter((lf) => lf.ino !== req.params.fileid)
+    req.libraryItem.changed('libraryFiles', true)
+
+    if (req.libraryItem.isBook) {
+      if (req.libraryItem.media.audioFiles.some((af) => af.ino === req.params.fileid)) {
+        req.libraryItem.media.audioFiles = req.libraryItem.media.audioFiles.filter((af) => af.ino !== req.params.fileid)
+        req.libraryItem.media.changed('audioFiles', true)
+      } else if (req.libraryItem.media.ebookFile?.ino === req.params.fileid) {
+        req.libraryItem.media.ebookFile = null
+        req.libraryItem.media.changed('ebookFile', true)
       }
+      if (!req.libraryItem.media.hasMediaFiles) {
+        req.libraryItem.isMissing = true
+      }
+    } else if (req.libraryItem.media.podcastEpisodes.some((ep) => ep.audioFile.ino === req.params.fileid)) {
+      const episodeToRemove = req.libraryItem.media.podcastEpisodes.find((ep) => ep.audioFile.ino === req.params.fileid)
+      await episodeToRemove.destroy()
+
+      req.libraryItem.media.podcastEpisodes = req.libraryItem.media.podcastEpisodes.filter((ep) => ep.audioFile.ino !== req.params.fileid)
     }
-    req.oldLibraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.oldLibraryItem)
-    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+
+    if (req.libraryItem.media.changed()) {
+      await req.libraryItem.media.save()
+    }
+
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     res.sendStatus(200)
   }
 
@@ -961,13 +1046,13 @@ class LibraryItemController {
   async getEBookFile(req, res) {
     let ebookFile = null
     if (req.params.fileid) {
-      ebookFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      ebookFile = req.libraryItem.getLibraryFileWithIno(req.params.fileid)
       if (!ebookFile?.isEBookFile) {
         Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
         return res.status(400).send('Invalid ebook file id')
       }
     } else {
-      ebookFile = req.oldLibraryItem.media.ebookFile
+      ebookFile = req.libraryItem.media.ebookFile
     }
 
     if (!ebookFile) {
@@ -999,28 +1084,55 @@ class LibraryItemController {
    * if an ebook file is the primary ebook, then it will be changed to supplementary
    * if an ebook file is supplementary, then it will be changed to primary
    *
-   * @param {LibraryItemControllerRequest} req
+   * @param {LibraryItemControllerRequestWithFile} req
    * @param {Response} res
    */
   async updateEbookFileStatus(req, res) {
-    const ebookLibraryFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
-    if (!ebookLibraryFile?.isEBookFile) {
+    if (!req.libraryItem.isBook) {
+      Logger.error(`[LibraryItemController] Invalid media type for ebook file status update`)
+      return res.sendStatus(400)
+    }
+    if (!req.libraryFile?.isEBookFile) {
       Logger.error(`[LibraryItemController] Invalid ebook file id "${req.params.fileid}"`)
       return res.status(400).send('Invalid ebook file id')
     }
 
+    const ebookLibraryFile = req.libraryFile
+    let primaryEbookFile = null
+
+    const ebookLibraryFileInos = req.libraryItem
+      .getLibraryFiles()
+      .filter((lf) => lf.isEBookFile)
+      .map((lf) => lf.ino)
+
     if (ebookLibraryFile.isSupplementary) {
       Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to primary`)
-      req.oldLibraryItem.setPrimaryEbook(ebookLibraryFile)
+
+      primaryEbookFile = ebookLibraryFile.toJSON()
+      delete primaryEbookFile.isSupplementary
+      delete primaryEbookFile.fileType
+      primaryEbookFile.ebookFormat = ebookLibraryFile.metadata.format
     } else {
       Logger.info(`[LibraryItemController] Updating ebook file "${ebookLibraryFile.metadata.filename}" to supplementary`)
-      ebookLibraryFile.isSupplementary = true
-      req.oldLibraryItem.setPrimaryEbook(null)
     }
 
-    req.oldLibraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(req.oldLibraryItem)
-    SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+    req.libraryItem.media.ebookFile = primaryEbookFile
+    req.libraryItem.media.changed('ebookFile', true)
+    await req.libraryItem.media.save()
+
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.map((lf) => {
+      if (ebookLibraryFileInos.includes(lf.ino)) {
+        lf.isSupplementary = lf.ino !== primaryEbookFile?.ino
+      }
+      return lf
+    })
+    req.libraryItem.changed('libraryFiles', true)
+
+    req.libraryItem.isMissing = !req.libraryItem.media.hasMediaFiles
+
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     res.sendStatus(200)
   }
 
@@ -1042,7 +1154,7 @@ class LibraryItemController {
 
     // For library file routes, get the library file
     if (req.params.fileid) {
-      req.libraryFile = req.oldLibraryItem.libraryFiles.find((lf) => lf.ino === req.params.fileid)
+      req.libraryFile = req.libraryItem.getLibraryFileWithIno(req.params.fileid)
       if (!req.libraryFile) {
         Logger.error(`[LibraryItemController] Library file "${req.params.fileid}" does not exist for library item`)
         return res.sendStatus(404)
diff --git a/server/managers/AudioMetadataManager.js b/server/managers/AudioMetadataManager.js
index 7911178e..36aecb97 100644
--- a/server/managers/AudioMetadataManager.js
+++ b/server/managers/AudioMetadataManager.js
@@ -34,8 +34,13 @@ class AudioMetadataMangaer {
     return this.tasksQueued.some((t) => t.data.libraryItemId === libraryItemId) || this.tasksRunning.some((t) => t.data.libraryItemId === libraryItemId)
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns
+   */
   getMetadataObjectForApi(libraryItem) {
-    return ffmpegHelpers.getFFMetadataObject(libraryItem, libraryItem.media.includedAudioFiles.length)
+    return ffmpegHelpers.getFFMetadataObject(libraryItem.toOldJSONExpanded(), libraryItem.media.includedAudioFiles.length)
   }
 
   /**
diff --git a/server/managers/CoverManager.js b/server/managers/CoverManager.js
index 2b3a697d..c995a446 100644
--- a/server/managers/CoverManager.js
+++ b/server/managers/CoverManager.js
@@ -79,6 +79,12 @@ class CoverManager {
     return imgType
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} coverFile - file object from req.files
+   * @returns {Promise<{error:string}|{cover:string}>}
+   */
   async uploadCover(libraryItem, coverFile) {
     const extname = Path.extname(coverFile.name.toLowerCase())
     if (!extname || !globals.SupportedImageTypes.includes(extname.slice(1))) {
@@ -110,14 +116,20 @@ class CoverManager {
     await this.removeOldCovers(coverDirPath, extname)
     await CacheManager.purgeCoverCache(libraryItem.id)
 
-    Logger.info(`[CoverManager] Uploaded libraryItem cover "${coverFullPath}" for "${libraryItem.media.metadata.title}"`)
+    Logger.info(`[CoverManager] Uploaded libraryItem cover "${coverFullPath}" for "${libraryItem.media.title}"`)
 
-    libraryItem.updateMediaCover(coverFullPath)
     return {
       cover: coverFullPath
     }
   }
 
+  /**
+   *
+   * @param {Object} libraryItem - old library item
+   * @param {string} url
+   * @param {boolean} [forceLibraryItemFolder=false]
+   * @returns {Promise<{error:string}|{cover:string}>}
+   */
   async downloadCoverFromUrl(libraryItem, url, forceLibraryItemFolder = false) {
     try {
       // Force save cover with library item is used for adding new podcasts
@@ -166,6 +178,12 @@ class CoverManager {
     }
   }
 
+  /**
+   *
+   * @param {string} coverPath
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns {Promise<{error:string}|{cover:string,updated:boolean}>}
+   */
   async validateCoverPath(coverPath, libraryItem) {
     // Invalid cover path
     if (!coverPath || coverPath.startsWith('http:') || coverPath.startsWith('https:')) {
@@ -235,7 +253,6 @@ class CoverManager {
 
     await CacheManager.purgeCoverCache(libraryItem.id)
 
-    libraryItem.updateMediaCover(coverPath)
     return {
       cover: coverPath,
       updated: true
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 412860d2..03e67a9e 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -1152,13 +1152,49 @@ class LibraryItem extends Model {
       Logger.error(`[LibraryItem] hasAudioTracks: Library item "${this.id}" does not have media`)
       return false
     }
-    if (this.mediaType === 'book') {
+    if (this.isBook) {
       return this.media.audioFiles?.length > 0
     } else {
       return this.media.podcastEpisodes?.length > 0
     }
   }
 
+  /**
+   *
+   * @param {string} ino
+   * @returns {import('./Book').AudioFileObject}
+   */
+  getAudioFileWithIno(ino) {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] getAudioFileWithIno: Library item "${this.id}" does not have media`)
+      return null
+    }
+    if (this.isBook) {
+      return this.media.audioFiles.find((af) => af.ino === ino)
+    } else {
+      return this.media.podcastEpisodes.find((pe) => pe.audioFile?.ino === ino)?.audioFile
+    }
+  }
+
+  /**
+   *
+   * @param {string} ino
+   * @returns {LibraryFile}
+   */
+  getLibraryFileWithIno(ino) {
+    const libraryFile = this.libraryFiles.find((lf) => lf.ino === ino)
+    if (!libraryFile) return null
+    return new LibraryFile(libraryFile)
+  }
+
+  getLibraryFiles() {
+    return this.libraryFiles.map((lf) => new LibraryFile(lf))
+  }
+
+  getLibraryFilesJson() {
+    return this.libraryFiles.map((lf) => new LibraryFile(lf).toJSON())
+  }
+
   toOldJSON() {
     if (!this.media) {
       throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
@@ -1184,7 +1220,8 @@ class LibraryItem extends Model {
       isInvalid: !!this.isInvalid,
       mediaType: this.mediaType,
       media: this.media.toOldJSON(this.id),
-      libraryFiles: structuredClone(this.libraryFiles)
+      // LibraryFile JSON includes a fileType property that may not be saved in libraryFiles column in the database
+      libraryFiles: this.getLibraryFilesJson()
     }
   }
 
@@ -1237,7 +1274,8 @@ class LibraryItem extends Model {
       isInvalid: !!this.isInvalid,
       mediaType: this.mediaType,
       media: this.media.toOldJSONExpanded(this.id),
-      libraryFiles: structuredClone(this.libraryFiles),
+      // LibraryFile JSON includes a fileType property that may not be saved in libraryFiles column in the database
+      libraryFiles: this.getLibraryFilesJson(),
       size: this.size
     }
   }
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index 84a37897..4656a028 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -327,20 +327,5 @@ class LibraryItem {
     }
     return false
   }
-
-  /**
-   * Set the EBookFile from a LibraryFile
-   * If null then ebookFile will be removed from the book
-   * all ebook library files that are not primary are marked as supplementary
-   *
-   * @param {LibraryFile} [libraryFile]
-   */
-  setPrimaryEbook(ebookLibraryFile = null) {
-    const ebookLibraryFiles = this.libraryFiles.filter((lf) => lf.isEBookFile)
-    for (const libraryFile of ebookLibraryFiles) {
-      libraryFile.isSupplementary = ebookLibraryFile?.ino !== libraryFile.ino
-    }
-    this.media.setEbookFile(ebookLibraryFile)
-  }
 }
 module.exports = LibraryItem
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
index 8fdff988..4701e422 100644
--- a/server/objects/mediaTypes/Book.js
+++ b/server/objects/mediaTypes/Book.js
@@ -33,8 +33,8 @@ class Book {
     this.metadata = new BookMetadata(book.metadata)
     this.coverPath = book.coverPath
     this.tags = [...book.tags]
-    this.audioFiles = book.audioFiles.map(f => new AudioFile(f))
-    this.chapters = book.chapters.map(c => ({ ...c }))
+    this.audioFiles = book.audioFiles.map((f) => new AudioFile(f))
+    this.chapters = book.chapters.map((c) => ({ ...c }))
     this.ebookFile = book.ebookFile ? new EBookFile(book.ebookFile) : null
     this.lastCoverSearch = book.lastCoverSearch || null
     this.lastCoverSearchQuery = book.lastCoverSearchQuery || null
@@ -47,8 +47,8 @@ class Book {
       metadata: this.metadata.toJSON(),
       coverPath: this.coverPath,
       tags: [...this.tags],
-      audioFiles: this.audioFiles.map(f => f.toJSON()),
-      chapters: this.chapters.map(c => ({ ...c })),
+      audioFiles: this.audioFiles.map((f) => f.toJSON()),
+      chapters: this.chapters.map((c) => ({ ...c })),
       ebookFile: this.ebookFile ? this.ebookFile.toJSON() : null
     }
   }
@@ -75,11 +75,11 @@ class Book {
       metadata: this.metadata.toJSONExpanded(),
       coverPath: this.coverPath,
       tags: [...this.tags],
-      audioFiles: this.audioFiles.map(f => f.toJSON()),
-      chapters: this.chapters.map(c => ({ ...c })),
+      audioFiles: this.audioFiles.map((f) => f.toJSON()),
+      chapters: this.chapters.map((c) => ({ ...c })),
       duration: this.duration,
       size: this.size,
-      tracks: this.tracks.map(t => t.toJSON()),
+      tracks: this.tracks.map((t) => t.toJSON()),
       ebookFile: this.ebookFile?.toJSON() || null
     }
   }
@@ -87,14 +87,14 @@ class Book {
   toJSONForMetadataFile() {
     return {
       tags: [...this.tags],
-      chapters: this.chapters.map(c => ({ ...c })),
+      chapters: this.chapters.map((c) => ({ ...c })),
       ...this.metadata.toJSONForMetadataFile()
     }
   }
 
   get size() {
     var total = 0
-    this.audioFiles.forEach((af) => total += af.metadata.size)
+    this.audioFiles.forEach((af) => (total += af.metadata.size))
     if (this.ebookFile) {
       total += this.ebookFile.metadata.size
     }
@@ -104,7 +104,7 @@ class Book {
     return !!this.tracks.length || this.ebookFile
   }
   get includedAudioFiles() {
-    return this.audioFiles.filter(af => !af.exclude)
+    return this.audioFiles.filter((af) => !af.exclude)
   }
   get tracks() {
     let startOffset = 0
@@ -117,7 +117,7 @@ class Book {
   }
   get duration() {
     let total = 0
-    this.tracks.forEach((track) => total += track.duration)
+    this.tracks.forEach((track) => (total += track.duration))
     return total
   }
   get numTracks() {
@@ -149,30 +149,6 @@ class Book {
     return hasUpdates
   }
 
-  updateChapters(chapters) {
-    var hasUpdates = this.chapters.length !== chapters.length
-    if (hasUpdates) {
-      this.chapters = chapters.map(ch => ({
-        id: ch.id,
-        start: ch.start,
-        end: ch.end,
-        title: ch.title
-      }))
-    } else {
-      for (let i = 0; i < this.chapters.length; i++) {
-        const currChapter = this.chapters[i]
-        const newChapter = chapters[i]
-        if (!hasUpdates && (currChapter.title !== newChapter.title || currChapter.start !== newChapter.start || currChapter.end !== newChapter.end)) {
-          hasUpdates = true
-        }
-        this.chapters[i].title = newChapter.title
-        this.chapters[i].start = newChapter.start
-        this.chapters[i].end = newChapter.end
-      }
-    }
-    return hasUpdates
-  }
-
   updateCover(coverPath) {
     coverPath = filePathToPOSIX(coverPath)
     if (this.coverPath === coverPath) return false
@@ -180,75 +156,6 @@ class Book {
     return true
   }
 
-  removeFileWithInode(inode) {
-    if (this.audioFiles.some(af => af.ino === inode)) {
-      this.audioFiles = this.audioFiles.filter(af => af.ino !== inode)
-      return true
-    }
-    if (this.ebookFile && this.ebookFile.ino === inode) {
-      this.ebookFile = null
-      return true
-    }
-    return false
-  }
-
-  /**
-   * Get audio file or ebook file from inode
-   * @param {string} inode 
-   * @returns {(AudioFile|EBookFile|null)}
-   */
-  findFileWithInode(inode) {
-    const audioFile = this.audioFiles.find(af => af.ino === inode)
-    if (audioFile) return audioFile
-    if (this.ebookFile && this.ebookFile.ino === inode) return this.ebookFile
-    return null
-  }
-
-  /**
-   * Set the EBookFile from a LibraryFile
-   * If null then ebookFile will be removed from the book
-   * 
-   * @param {LibraryFile} [libraryFile] 
-   */
-  setEbookFile(libraryFile = null) {
-    if (!libraryFile) {
-      this.ebookFile = null
-    } else {
-      const ebookFile = new EBookFile()
-      ebookFile.setData(libraryFile)
-      this.ebookFile = ebookFile
-    }
-  }
-
-  addAudioFile(audioFile) {
-    this.audioFiles.push(audioFile)
-  }
-
-  updateAudioTracks(orderedFileData) {
-    let index = 1
-    this.audioFiles = orderedFileData.map((fileData) => {
-      const audioFile = this.audioFiles.find(af => af.ino === fileData.ino)
-      audioFile.manuallyVerified = true
-      audioFile.error = null
-      if (fileData.exclude !== undefined) {
-        audioFile.exclude = !!fileData.exclude
-      }
-      if (audioFile.exclude) {
-        audioFile.index = -1
-      } else {
-        audioFile.index = index++
-      }
-      return audioFile
-    })
-
-    this.rebuildTracks()
-  }
-
-  rebuildTracks() {
-    Logger.debug(`[Book] Tracks being rebuilt...!`)
-    this.audioFiles.sort((a, b) => a.index - b.index)
-  }
-
   // Only checks container format
   checkCanDirectPlay(payload) {
     var supportedMimeTypes = payload.supportedMimeTypes || []
@@ -268,7 +175,7 @@ class Book {
   }
 
   getChapters() {
-    return this.chapters?.map(ch => ({ ...ch })) || []
+    return this.chapters?.map((ch) => ({ ...ch })) || []
   }
 }
 module.exports = Book
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index c7d91d0d..510575ed 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -181,20 +181,6 @@ class Podcast {
     return true
   }
 
-  removeFileWithInode(inode) {
-    const hasEpisode = this.episodes.some((ep) => ep.audioFile.ino === inode)
-    if (hasEpisode) {
-      this.episodes = this.episodes.filter((ep) => ep.audioFile.ino !== inode)
-    }
-    return hasEpisode
-  }
-
-  findFileWithInode(inode) {
-    var episode = this.episodes.find((ep) => ep.audioFile.ino === inode)
-    if (episode) return episode.audioFile
-    return null
-  }
-
   setData(mediaData) {
     this.metadata = new PodcastMetadata()
     if (mediaData.metadata) {
diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js
index 6c808aaa..00bd44d3 100644
--- a/server/scanner/AudioFileScanner.js
+++ b/server/scanner/AudioFileScanner.js
@@ -202,12 +202,12 @@ class AudioFileScanner {
 
   /**
    *
-   * @param {AudioFile} audioFile
+   * @param {string} audioFilePath
    * @returns {object}
    */
-  probeAudioFile(audioFile) {
-    Logger.debug(`[AudioFileScanner] Running ffprobe for audio file at "${audioFile.metadata.path}"`)
-    return prober.rawProbe(audioFile.metadata.path)
+  probeAudioFile(audioFilePath) {
+    Logger.debug(`[AudioFileScanner] Running ffprobe for audio file at "${audioFilePath}"`)
+    return prober.rawProbe(audioFilePath)
   }
 
   /**

From eb853d9f0919735c9c0f23663e9b1b195801480c Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 15:51:21 -0600
Subject: [PATCH 120/143] Fix LibraryItemController unit test

---
 server/controllers/LibraryItemController.js          |  2 +-
 .../server/controllers/LibraryItemController.test.js | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index f1d11c15..b187d2b6 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -1144,7 +1144,7 @@ class LibraryItemController {
    */
   async middleware(req, res, next) {
     req.libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
-    req.oldLibraryItem = await Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    req.oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
     if (!req.libraryItem?.media) return res.sendStatus(404)
 
     // Check user can access this library item
diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index 3fcd1cf8..846dd891 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -82,11 +82,13 @@ describe('LibraryItemController', () => {
     })
 
     it('should remove authors and series with no books on library item delete', async () => {
-      const oldLibraryItem = await Database.libraryItemModel.getOldById(libraryItem1Id)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)
+      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
 
       const fakeReq = {
         query: {},
-        libraryItem: oldLibraryItem
+        libraryItem,
+        oldLibraryItem
       }
       const fakeRes = {
         sendStatus: sinon.spy()
@@ -156,7 +158,8 @@ describe('LibraryItemController', () => {
     })
 
     it('should remove authors and series with no books on library item update media', async () => {
-      const oldLibraryItem = await Database.libraryItemModel.getOldById(libraryItem1Id)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)
+      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
 
       // Update library item 1 remove all authors and series
       const fakeReq = {
@@ -167,7 +170,8 @@ describe('LibraryItemController', () => {
             series: []
           }
         },
-        libraryItem: oldLibraryItem
+        libraryItem,
+        oldLibraryItem
       }
       const fakeRes = {
         json: sinon.spy()

From 5cd14108f93b2c7d1aff8d46fbb9ade0c687ab51 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 15:54:10 -0600
Subject: [PATCH 121/143] Remove req.oldLibraryItem usage

---
 server/controllers/LibraryItemController.js   | 34 ++++++++++---------
 .../controllers/LibraryItemController.test.js |  8 ++---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index b187d2b6..4b9ee894 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -27,7 +27,6 @@ const ShareManager = require('../managers/ShareManager')
  *
  * @typedef RequestEntityObject
  * @property {import('../models/LibraryItem')} libraryItem
- * @property {Object} oldLibraryItem - To be removed
  *
  * @typedef {RequestWithUser & RequestEntityObject} LibraryItemControllerRequest
  *
@@ -97,13 +96,14 @@ class LibraryItemController {
       await CacheManager.purgeCoverCache(req.libraryItem.id)
     }
 
-    const hasUpdates = req.oldLibraryItem.update(req.body)
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    const hasUpdates = oldLibraryItem.update(req.body)
     if (hasUpdates) {
       Logger.debug(`[LibraryItemController] Updated now saving`)
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(oldLibraryItem)
+      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
     }
-    res.json(req.oldLibraryItem.toJSON())
+    res.json(oldLibraryItem.toJSON())
   }
 
   /**
@@ -234,30 +234,32 @@ class LibraryItemController {
       }
     }
 
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+
     // Book specific - Get all series being removed from this item
     let seriesRemoved = []
     if (req.libraryItem.isBook && mediaPayload.metadata?.series) {
       const seriesIdsInUpdate = mediaPayload.metadata.series?.map((se) => se.id) || []
-      seriesRemoved = req.oldLibraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+      seriesRemoved = oldLibraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
     }
 
     let authorsRemoved = []
     if (req.libraryItem.isBook && mediaPayload.metadata?.authors) {
       const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-      authorsRemoved = req.oldLibraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+      authorsRemoved = oldLibraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
     }
 
-    const hasUpdates = req.oldLibraryItem.media.update(mediaPayload) || mediaPayload.url
+    const hasUpdates = oldLibraryItem.media.update(mediaPayload) || mediaPayload.url
     if (hasUpdates) {
-      req.oldLibraryItem.updatedAt = Date.now()
+      oldLibraryItem.updatedAt = Date.now()
 
       if (isPodcastAutoDownloadUpdated) {
-        this.cronManager.checkUpdatePodcastCron(req.oldLibraryItem)
+        this.cronManager.checkUpdatePodcastCron(oldLibraryItem)
       }
 
-      Logger.debug(`[LibraryItemController] Updated library item media ${req.oldLibraryItem.media.metadata.title}`)
-      await Database.updateLibraryItem(req.oldLibraryItem)
-      SocketAuthority.emitter('item_updated', req.oldLibraryItem.toJSONExpanded())
+      Logger.debug(`[LibraryItemController] Updated library item media ${oldLibraryItem.media.metadata.title}`)
+      await Database.updateLibraryItem(oldLibraryItem)
+      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
 
       if (authorsRemoved.length) {
         // Check remove empty authors
@@ -272,7 +274,7 @@ class LibraryItemController {
     }
     res.json({
       updated: hasUpdates,
-      libraryItem: req.oldLibraryItem
+      libraryItem: oldLibraryItem
     })
   }
 
@@ -527,7 +529,8 @@ class LibraryItemController {
       options.overrideDetails = !!reqBody.overrideDetails
     }
 
-    var matchResult = await Scanner.quickMatchLibraryItem(this, req.oldLibraryItem, options)
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    var matchResult = await Scanner.quickMatchLibraryItem(this, oldLibraryItem, options)
     res.json(matchResult)
   }
 
@@ -1144,7 +1147,6 @@ class LibraryItemController {
    */
   async middleware(req, res, next) {
     req.libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
-    req.oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
     if (!req.libraryItem?.media) return res.sendStatus(404)
 
     // Check user can access this library item
diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index 846dd891..fb65cc4b 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -83,12 +83,10 @@ describe('LibraryItemController', () => {
 
     it('should remove authors and series with no books on library item delete', async () => {
       const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
 
       const fakeReq = {
         query: {},
-        libraryItem,
-        oldLibraryItem
+        libraryItem
       }
       const fakeRes = {
         sendStatus: sinon.spy()
@@ -159,7 +157,6 @@ describe('LibraryItemController', () => {
 
     it('should remove authors and series with no books on library item update media', async () => {
       const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
 
       // Update library item 1 remove all authors and series
       const fakeReq = {
@@ -170,8 +167,7 @@ describe('LibraryItemController', () => {
             series: []
           }
         },
-        libraryItem,
-        oldLibraryItem
+        libraryItem
       }
       const fakeRes = {
         json: sinon.spy()

From 12c6f2e9a5b7401d5efd548361ec5d31758981a9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 17:21:07 -0600
Subject: [PATCH 122/143] Update updateMedia endpoint to use new model

---
 server/controllers/LibraryItemController.js |  19 ++--
 server/managers/CronManager.js              |   9 +-
 server/models/Book.js                       | 112 +++++++++++++++++++-
 server/models/Podcast.js                    |  79 +++++++++++++-
 4 files changed, 204 insertions(+), 15 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 4b9ee894..f08a6011 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -234,32 +234,27 @@ class LibraryItemController {
       }
     }
 
-    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
-
     // Book specific - Get all series being removed from this item
     let seriesRemoved = []
     if (req.libraryItem.isBook && mediaPayload.metadata?.series) {
       const seriesIdsInUpdate = mediaPayload.metadata.series?.map((se) => se.id) || []
-      seriesRemoved = oldLibraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+      seriesRemoved = req.libraryItem.media.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
     }
 
     let authorsRemoved = []
     if (req.libraryItem.isBook && mediaPayload.metadata?.authors) {
       const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-      authorsRemoved = oldLibraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+      authorsRemoved = req.libraryItem.media.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
     }
 
-    const hasUpdates = oldLibraryItem.media.update(mediaPayload) || mediaPayload.url
+    const hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
     if (hasUpdates) {
-      oldLibraryItem.updatedAt = Date.now()
-
       if (isPodcastAutoDownloadUpdated) {
-        this.cronManager.checkUpdatePodcastCron(oldLibraryItem)
+        this.cronManager.checkUpdatePodcastCron(req.libraryItem)
       }
 
-      Logger.debug(`[LibraryItemController] Updated library item media ${oldLibraryItem.media.metadata.title}`)
-      await Database.updateLibraryItem(oldLibraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+      Logger.debug(`[LibraryItemController] Updated library item media ${req.libraryItem.media.title}`)
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
 
       if (authorsRemoved.length) {
         // Check remove empty authors
@@ -274,7 +269,7 @@ class LibraryItemController {
     }
     res.json({
       updated: hasUpdates,
-      libraryItem: oldLibraryItem
+      libraryItem: req.libraryItem.toOldJSON()
     })
   }
 
diff --git a/server/managers/CronManager.js b/server/managers/CronManager.js
index 7a8c9bd0..a4dbe6b4 100644
--- a/server/managers/CronManager.js
+++ b/server/managers/CronManager.js
@@ -215,6 +215,10 @@ class CronManager {
     this.podcastCrons = this.podcastCrons.filter((pc) => pc.expression !== podcastCron.expression)
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem - this can be the old model
+   */
   checkUpdatePodcastCron(libraryItem) {
     // Remove from old cron by library item id
     const existingCron = this.podcastCrons.find((pc) => pc.libraryItemIds.includes(libraryItem.id))
@@ -230,7 +234,10 @@ class CronManager {
       const cronMatchingExpression = this.podcastCrons.find((pc) => pc.expression === libraryItem.media.autoDownloadSchedule)
       if (cronMatchingExpression) {
         cronMatchingExpression.libraryItemIds.push(libraryItem.id)
-        Logger.info(`[CronManager] Added podcast "${libraryItem.media.metadata.title}" to auto dl episode cron "${cronMatchingExpression.expression}"`)
+
+        // TODO: Update after old model removed
+        const podcastTitle = libraryItem.media.title || libraryItem.media.metadata?.title
+        Logger.info(`[CronManager] Added podcast "${podcastTitle}" to auto dl episode cron "${cronMatchingExpression.expression}"`)
       } else {
         this.startPodcastCron(libraryItem.media.autoDownloadSchedule, [libraryItem.id])
       }
diff --git a/server/models/Book.js b/server/models/Book.js
index 8f3e1cae..756a9dea 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -1,6 +1,6 @@
 const { DataTypes, Model } = require('sequelize')
 const Logger = require('../Logger')
-const { getTitlePrefixAtEnd } = require('../utils')
+const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils')
 const parseNameString = require('../utils/parsers/parseNameString')
 
 /**
@@ -425,6 +425,116 @@ class Book extends Model {
     }
   }
 
+  /**
+   *
+   * @param {Object} payload - old book object
+   * @returns {Promise<boolean>}
+   */
+  async updateFromRequest(payload) {
+    if (!payload) return false
+
+    let hasUpdates = false
+
+    if (payload.metadata) {
+      const metadataStringKeys = ['title', 'subtitle', 'publishedYear', 'publishedDate', 'publisher', 'description', 'isbn', 'asin', 'language']
+      metadataStringKeys.forEach((key) => {
+        if (typeof payload.metadata[key] === 'string' && this[key] !== payload.metadata[key]) {
+          this[key] = payload.metadata[key] || null
+
+          if (key === 'title') {
+            this.titleIgnorePrefix = getTitleIgnorePrefix(this.title)
+          }
+
+          hasUpdates = true
+        }
+      })
+      if (payload.metadata.explicit !== undefined && this.explicit !== !!payload.metadata.explicit) {
+        this.explicit = !!payload.metadata.explicit
+        hasUpdates = true
+      }
+      if (payload.metadata.abridged !== undefined && this.abridged !== !!payload.metadata.abridged) {
+        this.abridged = !!payload.metadata.abridged
+        hasUpdates = true
+      }
+      const arrayOfStringsKeys = ['narrators', 'genres']
+      arrayOfStringsKeys.forEach((key) => {
+        if (Array.isArray(payload.metadata[key]) && !payload.metadata[key].some((item) => typeof item !== 'string') && JSON.stringify(this[key]) !== JSON.stringify(payload.metadata[key])) {
+          this[key] = payload.metadata[key]
+          this.changed(key, true)
+          hasUpdates = true
+        }
+      })
+    }
+
+    if (Array.isArray(payload.tags) && !payload.tags.some((tag) => typeof tag !== 'string') && JSON.stringify(this.tags) !== JSON.stringify(payload.tags)) {
+      this.tags = payload.tags
+      this.changed('tags', true)
+      hasUpdates = true
+    }
+
+    // TODO: Remove support for updating audioFiles, chapters and ebookFile here
+    const arrayOfObjectsKeys = ['audioFiles', 'chapters']
+    arrayOfObjectsKeys.forEach((key) => {
+      if (Array.isArray(payload[key]) && !payload[key].some((item) => typeof item !== 'object') && JSON.stringify(this[key]) !== JSON.stringify(payload[key])) {
+        this[key] = payload[key]
+        this.changed(key, true)
+        hasUpdates = true
+      }
+    })
+    if (payload.ebookFile && JSON.stringify(this.ebookFile) !== JSON.stringify(payload.ebookFile)) {
+      this.ebookFile = payload.ebookFile
+      this.changed('ebookFile', true)
+      hasUpdates = true
+    }
+
+    if (hasUpdates) {
+      Logger.debug(`[Book] "${this.title}" changed keys:`, this.changed())
+      await this.save()
+    }
+
+    if (Array.isArray(payload.metadata?.authors)) {
+      const authorsRemoved = this.authors.filter((au) => !payload.metadata.authors.some((a) => a.id === au.id))
+      const newAuthors = payload.metadata.authors.filter((a) => !this.authors.some((au) => au.id === a.id))
+
+      for (const author of authorsRemoved) {
+        await this.sequelize.models.bookAuthor.removeByIds(author.id, this.id)
+        Logger.debug(`[Book] "${this.title}" Removed author ${author.id}`)
+        hasUpdates = true
+      }
+      for (const author of newAuthors) {
+        await this.sequelize.models.bookAuthor.create({ bookId: this.id, authorId: author.id })
+        Logger.debug(`[Book] "${this.title}" Added author ${author.id}`)
+        hasUpdates = true
+      }
+    }
+
+    if (Array.isArray(payload.metadata?.series)) {
+      const seriesRemoved = this.series.filter((se) => !payload.metadata.series.some((s) => s.id === se.id))
+      const newSeries = payload.metadata.series.filter((s) => !this.series.some((se) => se.id === s.id))
+
+      for (const series of seriesRemoved) {
+        await this.sequelize.models.bookSeries.removeByIds(series.id, this.id)
+        Logger.debug(`[Book] "${this.title}" Removed series ${series.id}`)
+        hasUpdates = true
+      }
+      for (const series of newSeries) {
+        await this.sequelize.models.bookSeries.create({ bookId: this.id, seriesId: series.id, sequence: series.sequence })
+        Logger.debug(`[Book] "${this.title}" Added series ${series.id}`)
+        hasUpdates = true
+      }
+      for (const series of payload.metadata.series) {
+        const existingSeries = this.series.find((se) => se.id === series.id)
+        if (existingSeries && existingSeries.bookSeries.sequence !== series.sequence) {
+          await existingSeries.bookSeries.update({ sequence: series.sequence })
+          Logger.debug(`[Book] "${this.title}" Updated series ${series.id} sequence ${series.sequence}`)
+          hasUpdates = true
+        }
+      }
+    }
+
+    return hasUpdates
+  }
+
   /**
    * Old model kept metadata in a separate object
    */
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index ec26e091..172e36a2 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -1,5 +1,6 @@
 const { DataTypes, Model } = require('sequelize')
-const { getTitlePrefixAtEnd } = require('../utils')
+const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils')
+const Logger = require('../Logger')
 
 /**
  * @typedef PodcastExpandedProperties
@@ -199,6 +200,82 @@ class Podcast extends Model {
     }
   }
 
+  /**
+   *
+   * @param {Object} payload - Old podcast object
+   * @returns {Promise<boolean>}
+   */
+  async updateFromRequest(payload) {
+    if (!payload) return false
+
+    let hasUpdates = false
+
+    if (payload.metadata) {
+      const stringKeys = ['title', 'author', 'releaseDate', 'feedUrl', 'imageUrl', 'description', 'itunesPageUrl', 'itunesId', 'itunesArtistId', 'language', 'type']
+      stringKeys.forEach((key) => {
+        let newKey = key
+        if (key === 'type') {
+          newKey = 'podcastType'
+        } else if (key === 'feedUrl') {
+          newKey = 'feedURL'
+        } else if (key === 'imageUrl') {
+          newKey = 'imageURL'
+        } else if (key === 'itunesPageUrl') {
+          newKey = 'itunesPageURL'
+        }
+        if (typeof payload.metadata[key] === 'string' && payload.metadata[key] !== this[newKey]) {
+          this[newKey] = payload.metadata[key]
+          if (key === 'title') {
+            this.titleIgnorePrefix = getTitleIgnorePrefix(this.title)
+          }
+
+          hasUpdates = true
+        }
+      })
+
+      if (payload.metadata.explicit !== undefined && payload.metadata.explicit !== this.explicit) {
+        this.explicit = !!payload.metadata.explicit
+        hasUpdates = true
+      }
+
+      if (Array.isArray(payload.metadata.genres) && !payload.metadata.genres.some((item) => typeof item !== 'string') && JSON.stringify(this.genres) !== JSON.stringify(payload.metadata.genres)) {
+        this.genres = payload.metadata.genres
+        this.changed('genres', true)
+        hasUpdates = true
+      }
+    }
+
+    if (Array.isArray(payload.tags) && !payload.tags.some((item) => typeof item !== 'string') && JSON.stringify(this.tags) !== JSON.stringify(payload.tags)) {
+      this.tags = payload.tags
+      this.changed('tags', true)
+      hasUpdates = true
+    }
+
+    if (payload.autoDownloadEpisodes !== undefined && payload.autoDownloadEpisodes !== this.autoDownloadEpisodes) {
+      this.autoDownloadEpisodes = !!payload.autoDownloadEpisodes
+      hasUpdates = true
+    }
+    if (typeof payload.autoDownloadSchedule === 'string' && payload.autoDownloadSchedule !== this.autoDownloadSchedule) {
+      this.autoDownloadSchedule = payload.autoDownloadSchedule
+      hasUpdates = true
+    }
+
+    const numberKeys = ['maxEpisodesToKeep', 'maxNewEpisodesToDownload']
+    numberKeys.forEach((key) => {
+      if (typeof payload[key] === 'number' && payload[key] !== this[key]) {
+        this[key] = payload[key]
+        hasUpdates = true
+      }
+    })
+
+    if (hasUpdates) {
+      Logger.debug(`[Podcast] changed keys:`, this.changed())
+      await this.save()
+    }
+
+    return hasUpdates
+  }
+
   /**
    * Old model kept metadata in a separate object
    */

From 5e8678f1ccfcbb29eb57da95bd3756b9aedda7c0 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 2 Jan 2025 17:25:10 -0600
Subject: [PATCH 123/143] Remove unused

---
 server/objects/LibraryItem.js        | 3 ---
 server/objects/mediaTypes/Book.js    | 5 -----
 server/objects/mediaTypes/Podcast.js | 3 ---
 3 files changed, 11 deletions(-)

diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index 4656a028..6578bae0 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -177,9 +177,6 @@ class LibraryItem {
   get hasAudioFiles() {
     return this.libraryFiles.some((lf) => lf.fileType === 'audio')
   }
-  get hasMediaEntities() {
-    return this.media.hasMediaEntities
-  }
 
   // Data comes from scandir library item data
   // TODO: Remove this function. Only used when creating a new podcast now
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
index 4701e422..5d455018 100644
--- a/server/objects/mediaTypes/Book.js
+++ b/server/objects/mediaTypes/Book.js
@@ -100,9 +100,6 @@ class Book {
     }
     return total
   }
-  get hasMediaEntities() {
-    return !!this.tracks.length || this.ebookFile
-  }
   get includedAudioFiles() {
     return this.audioFiles.filter((af) => !af.exclude)
   }
@@ -129,8 +126,6 @@ class Book {
 
   update(payload) {
     const json = this.toJSON()
-    delete json.audiobooks // do not update media entities here
-    delete json.ebooks
 
     let hasUpdates = false
     for (const key in json) {
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index 510575ed..d33b28ba 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -124,9 +124,6 @@ class Podcast {
     this.episodes.forEach((ep) => (total += ep.size))
     return total
   }
-  get hasMediaEntities() {
-    return !!this.episodes.length
-  }
   get duration() {
     let total = 0
     this.episodes.forEach((ep) => (total += ep.duration))

From a6fd0c95b2a83703e12b079c65f9399d139b3aea Mon Sep 17 00:00:00 2001
From: Nicholas Wallace <nicholaslwallace@gmail.com>
Date: Thu, 2 Jan 2025 20:07:21 -0700
Subject: [PATCH 124/143] API cache manager case-insensitive match

---
 server/routers/ApiRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 235d25cd..a4239745 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -65,7 +65,7 @@ class ApiRouter {
     //
     // Library Routes
     //
-    this.router.get(/^\/libraries/, this.apiCacheManager.middleware)
+    this.router.get(/^\/libraries/i, this.apiCacheManager.middleware)
     this.router.post('/libraries', LibraryController.create.bind(this))
     this.router.get('/libraries', LibraryController.findAll.bind(this))
     this.router.get('/libraries/:id', LibraryController.middleware.bind(this), LibraryController.findOne.bind(this))

From f70f21455f773e54494650a07688117febbc134a Mon Sep 17 00:00:00 2001
From: Nicholas Wallace <nicholaslwallace@gmail.com>
Date: Thu, 2 Jan 2025 20:13:38 -0700
Subject: [PATCH 125/143] Req URL is lowercase in ApiCacheManager

---
 server/managers/ApiCacheManager.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/managers/ApiCacheManager.js b/server/managers/ApiCacheManager.js
index 35009447..81b58c99 100644
--- a/server/managers/ApiCacheManager.js
+++ b/server/managers/ApiCacheManager.js
@@ -42,6 +42,8 @@ class ApiCacheManager {
         Logger.debug(`[ApiCacheManager] Skipping cache for random sort`)
         return next()
       }
+      // Force URL to be lower case for matching against routes
+      req.url = req.url.toLowerCase()
       const key = { user: req.user.username, url: req.url }
       const stringifiedKey = JSON.stringify(key)
       Logger.debug(`[ApiCacheManager] count: ${this.cache.size} size: ${this.cache.calculatedSize}`)

From c251f1899d536f762412760047c0b0a50790bdcb Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Jan 2025 11:16:03 -0600
Subject: [PATCH 126/143] Update PlaybackSession to use new library item model

---
 server/controllers/SessionController.js   |  2 +-
 server/controllers/ShareController.js     | 13 ++--
 server/managers/PlaybackSessionManager.js | 10 +--
 server/models/Book.js                     | 74 +++++++++++++++++++----
 server/models/FeedEpisode.js              | 24 ++++----
 server/models/LibraryItem.js              | 67 ++++++++++++++++++++
 server/models/MediaItemShare.js           | 46 +++++---------
 server/models/Podcast.js                  | 72 ++++++++++++++++++++++
 server/models/PodcastEpisode.js           | 25 +++++---
 server/objects/LibraryItem.js             |  4 --
 server/objects/PlaybackSession.js         | 41 +++++--------
 server/objects/Stream.js                  | 29 ++++-----
 server/objects/entities/PodcastEpisode.js | 10 ---
 server/objects/mediaTypes/Book.js         | 22 -------
 server/objects/mediaTypes/Podcast.js      | 33 ----------
 server/objects/metadata/BookMetadata.js   |  5 --
 16 files changed, 284 insertions(+), 193 deletions(-)

diff --git a/server/controllers/SessionController.js b/server/controllers/SessionController.js
index cc6c0fd7..c3361ce9 100644
--- a/server/controllers/SessionController.js
+++ b/server/controllers/SessionController.js
@@ -149,7 +149,7 @@ class SessionController {
    * @param {Response} res
    */
   async getOpenSession(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.playbackSession.libraryItemId)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(req.playbackSession.libraryItemId)
     const sessionForClient = req.playbackSession.toJSONForClient(libraryItem)
     res.json(sessionForClient)
   }
diff --git a/server/controllers/ShareController.js b/server/controllers/ShareController.js
index 93c6e9fb..3e7ea1de 100644
--- a/server/controllers/ShareController.js
+++ b/server/controllers/ShareController.js
@@ -70,14 +70,13 @@ class ShareController {
     }
 
     try {
-      const oldLibraryItem = await Database.mediaItemShareModel.getMediaItemsOldLibraryItem(mediaItemShare.mediaItemId, mediaItemShare.mediaItemType)
-
-      if (!oldLibraryItem) {
+      const libraryItem = await Database.mediaItemShareModel.getMediaItemsLibraryItem(mediaItemShare.mediaItemId, mediaItemShare.mediaItemType)
+      if (!libraryItem) {
         return res.status(404).send('Media item not found')
       }
 
       let startOffset = 0
-      const publicTracks = oldLibraryItem.media.includedAudioFiles.map((audioFile) => {
+      const publicTracks = libraryItem.media.includedAudioFiles.map((audioFile) => {
         const audioTrack = {
           index: audioFile.index,
           startOffset,
@@ -86,7 +85,7 @@ class ShareController {
           contentUrl: `${global.RouterBasePath}/public/share/${slug}/track/${audioFile.index}`,
           mimeType: audioFile.mimeType,
           codec: audioFile.codec || null,
-          metadata: audioFile.metadata.clone()
+          metadata: structuredClone(audioFile.metadata)
         }
         startOffset += audioTrack.duration
         return audioTrack
@@ -105,12 +104,12 @@ class ShareController {
       const deviceInfo = await this.playbackSessionManager.getDeviceInfo(req, clientDeviceInfo)
 
       const newPlaybackSession = new PlaybackSession()
-      newPlaybackSession.setData(oldLibraryItem, null, 'web-share', deviceInfo, startTime)
+      newPlaybackSession.setData(libraryItem, null, 'web-share', deviceInfo, startTime)
       newPlaybackSession.audioTracks = publicTracks
       newPlaybackSession.playMethod = PlayMethod.DIRECTPLAY
       newPlaybackSession.shareSessionId = shareSessionId
       newPlaybackSession.mediaItemShareId = mediaItemShare.id
-      newPlaybackSession.coverAspectRatio = oldLibraryItem.librarySettings.coverAspectRatio
+      newPlaybackSession.coverAspectRatio = libraryItem.library.settings.coverAspectRatio
 
       mediaItemShare.playbackSession = newPlaybackSession.toJSONForClient()
       ShareManager.addOpenSharePlaybackSession(newPlaybackSession)
diff --git a/server/managers/PlaybackSessionManager.js b/server/managers/PlaybackSessionManager.js
index aace3df7..97c87bbe 100644
--- a/server/managers/PlaybackSessionManager.js
+++ b/server/managers/PlaybackSessionManager.js
@@ -74,7 +74,7 @@ class PlaybackSessionManager {
   async startSessionRequest(req, res, episodeId) {
     const deviceInfo = await this.getDeviceInfo(req, req.body?.deviceInfo)
     Logger.debug(`[PlaybackSessionManager] startSessionRequest for device ${deviceInfo.deviceDescription}`)
-    const { oldLibraryItem: libraryItem, body: options } = req
+    const { libraryItem, body: options } = req
     const session = await this.startSession(req.user, deviceInfo, libraryItem, episodeId, options)
     res.json(session.toJSONForClient(libraryItem))
   }
@@ -279,7 +279,7 @@ class PlaybackSessionManager {
    *
    * @param {import('../models/User')} user
    * @param {DeviceInfo} deviceInfo
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {string|null} episodeId
    * @param {{forceDirectPlay?:boolean, forceTranscode?:boolean, mediaPlayer:string, supportedMimeTypes?:string[]}} options
    * @returns {Promise<PlaybackSession>}
@@ -292,7 +292,7 @@ class PlaybackSessionManager {
       await this.closeSession(user, session, null)
     }
 
-    const shouldDirectPlay = options.forceDirectPlay || (!options.forceTranscode && libraryItem.media.checkCanDirectPlay(options, episodeId))
+    const shouldDirectPlay = options.forceDirectPlay || (!options.forceTranscode && libraryItem.media.checkCanDirectPlay(options.supportedMimeTypes, episodeId))
     const mediaPlayer = options.mediaPlayer || 'unknown'
 
     const mediaItemId = episodeId || libraryItem.media.id
@@ -300,7 +300,7 @@ class PlaybackSessionManager {
     let userStartTime = 0
     if (userProgress) {
       if (userProgress.isFinished) {
-        Logger.info(`[PlaybackSessionManager] Starting session for user "${user.username}" and resetting progress for finished item "${libraryItem.media.metadata.title}"`)
+        Logger.info(`[PlaybackSessionManager] Starting session for user "${user.username}" and resetting progress for finished item "${libraryItem.media.title}"`)
         // Keep userStartTime as 0 so the client restarts the media
       } else {
         userStartTime = Number.parseFloat(userProgress.currentTime) || 0
@@ -312,7 +312,7 @@ class PlaybackSessionManager {
     let audioTracks = []
     if (shouldDirectPlay) {
       Logger.debug(`[PlaybackSessionManager] "${user.username}" starting direct play session for item "${libraryItem.id}" with id ${newPlaybackSession.id} (Device: ${newPlaybackSession.deviceDescription})`)
-      audioTracks = libraryItem.getDirectPlayTracklist(episodeId)
+      audioTracks = libraryItem.getTrackList(episodeId)
       newPlaybackSession.playMethod = PlayMethod.DIRECTPLAY
     } else {
       Logger.debug(`[PlaybackSessionManager] "${user.username}" starting stream session for item "${libraryItem.id}" (Device: ${newPlaybackSession.deviceDescription})`)
diff --git a/server/models/Book.js b/server/models/Book.js
index 756a9dea..4c2006a1 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -62,6 +62,13 @@ const parseNameString = require('../utils/parsers/parseNameString')
  * @property {ChapterObject[]} chapters
  * @property {Object} metaTags
  * @property {string} mimeType
+ *
+ * @typedef AudioTrackProperties
+ * @property {string} title
+ * @property {string} contentUrl
+ * @property {number} startOffset
+ *
+ * @typedef {AudioFileObject & AudioTrackProperties} AudioTrack
  */
 
 class Book extends Model {
@@ -367,16 +374,6 @@ class Book extends Model {
     return this.audioFiles.filter((af) => !af.exclude)
   }
 
-  get trackList() {
-    let startOffset = 0
-    return this.includedAudioFiles.map((af) => {
-      const track = structuredClone(af)
-      track.startOffset = startOffset
-      startOffset += track.duration
-      return track
-    })
-  }
-
   get hasMediaFiles() {
     return !!this.hasAudioTracks || !!this.ebookFile
   }
@@ -385,6 +382,59 @@ class Book extends Model {
     return !!this.includedAudioFiles.length
   }
 
+  /**
+   * Supported mime types are sent from the web client and are retrieved using the browser Audio player "canPlayType" function.
+   *
+   * @param {string[]} supportedMimeTypes
+   * @returns {boolean}
+   */
+  checkCanDirectPlay(supportedMimeTypes) {
+    if (!Array.isArray(supportedMimeTypes)) {
+      Logger.error(`[Book] checkCanDirectPlay: supportedMimeTypes is not an array`, supportedMimeTypes)
+      return false
+    }
+    return this.includedAudioFiles.every((af) => supportedMimeTypes.includes(af.mimeType))
+  }
+
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset, contentUrl and title
+   *
+   * @param {string} libraryItemId
+   * @returns {AudioTrack[]}
+   */
+  getTracklist(libraryItemId) {
+    let startOffset = 0
+    return this.includedAudioFiles.map((af) => {
+      const track = structuredClone(af)
+      track.title = af.metadata.filename
+      track.startOffset = startOffset
+      track.contentUrl = `${global.RouterBasePath}/api/items/${libraryItemId}/file/${track.ino}`
+      startOffset += track.duration
+      return track
+    })
+  }
+
+  /**
+   *
+   * @returns {ChapterObject[]}
+   */
+  getChapters() {
+    return structuredClone(this.chapters) || []
+  }
+
+  getPlaybackTitle() {
+    return this.title
+  }
+
+  getPlaybackAuthor() {
+    return this.authorName
+  }
+
+  getPlaybackDuration() {
+    return this.duration
+  }
+
   /**
    * Total file size of all audio files and ebook file
    *
@@ -635,7 +685,7 @@ class Book extends Model {
       metadata: this.oldMetadataToJSONMinified(),
       coverPath: this.coverPath,
       tags: [...(this.tags || [])],
-      numTracks: this.trackList.length,
+      numTracks: this.includedAudioFiles.length,
       numAudioFiles: this.audioFiles?.length || 0,
       numChapters: this.chapters?.length || 0,
       duration: this.duration,
@@ -666,7 +716,7 @@ class Book extends Model {
       ebookFile: structuredClone(this.ebookFile),
       duration: this.duration,
       size: this.size,
-      tracks: structuredClone(this.trackList)
+      tracks: this.getTracklist(libraryItemId)
     }
   }
 }
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 5825dd4e..0767577a 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -112,15 +112,15 @@ class FeedEpisode extends Model {
   /**
    * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
    *
+   * @param {import('./Book').AudioTrack[]} trackList
    * @param {import('./Book')} book
    * @returns {boolean}
    */
-  static checkUseChapterTitlesForEpisodes(book) {
-    const tracks = book.trackList || []
+  static checkUseChapterTitlesForEpisodes(trackList, book) {
     const chapters = book.chapters || []
-    if (tracks.length !== chapters.length) return false
-    for (let i = 0; i < tracks.length; i++) {
-      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
+    if (trackList.length !== chapters.length) return false
+    for (let i = 0; i < trackList.length; i++) {
+      if (Math.abs(chapters[i].start - trackList[i].startOffset) >= 1) {
         return false
       }
     }
@@ -148,7 +148,7 @@ class FeedEpisode extends Model {
     const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`
 
     let title = Path.basename(audioTrack.metadata.filename, Path.extname(audioTrack.metadata.filename))
-    if (book.trackList.length == 1) {
+    if (book.includedAudioFiles.length == 1) {
       // If audiobook is a single file, use book title instead of chapter/file title
       title = book.title
     } else {
@@ -185,11 +185,12 @@ class FeedEpisode extends Model {
    * @returns {Promise<FeedEpisode[]>}
    */
   static async createFromAudiobookTracks(libraryItemExpanded, feed, slug, transaction) {
-    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
+    const trackList = libraryItemExpanded.getTrackList()
+    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(trackList, libraryItemExpanded.media)
 
     const feedEpisodeObjs = []
     let numExisting = 0
-    for (const track of libraryItemExpanded.media.trackList) {
+    for (const track of trackList) {
       // Check for existing episode by filepath
       const existingEpisode = feed.feedEpisodes?.find((episode) => {
         return episode.filePath === track.metadata.path
@@ -204,7 +205,7 @@ class FeedEpisode extends Model {
 
   /**
    *
-   * @param {import('./Book')[]} books
+   * @param {import('./Book').BookExpandedWithLibraryItem[]} books
    * @param {import('./Feed')} feed
    * @param {string} slug
    * @param {import('sequelize').Transaction} transaction
@@ -218,8 +219,9 @@ class FeedEpisode extends Model {
     const feedEpisodeObjs = []
     let numExisting = 0
     for (const book of books) {
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
-      for (const track of book.trackList) {
+      const trackList = book.libraryItem.getTrackList()
+      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(trackList, book)
+      for (const track of trackList) {
         // Check for existing episode by filepath
         const existingEpisode = feed.feedEpisodes?.find((episode) => {
           return episode.filePath === track.metadata.path
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 03e67a9e..3381b94a 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -497,6 +497,57 @@ class LibraryItem extends Model {
     return libraryItem
   }
 
+  /**
+   *
+   * @param {import('sequelize').WhereOptions} where
+   * @param {import('sequelize').IncludeOptions} [include]
+   * @returns {Promise<LibraryItemExpanded>}
+   */
+  static async findOneExpanded(where, include = null) {
+    const libraryItem = await this.findOne({
+      where,
+      include
+    })
+    if (!libraryItem) {
+      Logger.error(`[LibraryItem] Library item not found`)
+      return null
+    }
+
+    if (libraryItem.mediaType === 'podcast') {
+      libraryItem.media = await libraryItem.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.podcastEpisode
+          }
+        ]
+      })
+    } else {
+      libraryItem.media = await libraryItem.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.author,
+            through: {
+              attributes: []
+            }
+          },
+          {
+            model: this.sequelize.models.series,
+            through: {
+              attributes: ['id', 'sequence']
+            }
+          }
+        ],
+        order: [
+          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+        ]
+      })
+    }
+
+    if (!libraryItem.media) return null
+    return libraryItem
+  }
+
   /**
    * Get old library item by id
    * @param {string} libraryItemId
@@ -1176,6 +1227,22 @@ class LibraryItem extends Model {
     }
   }
 
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset and contentUrl
+   * Podcasts must have an episodeId to get the track list
+   *
+   * @param {string} [episodeId]
+   * @returns {import('./Book').AudioTrack[]}
+   */
+  getTrackList(episodeId) {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] getTrackList: Library item "${this.id}" does not have media`)
+      return []
+    }
+    return this.media.getTracklist(this.id, episodeId)
+  }
+
   /**
    *
    * @param {string} ino
diff --git a/server/models/MediaItemShare.js b/server/models/MediaItemShare.js
index 2d7b3896..2d5be8f6 100644
--- a/server/models/MediaItemShare.js
+++ b/server/models/MediaItemShare.js
@@ -76,42 +76,26 @@ class MediaItemShare extends Model {
   }
 
   /**
+   * Expanded book that includes library settings
    *
    * @param {string} mediaItemId
    * @param {string} mediaItemType
-   * @returns {Promise<import('../objects/LibraryItem')>}
+   * @returns {Promise<import('./LibraryItem').LibraryItemExpanded>}
    */
-  static async getMediaItemsOldLibraryItem(mediaItemId, mediaItemType) {
+  static async getMediaItemsLibraryItem(mediaItemId, mediaItemType) {
+    /** @type {typeof import('./LibraryItem')} */
+    const libraryItemModel = this.sequelize.models.libraryItem
+
     if (mediaItemType === 'book') {
-      const book = await this.sequelize.models.book.findByPk(mediaItemId, {
-        include: [
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          },
-          {
-            model: this.sequelize.models.libraryItem,
-            include: {
-              model: this.sequelize.models.library,
-              attributes: ['settings']
-            }
-          }
-        ]
-      })
-      const libraryItem = book.libraryItem
-      libraryItem.media = book
-      delete book.libraryItem
-      const oldLibraryItem = this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem)
-      oldLibraryItem.librarySettings = libraryItem.library.settings
-      return oldLibraryItem
+      const libraryItem = await libraryItemModel.findOneExpanded(
+        { mediaId: mediaItemId },
+        {
+          model: this.sequelize.models.library,
+          attributes: ['settings']
+        }
+      )
+
+      return libraryItem
     }
     return null
   }
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index 172e36a2..188c1070 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -276,6 +276,78 @@ class Podcast extends Model {
     return hasUpdates
   }
 
+  checkCanDirectPlay(supportedMimeTypes, episodeId) {
+    if (!Array.isArray(supportedMimeTypes)) {
+      Logger.error(`[Podcast] checkCanDirectPlay: supportedMimeTypes is not an array`, supportedMimeTypes)
+      return false
+    }
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] checkCanDirectPlay: episode not found`, episodeId)
+      return false
+    }
+    return supportedMimeTypes.includes(episode.audioFile.mimeType)
+  }
+
+  /**
+   * Get the track list to be used in client audio players
+   * AudioTrack is the AudioFile with startOffset and contentUrl
+   * Podcast episodes only have one track
+   *
+   * @param {string} libraryItemId
+   * @param {string} episodeId
+   * @returns {import('./Book').AudioTrack[]}
+   */
+  getTracklist(libraryItemId, episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getTracklist: episode not found`, episodeId)
+      return []
+    }
+
+    const audioTrack = episode.getAudioTrack(libraryItemId)
+    return [audioTrack]
+  }
+
+  /**
+   *
+   * @param {string} episodeId
+   * @returns {import('./PodcastEpisode').ChapterObject[]}
+   */
+  getChapters(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getChapters: episode not found`, episodeId)
+      return []
+    }
+
+    return structuredClone(episode.chapters) || []
+  }
+
+  getPlaybackTitle(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getPlaybackTitle: episode not found`, episodeId)
+      return ''
+    }
+
+    return episode.title
+  }
+
+  getPlaybackAuthor() {
+    return this.author
+  }
+
+  getPlaybackDuration(episodeId) {
+    const episode = this.podcastEpisodes.find((ep) => ep.id === episodeId)
+    if (!episode) {
+      Logger.error(`[Podcast] getPlaybackDuration: episode not found`, episodeId)
+      return 0
+    }
+
+    return episode.duration
+  }
+
   /**
    * Old model kept metadata in a separate object
    */
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 23d237e0..24d07041 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -135,23 +135,28 @@ class PodcastEpisode extends Model {
     PodcastEpisode.belongsTo(podcast)
   }
 
+  get size() {
+    return this.audioFile?.metadata.size || 0
+  }
+
+  get duration() {
+    return this.audioFile?.duration || 0
+  }
+
   /**
-   * AudioTrack object used in old model
+   * Used in client players
    *
-   * @returns {import('./Book').AudioFileObject|null}
+   * @param {string} libraryItemId
+   * @returns {import('./Book').AudioTrack}
    */
-  get track() {
-    if (!this.audioFile) return null
+  getAudioTrack(libraryItemId) {
     const track = structuredClone(this.audioFile)
     track.startOffset = 0
     track.title = this.audioFile.metadata.title
+    track.contentUrl = `${global.RouterBasePath}/api/items/${libraryItemId}/file/${track.ino}`
     return track
   }
 
-  get size() {
-    return this.audioFile?.metadata.size || 0
-  }
-
   /**
    * @param {string} libraryItemId
    * @returns {oldPodcastEpisode}
@@ -228,9 +233,9 @@ class PodcastEpisode extends Model {
   toOldJSONExpanded(libraryItemId) {
     const json = this.toOldJSON(libraryItemId)
 
-    json.audioTrack = this.track
+    json.audioTrack = this.getAudioTrack(libraryItemId)
     json.size = this.size
-    json.duration = this.audioFile?.duration || 0
+    json.duration = this.duration
 
     return json
   }
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index 6578bae0..b1cdf43b 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -249,10 +249,6 @@ class LibraryItem {
     this.updatedAt = Date.now()
   }
 
-  getDirectPlayTracklist(episodeId) {
-    return this.media.getDirectPlayTracklist(episodeId)
-  }
-
   /**
    * Save metadata.json file
    * TODO: Move to new LibraryItem model
diff --git a/server/objects/PlaybackSession.js b/server/objects/PlaybackSession.js
index 6950a544..ba031b66 100644
--- a/server/objects/PlaybackSession.js
+++ b/server/objects/PlaybackSession.js
@@ -1,8 +1,6 @@
 const date = require('../libs/dateAndTime')
 const uuidv4 = require('uuid').v4
 const serverVersion = require('../../package.json').version
-const BookMetadata = require('./metadata/BookMetadata')
-const PodcastMetadata = require('./metadata/PodcastMetadata')
 const DeviceInfo = require('./DeviceInfo')
 
 class PlaybackSession {
@@ -60,7 +58,7 @@ class PlaybackSession {
       bookId: this.bookId,
       episodeId: this.episodeId,
       mediaType: this.mediaType,
-      mediaMetadata: this.mediaMetadata?.toJSON() || null,
+      mediaMetadata: structuredClone(this.mediaMetadata),
       chapters: (this.chapters || []).map((c) => ({ ...c })),
       displayTitle: this.displayTitle,
       displayAuthor: this.displayAuthor,
@@ -82,7 +80,7 @@ class PlaybackSession {
 
   /**
    * Session data to send to clients
-   * @param {Object} [libraryItem] - old library item
+   * @param {import('../models/LibraryItem')} [libraryItem]
    * @returns
    */
   toJSONForClient(libraryItem) {
@@ -94,7 +92,7 @@ class PlaybackSession {
       bookId: this.bookId,
       episodeId: this.episodeId,
       mediaType: this.mediaType,
-      mediaMetadata: this.mediaMetadata?.toJSON() || null,
+      mediaMetadata: structuredClone(this.mediaMetadata),
       chapters: (this.chapters || []).map((c) => ({ ...c })),
       displayTitle: this.displayTitle,
       displayAuthor: this.displayAuthor,
@@ -112,7 +110,7 @@ class PlaybackSession {
       startedAt: this.startedAt,
       updatedAt: this.updatedAt,
       audioTracks: this.audioTracks.map((at) => at.toJSON?.() || { ...at }),
-      libraryItem: libraryItem?.toJSONExpanded() || null
+      libraryItem: libraryItem?.toOldJSONExpanded() || null
     }
   }
 
@@ -148,14 +146,7 @@ class PlaybackSession {
     this.serverVersion = session.serverVersion
     this.chapters = session.chapters || []
 
-    this.mediaMetadata = null
-    if (session.mediaMetadata) {
-      if (this.mediaType === 'book') {
-        this.mediaMetadata = new BookMetadata(session.mediaMetadata)
-      } else if (this.mediaType === 'podcast') {
-        this.mediaMetadata = new PodcastMetadata(session.mediaMetadata)
-      }
-    }
+    this.mediaMetadata = session.mediaMetadata
     this.displayTitle = session.displayTitle || ''
     this.displayAuthor = session.displayAuthor || ''
     this.coverPath = session.coverPath
@@ -205,6 +196,15 @@ class PlaybackSession {
     }
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} userId
+   * @param {*} mediaPlayer
+   * @param {*} deviceInfo
+   * @param {*} startTime
+   * @param {*} episodeId
+   */
   setData(libraryItem, userId, mediaPlayer, deviceInfo, startTime, episodeId = null) {
     this.id = uuidv4()
     this.userId = userId
@@ -213,13 +213,12 @@ class PlaybackSession {
     this.bookId = episodeId ? null : libraryItem.media.id
     this.episodeId = episodeId
     this.mediaType = libraryItem.mediaType
-    this.mediaMetadata = libraryItem.media.metadata.clone()
+    this.mediaMetadata = libraryItem.media.oldMetadataToJSON()
     this.chapters = libraryItem.media.getChapters(episodeId)
     this.displayTitle = libraryItem.media.getPlaybackTitle(episodeId)
     this.displayAuthor = libraryItem.media.getPlaybackAuthor()
     this.coverPath = libraryItem.media.coverPath
-
-    this.setDuration(libraryItem, episodeId)
+    this.duration = libraryItem.media.getPlaybackDuration(episodeId)
 
     this.mediaPlayer = mediaPlayer
     this.deviceInfo = deviceInfo || new DeviceInfo()
@@ -235,14 +234,6 @@ class PlaybackSession {
     this.updatedAt = Date.now()
   }
 
-  setDuration(libraryItem, episodeId) {
-    if (episodeId) {
-      this.duration = libraryItem.media.getEpisodeDuration(episodeId)
-    } else {
-      this.duration = libraryItem.media.duration
-    }
-  }
-
   addListeningTime(timeListened) {
     if (!timeListened || isNaN(timeListened)) return
 
diff --git a/server/objects/Stream.js b/server/objects/Stream.js
index 2ab6f503..5f4feeef 100644
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@@ -18,6 +18,7 @@ class Stream extends EventEmitter {
 
     this.id = sessionId
     this.user = user
+    /** @type {import('../models/LibraryItem')} */
     this.libraryItem = libraryItem
     this.episodeId = episodeId
 
@@ -40,31 +41,25 @@ class Stream extends EventEmitter {
     this.furthestSegmentCreated = 0
   }
 
-  get isPodcast() {
-    return this.libraryItem.mediaType === 'podcast'
-  }
+  /**
+   * @returns {import('../models/PodcastEpisode') | null}
+   */
   get episode() {
-    if (!this.isPodcast) return null
-    return this.libraryItem.media.episodes.find((ep) => ep.id === this.episodeId)
-  }
-  get libraryItemId() {
-    return this.libraryItem.id
+    if (!this.libraryItem.isPodcast) return null
+    return this.libraryItem.media.podcastEpisodes.find((ep) => ep.id === this.episodeId)
   }
   get mediaTitle() {
-    if (this.episode) return this.episode.title || ''
-    return this.libraryItem.media.metadata.title || ''
+    return this.libraryItem.media.getPlaybackTitle(this.episodeId)
   }
   get totalDuration() {
-    if (this.episode) return this.episode.duration
-    return this.libraryItem.media.duration
+    return this.libraryItem.media.getPlaybackDuration(this.episodeId)
   }
   get tracks() {
-    if (this.episode) return this.episode.tracks
-    return this.libraryItem.media.tracks
+    return this.libraryItem.getTrackList(this.episodeId)
   }
   get tracksAudioFileType() {
     if (!this.tracks.length) return null
-    return this.tracks[0].metadata.format
+    return this.tracks[0].metadata.ext.slice(1)
   }
   get tracksMimeType() {
     if (!this.tracks.length) return null
@@ -116,8 +111,8 @@ class Stream extends EventEmitter {
     return {
       id: this.id,
       userId: this.user.id,
-      libraryItem: this.libraryItem.toJSONExpanded(),
-      episode: this.episode ? this.episode.toJSONExpanded() : null,
+      libraryItem: this.libraryItem.toOldJSONExpanded(),
+      episode: this.episode ? this.episode.toOldJSONExpanded(this.libraryItem.id) : null,
       segmentLength: this.segmentLength,
       playlistPath: this.playlistPath,
       clientPlaylistUri: this.clientPlaylistUri,
diff --git a/server/objects/entities/PodcastEpisode.js b/server/objects/entities/PodcastEpisode.js
index 69a9b2f0..945e0e56 100644
--- a/server/objects/entities/PodcastEpisode.js
+++ b/server/objects/entities/PodcastEpisode.js
@@ -168,16 +168,6 @@ class PodcastEpisode {
     return hasUpdates
   }
 
-  // Only checks container format
-  checkCanDirectPlay(payload) {
-    const supportedMimeTypes = payload.supportedMimeTypes || []
-    return supportedMimeTypes.includes(this.audioFile.mimeType)
-  }
-
-  getDirectPlayTracklist() {
-    return this.tracks
-  }
-
   checkEqualsEnclosureUrl(url) {
     if (!this.enclosure?.url) return false
     return this.enclosure.url == url
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
index 5d455018..488c3aac 100644
--- a/server/objects/mediaTypes/Book.js
+++ b/server/objects/mediaTypes/Book.js
@@ -150,27 +150,5 @@ class Book {
     this.coverPath = coverPath
     return true
   }
-
-  // Only checks container format
-  checkCanDirectPlay(payload) {
-    var supportedMimeTypes = payload.supportedMimeTypes || []
-    return !this.tracks.some((t) => !supportedMimeTypes.includes(t.mimeType))
-  }
-
-  getDirectPlayTracklist() {
-    return this.tracks
-  }
-
-  getPlaybackTitle() {
-    return this.metadata.title
-  }
-
-  getPlaybackAuthor() {
-    return this.metadata.authorName
-  }
-
-  getChapters() {
-    return this.chapters?.map((ch) => ({ ...ch })) || []
-  }
 }
 module.exports = Book
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index d33b28ba..2a009eb2 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -199,19 +199,6 @@ class Podcast {
     return this.episodes.some((ep) => (ep.guid && ep.guid === guid) || ep.checkEqualsEnclosureUrl(url))
   }
 
-  // Only checks container format
-  checkCanDirectPlay(payload, episodeId) {
-    var episode = this.episodes.find((ep) => ep.id === episodeId)
-    if (!episode) return false
-    return episode.checkCanDirectPlay(payload)
-  }
-
-  getDirectPlayTracklist(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id === episodeId)
-    if (!episode) return false
-    return episode.getDirectPlayTracklist()
-  }
-
   addPodcastEpisode(podcastEpisode) {
     this.episodes.push(podcastEpisode)
   }
@@ -224,22 +211,6 @@ class Podcast {
     return episode
   }
 
-  getPlaybackTitle(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id == episodeId)
-    if (!episode) return this.metadata.title
-    return episode.title
-  }
-
-  getPlaybackAuthor() {
-    return this.metadata.author
-  }
-
-  getEpisodeDuration(episodeId) {
-    var episode = this.episodes.find((ep) => ep.id == episodeId)
-    if (!episode) return 0
-    return episode.duration
-  }
-
   getEpisode(episodeId) {
     if (!episodeId) return null
 
@@ -248,9 +219,5 @@ class Podcast {
 
     return this.episodes.find((ep) => ep.id == episodeId)
   }
-
-  getChapters(episodeId) {
-    return this.getEpisode(episodeId)?.chapters?.map((ch) => ({ ...ch })) || []
-  }
 }
 module.exports = Podcast
diff --git a/server/objects/metadata/BookMetadata.js b/server/objects/metadata/BookMetadata.js
index c6192f11..0dfe1dbf 100644
--- a/server/objects/metadata/BookMetadata.js
+++ b/server/objects/metadata/BookMetadata.js
@@ -159,11 +159,6 @@ class BookMetadata {
   getSeries(seriesId) {
     return this.series.find((se) => se.id == seriesId)
   }
-  getSeriesSequence(seriesId) {
-    const series = this.series.find((se) => se.id == seriesId)
-    if (!series) return null
-    return series.sequence || ''
-  }
 
   update(payload) {
     const json = this.toJSON()

From 63466ec48bee46a9b4a0d4e95b1652ec79220e23 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Jan 2025 12:06:20 -0600
Subject: [PATCH 127/143] Fix deleting episode library file removes episode
 from playlist #3784

---
 server/Database.js                          | 21 ++++++++++
 server/controllers/LibraryItemController.js |  1 +
 server/models/Playlist.js                   | 44 +++++++++++++++++++++
 server/routers/ApiRouter.js                 | 31 +--------------
 4 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/server/Database.js b/server/Database.js
index bd14fbd5..2137b3c1 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -695,6 +695,27 @@ class Database {
       await book.destroy()
     }
 
+    const playlistMediaItemsWithNoMediaItem = await this.playlistMediaItemModel.findAll({
+      include: [
+        {
+          model: this.bookModel,
+          attributes: ['id']
+        },
+        {
+          model: this.podcastEpisodeModel,
+          attributes: ['id']
+        }
+      ],
+      where: {
+        '$book.id$': null,
+        '$podcastEpisode.id$': null
+      }
+    })
+    for (const playlistMediaItem of playlistMediaItemsWithNoMediaItem) {
+      Logger.warn(`Found playlistMediaItem with no book or podcastEpisode - removing it`)
+      await playlistMediaItem.destroy()
+    }
+
     // Remove empty series
     const emptySeries = await this.seriesModel.findAll({
       include: {
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index f08a6011..5a46be4b 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -971,6 +971,7 @@ class LibraryItemController {
       }
     } else if (req.libraryItem.media.podcastEpisodes.some((ep) => ep.audioFile.ino === req.params.fileid)) {
       const episodeToRemove = req.libraryItem.media.podcastEpisodes.find((ep) => ep.audioFile.ino === req.params.fileid)
+      await Database.playlistModel.removeMediaItemsFromPlaylists([episodeToRemove.id])
       await episodeToRemove.destroy()
 
       req.libraryItem.media.podcastEpisodes = req.libraryItem.media.podcastEpisodes.filter((ep) => ep.audioFile.ino !== req.params.fileid)
diff --git a/server/models/Playlist.js b/server/models/Playlist.js
index 7817211f..ec56248d 100644
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -1,5 +1,6 @@
 const { DataTypes, Model, Op } = require('sequelize')
 const Logger = require('../Logger')
+const SocketAuthority = require('../SocketAuthority')
 
 class Playlist extends Model {
   constructor(values, options) {
@@ -163,6 +164,49 @@ class Playlist extends Model {
     return playlists
   }
 
+  /**
+   * Removes media items and re-orders playlists
+   *
+   * @param {string[]} mediaItemIds
+   */
+  static async removeMediaItemsFromPlaylists(mediaItemIds) {
+    if (!mediaItemIds?.length) return
+
+    const playlistsWithItem = await this.getPlaylistsForMediaItemIds(mediaItemIds)
+
+    if (!playlistsWithItem.length) return
+
+    for (const playlist of playlistsWithItem) {
+      let numMediaItems = playlist.playlistMediaItems.length
+
+      let order = 1
+      // Remove items in playlist and re-order
+      for (const playlistMediaItem of playlist.playlistMediaItems) {
+        if (mediaItemIds.includes(playlistMediaItem.mediaItemId)) {
+          await playlistMediaItem.destroy()
+          numMediaItems--
+        } else {
+          if (playlistMediaItem.order !== order) {
+            playlistMediaItem.update({
+              order
+            })
+          }
+          order++
+        }
+      }
+
+      // If playlist is now empty then remove it
+      const jsonExpanded = await playlist.getOldJsonExpanded()
+      if (!numMediaItems) {
+        Logger.info(`[ApiRouter] Playlist "${playlist.name}" has no more items - removing it`)
+        await playlist.destroy()
+        SocketAuthority.clientEmitter(playlist.userId, 'playlist_removed', jsonExpanded)
+      } else {
+        SocketAuthority.clientEmitter(playlist.userId, 'playlist_updated', jsonExpanded)
+      }
+    }
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 235d25cd..4402fd04 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -361,36 +361,7 @@ class ApiRouter {
     }
 
     // remove item from playlists
-    const playlistsWithItem = await Database.playlistModel.getPlaylistsForMediaItemIds(mediaItemIds)
-    for (const playlist of playlistsWithItem) {
-      let numMediaItems = playlist.playlistMediaItems.length
-
-      let order = 1
-      // Remove items in playlist and re-order
-      for (const playlistMediaItem of playlist.playlistMediaItems) {
-        if (mediaItemIds.includes(playlistMediaItem.mediaItemId)) {
-          await playlistMediaItem.destroy()
-          numMediaItems--
-        } else {
-          if (playlistMediaItem.order !== order) {
-            playlistMediaItem.update({
-              order
-            })
-          }
-          order++
-        }
-      }
-
-      // If playlist is now empty then remove it
-      const jsonExpanded = await playlist.getOldJsonExpanded()
-      if (!numMediaItems) {
-        Logger.info(`[ApiRouter] Playlist "${playlist.name}" has no more items - removing it`)
-        await playlist.destroy()
-        SocketAuthority.clientEmitter(playlist.userId, 'playlist_removed', jsonExpanded)
-      } else {
-        SocketAuthority.clientEmitter(playlist.userId, 'playlist_updated', jsonExpanded)
-      }
-    }
+    await Database.playlistModel.removeMediaItemsFromPlaylists(mediaItemIds)
 
     // Close rss feed - remove from db and emit socket event
     await RssFeedManager.closeFeedForEntityId(libraryItemId)

From 6467a92de6db0c9fe4eb5a492fe5272de68922e7 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Jan 2025 12:12:56 -0600
Subject: [PATCH 128/143] Remove media progress when deleting podcast episode
 audio file

---
 server/controllers/LibraryItemController.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 5a46be4b..4da68866 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -971,7 +971,20 @@ class LibraryItemController {
       }
     } else if (req.libraryItem.media.podcastEpisodes.some((ep) => ep.audioFile.ino === req.params.fileid)) {
       const episodeToRemove = req.libraryItem.media.podcastEpisodes.find((ep) => ep.audioFile.ino === req.params.fileid)
+      // Remove episode from all playlists
       await Database.playlistModel.removeMediaItemsFromPlaylists([episodeToRemove.id])
+
+      // Remove episode media progress
+      const numProgressRemoved = await Database.mediaProgressModel.destroy({
+        where: {
+          mediaItemId: episodeToRemove.id
+        }
+      })
+      if (numProgressRemoved > 0) {
+        Logger.info(`[LibraryItemController] Removed media progress for episode ${episodeToRemove.id}`)
+      }
+
+      // Remove episode
       await episodeToRemove.destroy()
 
       req.libraryItem.media.podcastEpisodes = req.libraryItem.media.podcastEpisodes.filter((ep) => ep.audioFile.ino !== req.params.fileid)

From 0357dc90d40e965e51b3b3e1fdd92109d56a13ba Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Jan 2025 14:07:27 -0600
Subject: [PATCH 129/143] Update libraryItem.updatedAt on media update

---
 server/controllers/LibraryItemController.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 4da68866..74b8bdfc 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -249,6 +249,9 @@ class LibraryItemController {
 
     const hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
     if (hasUpdates) {
+      req.libraryItem.changed('updatedAt', true)
+      await req.libraryItem.save()
+
       if (isPodcastAutoDownloadUpdated) {
         this.cronManager.checkUpdatePodcastCron(req.libraryItem)
       }

From 69d1744496e1eecabbb0ca1d54bda929ac73bc83 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Jan 2025 16:48:24 -0600
Subject: [PATCH 130/143] Update podcasts to new library item model

---
 .../components/modals/podcast/EditEpisode.vue |  12 ++
 .../modals/podcast/tabs/EpisodeDetails.vue    |   9 +-
 server/controllers/PodcastController.js       | 164 +++++++++---------
 server/managers/CronManager.js                |   2 +-
 server/managers/PodcastManager.js             |  88 +++++++---
 server/models/Podcast.js                      |  29 ++++
 server/models/PodcastEpisode.js               |  17 ++
 server/objects/PodcastEpisodeDownload.js      |  17 +-
 server/objects/entities/PodcastEpisode.js     |   5 -
 server/objects/mediaTypes/Podcast.js          |   5 -
 server/utils/ffmpegHelpers.js                 |  28 +--
 11 files changed, 235 insertions(+), 141 deletions(-)

diff --git a/client/components/modals/podcast/EditEpisode.vue b/client/components/modals/podcast/EditEpisode.vue
index b87f89c7..9702ce38 100644
--- a/client/components/modals/podcast/EditEpisode.vue
+++ b/client/components/modals/podcast/EditEpisode.vue
@@ -170,6 +170,12 @@ export default {
         this.show = false
       }
     },
+    libraryItemUpdated(libraryItem) {
+      const episode = libraryItem.media.episodes.find((e) => e.id === this.selectedEpisodeId)
+      if (episode) {
+        this.episodeItem = episode
+      }
+    },
     hotkey(action) {
       if (action === this.$hotkeys.Modal.NEXT_PAGE) {
         this.goNextEpisode()
@@ -178,9 +184,15 @@ export default {
       }
     },
     registerListeners() {
+      if (this.libraryItem) {
+        this.$eventBus.$on(`${this.libraryItem.id}_updated`, this.libraryItemUpdated)
+      }
       this.$eventBus.$on('modal-hotkey', this.hotkey)
     },
     unregisterListeners() {
+      if (this.libraryItem) {
+        this.$eventBus.$on(`${this.libraryItem.id}_updated`, this.libraryItemUpdated)
+      }
       this.$eventBus.$off('modal-hotkey', this.hotkey)
     }
   },
diff --git a/client/components/modals/podcast/tabs/EpisodeDetails.vue b/client/components/modals/podcast/tabs/EpisodeDetails.vue
index 2084ddee..85cfb4ff 100644
--- a/client/components/modals/podcast/tabs/EpisodeDetails.vue
+++ b/client/components/modals/podcast/tabs/EpisodeDetails.vue
@@ -163,13 +163,10 @@ export default {
 
       this.isProcessing = false
       if (updateResult) {
-        if (updateResult) {
-          this.$toast.success(this.$strings.ToastItemUpdateSuccess)
-          return true
-        } else {
-          this.$toast.info(this.$strings.MessageNoUpdatesWereNecessary)
-        }
+        this.$toast.success(this.$strings.ToastItemUpdateSuccess)
+        return true
       }
+
       return false
     }
   },
diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index 3610c2ea..c62742a5 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -19,6 +19,11 @@ const LibraryItem = require('../objects/LibraryItem')
  * @property {import('../models/User')} user
  *
  * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/LibraryItem')} libraryItem
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} RequestWithLibraryItem
  */
 
 class PodcastController {
@@ -112,11 +117,6 @@ class PodcastController {
 
     res.json(libraryItem.toJSONExpanded())
 
-    if (payload.episodesToDownload?.length) {
-      Logger.info(`[PodcastController] Podcast created now starting ${payload.episodesToDownload.length} episode downloads`)
-      this.podcastManager.downloadPodcastEpisodes(libraryItem, payload.episodesToDownload)
-    }
-
     // Turn on podcast auto download cron if not already on
     if (libraryItem.media.autoDownloadEpisodes) {
       this.cronManager.checkUpdatePodcastCron(libraryItem)
@@ -213,7 +213,7 @@ class PodcastController {
    *
    * @this import('../routers/ApiRouter')
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async checkNewEpisodes(req, res) {
@@ -222,15 +222,14 @@ class PodcastController {
       return res.sendStatus(403)
     }
 
-    var libraryItem = req.libraryItem
-    if (!libraryItem.media.metadata.feedUrl) {
-      Logger.error(`[PodcastController] checkNewEpisodes no feed url for item ${libraryItem.id}`)
-      return res.status(500).send('Podcast has no rss feed url')
+    if (!req.libraryItem.media.feedURL) {
+      Logger.error(`[PodcastController] checkNewEpisodes no feed url for item ${req.libraryItem.id}`)
+      return res.status(400).send('Podcast has no rss feed url')
     }
 
     const maxEpisodesToDownload = !isNaN(req.query.limit) ? Number(req.query.limit) : 3
 
-    var newEpisodes = await this.podcastManager.checkAndDownloadNewEpisodes(libraryItem, maxEpisodesToDownload)
+    const newEpisodes = await this.podcastManager.checkAndDownloadNewEpisodes(req.libraryItem, maxEpisodesToDownload)
     res.json({
       episodes: newEpisodes || []
     })
@@ -258,23 +257,28 @@ class PodcastController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   getEpisodeDownloads(req, res) {
-    var libraryItem = req.libraryItem
-
-    var downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(libraryItem.id)
+    const downloadsInQueue = this.podcastManager.getEpisodeDownloadsInQueue(req.libraryItem.id)
     res.json({
       downloads: downloadsInQueue.map((d) => d.toJSONForClient())
     })
   }
 
+  /**
+   * GET: /api/podcasts/:id/search-episode
+   * Search for an episode in a podcast
+   *
+   * @param {RequestWithLibraryItem} req
+   * @param {Response} res
+   */
   async findEpisode(req, res) {
-    const rssFeedUrl = req.libraryItem.media.metadata.feedUrl
+    const rssFeedUrl = req.libraryItem.media.feedURL
     if (!rssFeedUrl) {
       Logger.error(`[PodcastController] findEpisode: Podcast has no feed url`)
-      return res.status(500).send('Podcast does not have an RSS feed URL')
+      return res.status(400).send('Podcast does not have an RSS feed URL')
     }
 
     const searchTitle = req.query.title
@@ -292,7 +296,7 @@ class PodcastController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async downloadEpisodes(req, res) {
@@ -300,13 +304,13 @@ class PodcastController {
       Logger.error(`[PodcastController] Non-admin user "${req.user.username}" attempted to download episodes`)
       return res.sendStatus(403)
     }
-    const libraryItem = req.libraryItem
+
     const episodes = req.body
-    if (!episodes?.length) {
+    if (!Array.isArray(episodes) || !episodes.length) {
       return res.sendStatus(400)
     }
 
-    this.podcastManager.downloadPodcastEpisodes(libraryItem, episodes)
+    this.podcastManager.downloadPodcastEpisodes(req.libraryItem, episodes)
     res.sendStatus(200)
   }
 
@@ -315,7 +319,7 @@ class PodcastController {
    *
    * @this {import('../routers/ApiRouter')}
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async quickMatchEpisodes(req, res) {
@@ -325,10 +329,11 @@ class PodcastController {
     }
 
     const overrideDetails = req.query.override === '1'
-    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(req.libraryItem, { overrideDetails })
+    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
+    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(oldLibraryItem, { overrideDetails })
     if (episodesUpdated) {
-      await Database.updateLibraryItem(req.libraryItem)
-      SocketAuthority.emitter('item_updated', req.libraryItem.toJSONExpanded())
+      await Database.updateLibraryItem(oldLibraryItem)
+      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
     }
 
     res.json({
@@ -339,58 +344,76 @@ class PodcastController {
   /**
    * PATCH: /api/podcasts/:id/episode/:episodeId
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async updateEpisode(req, res) {
-    const libraryItem = req.libraryItem
-
-    var episodeId = req.params.episodeId
-    if (!libraryItem.media.checkHasEpisode(episodeId)) {
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === req.params.episodeId)
+    if (!episode) {
       return res.status(404).send('Episode not found')
     }
 
-    if (libraryItem.media.updateEpisode(episodeId, req.body)) {
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    const updatePayload = {}
+    const supportedStringKeys = ['title', 'subtitle', 'description', 'pubDate', 'episode', 'season', 'episodeType']
+    for (const key in req.body) {
+      if (supportedStringKeys.includes(key) && typeof req.body[key] === 'string') {
+        updatePayload[key] = req.body[key]
+      } else if (key === 'chapters' && Array.isArray(req.body[key]) && req.body[key].every((ch) => typeof ch === 'object' && ch.title && ch.start)) {
+        updatePayload[key] = req.body[key]
+      } else if (key === 'publishedAt' && typeof req.body[key] === 'number') {
+        updatePayload[key] = req.body[key]
+      }
     }
 
-    res.json(libraryItem.toJSONExpanded())
+    if (Object.keys(updatePayload).length) {
+      episode.set(updatePayload)
+      if (episode.changed()) {
+        Logger.info(`[PodcastController] Updated episode "${episode.title}" keys`, episode.changed())
+        await episode.save()
+
+        SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+      } else {
+        Logger.info(`[PodcastController] No changes to episode "${episode.title}"`)
+      }
+    }
+
+    res.json(req.libraryItem.toOldJSONExpanded())
   }
 
   /**
    * GET: /api/podcasts/:id/episode/:episodeId
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async getEpisode(req, res) {
     const episodeId = req.params.episodeId
-    const libraryItem = req.libraryItem
 
-    const episode = libraryItem.media.episodes.find((ep) => ep.id === episodeId)
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === episodeId)
     if (!episode) {
-      Logger.error(`[PodcastController] getEpisode episode ${episodeId} not found for item ${libraryItem.id}`)
+      Logger.error(`[PodcastController] getEpisode episode ${episodeId} not found for item ${req.libraryItem.id}`)
       return res.sendStatus(404)
     }
 
-    res.json(episode)
+    res.json(episode.toOldJSON(req.libraryItem.id))
   }
 
   /**
    * DELETE: /api/podcasts/:id/episode/:episodeId
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async removeEpisode(req, res) {
     const episodeId = req.params.episodeId
-    const libraryItem = req.libraryItem
     const hardDelete = req.query.hard === '1'
 
-    const episode = libraryItem.media.episodes.find((ep) => ep.id === episodeId)
+    /** @type {import('../models/PodcastEpisode')} */
+    const episode = req.libraryItem.media.podcastEpisodes.find((ep) => ep.id === episodeId)
     if (!episode) {
-      Logger.error(`[PodcastController] removeEpisode episode ${episodeId} not found for item ${libraryItem.id}`)
+      Logger.error(`[PodcastController] removeEpisode episode ${episodeId} not found for item ${req.libraryItem.id}`)
       return res.sendStatus(404)
     }
 
@@ -407,36 +430,8 @@ class PodcastController {
         })
     }
 
-    // Remove episode from Podcast and library file
-    const episodeRemoved = libraryItem.media.removeEpisode(episodeId)
-    if (episodeRemoved?.audioFile) {
-      libraryItem.removeLibraryFile(episodeRemoved.audioFile.ino)
-    }
-
-    // Update/remove playlists that had this podcast episode
-    const playlistMediaItems = await Database.playlistMediaItemModel.findAll({
-      where: {
-        mediaItemId: episodeId
-      },
-      include: {
-        model: Database.playlistModel,
-        include: Database.playlistMediaItemModel
-      }
-    })
-    for (const pmi of playlistMediaItems) {
-      const numItems = pmi.playlist.playlistMediaItems.length - 1
-
-      if (!numItems) {
-        Logger.info(`[PodcastController] Playlist "${pmi.playlist.name}" has no more items - removing it`)
-        const jsonExpanded = await pmi.playlist.getOldJsonExpanded()
-        SocketAuthority.clientEmitter(pmi.playlist.userId, 'playlist_removed', jsonExpanded)
-        await pmi.playlist.destroy()
-      } else {
-        await pmi.destroy()
-        const jsonExpanded = await pmi.playlist.getOldJsonExpanded()
-        SocketAuthority.clientEmitter(pmi.playlist.userId, 'playlist_updated', jsonExpanded)
-      }
-    }
+    // Remove episode from playlists
+    await Database.playlistModel.removeMediaItemsFromPlaylists([episodeId])
 
     // Remove media progress for this episode
     const mediaProgressRemoved = await Database.mediaProgressModel.destroy({
@@ -448,9 +443,16 @@ class PodcastController {
       Logger.info(`[PodcastController] Removed ${mediaProgressRemoved} media progress for episode ${episode.id}`)
     }
 
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    res.json(libraryItem.toJSON())
+    // Remove episode
+    await episode.destroy()
+
+    // Remove library file
+    req.libraryItem.libraryFiles = req.libraryItem.libraryFiles.filter((file) => file.ino !== episode.audioFile.ino)
+    req.libraryItem.changed('libraryFiles', true)
+    await req.libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
+    res.json(req.libraryItem.toOldJSON())
   }
 
   /**
@@ -460,15 +462,15 @@ class PodcastController {
    * @param {NextFunction} next
    */
   async middleware(req, res, next) {
-    const item = await Database.libraryItemModel.getOldById(req.params.id)
-    if (!item?.media) return res.sendStatus(404)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
+    if (!libraryItem?.media) return res.sendStatus(404)
 
-    if (!item.isPodcast) {
+    if (!libraryItem.isPodcast) {
       return res.sendStatus(500)
     }
 
     // Check user can access this library item
-    if (!req.user.checkCanAccessLibraryItem(item)) {
+    if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
       return res.sendStatus(403)
     }
 
@@ -480,7 +482,7 @@ class PodcastController {
       return res.sendStatus(403)
     }
 
-    req.libraryItem = item
+    req.libraryItem = libraryItem
     next()
   }
 }
diff --git a/server/managers/CronManager.js b/server/managers/CronManager.js
index a4dbe6b4..c61fb049 100644
--- a/server/managers/CronManager.js
+++ b/server/managers/CronManager.js
@@ -181,7 +181,7 @@ class CronManager {
     // Get podcast library items to check
     const libraryItems = []
     for (const libraryItemId of libraryItemIds) {
-      const libraryItem = await Database.libraryItemModel.getOldById(libraryItemId)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItemId)
       if (!libraryItem) {
         Logger.error(`[CronManager] Library item ${libraryItemId} not found for episode check cron ${expression}`)
         podcastCron.libraryItemIds = podcastCron.libraryItemIds.filter((lid) => lid !== libraryItemId) // Filter it out
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index 456927c8..92053707 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -52,11 +52,16 @@ class PodcastManager {
     }
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} episodesToDownload
+   * @param {*} isAutoDownload
+   */
   async downloadPodcastEpisodes(libraryItem, episodesToDownload, isAutoDownload) {
-    let index = Math.max(...libraryItem.media.episodes.filter((ep) => ep.index == null || isNaN(ep.index)).map((ep) => Number(ep.index))) + 1
     for (const ep of episodesToDownload) {
       const newPe = new PodcastEpisode()
-      newPe.setData(ep, index++)
+      newPe.setData(ep, null)
       newPe.libraryItemId = libraryItem.id
       newPe.podcastId = libraryItem.media.id
       const newPeDl = new PodcastEpisodeDownload()
@@ -263,16 +268,21 @@ class PodcastManager {
     return newAudioFile
   }
 
-  // Returns false if auto download episodes was disabled (disabled if reaches max failed checks)
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @returns {Promise<boolean>} - Returns false if auto download episodes was disabled (disabled if reaches max failed checks)
+   */
   async runEpisodeCheck(libraryItem) {
-    const lastEpisodeCheckDate = new Date(libraryItem.media.lastEpisodeCheck || 0)
-    const latestEpisodePublishedAt = libraryItem.media.latestEpisodePublished
-    Logger.info(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.metadata.title}" | Last check: ${lastEpisodeCheckDate} | ${latestEpisodePublishedAt ? `Latest episode pubDate: ${new Date(latestEpisodePublishedAt)}` : 'No latest episode'}`)
+    const lastEpisodeCheck = libraryItem.media.lastEpisodeCheck?.valueOf() || 0
+    const latestEpisodePublishedAt = libraryItem.media.getLatestEpisodePublishedAt()
+
+    Logger.info(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" | Last check: ${new Date(lastEpisodeCheck)} | ${latestEpisodePublishedAt ? `Latest episode pubDate: ${new Date(latestEpisodePublishedAt)}` : 'No latest episode'}`)
 
     // Use latest episode pubDate if exists OR fallback to using lastEpisodeCheckDate
     //    lastEpisodeCheckDate will be the current time when adding a new podcast
     const dateToCheckForEpisodesAfter = latestEpisodePublishedAt || lastEpisodeCheckDate
-    Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.metadata.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)
+    Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)
 
     var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, dateToCheckForEpisodesAfter, libraryItem.media.maxNewEpisodesToDownload)
     Logger.debug(`[PodcastManager] runEpisodeCheck: ${newEpisodes?.length || 'N/A'} episodes found`)
@@ -283,36 +293,47 @@ class PodcastManager {
       if (!this.failedCheckMap[libraryItem.id]) this.failedCheckMap[libraryItem.id] = 0
       this.failedCheckMap[libraryItem.id]++
       if (this.failedCheckMap[libraryItem.id] >= this.MaxFailedEpisodeChecks) {
-        Logger.error(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.metadata.title}" - disabling auto download`)
+        Logger.error(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.title}" - disabling auto download`)
         libraryItem.media.autoDownloadEpisodes = false
         delete this.failedCheckMap[libraryItem.id]
       } else {
-        Logger.warn(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.metadata.title}"`)
+        Logger.warn(`[PodcastManager] runEpisodeCheck ${this.failedCheckMap[libraryItem.id]} failed attempts at checking episodes for "${libraryItem.media.title}"`)
       }
     } else if (newEpisodes.length) {
       delete this.failedCheckMap[libraryItem.id]
-      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.metadata.title}" - starting download`)
+      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.title}" - starting download`)
       this.downloadPodcastEpisodes(libraryItem, newEpisodes, true)
     } else {
       delete this.failedCheckMap[libraryItem.id]
-      Logger.debug(`[PodcastManager] No new episodes for "${libraryItem.media.metadata.title}"`)
+      Logger.debug(`[PodcastManager] No new episodes for "${libraryItem.media.title}"`)
     }
 
-    libraryItem.media.lastEpisodeCheck = Date.now()
-    libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    libraryItem.media.lastEpisodeCheck = new Date()
+    await libraryItem.media.save()
+
+    libraryItem.changed('updatedAt', true)
+    await libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
+
     return libraryItem.media.autoDownloadEpisodes
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} podcastLibraryItem
+   * @param {number} dateToCheckForEpisodesAfter - Unix timestamp
+   * @param {number} maxNewEpisodes
+   * @returns
+   */
   async checkPodcastForNewEpisodes(podcastLibraryItem, dateToCheckForEpisodesAfter, maxNewEpisodes = 3) {
-    if (!podcastLibraryItem.media.metadata.feedUrl) {
-      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for ${podcastLibraryItem.media.metadata.title} (ID: ${podcastLibraryItem.id})`)
+    if (!podcastLibraryItem.media.feedURL) {
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`)
       return false
     }
-    const feed = await getPodcastFeed(podcastLibraryItem.media.metadata.feedUrl)
+    const feed = await getPodcastFeed(podcastLibraryItem.media.feedURL)
     if (!feed?.episodes) {
-      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload for ${podcastLibraryItem.media.metadata.title} (ID: ${podcastLibraryItem.id})`, feed)
+      Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`, feed)
       return false
     }
 
@@ -326,21 +347,32 @@ class PodcastManager {
     return newEpisodes
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} maxEpisodesToDownload
+   * @returns
+   */
   async checkAndDownloadNewEpisodes(libraryItem, maxEpisodesToDownload) {
-    const lastEpisodeCheckDate = new Date(libraryItem.media.lastEpisodeCheck || 0)
-    Logger.info(`[PodcastManager] checkAndDownloadNewEpisodes for "${libraryItem.media.metadata.title}" - Last episode check: ${lastEpisodeCheckDate}`)
-    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, libraryItem.media.lastEpisodeCheck, maxEpisodesToDownload)
+    const lastEpisodeCheck = libraryItem.media.lastEpisodeCheck?.valueOf() || 0
+    const lastEpisodeCheckDate = lastEpisodeCheck > 0 ? libraryItem.media.lastEpisodeCheck : 'Never'
+    Logger.info(`[PodcastManager] checkAndDownloadNewEpisodes for "${libraryItem.media.title}" - Last episode check: ${lastEpisodeCheckDate}`)
+
+    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, lastEpisodeCheck, maxEpisodesToDownload)
     if (newEpisodes.length) {
-      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.metadata.title}" - starting download`)
+      Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.title}" - starting download`)
       this.downloadPodcastEpisodes(libraryItem, newEpisodes, false)
     } else {
-      Logger.info(`[PodcastManager] No new episodes found for podcast "${libraryItem.media.metadata.title}"`)
+      Logger.info(`[PodcastManager] No new episodes found for podcast "${libraryItem.media.title}"`)
     }
 
-    libraryItem.media.lastEpisodeCheck = Date.now()
-    libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+    libraryItem.media.lastEpisodeCheck = new Date()
+    await libraryItem.media.save()
+
+    libraryItem.changed('updatedAt', true)
+    await libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
 
     return newEpisodes
   }
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index 188c1070..fd471305 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -259,6 +259,10 @@ class Podcast extends Model {
       this.autoDownloadSchedule = payload.autoDownloadSchedule
       hasUpdates = true
     }
+    if (typeof payload.lastEpisodeCheck === 'number' && payload.lastEpisodeCheck !== this.lastEpisodeCheck?.valueOf()) {
+      this.lastEpisodeCheck = payload.lastEpisodeCheck
+      hasUpdates = true
+    }
 
     const numberKeys = ['maxEpisodesToKeep', 'maxNewEpisodesToDownload']
     numberKeys.forEach((key) => {
@@ -348,6 +352,31 @@ class Podcast extends Model {
     return episode.duration
   }
 
+  /**
+   *
+   * @returns {number} - Unix timestamp
+   */
+  getLatestEpisodePublishedAt() {
+    return this.podcastEpisodes.reduce((latest, episode) => {
+      if (episode.publishedAt?.valueOf() > latest) {
+        return episode.publishedAt.valueOf()
+      }
+      return latest
+    }, 0)
+  }
+
+  /**
+   * Used for checking if an rss feed episode is already in the podcast
+   *
+   * @param {Object} feedEpisode - object from rss feed
+   * @returns {boolean}
+   */
+  checkHasEpisodeByFeedEpisode(feedEpisode) {
+    const guid = feedEpisode.guid
+    const url = feedEpisode.enclosure.url
+    return this.podcastEpisodes.some((ep) => ep.checkMatchesGuidOrEnclosureUrl(guid, url))
+  }
+
   /**
    * Old model kept metadata in a separate object
    */
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 24d07041..4c9967f8 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -143,6 +143,23 @@ class PodcastEpisode extends Model {
     return this.audioFile?.duration || 0
   }
 
+  /**
+   * Used for matching the episode with an episode in the RSS feed
+   *
+   * @param {string} guid
+   * @param {string} enclosureURL
+   * @returns {boolean}
+   */
+  checkMatchesGuidOrEnclosureUrl(guid, enclosureURL) {
+    if (this.extraData?.guid && this.extraData.guid === guid) {
+      return true
+    }
+    if (this.enclosureURL && this.enclosureURL === enclosureURL) {
+      return true
+    }
+    return false
+  }
+
   /**
    * Used in client players
    *
diff --git a/server/objects/PodcastEpisodeDownload.js b/server/objects/PodcastEpisodeDownload.js
index eb9f059a..ecda4a47 100644
--- a/server/objects/PodcastEpisodeDownload.js
+++ b/server/objects/PodcastEpisodeDownload.js
@@ -6,8 +6,10 @@ const globals = require('../utils/globals')
 class PodcastEpisodeDownload {
   constructor() {
     this.id = null
+    /** @type {import('../objects/entities/PodcastEpisode')} */
     this.podcastEpisode = null
     this.url = null
+    /** @type {import('../models/LibraryItem')} */
     this.libraryItem = null
     this.libraryId = null
 
@@ -27,7 +29,7 @@ class PodcastEpisodeDownload {
       id: this.id,
       episodeDisplayTitle: this.podcastEpisode?.title ?? null,
       url: this.url,
-      libraryItemId: this.libraryItem?.id || null,
+      libraryItemId: this.libraryItemId,
       libraryId: this.libraryId || null,
       isFinished: this.isFinished,
       failed: this.failed,
@@ -35,8 +37,8 @@ class PodcastEpisodeDownload {
       startedAt: this.startedAt,
       createdAt: this.createdAt,
       finishedAt: this.finishedAt,
-      podcastTitle: this.libraryItem?.media.metadata.title ?? null,
-      podcastExplicit: !!this.libraryItem?.media.metadata.explicit,
+      podcastTitle: this.libraryItem?.media.title ?? null,
+      podcastExplicit: !!this.libraryItem?.media.explicit,
       season: this.podcastEpisode?.season ?? null,
       episode: this.podcastEpisode?.episode ?? null,
       episodeType: this.podcastEpisode?.episodeType ?? 'full',
@@ -80,9 +82,16 @@ class PodcastEpisodeDownload {
     return this.targetFilename
   }
   get libraryItemId() {
-    return this.libraryItem ? this.libraryItem.id : null
+    return this.libraryItem?.id || null
   }
 
+  /**
+   *
+   * @param {import('../objects/entities/PodcastEpisode')} podcastEpisode - old model
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} isAutoDownload
+   * @param {*} libraryId
+   */
   setData(podcastEpisode, libraryItem, isAutoDownload, libraryId) {
     this.id = uuidv4()
     this.podcastEpisode = podcastEpisode
diff --git a/server/objects/entities/PodcastEpisode.js b/server/objects/entities/PodcastEpisode.js
index 945e0e56..e759a0eb 100644
--- a/server/objects/entities/PodcastEpisode.js
+++ b/server/objects/entities/PodcastEpisode.js
@@ -167,10 +167,5 @@ class PodcastEpisode {
     }
     return hasUpdates
   }
-
-  checkEqualsEnclosureUrl(url) {
-    if (!this.enclosure?.url) return false
-    return this.enclosure.url == url
-  }
 }
 module.exports = PodcastEpisode
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index 2a009eb2..8d6b541d 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -193,11 +193,6 @@ class Podcast {
   checkHasEpisode(episodeId) {
     return this.episodes.some((ep) => ep.id === episodeId)
   }
-  checkHasEpisodeByFeedEpisode(feedEpisode) {
-    const guid = feedEpisode.guid
-    const url = feedEpisode.enclosure.url
-    return this.episodes.some((ep) => (ep.guid && ep.guid === guid) || ep.checkEqualsEnclosureUrl(url))
-  }
 
   addPodcastEpisode(podcastEpisode) {
     this.episodes.push(podcastEpisode)
diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index c7024225..06e20f1d 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -97,6 +97,11 @@ async function resizeImage(filePath, outputPath, width, height) {
 }
 module.exports.resizeImage = resizeImage
 
+/**
+ *
+ * @param {import('../objects/PodcastEpisodeDownload')} podcastEpisodeDownload
+ * @returns
+ */
 module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
   return new Promise(async (resolve) => {
     const response = await axios({
@@ -118,21 +123,22 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
     ffmpeg.addOption('-loglevel debug') // Debug logs printed on error
     ffmpeg.outputOptions('-c:a', 'copy', '-map', '0:a', '-metadata', 'podcast=1')
 
-    const podcastMetadata = podcastEpisodeDownload.libraryItem.media.metadata
+    /** @type {import('../models/Podcast')} */
+    const podcast = podcastEpisodeDownload.libraryItem.media
     const podcastEpisode = podcastEpisodeDownload.podcastEpisode
     const finalSizeInBytes = Number(podcastEpisode.enclosure?.length || 0)
 
     const taggings = {
-      album: podcastMetadata.title,
-      'album-sort': podcastMetadata.title,
-      artist: podcastMetadata.author,
-      'artist-sort': podcastMetadata.author,
+      album: podcast.title,
+      'album-sort': podcast.title,
+      artist: podcast.author,
+      'artist-sort': podcast.author,
       comment: podcastEpisode.description,
       subtitle: podcastEpisode.subtitle,
       disc: podcastEpisode.season,
-      genre: podcastMetadata.genres.length ? podcastMetadata.genres.join(';') : null,
-      language: podcastMetadata.language,
-      MVNM: podcastMetadata.title,
+      genre: podcast.genres.length ? podcast.genres.join(';') : null,
+      language: podcast.language,
+      MVNM: podcast.title,
       MVIN: podcastEpisode.episode,
       track: podcastEpisode.episode,
       'series-part': podcastEpisode.episode,
@@ -141,9 +147,9 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
       year: podcastEpisode.pubYear,
       date: podcastEpisode.pubDate,
       releasedate: podcastEpisode.pubDate,
-      'itunes-id': podcastMetadata.itunesId,
-      'podcast-type': podcastMetadata.type,
-      'episode-type': podcastMetadata.episodeType
+      'itunes-id': podcast.itunesId,
+      'podcast-type': podcast.podcastType,
+      'episode-type': podcastEpisode.episodeType
     }
 
     for (const tag in taggings) {

From 43d8d9b286223d8cfdca895adc56c3d09469430e Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Sat, 4 Jan 2025 20:16:48 +0200
Subject: [PATCH 131/143] Fix ffmpeg.addOption for transcoding

---
 server/objects/Stream.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/objects/Stream.js b/server/objects/Stream.js
index 2ab6f503..1a94a92e 100644
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@@ -280,15 +280,15 @@ class Stream extends EventEmitter {
 
     this.ffmpeg.addOption([`-loglevel ${logLevel}`, '-map 0:a', `-c:a ${audioCodec}`])
     const hlsOptions = ['-f hls', '-copyts', '-avoid_negative_ts make_non_negative', '-max_delay 5000000', '-max_muxing_queue_size 2048', `-hls_time 6`, `-hls_segment_type ${this.hlsSegmentType}`, `-start_number ${this.segmentStartNumber}`, '-hls_playlist_type vod', '-hls_list_size 0', '-hls_allow_cache 0']
+    this.ffmpeg.addOption(hlsOptions)
     if (this.hlsSegmentType === 'fmp4') {
-      hlsOptions.push('-strict -2')
+      this.ffmpeg.addOption('-strict -2')
       var fmp4InitFilename = Path.join(this.streamPath, 'init.mp4')
       // var fmp4InitFilename = 'init.mp4'
-      hlsOptions.push(`-hls_fmp4_init_filename ${fmp4InitFilename}`)
+      this.ffmpeg.addOption('-hls_fmp4_init_filename', fmp4InitFilename)
     }
-    this.ffmpeg.addOption(hlsOptions)
     var segmentFilename = Path.join(this.streamPath, this.segmentBasename)
-    this.ffmpeg.addOption(`-hls_segment_filename ${segmentFilename}`)
+    this.ffmpeg.addOption('-hls_segment_filename', segmentFilename)
     this.ffmpeg.output(this.finalPlaylistPath)
 
     this.ffmpeg.on('start', (command) => {

From d8823c8b1ca1b94fa9effea8da388f946d9d2005 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 4 Jan 2025 12:41:09 -0600
Subject: [PATCH 132/143] Update podcasts to new library item model

---
 server/controllers/PodcastController.js    | 100 +++++--
 server/managers/CoverManager.js            |   7 +-
 server/managers/CronManager.js             |   2 +-
 server/managers/NotificationManager.js     |  15 +-
 server/managers/PodcastManager.js          | 292 +++++++++++++--------
 server/models/Podcast.js                   |  41 ++-
 server/models/PodcastEpisode.js            |  34 +++
 server/objects/LibraryItem.js              |  40 ---
 server/objects/PodcastEpisodeDownload.js   |  41 +--
 server/objects/entities/PodcastEpisode.js  |  22 --
 server/objects/mediaTypes/Podcast.js       |  36 ---
 server/objects/metadata/PodcastMetadata.js |  18 --
 server/utils/ffmpegHelpers.js              |   4 +-
 server/utils/podcastUtils.js               |  45 +++-
 14 files changed, 416 insertions(+), 281 deletions(-)

diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index c62742a5..3d8ff240 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -1,3 +1,4 @@
+const Path = require('path')
 const { Request, Response, NextFunction } = require('express')
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
@@ -12,8 +13,6 @@ const { validateUrl } = require('../utils/index')
 const Scanner = require('../scanner/Scanner')
 const CoverManager = require('../managers/CoverManager')
 
-const LibraryItem = require('../objects/LibraryItem')
-
 /**
  * @typedef RequestUserObject
  * @property {import('../models/User')} user
@@ -42,6 +41,9 @@ class PodcastController {
       return res.sendStatus(403)
     }
     const payload = req.body
+    if (!payload.media || !payload.media.metadata) {
+      return res.status(400).send('Invalid request body. "media" and "media.metadata" are required')
+    }
 
     const library = await Database.libraryModel.findByIdWithFolders(payload.libraryId)
     if (!library) {
@@ -83,43 +85,87 @@ class PodcastController {
     let relPath = payload.path.replace(folder.fullPath, '')
     if (relPath.startsWith('/')) relPath = relPath.slice(1)
 
-    const libraryItemPayload = {
-      path: podcastPath,
-      relPath,
-      folderId: payload.folderId,
-      libraryId: payload.libraryId,
-      ino: libraryItemFolderStats.ino,
-      mtimeMs: libraryItemFolderStats.mtimeMs || 0,
-      ctimeMs: libraryItemFolderStats.ctimeMs || 0,
-      birthtimeMs: libraryItemFolderStats.birthtimeMs || 0,
-      media: payload.media
+    let newLibraryItem = null
+    const transaction = await Database.sequelize.transaction()
+    try {
+      const podcast = await Database.podcastModel.createFromRequest(payload.media, transaction)
+
+      newLibraryItem = await Database.libraryItemModel.create(
+        {
+          ino: libraryItemFolderStats.ino,
+          path: podcastPath,
+          relPath,
+          mediaId: podcast.id,
+          mediaType: 'podcast',
+          isFile: false,
+          isMissing: false,
+          isInvalid: false,
+          mtime: libraryItemFolderStats.mtimeMs || 0,
+          ctime: libraryItemFolderStats.ctimeMs || 0,
+          birthtime: libraryItemFolderStats.birthtimeMs || 0,
+          size: 0,
+          libraryFiles: [],
+          extraData: {},
+          libraryId: library.id,
+          libraryFolderId: folder.id
+        },
+        { transaction }
+      )
+
+      await transaction.commit()
+    } catch (error) {
+      Logger.error(`[PodcastController] Failed to create podcast: ${error}`)
+      await transaction.rollback()
+      return res.status(500).send('Failed to create podcast')
     }
 
-    const libraryItem = new LibraryItem()
-    libraryItem.setData('podcast', libraryItemPayload)
+    newLibraryItem.media = await newLibraryItem.getMediaExpanded()
 
     // Download and save cover image
-    if (payload.media.metadata.imageUrl) {
-      // TODO: Scan cover image to library files
+    if (typeof payload.media.metadata.imageUrl === 'string' && payload.media.metadata.imageUrl.startsWith('http')) {
       // Podcast cover will always go into library item folder
-      const coverResponse = await CoverManager.downloadCoverFromUrl(libraryItem, payload.media.metadata.imageUrl, true)
-      if (coverResponse) {
-        if (coverResponse.error) {
-          Logger.error(`[PodcastController] Download cover error from "${payload.media.metadata.imageUrl}": ${coverResponse.error}`)
-        } else if (coverResponse.cover) {
-          libraryItem.media.coverPath = coverResponse.cover
+      const coverResponse = await CoverManager.downloadCoverFromUrlNew(payload.media.metadata.imageUrl, newLibraryItem.id, newLibraryItem.path, true)
+      if (coverResponse.error) {
+        Logger.error(`[PodcastController] Download cover error from "${payload.media.metadata.imageUrl}": ${coverResponse.error}`)
+      } else if (coverResponse.cover) {
+        const coverImageFileStats = await getFileTimestampsWithIno(coverResponse.cover)
+        if (!coverImageFileStats) {
+          Logger.error(`[PodcastController] Failed to get cover image stats for "${coverResponse.cover}"`)
+        } else {
+          // Add libraryFile to libraryItem and coverPath to podcast
+          const newLibraryFile = {
+            ino: coverImageFileStats.ino,
+            fileType: 'image',
+            addedAt: Date.now(),
+            updatedAt: Date.now(),
+            metadata: {
+              filename: Path.basename(coverResponse.cover),
+              ext: Path.extname(coverResponse.cover).slice(1),
+              path: coverResponse.cover,
+              relPath: Path.basename(coverResponse.cover),
+              size: coverImageFileStats.size,
+              mtimeMs: coverImageFileStats.mtimeMs || 0,
+              ctimeMs: coverImageFileStats.ctimeMs || 0,
+              birthtimeMs: coverImageFileStats.birthtimeMs || 0
+            }
+          }
+          newLibraryItem.libraryFiles.push(newLibraryFile)
+          newLibraryItem.changed('libraryFiles', true)
+          await newLibraryItem.save()
+
+          newLibraryItem.media.coverPath = coverResponse.cover
+          await newLibraryItem.media.save()
         }
       }
     }
 
-    await Database.createLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_added', libraryItem.toJSONExpanded())
+    SocketAuthority.emitter('item_added', newLibraryItem.toOldJSONExpanded())
 
-    res.json(libraryItem.toJSONExpanded())
+    res.json(newLibraryItem.toOldJSONExpanded())
 
     // Turn on podcast auto download cron if not already on
-    if (libraryItem.media.autoDownloadEpisodes) {
-      this.cronManager.checkUpdatePodcastCron(libraryItem)
+    if (newLibraryItem.media.autoDownloadEpisodes) {
+      this.cronManager.checkUpdatePodcastCron(newLibraryItem)
     }
   }
 
diff --git a/server/managers/CoverManager.js b/server/managers/CoverManager.js
index c995a446..945c69ab 100644
--- a/server/managers/CoverManager.js
+++ b/server/managers/CoverManager.js
@@ -338,13 +338,14 @@ class CoverManager {
    *
    * @param {string} url
    * @param {string} libraryItemId
-   * @param {string} [libraryItemPath] null if library item isFile or is from adding new podcast
+   * @param {string} [libraryItemPath] - null if library item isFile
+   * @param {boolean} [forceLibraryItemFolder=false] - force save cover with library item (used for adding new podcasts)
    * @returns {Promise<{error:string}|{cover:string}>}
    */
-  async downloadCoverFromUrlNew(url, libraryItemId, libraryItemPath) {
+  async downloadCoverFromUrlNew(url, libraryItemId, libraryItemPath, forceLibraryItemFolder = false) {
     try {
       let coverDirPath = null
-      if (global.ServerSettings.storeCoverWithItem && libraryItemPath) {
+      if ((global.ServerSettings.storeCoverWithItem || forceLibraryItemFolder) && libraryItemPath) {
         coverDirPath = libraryItemPath
       } else {
         coverDirPath = Path.posix.join(global.MetadataPath, 'items', libraryItemId)
diff --git a/server/managers/CronManager.js b/server/managers/CronManager.js
index c61fb049..3f948583 100644
--- a/server/managers/CronManager.js
+++ b/server/managers/CronManager.js
@@ -217,7 +217,7 @@ class CronManager {
 
   /**
    *
-   * @param {import('../models/LibraryItem')} libraryItem - this can be the old model
+   * @param {import('../models/LibraryItem')} libraryItem
    */
   checkUpdatePodcastCron(libraryItem) {
     // Remove from old cron by library item id
diff --git a/server/managers/NotificationManager.js b/server/managers/NotificationManager.js
index c48e878c..8edcf428 100644
--- a/server/managers/NotificationManager.js
+++ b/server/managers/NotificationManager.js
@@ -14,6 +14,11 @@ class NotificationManager {
     return notificationData
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {import('../models/PodcastEpisode')} episode
+   */
   async onPodcastEpisodeDownloaded(libraryItem, episode) {
     if (!Database.notificationSettings.isUseable) return
 
@@ -22,17 +27,17 @@ class NotificationManager {
       return
     }
 
-    Logger.debug(`[NotificationManager] onPodcastEpisodeDownloaded: Episode "${episode.title}" for podcast ${libraryItem.media.metadata.title}`)
+    Logger.debug(`[NotificationManager] onPodcastEpisodeDownloaded: Episode "${episode.title}" for podcast ${libraryItem.media.title}`)
     const library = await Database.libraryModel.findByPk(libraryItem.libraryId)
     const eventData = {
       libraryItemId: libraryItem.id,
       libraryId: libraryItem.libraryId,
       libraryName: library?.name || 'Unknown',
       mediaTags: (libraryItem.media.tags || []).join(', '),
-      podcastTitle: libraryItem.media.metadata.title,
-      podcastAuthor: libraryItem.media.metadata.author || '',
-      podcastDescription: libraryItem.media.metadata.description || '',
-      podcastGenres: (libraryItem.media.metadata.genres || []).join(', '),
+      podcastTitle: libraryItem.media.title,
+      podcastAuthor: libraryItem.media.author || '',
+      podcastDescription: libraryItem.media.description || '',
+      podcastGenres: (libraryItem.media.genres || []).join(', '),
       episodeId: episode.id,
       episodeTitle: episode.title,
       episodeSubtitle: episode.subtitle || '',
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index 92053707..bd42e74b 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -1,3 +1,4 @@
+const Path = require('path')
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
@@ -19,9 +20,7 @@ const NotificationManager = require('../managers/NotificationManager')
 
 const LibraryFile = require('../objects/files/LibraryFile')
 const PodcastEpisodeDownload = require('../objects/PodcastEpisodeDownload')
-const PodcastEpisode = require('../objects/entities/PodcastEpisode')
 const AudioFile = require('../objects/files/AudioFile')
-const LibraryItem = require('../objects/LibraryItem')
 
 class PodcastManager {
   constructor() {
@@ -55,17 +54,13 @@ class PodcastManager {
   /**
    *
    * @param {import('../models/LibraryItem')} libraryItem
-   * @param {*} episodesToDownload
-   * @param {*} isAutoDownload
+   * @param {import('../utils/podcastUtils').RssPodcastEpisode[]} episodesToDownload
+   * @param {boolean} isAutoDownload - If this download was triggered by auto download
    */
   async downloadPodcastEpisodes(libraryItem, episodesToDownload, isAutoDownload) {
     for (const ep of episodesToDownload) {
-      const newPe = new PodcastEpisode()
-      newPe.setData(ep, null)
-      newPe.libraryItemId = libraryItem.id
-      newPe.podcastId = libraryItem.media.id
       const newPeDl = new PodcastEpisodeDownload()
-      newPeDl.setData(newPe, libraryItem, isAutoDownload, libraryItem.libraryId)
+      newPeDl.setData(ep, libraryItem, isAutoDownload, libraryItem.libraryId)
       this.startPodcastEpisodeDownload(newPeDl)
     }
   }
@@ -91,20 +86,20 @@ class PodcastManager {
       key: 'MessageDownloadingEpisode'
     }
     const taskDescriptionString = {
-      text: `Downloading episode "${podcastEpisodeDownload.podcastEpisode.title}".`,
+      text: `Downloading episode "${podcastEpisodeDownload.episodeTitle}".`,
       key: 'MessageTaskDownloadingEpisodeDescription',
-      subs: [podcastEpisodeDownload.podcastEpisode.title]
+      subs: [podcastEpisodeDownload.episodeTitle]
     }
     const task = TaskManager.createAndAddTask('download-podcast-episode', taskTitleString, taskDescriptionString, false, taskData)
 
     SocketAuthority.emitter('episode_download_started', podcastEpisodeDownload.toJSONForClient())
     this.currentDownload = podcastEpisodeDownload
 
-    // If this file already exists then append the episode id to the filename
+    // If this file already exists then append a uuid to the filename
     //  e.g. "/tagesschau 20 Uhr.mp3" becomes "/tagesschau 20 Uhr (ep_asdfasdf).mp3"
     //  this handles podcasts where every title is the same (ref https://github.com/advplyr/audiobookshelf/issues/1802)
     if (await fs.pathExists(this.currentDownload.targetPath)) {
-      this.currentDownload.appendEpisodeId = true
+      this.currentDownload.appendRandomId = true
     }
 
     // Ignores all added files to this dir
@@ -145,7 +140,7 @@ class PodcastManager {
         }
         task.setFailed(taskFailedString)
       } else {
-        Logger.info(`[PodcastManager] Successfully downloaded podcast episode "${this.currentDownload.podcastEpisode.title}"`)
+        Logger.info(`[PodcastManager] Successfully downloaded podcast episode "${this.currentDownload.episodeTitle}"`)
         this.currentDownload.setFinished(true)
         task.setFinished()
       }
@@ -171,47 +166,61 @@ class PodcastManager {
     }
   }
 
+  /**
+   * Scans the downloaded audio file, create the podcast episode, remove oldest episode if necessary
+   * @returns {Promise<boolean>} - Returns true if added
+   */
   async scanAddPodcastEpisodeAudioFile() {
-    const libraryFile = await this.getLibraryFile(this.currentDownload.targetPath, this.currentDownload.targetRelPath)
+    const libraryFile = new LibraryFile()
+    await libraryFile.setDataFromPath(this.currentDownload.targetPath, this.currentDownload.targetRelPath)
 
     const audioFile = await this.probeAudioFile(libraryFile)
     if (!audioFile) {
       return false
     }
 
-    const libraryItem = await Database.libraryItemModel.getOldById(this.currentDownload.libraryItem.id)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(this.currentDownload.libraryItem.id)
     if (!libraryItem) {
       Logger.error(`[PodcastManager] Podcast Episode finished but library item was not found ${this.currentDownload.libraryItem.id}`)
       return false
     }
 
-    const podcastEpisode = this.currentDownload.podcastEpisode
-    podcastEpisode.audioFile = audioFile
+    const podcastEpisode = await Database.podcastEpisodeModel.createFromRssPodcastEpisode(this.currentDownload.rssPodcastEpisode, libraryItem.media.id, audioFile)
 
-    if (audioFile.chapters?.length) {
-      podcastEpisode.chapters = audioFile.chapters.map((ch) => ({ ...ch }))
-    }
+    libraryItem.libraryFiles.push(libraryFile.toJSON())
+    libraryItem.changed('libraryFiles', true)
 
-    libraryItem.media.addPodcastEpisode(podcastEpisode)
-    if (libraryItem.isInvalid) {
-      // First episode added to an empty podcast
-      libraryItem.isInvalid = false
-    }
-    libraryItem.libraryFiles.push(libraryFile)
+    libraryItem.media.podcastEpisodes.push(podcastEpisode)
 
     if (this.currentDownload.isAutoDownload) {
       // Check setting maxEpisodesToKeep and remove episode if necessary
-      if (libraryItem.media.maxEpisodesToKeep && libraryItem.media.episodesWithPubDate.length > libraryItem.media.maxEpisodesToKeep) {
-        Logger.info(`[PodcastManager] # of episodes (${libraryItem.media.episodesWithPubDate.length}) exceeds max episodes to keep (${libraryItem.media.maxEpisodesToKeep})`)
-        await this.removeOldestEpisode(libraryItem, podcastEpisode.id)
+      const numEpisodesWithPubDate = libraryItem.media.podcastEpisodes.filter((ep) => !!ep.publishedAt).length
+      if (libraryItem.media.maxEpisodesToKeep && numEpisodesWithPubDate > libraryItem.media.maxEpisodesToKeep) {
+        Logger.info(`[PodcastManager] # of episodes (${numEpisodesWithPubDate}) exceeds max episodes to keep (${libraryItem.media.maxEpisodesToKeep})`)
+        const episodeToRemove = await this.getRemoveOldestEpisode(libraryItem, podcastEpisode.id)
+        if (episodeToRemove) {
+          // Remove episode from playlists
+          await Database.playlistModel.removeMediaItemsFromPlaylists([episodeToRemove.id])
+          // Remove media progress for this episode
+          await Database.mediaProgressModel.destroy({
+            where: {
+              mediaItemId: episodeToRemove.id
+            }
+          })
+          await episodeToRemove.destroy()
+          libraryItem.media.podcastEpisodes = libraryItem.media.podcastEpisodes.filter((ep) => ep.id !== episodeToRemove.id)
+
+          // Remove library file
+          libraryItem.libraryFiles = libraryItem.libraryFiles.filter((lf) => lf.ino !== episodeToRemove.audioFile.ino)
+        }
       }
     }
 
-    libraryItem.updatedAt = Date.now()
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    const podcastEpisodeExpanded = podcastEpisode.toJSONExpanded()
-    podcastEpisodeExpanded.libraryItem = libraryItem.toJSONExpanded()
+    await libraryItem.save()
+
+    SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
+    const podcastEpisodeExpanded = podcastEpisode.toOldJSONExpanded(libraryItem.id)
+    podcastEpisodeExpanded.libraryItem = libraryItem.toOldJSONExpanded()
     SocketAuthority.emitter('episode_added', podcastEpisodeExpanded)
 
     if (this.currentDownload.isAutoDownload) {
@@ -222,45 +231,53 @@ class PodcastManager {
     return true
   }
 
-  async removeOldestEpisode(libraryItem, episodeIdJustDownloaded) {
-    var smallestPublishedAt = 0
-    var oldestEpisode = null
-    libraryItem.media.episodesWithPubDate
-      .filter((ep) => ep.id !== episodeIdJustDownloaded)
-      .forEach((ep) => {
-        if (!smallestPublishedAt || ep.publishedAt < smallestPublishedAt) {
-          smallestPublishedAt = ep.publishedAt
-          oldestEpisode = ep
-        }
-      })
-    // TODO: Should we check for open playback sessions for this episode?
-    // TODO: remove all user progress for this episode
+  /**
+   * Find oldest episode publishedAt and delete the audio file
+   *
+   * @param {import('../models/LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} episodeIdJustDownloaded
+   * @returns {Promise<import('../models/PodcastEpisode')|null>} - Returns the episode to remove
+   */
+  async getRemoveOldestEpisode(libraryItem, episodeIdJustDownloaded) {
+    let smallestPublishedAt = 0
+    /** @type {import('../models/PodcastEpisode')} */
+    let oldestEpisode = null
+
+    /** @type {import('../models/PodcastEpisode')[]} */
+    const podcastEpisodes = libraryItem.media.podcastEpisodes
+
+    for (const ep of podcastEpisodes) {
+      if (ep.id === episodeIdJustDownloaded || !ep.publishedAt) continue
+
+      if (!smallestPublishedAt || ep.publishedAt < smallestPublishedAt) {
+        smallestPublishedAt = ep.publishedAt
+        oldestEpisode = ep
+      }
+    }
+
     if (oldestEpisode?.audioFile) {
       Logger.info(`[PodcastManager] Deleting oldest episode "${oldestEpisode.title}"`)
       const successfullyDeleted = await removeFile(oldestEpisode.audioFile.metadata.path)
       if (successfullyDeleted) {
-        libraryItem.media.removeEpisode(oldestEpisode.id)
-        libraryItem.removeLibraryFile(oldestEpisode.audioFile.ino)
-        return true
+        return oldestEpisode
       } else {
         Logger.warn(`[PodcastManager] Failed to remove oldest episode "${oldestEpisode.title}"`)
       }
     }
-    return false
-  }
-
-  async getLibraryFile(path, relPath) {
-    var newLibFile = new LibraryFile()
-    await newLibFile.setDataFromPath(path, relPath)
-    return newLibFile
+    return null
   }
 
+  /**
+   *
+   * @param {LibraryFile} libraryFile
+   * @returns {Promise<AudioFile|null>}
+   */
   async probeAudioFile(libraryFile) {
     const path = libraryFile.metadata.path
     const mediaProbeData = await prober.probe(path)
     if (mediaProbeData.error) {
       Logger.error(`[PodcastManager] Podcast Episode downloaded but failed to probe "${path}"`, mediaProbeData.error)
-      return false
+      return null
     }
     const newAudioFile = new AudioFile()
     newAudioFile.setDataFromProbe(libraryFile, mediaProbeData)
@@ -284,7 +301,7 @@ class PodcastManager {
     const dateToCheckForEpisodesAfter = latestEpisodePublishedAt || lastEpisodeCheckDate
     Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)
 
-    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, dateToCheckForEpisodesAfter, libraryItem.media.maxNewEpisodesToDownload)
+    const newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, dateToCheckForEpisodesAfter, libraryItem.media.maxNewEpisodesToDownload)
     Logger.debug(`[PodcastManager] runEpisodeCheck: ${newEpisodes?.length || 'N/A'} episodes found`)
 
     if (!newEpisodes) {
@@ -324,17 +341,17 @@ class PodcastManager {
    * @param {import('../models/LibraryItem')} podcastLibraryItem
    * @param {number} dateToCheckForEpisodesAfter - Unix timestamp
    * @param {number} maxNewEpisodes
-   * @returns
+   * @returns {Promise<import('../utils/podcastUtils').RssPodcastEpisode[]|null>}
    */
   async checkPodcastForNewEpisodes(podcastLibraryItem, dateToCheckForEpisodesAfter, maxNewEpisodes = 3) {
     if (!podcastLibraryItem.media.feedURL) {
       Logger.error(`[PodcastManager] checkPodcastForNewEpisodes no feed url for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`)
-      return false
+      return null
     }
     const feed = await getPodcastFeed(podcastLibraryItem.media.feedURL)
     if (!feed?.episodes) {
       Logger.error(`[PodcastManager] checkPodcastForNewEpisodes invalid feed payload for ${podcastLibraryItem.media.title} (ID: ${podcastLibraryItem.id})`, feed)
-      return false
+      return null
     }
 
     // Filter new and not already has
@@ -351,15 +368,15 @@ class PodcastManager {
    *
    * @param {import('../models/LibraryItem')} libraryItem
    * @param {*} maxEpisodesToDownload
-   * @returns
+   * @returns {Promise<import('../utils/podcastUtils').RssPodcastEpisode[]>}
    */
   async checkAndDownloadNewEpisodes(libraryItem, maxEpisodesToDownload) {
     const lastEpisodeCheck = libraryItem.media.lastEpisodeCheck?.valueOf() || 0
     const lastEpisodeCheckDate = lastEpisodeCheck > 0 ? libraryItem.media.lastEpisodeCheck : 'Never'
     Logger.info(`[PodcastManager] checkAndDownloadNewEpisodes for "${libraryItem.media.title}" - Last episode check: ${lastEpisodeCheckDate}`)
 
-    var newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, lastEpisodeCheck, maxEpisodesToDownload)
-    if (newEpisodes.length) {
+    const newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, lastEpisodeCheck, maxEpisodesToDownload)
+    if (newEpisodes?.length) {
       Logger.info(`[PodcastManager] Found ${newEpisodes.length} new episodes for podcast "${libraryItem.media.title}" - starting download`)
       this.downloadPodcastEpisodes(libraryItem, newEpisodes, false)
     } else {
@@ -374,7 +391,7 @@ class PodcastManager {
 
     SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
 
-    return newEpisodes
+    return newEpisodes || []
   }
 
   async findEpisode(rssFeedUrl, searchTitle) {
@@ -550,64 +567,123 @@ class PodcastManager {
         continue
       }
 
-      const newPodcastMetadata = {
-        title: feed.metadata.title,
-        author: feed.metadata.author,
-        description: feed.metadata.description,
-        releaseDate: '',
-        genres: [...feed.metadata.categories],
-        feedUrl: feed.metadata.feedUrl,
-        imageUrl: feed.metadata.image,
-        itunesPageUrl: '',
-        itunesId: '',
-        itunesArtistId: '',
-        language: '',
-        numEpisodes: feed.numEpisodes
-      }
+      let newLibraryItem = null
+      const transaction = await Database.sequelize.transaction()
+      try {
+        const libraryItemFolderStats = await getFileTimestampsWithIno(podcastPath)
 
-      const libraryItemFolderStats = await getFileTimestampsWithIno(podcastPath)
-      const libraryItemPayload = {
-        path: podcastPath,
-        relPath: podcastFilename,
-        folderId: folder.id,
-        libraryId: folder.libraryId,
-        ino: libraryItemFolderStats.ino,
-        mtimeMs: libraryItemFolderStats.mtimeMs || 0,
-        ctimeMs: libraryItemFolderStats.ctimeMs || 0,
-        birthtimeMs: libraryItemFolderStats.birthtimeMs || 0,
-        media: {
-          metadata: newPodcastMetadata,
-          autoDownloadEpisodes
+        const podcastPayload = {
+          autoDownloadEpisodes,
+          metadata: {
+            title: feed.metadata.title,
+            author: feed.metadata.author,
+            description: feed.metadata.description,
+            releaseDate: '',
+            genres: [...feed.metadata.categories],
+            feedUrl: feed.metadata.feedUrl,
+            imageUrl: feed.metadata.image,
+            itunesPageUrl: '',
+            itunesId: '',
+            itunesArtistId: '',
+            language: '',
+            numEpisodes: feed.numEpisodes
+          }
         }
+        const podcast = await Database.podcastModel.createFromRequest(podcastPayload, transaction)
+
+        newLibraryItem = await Database.libraryItemModel.create(
+          {
+            ino: libraryItemFolderStats.ino,
+            path: podcastPath,
+            relPath: podcastFilename,
+            mediaId: podcast.id,
+            mediaType: 'podcast',
+            isFile: false,
+            isMissing: false,
+            isInvalid: false,
+            mtime: libraryItemFolderStats.mtimeMs || 0,
+            ctime: libraryItemFolderStats.ctimeMs || 0,
+            birthtime: libraryItemFolderStats.birthtimeMs || 0,
+            size: 0,
+            libraryFiles: [],
+            extraData: {},
+            libraryId: folder.libraryId,
+            libraryFolderId: folder.id
+          },
+          { transaction }
+        )
+
+        await transaction.commit()
+      } catch (error) {
+        await transaction.rollback()
+        Logger.error(`[PodcastManager] createPodcastsFromFeedUrls: Failed to create podcast library item for "${feed.metadata.title}"`, error)
+        const taskTitleStringFeed = {
+          text: 'OPML import feed',
+          key: 'MessageTaskOpmlImportFeed'
+        }
+        const taskDescriptionStringPodcast = {
+          text: `Creating podcast "${feed.metadata.title}"`,
+          key: 'MessageTaskOpmlImportFeedPodcastDescription',
+          subs: [feed.metadata.title]
+        }
+        const taskErrorString = {
+          text: 'Failed to create podcast library item',
+          key: 'MessageTaskOpmlImportFeedPodcastFailed'
+        }
+        TaskManager.createAndEmitFailedTask('opml-import-feed', taskTitleStringFeed, taskDescriptionStringPodcast, taskErrorString)
+        continue
       }
 
-      const libraryItem = new LibraryItem()
-      libraryItem.setData('podcast', libraryItemPayload)
+      newLibraryItem.media = await newLibraryItem.getMediaExpanded()
 
       // Download and save cover image
-      if (newPodcastMetadata.imageUrl) {
-        // TODO: Scan cover image to library files
+      if (typeof feed.metadata.image === 'string' && feed.metadata.image.startsWith('http')) {
         // Podcast cover will always go into library item folder
-        const coverResponse = await CoverManager.downloadCoverFromUrl(libraryItem, newPodcastMetadata.imageUrl, true)
-        if (coverResponse) {
-          if (coverResponse.error) {
-            Logger.error(`[PodcastManager] createPodcastsFromFeedUrls: Download cover error from "${newPodcastMetadata.imageUrl}": ${coverResponse.error}`)
-          } else if (coverResponse.cover) {
-            libraryItem.media.coverPath = coverResponse.cover
+        const coverResponse = await CoverManager.downloadCoverFromUrlNew(feed.metadata.image, newLibraryItem.id, newLibraryItem.path, true)
+        if (coverResponse.error) {
+          Logger.error(`[PodcastManager] Download cover error from "${feed.metadata.image}": ${coverResponse.error}`)
+        } else if (coverResponse.cover) {
+          const coverImageFileStats = await getFileTimestampsWithIno(coverResponse.cover)
+          if (!coverImageFileStats) {
+            Logger.error(`[PodcastManager] Failed to get cover image stats for "${coverResponse.cover}"`)
+          } else {
+            // Add libraryFile to libraryItem and coverPath to podcast
+            const newLibraryFile = {
+              ino: coverImageFileStats.ino,
+              fileType: 'image',
+              addedAt: Date.now(),
+              updatedAt: Date.now(),
+              metadata: {
+                filename: Path.basename(coverResponse.cover),
+                ext: Path.extname(coverResponse.cover).slice(1),
+                path: coverResponse.cover,
+                relPath: Path.basename(coverResponse.cover),
+                size: coverImageFileStats.size,
+                mtimeMs: coverImageFileStats.mtimeMs || 0,
+                ctimeMs: coverImageFileStats.ctimeMs || 0,
+                birthtimeMs: coverImageFileStats.birthtimeMs || 0
+              }
+            }
+            newLibraryItem.libraryFiles.push(newLibraryFile)
+            newLibraryItem.changed('libraryFiles', true)
+            await newLibraryItem.save()
+
+            newLibraryItem.media.coverPath = coverResponse.cover
+            await newLibraryItem.media.save()
           }
         }
       }
 
-      await Database.createLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_added', libraryItem.toJSONExpanded())
+      SocketAuthority.emitter('item_added', newLibraryItem.toOldJSONExpanded())
 
       // Turn on podcast auto download cron if not already on
-      if (libraryItem.media.autoDownloadEpisodes) {
-        cronManager.checkUpdatePodcastCron(libraryItem)
+      if (newLibraryItem.media.autoDownloadEpisodes) {
+        cronManager.checkUpdatePodcastCron(newLibraryItem)
       }
 
       numPodcastsAdded++
     }
+
     const taskFinishedString = {
       text: `Added ${numPodcastsAdded} podcasts`,
       key: 'MessageTaskOpmlImportFinished',
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index fd471305..aa7afbac 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -126,6 +126,45 @@ class Podcast extends Model {
     }
   }
 
+  /**
+   * Payload from the /api/podcasts POST endpoint
+   *
+   * @param {Object} payload
+   * @param {import('sequelize').Transaction} transaction
+   */
+  static async createFromRequest(payload, transaction) {
+    const title = typeof payload.metadata.title === 'string' ? payload.metadata.title : null
+    const autoDownloadSchedule = typeof payload.autoDownloadSchedule === 'string' ? payload.autoDownloadSchedule : null
+    const genres = Array.isArray(payload.metadata.genres) && payload.metadata.genres.every((g) => typeof g === 'string' && g.length) ? payload.metadata.genres : []
+    const tags = Array.isArray(payload.tags) && payload.tags.every((t) => typeof t === 'string' && t.length) ? payload.tags : []
+
+    return this.create(
+      {
+        title,
+        titleIgnorePrefix: getTitleIgnorePrefix(title),
+        author: typeof payload.metadata.author === 'string' ? payload.metadata.author : null,
+        releaseDate: typeof payload.metadata.releaseDate === 'string' ? payload.metadata.releaseDate : null,
+        feedURL: typeof payload.metadata.feedUrl === 'string' ? payload.metadata.feedUrl : null,
+        imageURL: typeof payload.metadata.imageUrl === 'string' ? payload.metadata.imageUrl : null,
+        description: typeof payload.metadata.description === 'string' ? payload.metadata.description : null,
+        itunesPageURL: typeof payload.metadata.itunesPageUrl === 'string' ? payload.metadata.itunesPageUrl : null,
+        itunesId: typeof payload.metadata.itunesId === 'string' ? payload.metadata.itunesId : null,
+        itunesArtistId: typeof payload.metadata.itunesArtistId === 'string' ? payload.metadata.itunesArtistId : null,
+        language: typeof payload.metadata.language === 'string' ? payload.metadata.language : null,
+        podcastType: typeof payload.metadata.type === 'string' ? payload.metadata.type : null,
+        explicit: !!payload.metadata.explicit,
+        autoDownloadEpisodes: !!payload.autoDownloadEpisodes,
+        autoDownloadSchedule: autoDownloadSchedule || global.ServerSettings.podcastEpisodeSchedule,
+        lastEpisodeCheck: new Date(),
+        maxEpisodesToKeep: 0,
+        maxNewEpisodesToDownload: 3,
+        tags,
+        genres
+      },
+      { transaction }
+    )
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
@@ -368,7 +407,7 @@ class Podcast extends Model {
   /**
    * Used for checking if an rss feed episode is already in the podcast
    *
-   * @param {Object} feedEpisode - object from rss feed
+   * @param {import('../utils/podcastUtils').RssPodcastEpisode} feedEpisode - object from rss feed
    * @returns {boolean}
    */
   checkHasEpisodeByFeedEpisode(feedEpisode) {
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 4c9967f8..c1e66fdf 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -87,6 +87,40 @@ class PodcastEpisode extends Model {
     }
   }
 
+  /**
+   *
+   * @param {import('../utils/podcastUtils').RssPodcastEpisode} rssPodcastEpisode
+   * @param {string} podcastId
+   * @param {import('../objects/files/AudioFile')} audioFile
+   */
+  static async createFromRssPodcastEpisode(rssPodcastEpisode, podcastId, audioFile) {
+    const podcastEpisode = {
+      index: null,
+      season: rssPodcastEpisode.season,
+      episode: rssPodcastEpisode.episode,
+      episodeType: rssPodcastEpisode.episodeType,
+      title: rssPodcastEpisode.title,
+      subtitle: rssPodcastEpisode.subtitle,
+      description: rssPodcastEpisode.description,
+      pubDate: rssPodcastEpisode.pubDate,
+      enclosureURL: rssPodcastEpisode.enclosure?.url || null,
+      enclosureSize: rssPodcastEpisode.enclosure?.length || null,
+      enclosureType: rssPodcastEpisode.enclosure?.type || null,
+      publishedAt: rssPodcastEpisode.publishedAt,
+      podcastId,
+      audioFile: audioFile.toJSON(),
+      chapters: [],
+      extraData: {}
+    }
+    if (rssPodcastEpisode.guid) {
+      podcastEpisode.extraData.guid = rssPodcastEpisode.guid
+    }
+    if (audioFile.chapters?.length) {
+      podcastEpisode.chapters = audioFile.chapters.map((ch) => ({ ...ch }))
+    }
+    return this.create(podcastEpisode)
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index b1cdf43b..17d7484c 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -1,4 +1,3 @@
-const uuidv4 = require('uuid').v4
 const fs = require('../libs/fsExtra')
 const Path = require('path')
 const Logger = require('../Logger')
@@ -178,45 +177,6 @@ class LibraryItem {
     return this.libraryFiles.some((lf) => lf.fileType === 'audio')
   }
 
-  // Data comes from scandir library item data
-  // TODO: Remove this function. Only used when creating a new podcast now
-  setData(libraryMediaType, payload) {
-    this.id = uuidv4()
-    this.mediaType = libraryMediaType
-    if (libraryMediaType === 'podcast') {
-      this.media = new Podcast()
-    } else {
-      Logger.error(`[LibraryItem] setData called with unsupported media type "${libraryMediaType}"`)
-      return
-    }
-    this.media.id = uuidv4()
-    this.media.libraryItemId = this.id
-
-    for (const key in payload) {
-      if (key === 'libraryFiles') {
-        this.libraryFiles = payload.libraryFiles.map((lf) => lf.clone())
-
-        // Set cover image
-        const imageFiles = this.libraryFiles.filter((lf) => lf.fileType === 'image')
-        const coverMatch = imageFiles.find((iFile) => /\/cover\.[^.\/]*$/.test(iFile.metadata.path))
-        if (coverMatch) {
-          this.media.coverPath = coverMatch.metadata.path
-        } else if (imageFiles.length) {
-          this.media.coverPath = imageFiles[0].metadata.path
-        }
-      } else if (this[key] !== undefined && key !== 'media') {
-        this[key] = payload[key]
-      }
-    }
-
-    if (payload.media) {
-      this.media.setData(payload.media)
-    }
-
-    this.addedAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
   update(payload) {
     const json = this.toJSON()
     let hasUpdates = false
diff --git a/server/objects/PodcastEpisodeDownload.js b/server/objects/PodcastEpisodeDownload.js
index ecda4a47..ffdad9f0 100644
--- a/server/objects/PodcastEpisodeDownload.js
+++ b/server/objects/PodcastEpisodeDownload.js
@@ -6,8 +6,9 @@ const globals = require('../utils/globals')
 class PodcastEpisodeDownload {
   constructor() {
     this.id = null
-    /** @type {import('../objects/entities/PodcastEpisode')} */
-    this.podcastEpisode = null
+    /** @type {import('../utils/podcastUtils').RssPodcastEpisode} */
+    this.rssPodcastEpisode = null
+
     this.url = null
     /** @type {import('../models/LibraryItem')} */
     this.libraryItem = null
@@ -17,7 +18,7 @@ class PodcastEpisodeDownload {
     this.isFinished = false
     this.failed = false
 
-    this.appendEpisodeId = false
+    this.appendRandomId = false
 
     this.startedAt = null
     this.createdAt = null
@@ -27,22 +28,22 @@ class PodcastEpisodeDownload {
   toJSONForClient() {
     return {
       id: this.id,
-      episodeDisplayTitle: this.podcastEpisode?.title ?? null,
+      episodeDisplayTitle: this.rssPodcastEpisode?.title ?? null,
       url: this.url,
       libraryItemId: this.libraryItemId,
       libraryId: this.libraryId || null,
       isFinished: this.isFinished,
       failed: this.failed,
-      appendEpisodeId: this.appendEpisodeId,
+      appendRandomId: this.appendRandomId,
       startedAt: this.startedAt,
       createdAt: this.createdAt,
       finishedAt: this.finishedAt,
       podcastTitle: this.libraryItem?.media.title ?? null,
       podcastExplicit: !!this.libraryItem?.media.explicit,
-      season: this.podcastEpisode?.season ?? null,
-      episode: this.podcastEpisode?.episode ?? null,
-      episodeType: this.podcastEpisode?.episodeType ?? 'full',
-      publishedAt: this.podcastEpisode?.publishedAt ?? null
+      season: this.rssPodcastEpisode?.season ?? null,
+      episode: this.rssPodcastEpisode?.episode ?? null,
+      episodeType: this.rssPodcastEpisode?.episodeType ?? 'full',
+      publishedAt: this.rssPodcastEpisode?.publishedAt ?? null
     }
   }
 
@@ -56,7 +57,7 @@ class PodcastEpisodeDownload {
     return 'mp3'
   }
   get enclosureType() {
-    const enclosureType = this.podcastEpisode?.enclosure?.type
+    const enclosureType = this.rssPodcastEpisode.enclosure.type
     return typeof enclosureType === 'string' ? enclosureType : null
   }
   /**
@@ -69,10 +70,12 @@ class PodcastEpisodeDownload {
     if (this.enclosureType && !this.enclosureType.includes('mpeg')) return false
     return this.fileExtension === 'mp3'
   }
-
+  get episodeTitle() {
+    return this.rssPodcastEpisode.title
+  }
   get targetFilename() {
-    const appendage = this.appendEpisodeId ? ` (${this.podcastEpisode.id})` : ''
-    const filename = `${this.podcastEpisode.title}${appendage}.${this.fileExtension}`
+    const appendage = this.appendRandomId ? ` (${uuidv4()})` : ''
+    const filename = `${this.rssPodcastEpisode.title}${appendage}.${this.fileExtension}`
     return sanitizeFilename(filename)
   }
   get targetPath() {
@@ -84,19 +87,23 @@ class PodcastEpisodeDownload {
   get libraryItemId() {
     return this.libraryItem?.id || null
   }
+  get pubYear() {
+    if (!this.rssPodcastEpisode.publishedAt) return null
+    return new Date(this.rssPodcastEpisode.publishedAt).getFullYear()
+  }
 
   /**
    *
-   * @param {import('../objects/entities/PodcastEpisode')} podcastEpisode - old model
+   * @param {import('../utils/podcastUtils').RssPodcastEpisode} rssPodcastEpisode - from rss feed
    * @param {import('../models/LibraryItem')} libraryItem
    * @param {*} isAutoDownload
    * @param {*} libraryId
    */
-  setData(podcastEpisode, libraryItem, isAutoDownload, libraryId) {
+  setData(rssPodcastEpisode, libraryItem, isAutoDownload, libraryId) {
     this.id = uuidv4()
-    this.podcastEpisode = podcastEpisode
+    this.rssPodcastEpisode = rssPodcastEpisode
 
-    const url = podcastEpisode.enclosure.url
+    const url = rssPodcastEpisode.enclosure.url
     if (decodeURIComponent(url) !== url) {
       // Already encoded
       this.url = url
diff --git a/server/objects/entities/PodcastEpisode.js b/server/objects/entities/PodcastEpisode.js
index e759a0eb..6a3f4cf6 100644
--- a/server/objects/entities/PodcastEpisode.js
+++ b/server/objects/entities/PodcastEpisode.js
@@ -1,4 +1,3 @@
-const uuidv4 = require('uuid').v4
 const { areEquivalent, copyValue } = require('../../utils/index')
 const AudioFile = require('../files/AudioFile')
 const AudioTrack = require('../files/AudioTrack')
@@ -127,27 +126,6 @@ class PodcastEpisode {
   get enclosureUrl() {
     return this.enclosure?.url || null
   }
-  get pubYear() {
-    if (!this.publishedAt) return null
-    return new Date(this.publishedAt).getFullYear()
-  }
-
-  setData(data, index = 1) {
-    this.id = uuidv4()
-    this.index = index
-    this.title = data.title
-    this.subtitle = data.subtitle || ''
-    this.pubDate = data.pubDate || ''
-    this.description = data.description || ''
-    this.enclosure = data.enclosure ? { ...data.enclosure } : null
-    this.guid = data.guid || null
-    this.season = data.season || ''
-    this.episode = data.episode || ''
-    this.episodeType = data.episodeType || 'full'
-    this.publishedAt = data.publishedAt || 0
-    this.addedAt = Date.now()
-    this.updatedAt = Date.now()
-  }
 
   update(payload) {
     let hasUpdates = false
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index 8d6b541d..5f43ebc8 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -132,18 +132,6 @@ class Podcast {
   get numTracks() {
     return this.episodes.length
   }
-  get latestEpisodePublished() {
-    var largestPublishedAt = 0
-    this.episodes.forEach((ep) => {
-      if (ep.publishedAt && ep.publishedAt > largestPublishedAt) {
-        largestPublishedAt = ep.publishedAt
-      }
-    })
-    return largestPublishedAt
-  }
-  get episodesWithPubDate() {
-    return this.episodes.filter((ep) => !!ep.publishedAt)
-  }
 
   update(payload) {
     var json = this.toJSON()
@@ -178,34 +166,10 @@ class Podcast {
     return true
   }
 
-  setData(mediaData) {
-    this.metadata = new PodcastMetadata()
-    if (mediaData.metadata) {
-      this.metadata.setData(mediaData.metadata)
-    }
-
-    this.coverPath = mediaData.coverPath || null
-    this.autoDownloadEpisodes = !!mediaData.autoDownloadEpisodes
-    this.autoDownloadSchedule = mediaData.autoDownloadSchedule || global.ServerSettings.podcastEpisodeSchedule
-    this.lastEpisodeCheck = Date.now() // Makes sure new episodes are after this
-  }
-
   checkHasEpisode(episodeId) {
     return this.episodes.some((ep) => ep.id === episodeId)
   }
 
-  addPodcastEpisode(podcastEpisode) {
-    this.episodes.push(podcastEpisode)
-  }
-
-  removeEpisode(episodeId) {
-    const episode = this.episodes.find((ep) => ep.id === episodeId)
-    if (episode) {
-      this.episodes = this.episodes.filter((ep) => ep.id !== episodeId)
-    }
-    return episode
-  }
-
   getEpisode(episodeId) {
     if (!episodeId) return null
 
diff --git a/server/objects/metadata/PodcastMetadata.js b/server/objects/metadata/PodcastMetadata.js
index 8300e93a..0df40df0 100644
--- a/server/objects/metadata/PodcastMetadata.js
+++ b/server/objects/metadata/PodcastMetadata.js
@@ -91,24 +91,6 @@ class PodcastMetadata {
     return getTitlePrefixAtEnd(this.title)
   }
 
-  setData(mediaMetadata = {}) {
-    this.title = mediaMetadata.title || null
-    this.author = mediaMetadata.author || null
-    this.description = mediaMetadata.description || null
-    this.releaseDate = mediaMetadata.releaseDate || null
-    this.feedUrl = mediaMetadata.feedUrl || null
-    this.imageUrl = mediaMetadata.imageUrl || null
-    this.itunesPageUrl = mediaMetadata.itunesPageUrl || null
-    this.itunesId = mediaMetadata.itunesId || null
-    this.itunesArtistId = mediaMetadata.itunesArtistId || null
-    this.explicit = !!mediaMetadata.explicit
-    this.language = mediaMetadata.language || null
-    this.type = mediaMetadata.type || null
-    if (mediaMetadata.genres && mediaMetadata.genres.length) {
-      this.genres = [...mediaMetadata.genres]
-    }
-  }
-
   update(payload) {
     const json = this.toJSON()
     let hasUpdates = false
diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index 06e20f1d..f86df9eb 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -125,7 +125,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
 
     /** @type {import('../models/Podcast')} */
     const podcast = podcastEpisodeDownload.libraryItem.media
-    const podcastEpisode = podcastEpisodeDownload.podcastEpisode
+    const podcastEpisode = podcastEpisodeDownload.rssPodcastEpisode
     const finalSizeInBytes = Number(podcastEpisode.enclosure?.length || 0)
 
     const taggings = {
@@ -144,7 +144,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
       'series-part': podcastEpisode.episode,
       title: podcastEpisode.title,
       'title-sort': podcastEpisode.title,
-      year: podcastEpisode.pubYear,
+      year: podcastEpisodeDownload.pubYear,
       date: podcastEpisode.pubDate,
       releasedate: podcastEpisode.pubDate,
       'itunes-id': podcast.itunesId,
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index 26bd1733..d28c3b9d 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -4,6 +4,49 @@ const Logger = require('../Logger')
 const { xmlToJSON, levenshteinDistance } = require('./index')
 const htmlSanitizer = require('../utils/htmlSanitizer')
 
+/**
+ * @typedef RssPodcastEpisode
+ * @property {string} title
+ * @property {string} subtitle
+ * @property {string} description
+ * @property {string} descriptionPlain
+ * @property {string} pubDate
+ * @property {string} episodeType
+ * @property {string} season
+ * @property {string} episode
+ * @property {string} author
+ * @property {string} duration
+ * @property {string} explicit
+ * @property {number} publishedAt - Unix timestamp
+ * @property {{ url: string, type?: string, length?: string }} enclosure
+ * @property {string} guid
+ * @property {string} chaptersUrl
+ * @property {string} chaptersType
+ */
+
+/**
+ * @typedef RssPodcastMetadata
+ * @property {string} title
+ * @property {string} language
+ * @property {string} explicit
+ * @property {string} author
+ * @property {string} pubDate
+ * @property {string} link
+ * @property {string} image
+ * @property {string[]} categories
+ * @property {string} feedUrl
+ * @property {string} description
+ * @property {string} descriptionPlain
+ * @property {string} type
+ */
+
+/**
+ * @typedef RssPodcast
+ * @property {RssPodcastMetadata} metadata
+ * @property {RssPodcastEpisode[]} episodes
+ * @property {number} numEpisodes
+ */
+
 function extractFirstArrayItem(json, key) {
   if (!json[key]?.length) return null
   return json[key][0]
@@ -223,7 +266,7 @@ module.exports.parsePodcastRssFeedXml = async (xml, excludeEpisodeMetadata = fal
  *
  * @param {string} feedUrl
  * @param {boolean} [excludeEpisodeMetadata=false]
- * @returns {Promise}
+ * @returns {Promise<RssPodcast|null>}
  */
 module.exports.getPodcastFeed = (feedUrl, excludeEpisodeMetadata = false) => {
   Logger.debug(`[podcastUtils] getPodcastFeed for "${feedUrl}"`)

From 6d52f88a96ddf8f158c2e999dfe51a1ef43abc9b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 4 Jan 2025 15:20:41 -0600
Subject: [PATCH 133/143] Update controllers to use toOldJSON functions

---
 server/Database.js                            | 24 ++++-
 server/controllers/AuthorController.js        | 21 ++--
 server/controllers/CollectionController.js    | 16 ++--
 server/controllers/LibraryController.js       | 12 +--
 server/controllers/LibraryItemController.js   | 41 ++++----
 server/controllers/MeController.js            | 14 +--
 server/controllers/MiscController.js          | 16 ++--
 server/controllers/PlaylistController.js      | 26 ++---
 server/managers/PodcastManager.js             |  6 +-
 server/models/Collection.js                   |  2 +-
 server/models/LibraryItem.js                  | 82 ++++++++--------
 server/models/Playlist.js                     |  4 +-
 server/objects/mediaTypes/Podcast.js          |  4 -
 server/scanner/LibraryItemScanner.js          |  3 +-
 server/scanner/LibraryScanner.js              | 47 +++++----
 server/utils/migrations/dbMigration.js        |  2 +-
 server/utils/queries/libraryFilters.js        | 26 ++---
 .../utils/queries/libraryItemsBookFilters.js  | 96 +++++++++++++------
 .../queries/libraryItemsPodcastFilters.js     | 27 +++---
 server/utils/queries/seriesFilters.js         | 10 +-
 20 files changed, 277 insertions(+), 202 deletions(-)

diff --git a/server/Database.js b/server/Database.js
index 2137b3c1..45af5248 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -665,7 +665,7 @@ class Database {
   /**
    * Clean invalid records in database
    * Series should have atleast one Book
-   * Book and Podcast must have an associated LibraryItem
+   * Book and Podcast must have an associated LibraryItem (and vice versa)
    * Remove playback sessions that are 3 seconds or less
    */
   async cleanDatabase() {
@@ -695,6 +695,28 @@ class Database {
       await book.destroy()
     }
 
+    // Remove invalid LibraryItem records
+    const libraryItemsWithNoMedia = await this.libraryItemModel.findAll({
+      include: [
+        {
+          model: this.bookModel,
+          attributes: ['id']
+        },
+        {
+          model: this.podcastModel,
+          attributes: ['id']
+        }
+      ],
+      where: {
+        '$book.id$': null,
+        '$podcast.id$': null
+      }
+    })
+    for (const libraryItem of libraryItemsWithNoMedia) {
+      Logger.warn(`Found libraryItem "${libraryItem.id}" with no media - removing it`)
+      await libraryItem.destroy()
+    }
+
     const playlistMediaItemsWithNoMediaItem = await this.playlistMediaItemModel.findAll({
       include: [
         {
diff --git a/server/controllers/AuthorController.js b/server/controllers/AuthorController.js
index 45bbdf84..a6b5a2f4 100644
--- a/server/controllers/AuthorController.js
+++ b/server/controllers/AuthorController.js
@@ -125,7 +125,7 @@ class AuthorController {
       const bookAuthorsToCreate = []
       const allItemsWithAuthor = await Database.authorModel.getAllLibraryItemsForAuthor(req.author.id)
 
-      const oldLibraryItems = []
+      const libraryItems = []
       allItemsWithAuthor.forEach((libraryItem) => {
         // Replace old author with merging author for each book
         libraryItem.media.authors = libraryItem.media.authors.filter((au) => au.id !== req.author.id)
@@ -134,23 +134,22 @@ class AuthorController {
           name: existingAuthor.name
         })
 
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-        oldLibraryItems.push(oldLibraryItem)
+        libraryItems.push(libraryItem)
 
         bookAuthorsToCreate.push({
           bookId: libraryItem.media.id,
           authorId: existingAuthor.id
         })
       })
-      if (oldLibraryItems.length) {
+      if (libraryItems.length) {
         await Database.removeBulkBookAuthors(req.author.id) // Remove all old BookAuthor
         await Database.createBulkBookAuthors(bookAuthorsToCreate) // Create all new BookAuthor
-        for (const libraryItem of allItemsWithAuthor) {
+        for (const libraryItem of libraryItems) {
           await libraryItem.saveMetadataFile()
         }
         SocketAuthority.emitter(
           'items_updated',
-          oldLibraryItems.map((li) => li.toJSONExpanded())
+          libraryItems.map((li) => li.toOldJSONExpanded())
         )
       }
 
@@ -190,7 +189,7 @@ class AuthorController {
         const allItemsWithAuthor = await Database.authorModel.getAllLibraryItemsForAuthor(req.author.id)
 
         numBooksForAuthor = allItemsWithAuthor.length
-        const oldLibraryItems = []
+        const libraryItems = []
         // Update author name on all books
         for (const libraryItem of allItemsWithAuthor) {
           libraryItem.media.authors = libraryItem.media.authors.map((au) => {
@@ -199,16 +198,16 @@ class AuthorController {
             }
             return au
           })
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-          oldLibraryItems.push(oldLibraryItem)
+
+          libraryItems.push(libraryItem)
 
           await libraryItem.saveMetadataFile()
         }
 
-        if (oldLibraryItems.length) {
+        if (libraryItems.length) {
           SocketAuthority.emitter(
             'items_updated',
-            oldLibraryItems.map((li) => li.toJSONExpanded())
+            libraryItems.map((li) => li.toOldJSONExpanded())
           )
         }
       } else {
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 6986f2b7..00b82ce9 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -221,7 +221,9 @@ class CollectionController {
    * @param {Response} res
    */
   async addBook(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.body.id)
+    const libraryItem = await Database.libraryItemModel.findByPk(req.body.id, {
+      attributes: ['libraryId', 'mediaId']
+    })
     if (!libraryItem) {
       return res.status(404).send('Book not found')
     }
@@ -231,14 +233,14 @@ class CollectionController {
 
     // Check if book is already in collection
     const collectionBooks = await req.collection.getCollectionBooks()
-    if (collectionBooks.some((cb) => cb.bookId === libraryItem.media.id)) {
+    if (collectionBooks.some((cb) => cb.bookId === libraryItem.mediaId)) {
       return res.status(400).send('Book already in collection')
     }
 
     // Create collectionBook record
     await Database.collectionBookModel.create({
       collectionId: req.collection.id,
-      bookId: libraryItem.media.id,
+      bookId: libraryItem.mediaId,
       order: collectionBooks.length + 1
     })
     const jsonExpanded = await req.collection.getOldJsonExpanded()
@@ -255,7 +257,9 @@ class CollectionController {
    * @param {Response} res
    */
   async removeBook(req, res) {
-    const libraryItem = await Database.libraryItemModel.getOldById(req.params.bookId)
+    const libraryItem = await Database.libraryItemModel.findByPk(req.params.bookId, {
+      attributes: ['mediaId']
+    })
     if (!libraryItem) {
       return res.sendStatus(404)
     }
@@ -266,7 +270,7 @@ class CollectionController {
     })
 
     let jsonExpanded = null
-    const collectionBookToRemove = collectionBooks.find((cb) => cb.bookId === libraryItem.media.id)
+    const collectionBookToRemove = collectionBooks.find((cb) => cb.bookId === libraryItem.mediaId)
     if (collectionBookToRemove) {
       // Remove collection book record
       await collectionBookToRemove.destroy()
@@ -274,7 +278,7 @@ class CollectionController {
       // Update order on collection books
       let order = 1
       for (const collectionBook of collectionBooks) {
-        if (collectionBook.bookId === libraryItem.media.id) continue
+        if (collectionBook.bookId === libraryItem.mediaId) continue
         if (collectionBook.order !== order) {
           await collectionBook.update({
             order
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index f42a023d..216f7595 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -1145,14 +1145,14 @@ class LibraryController {
       await libraryItem.media.update({
         narrators: libraryItem.media.narrators
       })
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-      itemsUpdated.push(oldLibraryItem)
+
+      itemsUpdated.push(libraryItem)
     }
 
     if (itemsUpdated.length) {
       SocketAuthority.emitter(
         'items_updated',
-        itemsUpdated.map((li) => li.toJSONExpanded())
+        itemsUpdated.map((li) => li.toOldJSONExpanded())
       )
     }
 
@@ -1189,14 +1189,14 @@ class LibraryController {
       await libraryItem.media.update({
         narrators: libraryItem.media.narrators
       })
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-      itemsUpdated.push(oldLibraryItem)
+
+      itemsUpdated.push(libraryItem)
     }
 
     if (itemsUpdated.length) {
       SocketAuthority.emitter(
         'items_updated',
-        itemsUpdated.map((li) => li.toJSONExpanded())
+        itemsUpdated.map((li) => li.toOldJSONExpanded())
       )
     }
 
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 74b8bdfc..14a85f6e 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -551,11 +551,11 @@ class LibraryItemController {
     const hardDelete = req.query.hard == 1 // Delete files from filesystem
 
     const { libraryItemIds } = req.body
-    if (!libraryItemIds?.length) {
+    if (!libraryItemIds?.length || !Array.isArray(libraryItemIds)) {
       return res.status(400).send('Invalid request body')
     }
 
-    const itemsToDelete = await Database.libraryItemModel.getAllOldLibraryItems({
+    const itemsToDelete = await Database.libraryItemModel.findAllExpandedWhere({
       id: libraryItemIds
     })
 
@@ -566,19 +566,19 @@ class LibraryItemController {
     const libraryId = itemsToDelete[0].libraryId
     for (const libraryItem of itemsToDelete) {
       const libraryItemPath = libraryItem.path
-      Logger.info(`[LibraryItemController] (${hardDelete ? 'Hard' : 'Soft'}) deleting Library Item "${libraryItem.media.metadata.title}" with id "${libraryItem.id}"`)
+      Logger.info(`[LibraryItemController] (${hardDelete ? 'Hard' : 'Soft'}) deleting Library Item "${libraryItem.media.title}" with id "${libraryItem.id}"`)
       const mediaItemIds = []
       const seriesIds = []
       const authorIds = []
       if (libraryItem.isPodcast) {
-        mediaItemIds.push(...libraryItem.media.episodes.map((ep) => ep.id))
+        mediaItemIds.push(...libraryItem.media.podcastEpisodes.map((ep) => ep.id))
       } else {
         mediaItemIds.push(libraryItem.media.id)
-        if (libraryItem.media.metadata.series?.length) {
-          seriesIds.push(...libraryItem.media.metadata.series.map((se) => se.id))
+        if (libraryItem.media.series?.length) {
+          seriesIds.push(...libraryItem.media.series.map((se) => se.id))
         }
-        if (libraryItem.media.metadata.authors?.length) {
-          authorIds.push(...libraryItem.media.metadata.authors.map((au) => au.id))
+        if (libraryItem.media.authors?.length) {
+          authorIds.push(...libraryItem.media.authors.map((au) => au.id))
         }
       }
       await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
@@ -623,7 +623,7 @@ class LibraryItemController {
     }
 
     // Get all library items to update
-    const libraryItems = await Database.libraryItemModel.getAllOldLibraryItems({
+    const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({
       id: libraryItemIds
     })
     if (updatePayloads.length !== libraryItems.length) {
@@ -645,21 +645,23 @@ class LibraryItemController {
       if (libraryItem.isBook) {
         if (Array.isArray(mediaPayload.metadata?.series)) {
           const seriesIdsInUpdate = mediaPayload.metadata.series.map((se) => se.id)
-          const seriesRemoved = libraryItem.media.metadata.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+          const seriesRemoved = libraryItem.media.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
           seriesIdsRemoved.push(...seriesRemoved.map((se) => se.id))
         }
         if (Array.isArray(mediaPayload.metadata?.authors)) {
           const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-          const authorsRemoved = libraryItem.media.metadata.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+          const authorsRemoved = libraryItem.media.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
           authorIdsRemoved.push(...authorsRemoved.map((au) => au.id))
         }
       }
 
-      if (libraryItem.media.update(mediaPayload)) {
-        Logger.debug(`[LibraryItemController] Updated library item media ${libraryItem.media.metadata.title}`)
+      const hasUpdates = await libraryItem.media.updateFromRequest(mediaPayload)
+      if (hasUpdates) {
+        libraryItem.changed('updatedAt', true)
+        await libraryItem.save()
 
-        await Database.updateLibraryItem(libraryItem)
-        SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+        Logger.debug(`[LibraryItemController] Updated library item media "${libraryItem.media.title}"`)
+        SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
         itemsUpdated++
       }
     }
@@ -688,11 +690,11 @@ class LibraryItemController {
     if (!libraryItemIds.length) {
       return res.status(403).send('Invalid payload')
     }
-    const libraryItems = await Database.libraryItemModel.getAllOldLibraryItems({
+    const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({
       id: libraryItemIds
     })
     res.json({
-      libraryItems: libraryItems.map((li) => li.toJSONExpanded())
+      libraryItems: libraryItems.map((li) => li.toOldJSONExpanded())
     })
   }
 
@@ -715,7 +717,7 @@ class LibraryItemController {
       return res.sendStatus(400)
     }
 
-    const libraryItems = await Database.libraryItemModel.getAllOldLibraryItems({
+    const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({
       id: req.body.libraryItemIds
     })
     if (!libraryItems?.length) {
@@ -737,7 +739,8 @@ class LibraryItemController {
     }
 
     for (const libraryItem of libraryItems) {
-      const matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
+      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
+      const matchResult = await Scanner.quickMatchLibraryItem(this, oldLibraryItem, options)
       if (matchResult.updated) {
         itemsUpdated++
       } else if (matchResult.warning) {
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index cc67b320..87acd221 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -66,7 +66,7 @@ class MeController {
     const libraryItem = await Database.libraryItemModel.findByPk(req.params.libraryItemId)
     const episode = await Database.podcastEpisodeModel.findByPk(req.params.episodeId)
 
-    if (!libraryItem || (libraryItem.mediaType === 'podcast' && !episode)) {
+    if (!libraryItem || (libraryItem.isPodcast && !episode)) {
       Logger.error(`[MeController] Media item not found for library item id "${req.params.libraryItemId}"`)
       return res.sendStatus(404)
     }
@@ -296,7 +296,7 @@ class MeController {
     const mediaProgressesInProgress = req.user.mediaProgresses.filter((mp) => !mp.isFinished && (mp.currentTime > 0 || mp.ebookProgress > 0))
 
     const libraryItemsIds = [...new Set(mediaProgressesInProgress.map((mp) => mp.extraData?.libraryItemId).filter((id) => id))]
-    const libraryItems = await Database.libraryItemModel.getAllOldLibraryItems({ id: libraryItemsIds })
+    const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({ id: libraryItemsIds })
 
     let itemsInProgress = []
 
@@ -304,19 +304,19 @@ class MeController {
       const oldMediaProgress = mediaProgress.getOldMediaProgress()
       const libraryItem = libraryItems.find((li) => li.id === oldMediaProgress.libraryItemId)
       if (libraryItem) {
-        if (oldMediaProgress.episodeId && libraryItem.mediaType === 'podcast') {
-          const episode = libraryItem.media.episodes.find((ep) => ep.id === oldMediaProgress.episodeId)
+        if (oldMediaProgress.episodeId && libraryItem.isPodcast) {
+          const episode = libraryItem.media.podcastEpisodes.find((ep) => ep.id === oldMediaProgress.episodeId)
           if (episode) {
             const libraryItemWithEpisode = {
-              ...libraryItem.toJSONMinified(),
-              recentEpisode: episode.toJSON(),
+              ...libraryItem.toOldJSONMinified(),
+              recentEpisode: episode.toOldJSON(libraryItem.id),
               progressLastUpdate: oldMediaProgress.lastUpdate
             }
             itemsInProgress.push(libraryItemWithEpisode)
           }
         } else if (!oldMediaProgress.episodeId) {
           itemsInProgress.push({
-            ...libraryItem.toJSONMinified(),
+            ...libraryItem.toOldJSONMinified(),
             progressLastUpdate: oldMediaProgress.lastUpdate
           })
         }
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index b35619b7..48eca3f8 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -342,8 +342,8 @@ class MiscController {
           tags: libraryItem.media.tags
         })
         await libraryItem.saveMetadataFile()
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-        SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+
+        SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
         numItemsUpdated++
       }
     }
@@ -385,8 +385,8 @@ class MiscController {
         tags: libraryItem.media.tags
       })
       await libraryItem.saveMetadataFile()
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+
+      SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
       numItemsUpdated++
     }
 
@@ -480,8 +480,8 @@ class MiscController {
           genres: libraryItem.media.genres
         })
         await libraryItem.saveMetadataFile()
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-        SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+
+        SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
         numItemsUpdated++
       }
     }
@@ -523,8 +523,8 @@ class MiscController {
         genres: libraryItem.media.genres
       })
       await libraryItem.saveMetadataFile()
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+
+      SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
       numItemsUpdated++
     }
 
diff --git a/server/controllers/PlaylistController.js b/server/controllers/PlaylistController.js
index 8c13ecb2..972c352a 100644
--- a/server/controllers/PlaylistController.js
+++ b/server/controllers/PlaylistController.js
@@ -276,7 +276,7 @@ class PlaylistController {
       return res.status(400).send('Request body has no libraryItemId')
     }
 
-    const libraryItem = await Database.libraryItemModel.getOldById(itemToAdd.libraryItemId)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(itemToAdd.libraryItemId)
     if (!libraryItem) {
       return res.status(400).send('Library item not found')
     }
@@ -286,7 +286,7 @@ class PlaylistController {
     if ((itemToAdd.episodeId && !libraryItem.isPodcast) || (libraryItem.isPodcast && !itemToAdd.episodeId)) {
       return res.status(400).send('Invalid item to add for this library type')
     }
-    if (itemToAdd.episodeId && !libraryItem.media.checkHasEpisode(itemToAdd.episodeId)) {
+    if (itemToAdd.episodeId && !libraryItem.media.podcastEpisodes.some((pe) => pe.id === itemToAdd.episodeId)) {
       return res.status(400).send('Episode not found in library item')
     }
 
@@ -308,17 +308,17 @@ class PlaylistController {
 
     // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
     if (itemToAdd.episodeId) {
-      const episode = libraryItem.media.episodes.find((ep) => ep.id === itemToAdd.episodeId)
+      const episode = libraryItem.media.podcastEpisodes.find((ep) => ep.id === itemToAdd.episodeId)
       jsonExpanded.items.push({
         episodeId: itemToAdd.episodeId,
-        episode: episode.toJSONExpanded(),
+        episode: episode.toOldJSONExpanded(libraryItem.id),
         libraryItemId: libraryItem.id,
-        libraryItem: libraryItem.toJSONMinified()
+        libraryItem: libraryItem.toOldJSONMinified()
       })
     } else {
       jsonExpanded.items.push({
         libraryItemId: libraryItem.id,
-        libraryItem: libraryItem.toJSONExpanded()
+        libraryItem: libraryItem.toOldJSONExpanded()
       })
     }
 
@@ -388,8 +388,8 @@ class PlaylistController {
     // Find all library items
     const libraryItemIds = new Set(req.body.items.map((i) => i.libraryItemId).filter((i) => i))
 
-    const oldLibraryItems = await Database.libraryItemModel.getAllOldLibraryItems({ id: Array.from(libraryItemIds) })
-    if (oldLibraryItems.length !== libraryItemIds.size) {
+    const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({ id: Array.from(libraryItemIds) })
+    if (libraryItems.length !== libraryItemIds.size) {
       return res.status(400).send('Invalid request body items')
     }
 
@@ -401,7 +401,7 @@ class PlaylistController {
     // Setup array of playlistMediaItem records to add
     let order = req.playlist.playlistMediaItems.length + 1
     for (const item of req.body.items) {
-      const libraryItem = oldLibraryItems.find((li) => li.id === item.libraryItemId)
+      const libraryItem = libraryItems.find((li) => li.id === item.libraryItemId)
 
       const mediaItemId = item.episodeId || libraryItem.media.id
       if (req.playlist.playlistMediaItems.some((pmi) => pmi.mediaItemId === mediaItemId)) {
@@ -417,17 +417,17 @@ class PlaylistController {
 
         // Add the new item to to the old json expanded to prevent having to fully reload the playlist media items
         if (item.episodeId) {
-          const episode = libraryItem.media.episodes.find((ep) => ep.id === item.episodeId)
+          const episode = libraryItem.media.podcastEpisodes.find((ep) => ep.id === item.episodeId)
           jsonExpanded.items.push({
             episodeId: item.episodeId,
-            episode: episode.toJSONExpanded(),
+            episode: episode.toOldJSONExpanded(libraryItem.id),
             libraryItemId: libraryItem.id,
-            libraryItem: libraryItem.toJSONMinified()
+            libraryItem: libraryItem.toOldJSONMinified()
           })
         } else {
           jsonExpanded.items.push({
             libraryItemId: libraryItem.id,
-            libraryItem: libraryItem.toJSONExpanded()
+            libraryItem: libraryItem.toOldJSONExpanded()
           })
         }
       }
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index bd42e74b..0b45dfc4 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -296,9 +296,9 @@ class PodcastManager {
 
     Logger.info(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" | Last check: ${new Date(lastEpisodeCheck)} | ${latestEpisodePublishedAt ? `Latest episode pubDate: ${new Date(latestEpisodePublishedAt)}` : 'No latest episode'}`)
 
-    // Use latest episode pubDate if exists OR fallback to using lastEpisodeCheckDate
-    //    lastEpisodeCheckDate will be the current time when adding a new podcast
-    const dateToCheckForEpisodesAfter = latestEpisodePublishedAt || lastEpisodeCheckDate
+    // Use latest episode pubDate if exists OR fallback to using lastEpisodeCheck
+    //    lastEpisodeCheck will be the current time when adding a new podcast
+    const dateToCheckForEpisodesAfter = latestEpisodePublishedAt || lastEpisodeCheck
     Logger.debug(`[PodcastManager] runEpisodeCheck: "${libraryItem.media.title}" checking for episodes after ${new Date(dateToCheckForEpisodesAfter)}`)
 
     const newEpisodes = await this.checkPodcastForNewEpisodes(libraryItem, dateToCheckForEpisodesAfter, libraryItem.media.maxNewEpisodesToDownload)
diff --git a/server/models/Collection.js b/server/models/Collection.js
index c8f62e69..d5f36ba9 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -282,7 +282,7 @@ class Collection extends Model {
       const libraryItem = book.libraryItem
       delete book.libraryItem
       libraryItem.media = book
-      return this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONExpanded()
+      return libraryItem.toOldJSONExpanded()
     })
 
     return json
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 3381b94a..0d87a328 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -122,45 +122,6 @@ class LibraryItem extends Model {
     })
   }
 
-  /**
-   *
-   * @param {import('sequelize').WhereOptions} [where]
-   * @returns {Array<objects.LibraryItem>} old library items
-   */
-  static async getAllOldLibraryItems(where = null) {
-    let libraryItems = await this.findAll({
-      where,
-      include: [
-        {
-          model: this.sequelize.models.book,
-          include: [
-            {
-              model: this.sequelize.models.author,
-              through: {
-                attributes: []
-              }
-            },
-            {
-              model: this.sequelize.models.series,
-              through: {
-                attributes: ['sequence']
-              }
-            }
-          ]
-        },
-        {
-          model: this.sequelize.models.podcast,
-          include: [
-            {
-              model: this.sequelize.models.podcastEpisode
-            }
-          ]
-        }
-      ]
-    })
-    return libraryItems.map((ti) => this.getOldLibraryItem(ti))
-  }
-
   /**
    * Convert an expanded LibraryItem into an old library item
    *
@@ -448,6 +409,47 @@ class LibraryItem extends Model {
     })
   }
 
+  /**
+   *
+   * @param {import('sequelize').WhereOptions} where
+   * @returns {Promise<LibraryItemExpanded[]>}
+   */
+  static async findAllExpandedWhere(where = null) {
+    return this.findAll({
+      where,
+      include: [
+        {
+          model: this.sequelize.models.book,
+          include: [
+            {
+              model: this.sequelize.models.author,
+              through: {
+                attributes: []
+              }
+            },
+            {
+              model: this.sequelize.models.series,
+              through: {
+                attributes: ['sequence']
+              }
+            }
+          ]
+        },
+        {
+          model: this.sequelize.models.podcast,
+          include: {
+            model: this.sequelize.models.podcastEpisode
+          }
+        }
+      ],
+      order: [
+        // Ensure author & series stay in the same order
+        [this.sequelize.models.book, this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+        [this.sequelize.models.book, this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+      ]
+    })
+  }
+
   /**
    *
    * @param {string} libraryItemId
@@ -611,7 +613,7 @@ class LibraryItem extends Model {
 
     return {
       libraryItems: libraryItems.map((li) => {
-        const oldLibraryItem = this.getOldLibraryItem(li).toJSONMinified()
+        const oldLibraryItem = li.toOldJSONMinified()
         if (li.collapsedSeries) {
           oldLibraryItem.collapsedSeries = li.collapsedSeries
         }
diff --git a/server/models/Playlist.js b/server/models/Playlist.js
index ec56248d..35bd6c99 100644
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -357,7 +357,7 @@ class Playlist extends Model {
         libraryItem.media = pmi.mediaItem
         return {
           libraryItemId: libraryItem.id,
-          libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONExpanded()
+          libraryItem: libraryItem.toOldJSONExpanded()
         }
       }
 
@@ -368,7 +368,7 @@ class Playlist extends Model {
         episodeId: pmi.mediaItemId,
         episode: pmi.mediaItem.toOldJSONExpanded(libraryItem.id),
         libraryItemId: libraryItem.id,
-        libraryItem: this.sequelize.models.libraryItem.getOldLibraryItem(libraryItem).toJSONMinified()
+        libraryItem: libraryItem.toOldJSONMinified()
       }
     })
 
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index 5f43ebc8..f27f3fa2 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -166,10 +166,6 @@ class Podcast {
     return true
   }
 
-  checkHasEpisode(episodeId) {
-    return this.episodes.some((ep) => ep.id === episodeId)
-  }
-
   getEpisode(episodeId) {
     if (!episodeId) return null
 
diff --git a/server/scanner/LibraryItemScanner.js b/server/scanner/LibraryItemScanner.js
index 5edfc2e2..bd99060c 100644
--- a/server/scanner/LibraryItemScanner.js
+++ b/server/scanner/LibraryItemScanner.js
@@ -64,8 +64,7 @@ class LibraryItemScanner {
 
     const { libraryItem: expandedLibraryItem, wasUpdated } = await this.rescanLibraryItemMedia(libraryItem, libraryItemScanData, library.settings, scanLogger)
     if (libraryItemDataUpdated || wasUpdated) {
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(expandedLibraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+      SocketAuthority.emitter('item_updated', expandedLibraryItem.toOldJSONExpanded())
 
       await this.checkAuthorsAndSeriesRemovedFromBooks(library.id, scanLogger)
 
diff --git a/server/scanner/LibraryScanner.js b/server/scanner/LibraryScanner.js
index a52350f6..c4f6410d 100644
--- a/server/scanner/LibraryScanner.js
+++ b/server/scanner/LibraryScanner.js
@@ -167,7 +167,7 @@ class LibraryScanner {
     if (this.shouldCancelScan(libraryScan)) return true
 
     const libraryItemIdsMissing = []
-    let oldLibraryItemsUpdated = []
+    let libraryItemsUpdated = []
     for (const existingLibraryItem of existingLibraryItems) {
       // First try to find matching library item with exact file path
       let libraryItemData = libraryItemDataFound.find((lid) => lid.path === existingLibraryItem.path)
@@ -190,11 +190,11 @@ class LibraryScanner {
             libraryItemIdsMissing.push(existingLibraryItem.id)
 
             // TODO: Temporary while using old model to socket emit
-            const oldLibraryItem = await Database.libraryItemModel.getOldById(existingLibraryItem.id)
-            if (oldLibraryItem) {
-              oldLibraryItem.isMissing = true
-              oldLibraryItem.updatedAt = Date.now()
-              oldLibraryItemsUpdated.push(oldLibraryItem)
+            const libraryItem = await Database.libraryItemModel.getExpandedById(existingLibraryItem.id)
+            if (libraryItem) {
+              libraryItem.isMissing = true
+              await libraryItem.save()
+              libraryItemsUpdated.push(libraryItem)
             }
           }
         }
@@ -206,16 +206,15 @@ class LibraryScanner {
             const { libraryItem, wasUpdated } = await LibraryItemScanner.rescanLibraryItemMedia(existingLibraryItem, libraryItemData, libraryScan.library.settings, libraryScan)
             if (!forceRescan || wasUpdated) {
               libraryScan.resultsUpdated++
-              const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-              oldLibraryItemsUpdated.push(oldLibraryItem)
+              libraryItemsUpdated.push(libraryItem)
             } else {
               libraryScan.addLog(LogLevel.DEBUG, `Library item "${existingLibraryItem.relPath}" is up-to-date`)
             }
           } else {
             libraryScan.resultsUpdated++
             // TODO: Temporary while using old model to socket emit
-            const oldLibraryItem = await Database.libraryItemModel.getOldById(existingLibraryItem.id)
-            oldLibraryItemsUpdated.push(oldLibraryItem)
+            const libraryItem = await Database.libraryItemModel.getExpandedById(existingLibraryItem.id)
+            libraryItemsUpdated.push(libraryItem)
           }
         } else {
           libraryScan.addLog(LogLevel.DEBUG, `Library item "${existingLibraryItem.relPath}" is up-to-date`)
@@ -223,23 +222,23 @@ class LibraryScanner {
       }
 
       // Emit item updates in chunks of 10 to client
-      if (oldLibraryItemsUpdated.length === 10) {
+      if (libraryItemsUpdated.length === 10) {
         // TODO: Should only emit to clients where library item is accessible
         SocketAuthority.emitter(
           'items_updated',
-          oldLibraryItemsUpdated.map((li) => li.toJSONExpanded())
+          libraryItemsUpdated.map((li) => li.toOldJSONExpanded())
         )
-        oldLibraryItemsUpdated = []
+        libraryItemsUpdated = []
       }
 
       if (this.shouldCancelScan(libraryScan)) return true
     }
     // Emit item updates to client
-    if (oldLibraryItemsUpdated.length) {
+    if (libraryItemsUpdated.length) {
       // TODO: Should only emit to clients where library item is accessible
       SocketAuthority.emitter(
         'items_updated',
-        oldLibraryItemsUpdated.map((li) => li.toJSONExpanded())
+        libraryItemsUpdated.map((li) => li.toOldJSONExpanded())
       )
     }
 
@@ -267,34 +266,33 @@ class LibraryScanner {
 
     // Add new library items
     if (libraryItemDataFound.length) {
-      let newOldLibraryItems = []
+      let newLibraryItems = []
       for (const libraryItemData of libraryItemDataFound) {
         const newLibraryItem = await LibraryItemScanner.scanNewLibraryItem(libraryItemData, libraryScan.library.settings, libraryScan)
         if (newLibraryItem) {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(newLibraryItem)
-          newOldLibraryItems.push(oldLibraryItem)
+          newLibraryItems.push(newLibraryItem)
 
           libraryScan.resultsAdded++
         }
 
         // Emit new items in chunks of 10 to client
-        if (newOldLibraryItems.length === 10) {
+        if (newLibraryItems.length === 10) {
           // TODO: Should only emit to clients where library item is accessible
           SocketAuthority.emitter(
             'items_added',
-            newOldLibraryItems.map((li) => li.toJSONExpanded())
+            newLibraryItems.map((li) => li.toOldJSONExpanded())
           )
-          newOldLibraryItems = []
+          newLibraryItems = []
         }
 
         if (this.shouldCancelScan(libraryScan)) return true
       }
       // Emit new items to client
-      if (newOldLibraryItems.length) {
+      if (newLibraryItems.length) {
         // TODO: Should only emit to clients where library item is accessible
         SocketAuthority.emitter(
           'items_added',
-          newOldLibraryItems.map((li) => li.toJSONExpanded())
+          newLibraryItems.map((li) => li.toOldJSONExpanded())
         )
       }
     }
@@ -645,8 +643,7 @@ class LibraryScanner {
       const isSingleMediaItem = isSingleMediaFile(fileUpdateGroup, itemDir)
       const newLibraryItem = await LibraryItemScanner.scanPotentialNewLibraryItem(fullPath, library, folder, isSingleMediaItem)
       if (newLibraryItem) {
-        const oldNewLibraryItem = Database.libraryItemModel.getOldLibraryItem(newLibraryItem)
-        SocketAuthority.emitter('item_added', oldNewLibraryItem.toJSONExpanded())
+        SocketAuthority.emitter('item_added', newLibraryItem.toOldJSONExpanded())
       }
       itemGroupingResults[itemDir] = newLibraryItem ? ScanResult.ADDED : ScanResult.NOTHING
     }
diff --git a/server/utils/migrations/dbMigration.js b/server/utils/migrations/dbMigration.js
index 8337f5aa..eb42c81c 100644
--- a/server/utils/migrations/dbMigration.js
+++ b/server/utils/migrations/dbMigration.js
@@ -1200,7 +1200,7 @@ async function migrationPatchNewColumns(queryInterface) {
  */
 async function handleOldLibraryItems(ctx) {
   const oldLibraryItems = await oldDbFiles.loadOldData('libraryItems')
-  const libraryItems = await ctx.models.libraryItem.getAllOldLibraryItems()
+  const libraryItems = (await ctx.models.libraryItem.findAllExpandedWhere()).map((li) => ctx.models.libraryItem.getOldLibraryItem(li))
 
   const bulkUpdateItems = []
   const bulkUpdateEpisodes = []
diff --git a/server/utils/queries/libraryFilters.js b/server/utils/queries/libraryFilters.js
index 57ca48ba..60c07805 100644
--- a/server/utils/queries/libraryFilters.js
+++ b/server/utils/queries/libraryFilters.js
@@ -18,7 +18,7 @@ module.exports = {
    * @param {string} libraryId
    * @param {import('../../models/User')} user
    * @param {object} options
-   * @returns {object} { libraryItems:LibraryItem[], count:number }
+   * @returns {Promise<{ libraryItems:import('../../models/LibraryItem')[], count:number }>}
    */
   async getFilteredLibraryItems(libraryId, user, options) {
     const { filterBy, sortBy, sortDesc, limit, offset, collapseseries, include, mediaType } = options
@@ -52,7 +52,7 @@ module.exports = {
       const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(library.id, user, 'progress', 'in-progress', 'progress', true, false, include, limit, 0, true)
       return {
         items: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           if (li.rssFeed) {
             oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
@@ -68,7 +68,7 @@ module.exports = {
       return {
         count,
         items: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           oldLibraryItem.recentEpisode = li.recentEpisode
           return oldLibraryItem
         })
@@ -89,7 +89,7 @@ module.exports = {
       const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(library.id, user, 'recent', null, 'addedAt', true, false, include, limit, 0)
       return {
         libraryItems: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           if (li.rssFeed) {
             oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
@@ -107,7 +107,7 @@ module.exports = {
       const { libraryItems, count } = await libraryItemsPodcastFilters.getFilteredLibraryItems(library.id, user, 'recent', null, 'addedAt', true, include, limit, 0)
       return {
         libraryItems: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           if (li.rssFeed) {
             oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
@@ -136,7 +136,7 @@ module.exports = {
     const { libraryItems, count } = await libraryItemsBookFilters.getContinueSeriesLibraryItems(library, user, include, limit, 0)
     return {
       libraryItems: libraryItems.map((li) => {
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+        const oldLibraryItem = li.toOldJSONMinified()
         if (li.rssFeed) {
           oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
@@ -166,7 +166,7 @@ module.exports = {
       const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(library.id, user, 'progress', 'finished', 'progress', true, false, include, limit, 0)
       return {
         items: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           if (li.rssFeed) {
             oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
@@ -182,7 +182,7 @@ module.exports = {
       return {
         count,
         items: libraryItems.map((li) => {
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+          const oldLibraryItem = li.toOldJSONMinified()
           oldLibraryItem.recentEpisode = li.recentEpisode
           return oldLibraryItem
         })
@@ -293,15 +293,17 @@ module.exports = {
       })
       oldSeries.books = s.bookSeries
         .map((bs) => {
-          const libraryItem = bs.book.libraryItem?.toJSON()
+          const libraryItem = bs.book.libraryItem
           if (!libraryItem) {
             Logger.warn(`Book series book has no libraryItem`, bs, bs.book, 'series=', series)
             return null
           }
 
           delete bs.book.libraryItem
+          bs.book.authors = [] // Not needed
+          bs.book.series = [] // Not needed
           libraryItem.media = bs.book
-          const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem).toJSONMinified()
+          const oldLibraryItem = libraryItem.toOldJSONMinified()
           return oldLibraryItem
         })
         .filter((b) => b)
@@ -373,7 +375,7 @@ module.exports = {
     const { libraryItems, count } = await libraryItemsBookFilters.getDiscoverLibraryItems(library.id, user, include, limit)
     return {
       libraryItems: libraryItems.map((li) => {
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+        const oldLibraryItem = li.toOldJSONMinified()
         if (li.rssFeed) {
           oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
@@ -400,7 +402,7 @@ module.exports = {
     return {
       count,
       libraryItems: libraryItems.map((li) => {
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
+        const oldLibraryItem = li.toOldJSONMinified()
         oldLibraryItem.recentEpisode = li.recentEpisode
         return oldLibraryItem
       })
diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js
index ccce5304..9e74276a 100644
--- a/server/utils/queries/libraryItemsBookFilters.js
+++ b/server/utils/queries/libraryItemsBookFilters.js
@@ -349,7 +349,7 @@ module.exports = {
    * @param {number} limit
    * @param {number} offset
    * @param {boolean} isHomePage for home page shelves
-   * @returns {object} { libraryItems:LibraryItem[], count:number }
+   * @returns {{ libraryItems: import('../../models/LibraryItem')[], count: number }}
    */
   async getFilteredLibraryItems(libraryId, user, filterGroup, filterValue, sortBy, sortDesc, collapseseries, include, limit, offset, isHomePage = false) {
     // TODO: Handle collapse sub-series
@@ -583,8 +583,8 @@ module.exports = {
     })
 
     const libraryItems = books.map((bookExpanded) => {
-      const libraryItem = bookExpanded.libraryItem.toJSON()
-      const book = bookExpanded.toJSON()
+      const libraryItem = bookExpanded.libraryItem
+      const book = bookExpanded
 
       if (filterGroup === 'series' && book.series?.length) {
         // For showing sequence on book cover when filtering for series
@@ -596,27 +596,37 @@ module.exports = {
       }
 
       delete book.libraryItem
-      delete book.authors
-      delete book.series
+
+      book.series =
+        book.bookSeries?.map((bs) => {
+          const series = bs.series
+          delete bs.series
+          series.bookSeries = bs
+          return series
+        }) || []
+      delete book.bookSeries
+
+      book.authors = book.bookAuthors?.map((ba) => ba.author) || []
+      delete book.bookAuthors
 
       // For showing details of collapsed series
-      if (collapseseries && book.bookSeries?.length) {
-        const collapsedSeries = book.bookSeries.find((bs) => collapseSeriesBookSeries.some((cbs) => cbs.id === bs.id))
+      if (collapseseries && book.series?.length) {
+        const collapsedSeries = book.series.find((bs) => collapseSeriesBookSeries.some((cbs) => cbs.id === bs.bookSeries.id))
         if (collapsedSeries) {
-          const collapseSeriesObj = collapseSeriesBookSeries.find((csbs) => csbs.id === collapsedSeries.id)
+          const collapseSeriesObj = collapseSeriesBookSeries.find((csbs) => csbs.id === collapsedSeries.bookSeries.id)
           libraryItem.collapsedSeries = {
-            id: collapsedSeries.series.id,
-            name: collapsedSeries.series.name,
-            nameIgnorePrefix: collapsedSeries.series.nameIgnorePrefix,
-            sequence: collapsedSeries.sequence,
+            id: collapsedSeries.id,
+            name: collapsedSeries.name,
+            nameIgnorePrefix: collapsedSeries.nameIgnorePrefix,
+            sequence: collapsedSeries.bookSeries.sequence,
             numBooks: collapseSeriesObj?.numBooks || 0,
             libraryItemIds: collapseSeriesObj?.libraryItemIds || []
           }
         }
       }
 
-      if (bookExpanded.libraryItem.feeds?.length) {
-        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
+      if (libraryItem.feeds?.length) {
+        libraryItem.rssFeed = libraryItem.feeds[0]
       }
 
       if (includeMediaItemShare) {
@@ -646,7 +656,7 @@ module.exports = {
    * @param {string[]} include
    * @param {number} limit
    * @param {number} offset
-   * @returns {{ libraryItems:import('../../models/LibraryItem')[], count:number }}
+   * @returns {Promise<{ libraryItems:import('../../models/LibraryItem')[], count:number }>}
    */
   async getContinueSeriesLibraryItems(library, user, include, limit, offset) {
     const libraryId = library.id
@@ -758,16 +768,19 @@ module.exports = {
           }
         }
 
-        const libraryItem = s.bookSeries[bookIndex].book.libraryItem.toJSON()
-        const book = s.bookSeries[bookIndex].book.toJSON()
+        const libraryItem = s.bookSeries[bookIndex].book.libraryItem
+        const book = s.bookSeries[bookIndex].book
         delete book.libraryItem
+
+        book.series = []
+
         libraryItem.series = {
           id: s.id,
           name: s.name,
           sequence: s.bookSeries[bookIndex].sequence
         }
-        if (s.bookSeries[bookIndex].book.libraryItem.feeds?.length) {
-          libraryItem.rssFeed = s.bookSeries[bookIndex].book.libraryItem.feeds[0]
+        if (libraryItem.feeds?.length) {
+          libraryItem.rssFeed = libraryItem.feeds[0]
         }
         libraryItem.media = book
         return libraryItem
@@ -788,7 +801,7 @@ module.exports = {
    * @param {import('../../models/User')} user
    * @param {string[]} include
    * @param {number} limit
-   * @returns {object} {libraryItems:LibraryItem, count:number}
+   * @returns {Promise<{ libraryItems: import('../../models/LibraryItem')[], count: number }>}
    */
   async getDiscoverLibraryItems(libraryId, user, include, limit) {
     const userPermissionBookWhere = this.getUserPermissionBookWhereQuery(user)
@@ -895,13 +908,26 @@ module.exports = {
 
     // Step 3: Map books to library items
     const libraryItems = books.map((bookExpanded) => {
-      const libraryItem = bookExpanded.libraryItem.toJSON()
-      const book = bookExpanded.toJSON()
+      const libraryItem = bookExpanded.libraryItem
+      const book = bookExpanded
       delete book.libraryItem
+
+      book.series =
+        book.bookSeries?.map((bs) => {
+          const series = bs.series
+          delete bs.series
+          series.bookSeries = bs
+          return series
+        }) || []
+      delete book.bookSeries
+
+      book.authors = book.bookAuthors?.map((ba) => ba.author) || []
+      delete book.bookAuthors
+
       libraryItem.media = book
 
-      if (bookExpanded.libraryItem.feeds?.length) {
-        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
+      if (libraryItem.feeds?.length) {
+        libraryItem.rssFeed = libraryItem.feeds[0]
       }
 
       return libraryItem
@@ -961,11 +987,11 @@ module.exports = {
    * Get library items for series
    * @param {import('../../models/Series')} series
    * @param {import('../../models/User')} [user]
-   * @returns {Promise<import('../../objects/LibraryItem')[]>}
+   * @returns {Promise<import('../../models/LibraryItem')[]>}
    */
   async getLibraryItemsForSeries(series, user) {
     const { libraryItems } = await this.getFilteredLibraryItems(series.libraryId, user, 'series', series.id, null, null, false, [], null, null)
-    return libraryItems.map((li) => Database.libraryItemModel.getOldLibraryItem(li))
+    return libraryItems
   },
 
   /**
@@ -1040,9 +1066,21 @@ module.exports = {
     for (const book of books) {
       const libraryItem = book.libraryItem
       delete book.libraryItem
+
+      book.series = book.bookSeries.map((bs) => {
+        const series = bs.series
+        delete bs.series
+        series.bookSeries = bs
+        return series
+      })
+      delete book.bookSeries
+
+      book.authors = book.bookAuthors.map((ba) => ba.author)
+      delete book.bookAuthors
+
       libraryItem.media = book
       itemMatches.push({
-        libraryItem: Database.libraryItemModel.getOldLibraryItem(libraryItem).toJSONExpanded()
+        libraryItem: libraryItem.toOldJSONExpanded()
       })
     }
 
@@ -1132,7 +1170,9 @@ module.exports = {
       const books = series.bookSeries.map((bs) => {
         const libraryItem = bs.book.libraryItem
         libraryItem.media = bs.book
-        return Database.libraryItemModel.getOldLibraryItem(libraryItem).toJSON()
+        libraryItem.media.authors = []
+        libraryItem.media.series = []
+        return libraryItem.toOldJSON()
       })
       seriesMatches.push({
         series: series.toOldJSON(),
diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js
index c7c0914b..0aaf6f4b 100644
--- a/server/utils/queries/libraryItemsPodcastFilters.js
+++ b/server/utils/queries/libraryItemsPodcastFilters.js
@@ -107,7 +107,7 @@ module.exports = {
    * @param {string[]} include
    * @param {number} limit
    * @param {number} offset
-   * @returns {object} { libraryItems:LibraryItem[], count:number }
+   * @returns {Promise<{ libraryItems: import('../../models/LibraryItem')[], count: number }>}
    */
   async getFilteredLibraryItems(libraryId, user, filterGroup, filterValue, sortBy, sortDesc, include, limit, offset) {
     const includeRSSFeed = include.includes('rssfeed')
@@ -175,16 +175,19 @@ module.exports = {
     })
 
     const libraryItems = podcasts.map((podcastExpanded) => {
-      const libraryItem = podcastExpanded.libraryItem.toJSON()
-      const podcast = podcastExpanded.toJSON()
+      const libraryItem = podcastExpanded.libraryItem
+      const podcast = podcastExpanded
 
       delete podcast.libraryItem
 
-      if (podcastExpanded.libraryItem.feeds?.length) {
-        libraryItem.rssFeed = podcastExpanded.libraryItem.feeds[0]
+      if (libraryItem.feeds?.length) {
+        libraryItem.rssFeed = libraryItem.feeds[0]
       }
-      if (podcast.numEpisodesIncomplete) {
-        libraryItem.numEpisodesIncomplete = podcast.numEpisodesIncomplete
+      if (podcast.dataValues.numEpisodesIncomplete) {
+        libraryItem.numEpisodesIncomplete = podcast.dataValues.numEpisodesIncomplete
+      }
+      if (podcast.dataValues.numEpisodes) {
+        podcast.numEpisodes = podcast.dataValues.numEpisodes
       }
 
       libraryItem.media = podcast
@@ -209,7 +212,7 @@ module.exports = {
    * @param {number} limit
    * @param {number} offset
    * @param {boolean} isHomePage for home page shelves
-   * @returns {object} {libraryItems:LibraryItem[], count:number}
+   * @returns {Promise<{ libraryItems: import('../../models/LibraryItem')[], count: number }>}
    */
   async getFilteredPodcastEpisodes(libraryId, user, filterGroup, filterValue, sortBy, sortDesc, limit, offset, isHomePage = false) {
     if (sortBy === 'progress' && filterGroup !== 'progress') {
@@ -289,10 +292,11 @@ module.exports = {
     })
 
     const libraryItems = podcastEpisodes.map((ep) => {
-      const libraryItem = ep.podcast.libraryItem.toJSON()
-      const podcast = ep.podcast.toJSON()
+      const libraryItem = ep.podcast.libraryItem
+      const podcast = ep.podcast
       delete podcast.libraryItem
       libraryItem.media = podcast
+
       libraryItem.recentEpisode = ep.getOldPodcastEpisode(libraryItem.id).toJSON()
       return libraryItem
     })
@@ -362,8 +366,9 @@ module.exports = {
       const libraryItem = podcast.libraryItem
       delete podcast.libraryItem
       libraryItem.media = podcast
+      libraryItem.media.podcastEpisodes = []
       itemMatches.push({
-        libraryItem: Database.libraryItemModel.getOldLibraryItem(libraryItem).toJSONExpanded()
+        libraryItem: libraryItem.toOldJSONExpanded()
       })
     }
 
diff --git a/server/utils/queries/seriesFilters.js b/server/utils/queries/seriesFilters.js
index 2e0e2346..ed71e5b3 100644
--- a/server/utils/queries/seriesFilters.js
+++ b/server/utils/queries/seriesFilters.js
@@ -162,6 +162,12 @@ module.exports = {
             include: [
               {
                 model: Database.libraryItemModel
+              },
+              {
+                model: Database.authorModel
+              },
+              {
+                model: Database.seriesModel
               }
             ]
           },
@@ -195,10 +201,10 @@ module.exports = {
         })
       })
       oldSeries.books = s.bookSeries.map((bs) => {
-        const libraryItem = bs.book.libraryItem.toJSON()
+        const libraryItem = bs.book.libraryItem
         delete bs.book.libraryItem
         libraryItem.media = bs.book
-        const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem).toJSONMinified()
+        const oldLibraryItem = libraryItem.toOldJSONMinified()
         return oldLibraryItem
       })
       allOldSeries.push(oldSeries)

From 726a9eaea5c41bc8e6cd3221fb4096f1ad7e3d32 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 4 Jan 2025 15:35:05 -0600
Subject: [PATCH 134/143] Fix local playback sync

---
 server/controllers/EmailController.js     |  2 +-
 server/managers/PlaybackSessionManager.js | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/server/controllers/EmailController.js b/server/controllers/EmailController.js
index 916b4268..5d433e0a 100644
--- a/server/controllers/EmailController.js
+++ b/server/controllers/EmailController.js
@@ -106,7 +106,7 @@ class EmailController {
       return res.sendStatus(403)
     }
 
-    const libraryItem = await Database.libraryItemModel.getOldById(req.body.libraryItemId)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(req.body.libraryItemId)
     if (!libraryItem) {
       return res.status(404).send('Library item not found')
     }
diff --git a/server/managers/PlaybackSessionManager.js b/server/managers/PlaybackSessionManager.js
index 97c87bbe..25992f0a 100644
--- a/server/managers/PlaybackSessionManager.js
+++ b/server/managers/PlaybackSessionManager.js
@@ -120,8 +120,8 @@ class PlaybackSessionManager {
    */
   async syncLocalSession(user, sessionJson, deviceInfo) {
     // TODO: Combine libraryItem query with library query
-    const libraryItem = await Database.libraryItemModel.getOldById(sessionJson.libraryItemId)
-    const episode = sessionJson.episodeId && libraryItem && libraryItem.isPodcast ? libraryItem.media.getEpisode(sessionJson.episodeId) : null
+    const libraryItem = await Database.libraryItemModel.getExpandedById(sessionJson.libraryItemId)
+    const episode = sessionJson.episodeId && libraryItem && libraryItem.isPodcast ? libraryItem.media.podcastEpisodes.find((pe) => pe.id === sessionJson.episodeId) : null
     if (!libraryItem || (libraryItem.isPodcast && !episode)) {
       Logger.error(`[PlaybackSessionManager] syncLocalSession: Media item not found for session "${sessionJson.displayTitle}" (${sessionJson.id})`)
       return {
@@ -175,7 +175,8 @@ class PlaybackSessionManager {
       // New session from local
       session = new PlaybackSession(sessionJson)
       session.deviceInfo = deviceInfo
-      session.setDuration(libraryItem, sessionJson.episodeId)
+      session.duration = libraryItem.media.getPlaybackDuration(sessionJson.episodeId)
+
       Logger.debug(`[PlaybackSessionManager] Inserting new session for "${session.displayTitle}" (${session.id})`)
       await Database.createPlaybackSession(session)
     } else {
@@ -346,7 +347,7 @@ class PlaybackSessionManager {
    */
   async syncSession(user, session, syncData) {
     // TODO: Combine libraryItem query with library query
-    const libraryItem = await Database.libraryItemModel.getOldById(session.libraryItemId)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(session.libraryItemId)
     if (!libraryItem) {
       Logger.error(`[PlaybackSessionManager] syncSession Library Item not found "${session.libraryItemId}"`)
       return null
@@ -381,9 +382,6 @@ class PlaybackSessionManager {
       })
     }
     this.saveSession(session)
-    return {
-      libraryItem
-    }
   }
 
   /**

From 1e9470b8402099d3c05e46fb83b2579a50890971 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sat, 4 Jan 2025 15:59:40 -0600
Subject: [PATCH 135/143] Update AuthorController library item usage and remove
 unused

---
 server/Database.js                     | 22 ------------
 server/controllers/AuthorController.js | 23 +++++++-----
 server/models/LibraryItem.js           | 48 ++------------------------
 server/objects/LibraryItem.js          | 11 ------
 4 files changed, 16 insertions(+), 88 deletions(-)

diff --git a/server/Database.js b/server/Database.js
index 45af5248..61385981 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -401,17 +401,6 @@ class Database {
     return this.models.setting.updateSettingObj(settings.toJSON())
   }
 
-  updateBulkBooks(oldBooks) {
-    if (!this.sequelize) return false
-    return Promise.all(oldBooks.map((oldBook) => this.models.book.saveFromOld(oldBook)))
-  }
-
-  async createLibraryItem(oldLibraryItem) {
-    if (!this.sequelize) return false
-    await oldLibraryItem.saveMetadata()
-    await this.models.libraryItem.fullCreateFromOld(oldLibraryItem)
-  }
-
   /**
    * Save metadata file and update library item
    *
@@ -429,17 +418,6 @@ class Database {
     return updated
   }
 
-  async createBulkBookAuthors(bookAuthors) {
-    if (!this.sequelize) return false
-    await this.models.bookAuthor.bulkCreate(bookAuthors)
-  }
-
-  async removeBulkBookAuthors(authorId = null, bookId = null) {
-    if (!this.sequelize) return false
-    if (!authorId && !bookId) return
-    await this.models.bookAuthor.removeByIds(authorId, bookId)
-  }
-
   getPlaybackSessions(where = null) {
     if (!this.sequelize) return false
     return this.models.playbackSession.getOldPlaybackSessions(where)
diff --git a/server/controllers/AuthorController.js b/server/controllers/AuthorController.js
index a6b5a2f4..31c94307 100644
--- a/server/controllers/AuthorController.js
+++ b/server/controllers/AuthorController.js
@@ -44,16 +44,21 @@ class AuthorController {
 
     // Used on author landing page to include library items and items grouped in series
     if (include.includes('items')) {
-      authorJson.libraryItems = await Database.libraryItemModel.getForAuthor(req.author, req.user)
+      const libraryItems = await Database.libraryItemModel.getForAuthor(req.author, req.user)
 
       if (include.includes('series')) {
         const seriesMap = {}
         // Group items into series
-        authorJson.libraryItems.forEach((li) => {
-          if (li.media.metadata.series) {
-            li.media.metadata.series.forEach((series) => {
-              const itemWithSeries = li.toJSONMinified()
-              itemWithSeries.media.metadata.series = series
+        libraryItems.forEach((li) => {
+          if (li.media.series?.length) {
+            li.media.series.forEach((series) => {
+              const itemWithSeries = li.toOldJSONMinified()
+              itemWithSeries.media.metadata.series = {
+                id: series.id,
+                name: series.name,
+                nameIgnorePrefix: series.nameIgnorePrefix,
+                sequence: series.bookSeries.sequence
+              }
 
               if (seriesMap[series.id]) {
                 seriesMap[series.id].items.push(itemWithSeries)
@@ -76,7 +81,7 @@ class AuthorController {
       }
 
       // Minify library items
-      authorJson.libraryItems = authorJson.libraryItems.map((li) => li.toJSONMinified())
+      authorJson.libraryItems = libraryItems.map((li) => li.toOldJSONMinified())
     }
 
     return res.json(authorJson)
@@ -142,8 +147,8 @@ class AuthorController {
         })
       })
       if (libraryItems.length) {
-        await Database.removeBulkBookAuthors(req.author.id) // Remove all old BookAuthor
-        await Database.createBulkBookAuthors(bookAuthorsToCreate) // Create all new BookAuthor
+        await Database.bookAuthorModel.removeByIds(req.author.id) // Remove all old BookAuthor
+        await Database.bookAuthorModel.bulkCreate(bookAuthorsToCreate) // Create all new BookAuthor
         for (const libraryItem of libraryItems) {
           await libraryItem.saveMetadataFile()
         }
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 0d87a328..31a6a0b4 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -160,40 +160,6 @@ class LibraryItem extends Model {
     })
   }
 
-  static async fullCreateFromOld(oldLibraryItem) {
-    const newLibraryItem = await this.create(this.getFromOld(oldLibraryItem))
-
-    if (oldLibraryItem.mediaType === 'book') {
-      const bookObj = this.sequelize.models.book.getFromOld(oldLibraryItem.media)
-      bookObj.libraryItemId = newLibraryItem.id
-      const newBook = await this.sequelize.models.book.create(bookObj)
-
-      const oldBookAuthors = oldLibraryItem.media.metadata.authors || []
-      const oldBookSeriesAll = oldLibraryItem.media.metadata.series || []
-
-      for (const oldBookAuthor of oldBookAuthors) {
-        await this.sequelize.models.bookAuthor.create({ authorId: oldBookAuthor.id, bookId: newBook.id })
-      }
-      for (const oldSeries of oldBookSeriesAll) {
-        await this.sequelize.models.bookSeries.create({ seriesId: oldSeries.id, bookId: newBook.id, sequence: oldSeries.sequence })
-      }
-    } else if (oldLibraryItem.mediaType === 'podcast') {
-      const podcastObj = this.sequelize.models.podcast.getFromOld(oldLibraryItem.media)
-      podcastObj.libraryItemId = newLibraryItem.id
-      const newPodcast = await this.sequelize.models.podcast.create(podcastObj)
-
-      const oldEpisodes = oldLibraryItem.media.episodes || []
-      for (const oldEpisode of oldEpisodes) {
-        const episodeObj = this.sequelize.models.podcastEpisode.getFromOld(oldEpisode)
-        episodeObj.libraryItemId = newLibraryItem.id
-        episodeObj.podcastId = newPodcast.id
-        await this.sequelize.models.podcastEpisode.create(episodeObj)
-      }
-    }
-
-    return newLibraryItem
-  }
-
   /**
    * Updates libraryItem, book, authors and series from old library item
    *
@@ -819,21 +785,11 @@ class LibraryItem extends Model {
    * Get book library items for author, optional use user permissions
    * @param {import('./Author')} author
    * @param {import('./User')} user
-   * @returns {Promise<oldLibraryItem[]>}
+   * @returns {Promise<LibraryItemExpanded[]>}
    */
   static async getForAuthor(author, user = null) {
     const { libraryItems } = await libraryFilters.getLibraryItemsForAuthor(author, user, undefined, undefined)
-    return libraryItems.map((li) => this.getOldLibraryItem(li))
-  }
-
-  /**
-   * Get book library items in a collection
-   * @param {oldCollection} collection
-   * @returns {Promise<oldLibraryItem[]>}
-   */
-  static async getForCollection(collection) {
-    const libraryItems = await libraryFilters.getLibraryItemsForCollection(collection)
-    return libraryItems.map((li) => this.getOldLibraryItem(li))
+    return libraryItems
   }
 
   /**
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index 17d7484c..d955356e 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -269,16 +269,5 @@ class LibraryItem {
         this.isSavingMetadata = false
       })
   }
-
-  removeLibraryFile(ino) {
-    if (!ino) return false
-    const libraryFile = this.libraryFiles.find((lf) => lf.ino === ino)
-    if (libraryFile) {
-      this.libraryFiles = this.libraryFiles.filter((lf) => lf.ino !== ino)
-      this.updatedAt = Date.now()
-      return true
-    }
-    return false
-  }
 }
 module.exports = LibraryItem

From d5ce7b4939ca31a8c8d0456c230c1f3d10525362 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 5 Jan 2025 12:05:01 -0600
Subject: [PATCH 136/143] Migrate to new library item in scanner

---
 server/Database.js                          |  17 --
 server/controllers/AuthorController.js      |  10 +
 server/controllers/LibraryItemController.js | 135 ++++-----
 server/controllers/PodcastController.js     |   6 +-
 server/controllers/SearchController.js      |   2 +-
 server/finders/BookFinder.js                |   2 +-
 server/managers/CoverManager.js             |  55 ----
 server/models/Author.js                     |  16 ++
 server/models/Book.js                       | 144 +++++++---
 server/models/LibraryItem.js                | 252 +---------------
 server/models/MediaItemShare.js             |  11 +-
 server/models/Series.js                     |  18 +-
 server/objects/LibraryItem.js               | 120 --------
 server/objects/mediaTypes/Book.js           |  16 --
 server/objects/mediaTypes/Podcast.js        |  17 --
 server/objects/metadata/BookMetadata.js     |  25 --
 server/objects/metadata/PodcastMetadata.js  |   4 -
 server/routers/ApiRouter.js                 | 105 -------
 server/scanner/LibraryScanner.js            |  18 +-
 server/scanner/Scanner.js                   | 301 +++++++++++++-------
 server/utils/podcastUtils.js                |   6 +
 21 files changed, 435 insertions(+), 845 deletions(-)

diff --git a/server/Database.js b/server/Database.js
index 61385981..82a8fbd1 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -401,23 +401,6 @@ class Database {
     return this.models.setting.updateSettingObj(settings.toJSON())
   }
 
-  /**
-   * Save metadata file and update library item
-   *
-   * @param {import('./objects/LibraryItem')} oldLibraryItem
-   * @returns {Promise<boolean>}
-   */
-  async updateLibraryItem(oldLibraryItem) {
-    if (!this.sequelize) return false
-    await oldLibraryItem.saveMetadata()
-    const updated = await this.models.libraryItem.fullUpdateFromOld(oldLibraryItem)
-    // Clear library filter data cache
-    if (updated) {
-      delete this.libraryFilterData[oldLibraryItem.libraryId]
-    }
-    return updated
-  }
-
   getPlaybackSessions(where = null) {
     if (!this.sequelize) return false
     return this.models.playbackSession.getOldPlaybackSessions(where)
diff --git a/server/controllers/AuthorController.js b/server/controllers/AuthorController.js
index 31c94307..47150883 100644
--- a/server/controllers/AuthorController.js
+++ b/server/controllers/AuthorController.js
@@ -242,8 +242,18 @@ class AuthorController {
       await CacheManager.purgeImageCache(req.author.id) // Purge cache
     }
 
+    // Load library items so that metadata file can be updated
+    const allItemsWithAuthor = await Database.authorModel.getAllLibraryItemsForAuthor(req.author.id)
+    allItemsWithAuthor.forEach((libraryItem) => {
+      libraryItem.media.authors = libraryItem.media.authors.filter((au) => au.id !== req.author.id)
+    })
+
     await req.author.destroy()
 
+    for (const libraryItem of allItemsWithAuthor) {
+      await libraryItem.saveMetadataFile()
+    }
+
     SocketAuthority.emitter('author_removed', req.author.toOldJSON())
 
     // Update filter data
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 14a85f6e..3a4fb159 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -81,31 +81,6 @@ class LibraryItemController {
     res.json(req.libraryItem.toOldJSON())
   }
 
-  /**
-   * PATCH: /api/items/:id
-   *
-   * @deprecated
-   * Use the updateMedia /api/items/:id/media endpoint instead or updateCover /api/items/:id/cover
-   *
-   * @param {LibraryItemControllerRequest} req
-   * @param {Response} res
-   */
-  async update(req, res) {
-    // Item has cover and update is removing cover so purge it from cache
-    if (req.libraryItem.media.coverPath && req.body.media && (req.body.media.coverPath === '' || req.body.media.coverPath === null)) {
-      await CacheManager.purgeCoverCache(req.libraryItem.id)
-    }
-
-    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
-    const hasUpdates = oldLibraryItem.update(req.body)
-    if (hasUpdates) {
-      Logger.debug(`[LibraryItemController] Updated now saving`)
-      await Database.updateLibraryItem(oldLibraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
-    }
-    res.json(oldLibraryItem.toJSON())
-  }
-
   /**
    * DELETE: /api/items/:id
    * Delete library item. Will delete from database and file system if hard delete is requested.
@@ -219,11 +194,6 @@ class LibraryItemController {
       if (res.writableEnded || res.headersSent) return
     }
 
-    // Book specific
-    if (req.libraryItem.isBook) {
-      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, req.libraryItem.libraryId)
-    }
-
     // Podcast specific
     let isPodcastAutoDownloadUpdated = false
     if (req.libraryItem.isPodcast) {
@@ -234,41 +204,56 @@ class LibraryItemController {
       }
     }
 
-    // Book specific - Get all series being removed from this item
-    let seriesRemoved = []
-    if (req.libraryItem.isBook && mediaPayload.metadata?.series) {
-      const seriesIdsInUpdate = mediaPayload.metadata.series?.map((se) => se.id) || []
-      seriesRemoved = req.libraryItem.media.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
+    let hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
+
+    if (req.libraryItem.isBook && Array.isArray(mediaPayload.metadata?.series)) {
+      const seriesUpdateData = await req.libraryItem.media.updateSeriesFromRequest(mediaPayload.metadata.series, req.libraryItem.libraryId)
+      if (seriesUpdateData?.seriesRemoved.length) {
+        // Check remove empty series
+        Logger.debug(`[LibraryItemController] Series were removed from book. Check if series are now empty.`)
+        await this.checkRemoveEmptySeries(seriesUpdateData.seriesRemoved.map((se) => se.id))
+      }
+      if (seriesUpdateData?.seriesAdded.length) {
+        // Add series to filter data
+        seriesUpdateData.seriesAdded.forEach((se) => {
+          Database.addSeriesToFilterData(req.libraryItem.libraryId, se.name, se.id)
+        })
+      }
+      if (seriesUpdateData?.hasUpdates) {
+        hasUpdates = true
+      }
     }
 
-    let authorsRemoved = []
-    if (req.libraryItem.isBook && mediaPayload.metadata?.authors) {
-      const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-      authorsRemoved = req.libraryItem.media.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
+    if (req.libraryItem.isBook && Array.isArray(mediaPayload.metadata?.authors)) {
+      const authorNames = mediaPayload.metadata.authors.map((au) => (typeof au.name === 'string' ? au.name.trim() : null)).filter((au) => au)
+      const authorUpdateData = await req.libraryItem.media.updateAuthorsFromRequest(authorNames, req.libraryItem.libraryId)
+      if (authorUpdateData?.authorsRemoved.length) {
+        // Check remove empty authors
+        Logger.debug(`[LibraryItemController] Authors were removed from book. Check if authors are now empty.`)
+        await this.checkRemoveAuthorsWithNoBooks(authorUpdateData.authorsRemoved.map((au) => au.id))
+        hasUpdates = true
+      }
+      if (authorUpdateData?.authorsAdded.length) {
+        // Add authors to filter data
+        authorUpdateData.authorsAdded.forEach((au) => {
+          Database.addAuthorToFilterData(req.libraryItem.libraryId, au.name, au.id)
+        })
+        hasUpdates = true
+      }
     }
 
-    const hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
     if (hasUpdates) {
       req.libraryItem.changed('updatedAt', true)
       await req.libraryItem.save()
 
+      await req.libraryItem.saveMetadataFile()
+
       if (isPodcastAutoDownloadUpdated) {
         this.cronManager.checkUpdatePodcastCron(req.libraryItem)
       }
 
       Logger.debug(`[LibraryItemController] Updated library item media ${req.libraryItem.media.title}`)
       SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
-
-      if (authorsRemoved.length) {
-        // Check remove empty authors
-        Logger.debug(`[LibraryItemController] Authors were removed from book. Check if authors are now empty.`)
-        await this.checkRemoveAuthorsWithNoBooks(authorsRemoved.map((au) => au.id))
-      }
-      if (seriesRemoved.length) {
-        // Check remove empty series
-        Logger.debug(`[LibraryItemController] Series were removed from book. Check if series are now empty.`)
-        await this.checkRemoveEmptySeries(seriesRemoved.map((se) => se.id))
-      }
     }
     res.json({
       updated: hasUpdates,
@@ -527,8 +512,7 @@ class LibraryItemController {
       options.overrideDetails = !!reqBody.overrideDetails
     }
 
-    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
-    var matchResult = await Scanner.quickMatchLibraryItem(this, oldLibraryItem, options)
+    const matchResult = await Scanner.quickMatchLibraryItem(this, req.libraryItem, options)
     res.json(matchResult)
   }
 
@@ -640,26 +624,44 @@ class LibraryItemController {
       const mediaPayload = updatePayload.mediaPayload
       const libraryItem = libraryItems.find((li) => li.id === updatePayload.id)
 
-      await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, libraryItem.libraryId)
+      let hasUpdates = await libraryItem.media.updateFromRequest(mediaPayload)
 
-      if (libraryItem.isBook) {
-        if (Array.isArray(mediaPayload.metadata?.series)) {
-          const seriesIdsInUpdate = mediaPayload.metadata.series.map((se) => se.id)
-          const seriesRemoved = libraryItem.media.series.filter((se) => !seriesIdsInUpdate.includes(se.id))
-          seriesIdsRemoved.push(...seriesRemoved.map((se) => se.id))
+      if (libraryItem.isBook && Array.isArray(mediaPayload.metadata?.series)) {
+        const seriesUpdateData = await libraryItem.media.updateSeriesFromRequest(mediaPayload.metadata.series, libraryItem.libraryId)
+        if (seriesUpdateData?.seriesRemoved.length) {
+          seriesIdsRemoved.push(...seriesUpdateData.seriesRemoved.map((se) => se.id))
         }
-        if (Array.isArray(mediaPayload.metadata?.authors)) {
-          const authorIdsInUpdate = mediaPayload.metadata.authors.map((au) => au.id)
-          const authorsRemoved = libraryItem.media.authors.filter((au) => !authorIdsInUpdate.includes(au.id))
-          authorIdsRemoved.push(...authorsRemoved.map((au) => au.id))
+        if (seriesUpdateData?.seriesAdded.length) {
+          seriesUpdateData.seriesAdded.forEach((se) => {
+            Database.addSeriesToFilterData(libraryItem.libraryId, se.name, se.id)
+          })
+        }
+        if (seriesUpdateData?.hasUpdates) {
+          hasUpdates = true
+        }
+      }
+
+      if (libraryItem.isBook && Array.isArray(mediaPayload.metadata?.authors)) {
+        const authorNames = mediaPayload.metadata.authors.map((au) => (typeof au.name === 'string' ? au.name.trim() : null)).filter((au) => au)
+        const authorUpdateData = await libraryItem.media.updateAuthorsFromRequest(authorNames, libraryItem.libraryId)
+        if (authorUpdateData?.authorsRemoved.length) {
+          authorIdsRemoved.push(...authorUpdateData.authorsRemoved.map((au) => au.id))
+          hasUpdates = true
+        }
+        if (authorUpdateData?.authorsAdded.length) {
+          authorUpdateData.authorsAdded.forEach((au) => {
+            Database.addAuthorToFilterData(libraryItem.libraryId, au.name, au.id)
+          })
+          hasUpdates = true
         }
       }
 
-      const hasUpdates = await libraryItem.media.updateFromRequest(mediaPayload)
       if (hasUpdates) {
         libraryItem.changed('updatedAt', true)
         await libraryItem.save()
 
+        await libraryItem.saveMetadataFile()
+
         Logger.debug(`[LibraryItemController] Updated library item media "${libraryItem.media.title}"`)
         SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
         itemsUpdated++
@@ -739,8 +741,7 @@ class LibraryItemController {
     }
 
     for (const libraryItem of libraryItems) {
-      const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
-      const matchResult = await Scanner.quickMatchLibraryItem(this, oldLibraryItem, options)
+      const matchResult = await Scanner.quickMatchLibraryItem(this, libraryItem, options)
       if (matchResult.updated) {
         itemsUpdated++
       } else if (matchResult.warning) {
@@ -891,6 +892,8 @@ class LibraryItemController {
       req.libraryItem.media.changed('chapters', true)
       await req.libraryItem.media.save()
 
+      await req.libraryItem.saveMetadataFile()
+
       SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     }
 
diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index 3d8ff240..1d1c106d 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -375,11 +375,9 @@ class PodcastController {
     }
 
     const overrideDetails = req.query.override === '1'
-    const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(req.libraryItem)
-    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(oldLibraryItem, { overrideDetails })
+    const episodesUpdated = await Scanner.quickMatchPodcastEpisodes(req.libraryItem, { overrideDetails })
     if (episodesUpdated) {
-      await Database.updateLibraryItem(oldLibraryItem)
-      SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
+      SocketAuthority.emitter('item_updated', req.libraryItem.toOldJSONExpanded())
     }
 
     res.json({
diff --git a/server/controllers/SearchController.js b/server/controllers/SearchController.js
index a19ff876..51aaa910 100644
--- a/server/controllers/SearchController.js
+++ b/server/controllers/SearchController.js
@@ -24,7 +24,7 @@ class SearchController {
    */
   async findBooks(req, res) {
     const id = req.query.id
-    const libraryItem = await Database.libraryItemModel.getOldById(id)
+    const libraryItem = await Database.libraryItemModel.getExpandedById(id)
     const provider = req.query.provider || 'google'
     const title = req.query.title || ''
     const author = req.query.author || ''
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 47d1118c..f4323094 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -361,7 +361,7 @@ class BookFinder {
   /**
    * Search for books including fuzzy searches
    *
-   * @param {Object} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {string} provider
    * @param {string} title
    * @param {string} author
diff --git a/server/managers/CoverManager.js b/server/managers/CoverManager.js
index 945c69ab..c8f88910 100644
--- a/server/managers/CoverManager.js
+++ b/server/managers/CoverManager.js
@@ -123,61 +123,6 @@ class CoverManager {
     }
   }
 
-  /**
-   *
-   * @param {Object} libraryItem - old library item
-   * @param {string} url
-   * @param {boolean} [forceLibraryItemFolder=false]
-   * @returns {Promise<{error:string}|{cover:string}>}
-   */
-  async downloadCoverFromUrl(libraryItem, url, forceLibraryItemFolder = false) {
-    try {
-      // Force save cover with library item is used for adding new podcasts
-      var coverDirPath = forceLibraryItemFolder ? libraryItem.path : this.getCoverDirectory(libraryItem)
-      await fs.ensureDir(coverDirPath)
-
-      var temppath = Path.posix.join(coverDirPath, 'cover')
-
-      let errorMsg = ''
-      let success = await downloadImageFile(url, temppath)
-        .then(() => true)
-        .catch((err) => {
-          errorMsg = err.message || 'Unknown error'
-          Logger.error(`[CoverManager] Download image file failed for "${url}"`, errorMsg)
-          return false
-        })
-      if (!success) {
-        return {
-          error: 'Failed to download image from url: ' + errorMsg
-        }
-      }
-
-      var imgtype = await this.checkFileIsValidImage(temppath, true)
-
-      if (imgtype.error) {
-        return imgtype
-      }
-
-      var coverFilename = `cover.${imgtype.ext}`
-      var coverFullPath = Path.posix.join(coverDirPath, coverFilename)
-      await fs.rename(temppath, coverFullPath)
-
-      await this.removeOldCovers(coverDirPath, '.' + imgtype.ext)
-      await CacheManager.purgeCoverCache(libraryItem.id)
-
-      Logger.info(`[CoverManager] Downloaded libraryItem cover "${coverFullPath}" from url "${url}" for "${libraryItem.media.metadata.title}"`)
-      libraryItem.updateMediaCover(coverFullPath)
-      return {
-        cover: coverFullPath
-      }
-    } catch (error) {
-      Logger.error(`[CoverManager] Fetch cover image from url "${url}" failed`, error)
-      return {
-        error: 'Failed to fetch image from url'
-      }
-    }
-  }
-
   /**
    *
    * @param {string} coverPath
diff --git a/server/models/Author.js b/server/models/Author.js
index f3bbba57..287b6697 100644
--- a/server/models/Author.js
+++ b/server/models/Author.js
@@ -107,6 +107,22 @@ class Author extends Model {
     return libraryItems
   }
 
+  /**
+   *
+   * @param {string} name
+   * @param {string} libraryId
+   * @returns {Promise<Author>}
+   */
+  static async findOrCreateByNameAndLibrary(name, libraryId) {
+    const author = await this.getByNameAndLibrary(name, libraryId)
+    if (author) return author
+    return this.create({
+      name,
+      lastFirst: this.getLastFirst(name),
+      libraryId
+    })
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/models/Book.js b/server/models/Book.js
index 4c2006a1..dff79da2 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -542,49 +542,113 @@ class Book extends Model {
       await this.save()
     }
 
-    if (Array.isArray(payload.metadata?.authors)) {
-      const authorsRemoved = this.authors.filter((au) => !payload.metadata.authors.some((a) => a.id === au.id))
-      const newAuthors = payload.metadata.authors.filter((a) => !this.authors.some((au) => au.id === a.id))
-
-      for (const author of authorsRemoved) {
-        await this.sequelize.models.bookAuthor.removeByIds(author.id, this.id)
-        Logger.debug(`[Book] "${this.title}" Removed author ${author.id}`)
-        hasUpdates = true
-      }
-      for (const author of newAuthors) {
-        await this.sequelize.models.bookAuthor.create({ bookId: this.id, authorId: author.id })
-        Logger.debug(`[Book] "${this.title}" Added author ${author.id}`)
-        hasUpdates = true
-      }
-    }
-
-    if (Array.isArray(payload.metadata?.series)) {
-      const seriesRemoved = this.series.filter((se) => !payload.metadata.series.some((s) => s.id === se.id))
-      const newSeries = payload.metadata.series.filter((s) => !this.series.some((se) => se.id === s.id))
-
-      for (const series of seriesRemoved) {
-        await this.sequelize.models.bookSeries.removeByIds(series.id, this.id)
-        Logger.debug(`[Book] "${this.title}" Removed series ${series.id}`)
-        hasUpdates = true
-      }
-      for (const series of newSeries) {
-        await this.sequelize.models.bookSeries.create({ bookId: this.id, seriesId: series.id, sequence: series.sequence })
-        Logger.debug(`[Book] "${this.title}" Added series ${series.id}`)
-        hasUpdates = true
-      }
-      for (const series of payload.metadata.series) {
-        const existingSeries = this.series.find((se) => se.id === series.id)
-        if (existingSeries && existingSeries.bookSeries.sequence !== series.sequence) {
-          await existingSeries.bookSeries.update({ sequence: series.sequence })
-          Logger.debug(`[Book] "${this.title}" Updated series ${series.id} sequence ${series.sequence}`)
-          hasUpdates = true
-        }
-      }
-    }
-
     return hasUpdates
   }
 
+  /**
+   * Creates or removes authors from the book using the author names from the request
+   *
+   * @param {string[]} authors
+   * @param {string} libraryId
+   * @returns {Promise<{authorsRemoved: import('./Author')[], authorsAdded: import('./Author')[]}>}
+   */
+  async updateAuthorsFromRequest(authors, libraryId) {
+    if (!Array.isArray(authors)) return null
+
+    if (!this.authors) {
+      throw new Error(`[Book] Cannot update authors because authors are not loaded for book ${this.id}`)
+    }
+
+    /** @type {typeof import('./Author')} */
+    const authorModel = this.sequelize.models.author
+
+    /** @type {typeof import('./BookAuthor')} */
+    const bookAuthorModel = this.sequelize.models.bookAuthor
+
+    const authorsCleaned = authors.map((a) => a.toLowerCase()).filter((a) => a)
+    const authorsRemoved = this.authors.filter((au) => !authorsCleaned.includes(au.name.toLowerCase()))
+    const newAuthorNames = authors.filter((a) => !this.authors.some((au) => au.name.toLowerCase() === a.toLowerCase()))
+
+    for (const author of authorsRemoved) {
+      await bookAuthorModel.removeByIds(author.id, this.id)
+      Logger.debug(`[Book] "${this.title}" Removed author "${author.name}"`)
+      this.authors = this.authors.filter((au) => au.id !== author.id)
+    }
+    const authorsAdded = []
+    for (const authorName of newAuthorNames) {
+      const author = await authorModel.findOrCreateByNameAndLibrary(authorName, libraryId)
+      await bookAuthorModel.create({ bookId: this.id, authorId: author.id })
+      Logger.debug(`[Book] "${this.title}" Added author "${author.name}"`)
+      this.authors.push(author)
+      authorsAdded.push(author)
+    }
+
+    return {
+      authorsRemoved,
+      authorsAdded
+    }
+  }
+
+  /**
+   * Creates or removes series from the book using the series names from the request.
+   * Updates series sequence if it has changed.
+   *
+   * @param {{ name: string, sequence: string }[]} seriesObjects
+   * @param {string} libraryId
+   * @returns {Promise<{seriesRemoved: import('./Series')[], seriesAdded: import('./Series')[], hasUpdates: boolean}>}
+   */
+  async updateSeriesFromRequest(seriesObjects, libraryId) {
+    if (!Array.isArray(seriesObjects) || seriesObjects.some((se) => !se.name || typeof se.name !== 'string')) return null
+
+    if (!this.series) {
+      throw new Error(`[Book] Cannot update series because series are not loaded for book ${this.id}`)
+    }
+
+    /** @type {typeof import('./Series')} */
+    const seriesModel = this.sequelize.models.series
+
+    /** @type {typeof import('./BookSeries')} */
+    const bookSeriesModel = this.sequelize.models.bookSeries
+
+    const seriesNamesCleaned = seriesObjects.map((se) => se.name.toLowerCase())
+    const seriesRemoved = this.series.filter((se) => !seriesNamesCleaned.includes(se.name.toLowerCase()))
+    const seriesAdded = []
+    let hasUpdates = false
+    for (const seriesObj of seriesObjects) {
+      const seriesObjSequence = typeof seriesObj.sequence === 'string' ? seriesObj.sequence : null
+
+      const existingSeries = this.series.find((se) => se.name.toLowerCase() === seriesObj.name.toLowerCase())
+      if (existingSeries) {
+        if (existingSeries.bookSeries.sequence !== seriesObjSequence) {
+          existingSeries.bookSeries.sequence = seriesObjSequence
+          await existingSeries.bookSeries.save()
+          hasUpdates = true
+          Logger.debug(`[Book] "${this.title}" Updated series "${existingSeries.name}" sequence ${seriesObjSequence}`)
+        }
+      } else {
+        const series = await seriesModel.findOrCreateByNameAndLibrary(seriesObj.name, libraryId)
+        series.bookSeries = await bookSeriesModel.create({ bookId: this.id, seriesId: series.id, sequence: seriesObjSequence })
+        this.series.push(series)
+        seriesAdded.push(series)
+        hasUpdates = true
+        Logger.debug(`[Book] "${this.title}" Added series "${series.name}"`)
+      }
+    }
+
+    for (const series of seriesRemoved) {
+      await bookSeriesModel.removeByIds(series.id, this.id)
+      this.series = this.series.filter((se) => se.id !== series.id)
+      Logger.debug(`[Book] "${this.title}" Removed series ${series.id}`)
+      hasUpdates = true
+    }
+
+    return {
+      seriesRemoved,
+      seriesAdded,
+      hasUpdates
+    }
+  }
+
   /**
    * Old model kept metadata in a separate object
    */
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 31a6a0b4..d19816a3 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -160,206 +160,6 @@ class LibraryItem extends Model {
     })
   }
 
-  /**
-   * Updates libraryItem, book, authors and series from old library item
-   *
-   * @param {oldLibraryItem} oldLibraryItem
-   * @returns {Promise<boolean>} true if updates were made
-   */
-  static async fullUpdateFromOld(oldLibraryItem) {
-    const libraryItemExpanded = await this.getExpandedById(oldLibraryItem.id)
-    if (!libraryItemExpanded) return false
-
-    let hasUpdates = false
-
-    // Check update Book/Podcast
-    if (libraryItemExpanded.media) {
-      let updatedMedia = null
-      if (libraryItemExpanded.mediaType === 'podcast') {
-        updatedMedia = this.sequelize.models.podcast.getFromOld(oldLibraryItem.media)
-
-        const existingPodcastEpisodes = libraryItemExpanded.media.podcastEpisodes || []
-        const updatedPodcastEpisodes = oldLibraryItem.media.episodes || []
-
-        for (const existingPodcastEpisode of existingPodcastEpisodes) {
-          // Episode was removed
-          if (!updatedPodcastEpisodes.some((ep) => ep.id === existingPodcastEpisode.id)) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" episode "${existingPodcastEpisode.title}" was removed`)
-            await existingPodcastEpisode.destroy()
-            hasUpdates = true
-          }
-        }
-        for (const updatedPodcastEpisode of updatedPodcastEpisodes) {
-          const existingEpisodeMatch = existingPodcastEpisodes.find((ep) => ep.id === updatedPodcastEpisode.id)
-          if (!existingEpisodeMatch) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" episode "${updatedPodcastEpisode.title}" was added`)
-            await this.sequelize.models.podcastEpisode.createFromOld(updatedPodcastEpisode)
-            hasUpdates = true
-          } else {
-            const updatedEpisodeCleaned = this.sequelize.models.podcastEpisode.getFromOld(updatedPodcastEpisode)
-            let episodeHasUpdates = false
-            for (const key in updatedEpisodeCleaned) {
-              let existingValue = existingEpisodeMatch[key]
-              if (existingValue instanceof Date) existingValue = existingValue.valueOf()
-
-              if (!areEquivalent(updatedEpisodeCleaned[key], existingValue, true)) {
-                Logger.debug(util.format(`[LibraryItem] "${libraryItemExpanded.media.title}" episode "${existingEpisodeMatch.title}" ${key} was updated from %j to %j`, existingValue, updatedEpisodeCleaned[key]))
-                episodeHasUpdates = true
-              }
-            }
-            if (episodeHasUpdates) {
-              await existingEpisodeMatch.update(updatedEpisodeCleaned)
-              hasUpdates = true
-            }
-          }
-        }
-      } else if (libraryItemExpanded.mediaType === 'book') {
-        updatedMedia = this.sequelize.models.book.getFromOld(oldLibraryItem.media)
-
-        const existingAuthors = libraryItemExpanded.media.authors || []
-        const existingSeriesAll = libraryItemExpanded.media.series || []
-        const updatedAuthors = oldLibraryItem.media.metadata.authors || []
-        const uniqueUpdatedAuthors = updatedAuthors.filter((au, idx) => updatedAuthors.findIndex((a) => a.id === au.id) === idx)
-        const updatedSeriesAll = oldLibraryItem.media.metadata.series || []
-
-        for (const existingAuthor of existingAuthors) {
-          // Author was removed from Book
-          if (!uniqueUpdatedAuthors.some((au) => au.id === existingAuthor.id)) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" author "${existingAuthor.name}" was removed`)
-            await this.sequelize.models.bookAuthor.removeByIds(existingAuthor.id, libraryItemExpanded.media.id)
-            hasUpdates = true
-          }
-        }
-        for (const updatedAuthor of uniqueUpdatedAuthors) {
-          // Author was added
-          if (!existingAuthors.some((au) => au.id === updatedAuthor.id)) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" author "${updatedAuthor.name}" was added`)
-            await this.sequelize.models.bookAuthor.create({ authorId: updatedAuthor.id, bookId: libraryItemExpanded.media.id })
-            hasUpdates = true
-          }
-        }
-        for (const existingSeries of existingSeriesAll) {
-          // Series was removed
-          if (!updatedSeriesAll.some((se) => se.id === existingSeries.id)) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" series "${existingSeries.name}" was removed`)
-            await this.sequelize.models.bookSeries.removeByIds(existingSeries.id, libraryItemExpanded.media.id)
-            hasUpdates = true
-          }
-        }
-        for (const updatedSeries of updatedSeriesAll) {
-          // Series was added/updated
-          const existingSeriesMatch = existingSeriesAll.find((se) => se.id === updatedSeries.id)
-          if (!existingSeriesMatch) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" series "${updatedSeries.name}" was added`)
-            await this.sequelize.models.bookSeries.create({ seriesId: updatedSeries.id, bookId: libraryItemExpanded.media.id, sequence: updatedSeries.sequence })
-            hasUpdates = true
-          } else if (existingSeriesMatch.bookSeries.sequence !== updatedSeries.sequence) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" series "${updatedSeries.name}" sequence was updated from "${existingSeriesMatch.bookSeries.sequence}" to "${updatedSeries.sequence}"`)
-            await existingSeriesMatch.bookSeries.update({ id: updatedSeries.id, sequence: updatedSeries.sequence })
-            hasUpdates = true
-          }
-        }
-      }
-
-      let hasMediaUpdates = false
-      for (const key in updatedMedia) {
-        let existingValue = libraryItemExpanded.media[key]
-        if (existingValue instanceof Date) existingValue = existingValue.valueOf()
-
-        if (!areEquivalent(updatedMedia[key], existingValue, true)) {
-          if (key === 'chapters') {
-            // Handle logging of chapters separately because the object is large
-            const chaptersRemoved = libraryItemExpanded.media.chapters.filter((ch) => !updatedMedia.chapters.some((uch) => uch.id === ch.id))
-            if (chaptersRemoved.length) {
-              Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" chapters removed: ${chaptersRemoved.map((ch) => ch.title).join(', ')}`)
-            }
-            const chaptersAdded = updatedMedia.chapters.filter((uch) => !libraryItemExpanded.media.chapters.some((ch) => ch.id === uch.id))
-            if (chaptersAdded.length) {
-              Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" chapters added: ${chaptersAdded.map((ch) => ch.title).join(', ')}`)
-            }
-            if (!chaptersRemoved.length && !chaptersAdded.length) {
-              Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" chapters updated`)
-            }
-          } else {
-            Logger.debug(util.format(`[LibraryItem] "${libraryItemExpanded.media.title}" ${libraryItemExpanded.mediaType}.${key} updated from %j to %j`, existingValue, updatedMedia[key]))
-          }
-
-          hasMediaUpdates = true
-        }
-      }
-      if (hasMediaUpdates && updatedMedia) {
-        await libraryItemExpanded.media.update(updatedMedia)
-        hasUpdates = true
-      }
-    }
-
-    const updatedLibraryItem = this.getFromOld(oldLibraryItem)
-    let hasLibraryItemUpdates = false
-    for (const key in updatedLibraryItem) {
-      let existingValue = libraryItemExpanded[key]
-      if (existingValue instanceof Date) existingValue = existingValue.valueOf()
-
-      if (!areEquivalent(updatedLibraryItem[key], existingValue, true)) {
-        if (key === 'libraryFiles') {
-          // Handle logging of libraryFiles separately because the object is large (should be addressed when migrating off the old library item model)
-          const libraryFilesRemoved = libraryItemExpanded.libraryFiles.filter((lf) => !updatedLibraryItem.libraryFiles.some((ulf) => ulf.ino === lf.ino))
-          if (libraryFilesRemoved.length) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" library files removed: ${libraryFilesRemoved.map((lf) => lf.metadata.path).join(', ')}`)
-          }
-          const libraryFilesAdded = updatedLibraryItem.libraryFiles.filter((ulf) => !libraryItemExpanded.libraryFiles.some((lf) => lf.ino === ulf.ino))
-          if (libraryFilesAdded.length) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" library files added: ${libraryFilesAdded.map((lf) => lf.metadata.path).join(', ')}`)
-          }
-          if (!libraryFilesRemoved.length && !libraryFilesAdded.length) {
-            Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" library files updated`)
-          }
-        } else {
-          Logger.debug(util.format(`[LibraryItem] "${libraryItemExpanded.media.title}" ${key} updated from %j to %j`, existingValue, updatedLibraryItem[key]))
-        }
-
-        hasLibraryItemUpdates = true
-        if (key === 'updatedAt') {
-          libraryItemExpanded.changed('updatedAt', true)
-        }
-      }
-    }
-    if (hasLibraryItemUpdates) {
-      await libraryItemExpanded.update(updatedLibraryItem)
-      Logger.info(`[LibraryItem] Library item "${libraryItemExpanded.id}" updated`)
-      hasUpdates = true
-    }
-    return hasUpdates
-  }
-
-  static getFromOld(oldLibraryItem) {
-    const extraData = {}
-    if (oldLibraryItem.oldLibraryItemId) {
-      extraData.oldLibraryItemId = oldLibraryItem.oldLibraryItemId
-    }
-    return {
-      id: oldLibraryItem.id,
-      ino: oldLibraryItem.ino,
-      path: oldLibraryItem.path,
-      relPath: oldLibraryItem.relPath,
-      mediaId: oldLibraryItem.media.id,
-      mediaType: oldLibraryItem.mediaType,
-      isFile: !!oldLibraryItem.isFile,
-      isMissing: !!oldLibraryItem.isMissing,
-      isInvalid: !!oldLibraryItem.isInvalid,
-      mtime: oldLibraryItem.mtimeMs,
-      ctime: oldLibraryItem.ctimeMs,
-      updatedAt: oldLibraryItem.updatedAt,
-      birthtime: oldLibraryItem.birthtimeMs,
-      size: oldLibraryItem.size,
-      lastScan: oldLibraryItem.lastScan,
-      lastScanVersion: oldLibraryItem.scanVersion,
-      libraryId: oldLibraryItem.libraryId,
-      libraryFolderId: oldLibraryItem.folderId,
-      libraryFiles: oldLibraryItem.libraryFiles?.map((lf) => lf.toJSON()) || [],
-      extraData
-    }
-  }
-
   /**
    * Remove library item by id
    *
@@ -468,12 +268,14 @@ class LibraryItem extends Model {
   /**
    *
    * @param {import('sequelize').WhereOptions} where
+   * @param {import('sequelize').BindOrReplacements} [replacements]
    * @param {import('sequelize').IncludeOptions} [include]
    * @returns {Promise<LibraryItemExpanded>}
    */
-  static async findOneExpanded(where, include = null) {
+  static async findOneExpanded(where, replacements = null, include = null) {
     const libraryItem = await this.findOne({
       where,
+      replacements,
       include
     })
     if (!libraryItem) {
@@ -801,52 +603,6 @@ class LibraryItem extends Model {
     return (await this.count({ where: { id: libraryItemId } })) > 0
   }
 
-  /**
-   *
-   * @param {import('sequelize').WhereOptions} where
-   * @param {import('sequelize').BindOrReplacements} replacements
-   * @returns {Object} oldLibraryItem
-   */
-  static async findOneOld(where, replacements = {}) {
-    const libraryItem = await this.findOne({
-      where,
-      replacements,
-      include: [
-        {
-          model: this.sequelize.models.book,
-          include: [
-            {
-              model: this.sequelize.models.author,
-              through: {
-                attributes: []
-              }
-            },
-            {
-              model: this.sequelize.models.series,
-              through: {
-                attributes: ['sequence']
-              }
-            }
-          ]
-        },
-        {
-          model: this.sequelize.models.podcast,
-          include: [
-            {
-              model: this.sequelize.models.podcastEpisode
-            }
-          ]
-        }
-      ],
-      order: [
-        [this.sequelize.models.book, this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
-        [this.sequelize.models.book, this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
-      ]
-    })
-    if (!libraryItem) return null
-    return this.getOldLibraryItem(libraryItem)
-  }
-
   /**
    *
    * @param {string} libraryItemId
@@ -970,7 +726,7 @@ class LibraryItem extends Model {
           }
         }
 
-        Logger.debug(`Success saving abmetadata to "${metadataFilePath}"`)
+        Logger.debug(`[LibraryItem] Saved metadata for "${this.media.title}" file to "${metadataFilePath}"`)
 
         return metadataLibraryFile
       })
diff --git a/server/models/MediaItemShare.js b/server/models/MediaItemShare.js
index 2d5be8f6..6bff17b8 100644
--- a/server/models/MediaItemShare.js
+++ b/server/models/MediaItemShare.js
@@ -87,13 +87,10 @@ class MediaItemShare extends Model {
     const libraryItemModel = this.sequelize.models.libraryItem
 
     if (mediaItemType === 'book') {
-      const libraryItem = await libraryItemModel.findOneExpanded(
-        { mediaId: mediaItemId },
-        {
-          model: this.sequelize.models.library,
-          attributes: ['settings']
-        }
-      )
+      const libraryItem = await libraryItemModel.findOneExpanded({ mediaId: mediaItemId }, null, {
+        model: this.sequelize.models.library,
+        attributes: ['settings']
+      })
 
       return libraryItem
     }
diff --git a/server/models/Series.js b/server/models/Series.js
index c4bc1594..6ca28846 100644
--- a/server/models/Series.js
+++ b/server/models/Series.js
@@ -1,6 +1,6 @@
 const { DataTypes, Model, where, fn, col, literal } = require('sequelize')
 
-const { getTitlePrefixAtEnd } = require('../utils/index')
+const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils/index')
 
 class Series extends Model {
   constructor(values, options) {
@@ -66,6 +66,22 @@ class Series extends Model {
     return series
   }
 
+  /**
+   *
+   * @param {string} seriesName
+   * @param {string} libraryId
+   * @returns {Promise<Series>}
+   */
+  static async findOrCreateByNameAndLibrary(seriesName, libraryId) {
+    const series = await this.getByNameAndLibrary(seriesName, libraryId)
+    if (series) return series
+    return this.create({
+      name: seriesName,
+      nameIgnorePrefix: getTitleIgnorePrefix(seriesName),
+      libraryId
+    })
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
index d955356e..3cf89b10 100644
--- a/server/objects/LibraryItem.js
+++ b/server/objects/LibraryItem.js
@@ -135,33 +135,6 @@ class LibraryItem {
     }
   }
 
-  // Adds additional helpful fields like media duration, tracks, etc.
-  toJSONExpanded() {
-    return {
-      id: this.id,
-      ino: this.ino,
-      oldLibraryItemId: this.oldLibraryItemId,
-      libraryId: this.libraryId,
-      folderId: this.folderId,
-      path: this.path,
-      relPath: this.relPath,
-      isFile: this.isFile,
-      mtimeMs: this.mtimeMs,
-      ctimeMs: this.ctimeMs,
-      birthtimeMs: this.birthtimeMs,
-      addedAt: this.addedAt,
-      updatedAt: this.updatedAt,
-      lastScan: this.lastScan,
-      scanVersion: this.scanVersion,
-      isMissing: !!this.isMissing,
-      isInvalid: !!this.isInvalid,
-      mediaType: this.mediaType,
-      media: this.media.toJSONExpanded(),
-      libraryFiles: this.libraryFiles.map((f) => f.toJSON()),
-      size: this.size
-    }
-  }
-
   get isPodcast() {
     return this.mediaType === 'podcast'
   }
@@ -176,98 +149,5 @@ class LibraryItem {
   get hasAudioFiles() {
     return this.libraryFiles.some((lf) => lf.fileType === 'audio')
   }
-
-  update(payload) {
-    const json = this.toJSON()
-    let hasUpdates = false
-    for (const key in json) {
-      if (payload[key] !== undefined) {
-        if (key === 'media') {
-          if (this.media.update(payload[key])) {
-            hasUpdates = true
-          }
-        } else if (!areEquivalent(payload[key], json[key])) {
-          this[key] = copyValue(payload[key])
-          hasUpdates = true
-        }
-      }
-    }
-    if (hasUpdates) {
-      this.updatedAt = Date.now()
-    }
-    return hasUpdates
-  }
-
-  updateMediaCover(coverPath) {
-    this.media.updateCover(coverPath)
-    this.updatedAt = Date.now()
-    return true
-  }
-
-  setMissing() {
-    this.isMissing = true
-    this.updatedAt = Date.now()
-  }
-
-  /**
-   * Save metadata.json file
-   * TODO: Move to new LibraryItem model
-   * @returns {Promise<LibraryFile>} null if not saved
-   */
-  async saveMetadata() {
-    if (this.isSavingMetadata || !global.MetadataPath) return null
-
-    this.isSavingMetadata = true
-
-    let metadataPath = Path.join(global.MetadataPath, 'items', this.id)
-    let storeMetadataWithItem = global.ServerSettings.storeMetadataWithItem
-    if (storeMetadataWithItem && !this.isFile) {
-      metadataPath = this.path
-    } else {
-      // Make sure metadata book dir exists
-      storeMetadataWithItem = false
-      await fs.ensureDir(metadataPath)
-    }
-
-    const metadataFilePath = Path.join(metadataPath, `metadata.${global.ServerSettings.metadataFileFormat}`)
-
-    return fs
-      .writeFile(metadataFilePath, JSON.stringify(this.media.toJSONForMetadataFile(), null, 2))
-      .then(async () => {
-        // Add metadata.json to libraryFiles array if it is new
-        let metadataLibraryFile = this.libraryFiles.find((lf) => lf.metadata.path === filePathToPOSIX(metadataFilePath))
-        if (storeMetadataWithItem) {
-          if (!metadataLibraryFile) {
-            metadataLibraryFile = new LibraryFile()
-            await metadataLibraryFile.setDataFromPath(metadataFilePath, `metadata.json`)
-            this.libraryFiles.push(metadataLibraryFile)
-          } else {
-            const fileTimestamps = await getFileTimestampsWithIno(metadataFilePath)
-            if (fileTimestamps) {
-              metadataLibraryFile.metadata.mtimeMs = fileTimestamps.mtimeMs
-              metadataLibraryFile.metadata.ctimeMs = fileTimestamps.ctimeMs
-              metadataLibraryFile.metadata.size = fileTimestamps.size
-              metadataLibraryFile.ino = fileTimestamps.ino
-            }
-          }
-          const libraryItemDirTimestamps = await getFileTimestampsWithIno(this.path)
-          if (libraryItemDirTimestamps) {
-            this.mtimeMs = libraryItemDirTimestamps.mtimeMs
-            this.ctimeMs = libraryItemDirTimestamps.ctimeMs
-          }
-        }
-
-        Logger.debug(`[LibraryItem] Success saving abmetadata to "${metadataFilePath}"`)
-
-        return metadataLibraryFile
-      })
-      .catch((error) => {
-        Logger.error(`[LibraryItem] Failed to save json file at "${metadataFilePath}"`, error)
-        return null
-      })
-      .finally(() => {
-        this.isSavingMetadata = false
-      })
-  }
 }
 module.exports = LibraryItem
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
index 488c3aac..b270e0e7 100644
--- a/server/objects/mediaTypes/Book.js
+++ b/server/objects/mediaTypes/Book.js
@@ -68,22 +68,6 @@ class Book {
     }
   }
 
-  toJSONExpanded() {
-    return {
-      id: this.id,
-      libraryItemId: this.libraryItemId,
-      metadata: this.metadata.toJSONExpanded(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      audioFiles: this.audioFiles.map((f) => f.toJSON()),
-      chapters: this.chapters.map((c) => ({ ...c })),
-      duration: this.duration,
-      size: this.size,
-      tracks: this.tracks.map((t) => t.toJSON()),
-      ebookFile: this.ebookFile?.toJSON() || null
-    }
-  }
-
   toJSONForMetadataFile() {
     return {
       tags: [...this.tags],
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
index f27f3fa2..2ec4a873 100644
--- a/server/objects/mediaTypes/Podcast.js
+++ b/server/objects/mediaTypes/Podcast.js
@@ -83,23 +83,6 @@ class Podcast {
     }
   }
 
-  toJSONExpanded() {
-    return {
-      id: this.id,
-      libraryItemId: this.libraryItemId,
-      metadata: this.metadata.toJSONExpanded(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      episodes: this.episodes.map((e) => e.toJSONExpanded()),
-      autoDownloadEpisodes: this.autoDownloadEpisodes,
-      autoDownloadSchedule: this.autoDownloadSchedule,
-      lastEpisodeCheck: this.lastEpisodeCheck,
-      maxEpisodesToKeep: this.maxEpisodesToKeep,
-      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
-      size: this.size
-    }
-  }
-
   toJSONForMetadataFile() {
     return {
       tags: [...this.tags],
diff --git a/server/objects/metadata/BookMetadata.js b/server/objects/metadata/BookMetadata.js
index 0dfe1dbf..5116f2f4 100644
--- a/server/objects/metadata/BookMetadata.js
+++ b/server/objects/metadata/BookMetadata.js
@@ -89,31 +89,6 @@ class BookMetadata {
     }
   }
 
-  toJSONExpanded() {
-    return {
-      title: this.title,
-      titleIgnorePrefix: this.titlePrefixAtEnd,
-      subtitle: this.subtitle,
-      authors: this.authors.map((a) => ({ ...a })), // Author JSONMinimal with name and id
-      narrators: [...this.narrators],
-      series: this.series.map((s) => ({ ...s })),
-      genres: [...this.genres],
-      publishedYear: this.publishedYear,
-      publishedDate: this.publishedDate,
-      publisher: this.publisher,
-      description: this.description,
-      isbn: this.isbn,
-      asin: this.asin,
-      language: this.language,
-      explicit: this.explicit,
-      authorName: this.authorName,
-      authorNameLF: this.authorNameLF,
-      narratorName: this.narratorName,
-      seriesName: this.seriesName,
-      abridged: this.abridged
-    }
-  }
-
   toJSONForMetadataFile() {
     const json = this.toJSON()
     json.authors = json.authors.map((au) => au.name)
diff --git a/server/objects/metadata/PodcastMetadata.js b/server/objects/metadata/PodcastMetadata.js
index 0df40df0..ccc94ce0 100644
--- a/server/objects/metadata/PodcastMetadata.js
+++ b/server/objects/metadata/PodcastMetadata.js
@@ -75,10 +75,6 @@ class PodcastMetadata {
     }
   }
 
-  toJSONExpanded() {
-    return this.toJSONMinified()
-  }
-
   clone() {
     return new PodcastMetadata(this.toJSON())
   }
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 56f43dbf..db9e66c5 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -105,7 +105,6 @@ class ApiRouter {
     this.router.post('/items/batch/scan', LibraryItemController.batchScan.bind(this))
 
     this.router.get('/items/:id', LibraryItemController.middleware.bind(this), LibraryItemController.findOne.bind(this))
-    this.router.patch('/items/:id', LibraryItemController.middleware.bind(this), LibraryItemController.update.bind(this))
     this.router.delete('/items/:id', LibraryItemController.middleware.bind(this), LibraryItemController.delete.bind(this))
     this.router.get('/items/:id/download', LibraryItemController.middleware.bind(this), LibraryItemController.download.bind(this))
     this.router.patch('/items/:id/media', LibraryItemController.middleware.bind(this), LibraryItemController.updateMedia.bind(this))
@@ -531,109 +530,5 @@ class ApiRouter {
     })
     return listeningStats
   }
-
-  async createAuthorsAndSeriesForItemUpdate(mediaPayload, libraryId) {
-    if (mediaPayload.metadata) {
-      const mediaMetadata = mediaPayload.metadata
-
-      // Create new authors if in payload
-      if (mediaMetadata.authors?.length) {
-        const newAuthors = []
-        for (let i = 0; i < mediaMetadata.authors.length; i++) {
-          const authorName = (mediaMetadata.authors[i].name || '').trim()
-          if (!authorName) {
-            Logger.error(`[ApiRouter] Invalid author object, no name`, mediaMetadata.authors[i])
-            mediaMetadata.authors[i].id = null
-            continue
-          }
-
-          if (mediaMetadata.authors[i].id?.startsWith('new')) {
-            mediaMetadata.authors[i].id = null
-          }
-
-          // Ensure the ID for the author exists
-          if (mediaMetadata.authors[i].id && !(await Database.checkAuthorExists(libraryId, mediaMetadata.authors[i].id))) {
-            Logger.warn(`[ApiRouter] Author id "${mediaMetadata.authors[i].id}" does not exist`)
-            mediaMetadata.authors[i].id = null
-          }
-
-          if (!mediaMetadata.authors[i].id) {
-            let author = await Database.authorModel.getByNameAndLibrary(authorName, libraryId)
-            if (!author) {
-              author = await Database.authorModel.create({
-                name: authorName,
-                lastFirst: Database.authorModel.getLastFirst(authorName),
-                libraryId
-              })
-              Logger.debug(`[ApiRouter] Creating new author "${author.name}"`)
-              newAuthors.push(author)
-              // Update filter data
-              Database.addAuthorToFilterData(libraryId, author.name, author.id)
-            }
-
-            // Update ID in original payload
-            mediaMetadata.authors[i].id = author.id
-          }
-        }
-        // Remove authors without an id
-        mediaMetadata.authors = mediaMetadata.authors.filter((au) => !!au.id)
-        if (newAuthors.length) {
-          SocketAuthority.emitter(
-            'authors_added',
-            newAuthors.map((au) => au.toOldJSON())
-          )
-        }
-      }
-
-      // Create new series if in payload
-      if (mediaMetadata.series && mediaMetadata.series.length) {
-        const newSeries = []
-        for (let i = 0; i < mediaMetadata.series.length; i++) {
-          const seriesName = (mediaMetadata.series[i].name || '').trim()
-          if (!seriesName) {
-            Logger.error(`[ApiRouter] Invalid series object, no name`, mediaMetadata.series[i])
-            mediaMetadata.series[i].id = null
-            continue
-          }
-
-          if (mediaMetadata.series[i].id?.startsWith('new')) {
-            mediaMetadata.series[i].id = null
-          }
-
-          // Ensure the ID for the series exists
-          if (mediaMetadata.series[i].id && !(await Database.checkSeriesExists(libraryId, mediaMetadata.series[i].id))) {
-            Logger.warn(`[ApiRouter] Series id "${mediaMetadata.series[i].id}" does not exist`)
-            mediaMetadata.series[i].id = null
-          }
-
-          if (!mediaMetadata.series[i].id) {
-            let seriesItem = await Database.seriesModel.getByNameAndLibrary(seriesName, libraryId)
-            if (!seriesItem) {
-              seriesItem = await Database.seriesModel.create({
-                name: seriesName,
-                nameIgnorePrefix: getTitleIgnorePrefix(seriesName),
-                libraryId
-              })
-              Logger.debug(`[ApiRouter] Creating new series "${seriesItem.name}"`)
-              newSeries.push(seriesItem)
-              // Update filter data
-              Database.addSeriesToFilterData(libraryId, seriesItem.name, seriesItem.id)
-            }
-
-            // Update ID in original payload
-            mediaMetadata.series[i].id = seriesItem.id
-          }
-        }
-        // Remove series without an id
-        mediaMetadata.series = mediaMetadata.series.filter((se) => se.id)
-        if (newSeries.length) {
-          SocketAuthority.emitter(
-            'multiple_series_added',
-            newSeries.map((se) => se.toOldJSON())
-          )
-        }
-      }
-    }
-  }
 }
 module.exports = ApiRouter
diff --git a/server/scanner/LibraryScanner.js b/server/scanner/LibraryScanner.js
index c4f6410d..1e92efde 100644
--- a/server/scanner/LibraryScanner.js
+++ b/server/scanner/LibraryScanner.js
@@ -582,7 +582,7 @@ class LibraryScanner {
       }
 
       // Check if book dir group is already an item
-      let existingLibraryItem = await Database.libraryItemModel.findOneOld({
+      let existingLibraryItem = await Database.libraryItemModel.findOneExpanded({
         libraryId: library.id,
         path: potentialChildDirs
       })
@@ -606,17 +606,17 @@ class LibraryScanner {
         if (existingLibraryItem.path === fullPath) {
           const exists = await fs.pathExists(fullPath)
           if (!exists) {
-            Logger.info(`[LibraryScanner] Scanning file update group and library item was deleted "${existingLibraryItem.media.metadata.title}" - marking as missing`)
-            existingLibraryItem.setMissing()
-            await Database.updateLibraryItem(existingLibraryItem)
-            SocketAuthority.emitter('item_updated', existingLibraryItem.toJSONExpanded())
+            Logger.info(`[LibraryScanner] Scanning file update group and library item was deleted "${existingLibraryItem.media.title}" - marking as missing`)
+            existingLibraryItem.isMissing = true
+            await existingLibraryItem.save()
+            SocketAuthority.emitter('item_updated', existingLibraryItem.toOldJSONExpanded())
 
             itemGroupingResults[itemDir] = ScanResult.REMOVED
             continue
           }
         }
         // Scan library item for updates
-        Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" is in library item "${existingLibraryItem.media.metadata.title}" with id "${existingLibraryItem.id}" - scan for updates`)
+        Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" is in library item "${existingLibraryItem.media.title}" with id "${existingLibraryItem.id}" - scan for updates`)
         itemGroupingResults[itemDir] = await LibraryItemScanner.scanLibraryItem(existingLibraryItem.id, updatedLibraryItemDetails)
         continue
       } else if (library.settings.audiobooksOnly && !hasAudioFiles(fileUpdateGroup, itemDir)) {
@@ -672,7 +672,7 @@ function isSingleMediaFile(fileUpdateGroup, itemDir) {
 async function findLibraryItemByItemToItemInoMatch(libraryId, fullPath) {
   const ino = await fileUtils.getIno(fullPath)
   if (!ino) return null
-  const existingLibraryItem = await Database.libraryItemModel.findOneOld({
+  const existingLibraryItem = await Database.libraryItemModel.findOneExpanded({
     libraryId: libraryId,
     ino: ino
   })
@@ -685,7 +685,7 @@ async function findLibraryItemByItemToFileInoMatch(libraryId, fullPath, isSingle
   // check if it was moved from another folder by comparing the ino to the library files
   const ino = await fileUtils.getIno(fullPath)
   if (!ino) return null
-  const existingLibraryItem = await Database.libraryItemModel.findOneOld(
+  const existingLibraryItem = await Database.libraryItemModel.findOneExpanded(
     [
       {
         libraryId: libraryId
@@ -711,7 +711,7 @@ async function findLibraryItemByFileToItemInoMatch(libraryId, fullPath, isSingle
     if (ino) itemFileInos.push(ino)
   }
   if (!itemFileInos.length) return null
-  const existingLibraryItem = await Database.libraryItemModel.findOneOld({
+  const existingLibraryItem = await Database.libraryItemModel.findOneExpanded({
     libraryId: libraryId,
     ino: {
       [sequelize.Op.in]: itemFileInos
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 942c4d02..5d4e1cc5 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -30,14 +30,14 @@ class Scanner {
   /**
    *
    * @param {import('../routers/ApiRouter')} apiRouterCtx
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {QuickMatchOptions} options
    * @returns {Promise<{updated: boolean, libraryItem: import('../objects/LibraryItem')}>}
    */
   async quickMatchLibraryItem(apiRouterCtx, libraryItem, options = {}) {
     const provider = options.provider || 'google'
-    const searchTitle = options.title || libraryItem.media.metadata.title
-    const searchAuthor = options.author || libraryItem.media.metadata.authorName
+    const searchTitle = options.title || libraryItem.media.title
+    const searchAuthor = options.author || libraryItem.media.authorName
 
     // If overrideCover and overrideDetails is not sent in options than use the server setting to determine if we should override
     if (options.overrideCover === undefined && options.overrideDetails === undefined && Database.serverSettings.scannerPreferMatchedMetadata) {
@@ -52,11 +52,11 @@ class Scanner {
     let existingSeries = []
 
     if (libraryItem.isBook) {
-      existingAuthors = libraryItem.media.metadata.authors.map((a) => a.id)
-      existingSeries = libraryItem.media.metadata.series.map((s) => s.id)
+      existingAuthors = libraryItem.media.authors.map((a) => a.id)
+      existingSeries = libraryItem.media.series.map((s) => s.id)
 
-      const searchISBN = options.isbn || libraryItem.media.metadata.isbn
-      const searchASIN = options.asin || libraryItem.media.metadata.asin
+      const searchISBN = options.isbn || libraryItem.media.isbn
+      const searchASIN = options.asin || libraryItem.media.asin
 
       const results = await BookFinder.search(libraryItem, provider, searchTitle, searchAuthor, searchISBN, searchASIN, { maxFuzzySearches: 2 })
       if (!results.length) {
@@ -69,15 +69,21 @@ class Scanner {
       // Update cover if not set OR overrideCover flag
       if (matchData.cover && (!libraryItem.media.coverPath || options.overrideCover)) {
         Logger.debug(`[Scanner] Updating cover "${matchData.cover}"`)
-        var coverResult = await CoverManager.downloadCoverFromUrl(libraryItem, matchData.cover)
-        if (!coverResult || coverResult.error || !coverResult.cover) {
-          Logger.warn(`[Scanner] Match cover "${matchData.cover}" failed to use: ${coverResult ? coverResult.error : 'Unknown Error'}`)
+        const coverResult = await CoverManager.downloadCoverFromUrlNew(matchData.cover, libraryItem.id, libraryItem.isFile ? null : libraryItem.path)
+        if (coverResult.error) {
+          Logger.warn(`[Scanner] Match cover "${matchData.cover}" failed to use: ${coverResult.error}`)
         } else {
+          libraryItem.media.coverPath = coverResult.cover
+          libraryItem.media.changed('coverPath', true) // Cover path may be the same but this forces the update
           hasUpdated = true
         }
       }
 
-      updatePayload = await this.quickMatchBookBuildUpdatePayload(libraryItem, matchData, options)
+      const bookBuildUpdateData = await this.quickMatchBookBuildUpdatePayload(apiRouterCtx, libraryItem, matchData, options)
+      updatePayload = bookBuildUpdateData.updatePayload
+      if (bookBuildUpdateData.hasSeriesUpdates || bookBuildUpdateData.hasAuthorUpdates) {
+        hasUpdated = true
+      }
     } else if (libraryItem.isPodcast) {
       // Podcast quick match
       const results = await PodcastFinder.search(searchTitle)
@@ -91,10 +97,12 @@ class Scanner {
       // Update cover if not set OR overrideCover flag
       if (matchData.cover && (!libraryItem.media.coverPath || options.overrideCover)) {
         Logger.debug(`[Scanner] Updating cover "${matchData.cover}"`)
-        var coverResult = await CoverManager.downloadCoverFromUrl(libraryItem, matchData.cover)
-        if (!coverResult || coverResult.error || !coverResult.cover) {
-          Logger.warn(`[Scanner] Match cover "${matchData.cover}" failed to use: ${coverResult ? coverResult.error : 'Unknown Error'}`)
+        const coverResult = await CoverManager.downloadCoverFromUrlNew(matchData.cover, libraryItem.id, libraryItem.path)
+        if (coverResult.error) {
+          Logger.warn(`[Scanner] Match cover "${matchData.cover}" failed to use: ${coverResult.error}`)
         } else {
+          libraryItem.media.coverPath = coverResult.cover
+          libraryItem.media.changed('coverPath', true) // Cover path may be the same but this forces the update
           hasUpdated = true
         }
       }
@@ -103,44 +111,45 @@ class Scanner {
     }
 
     if (Object.keys(updatePayload).length) {
-      Logger.debug('[Scanner] Updating details', updatePayload)
-      if (libraryItem.media.update(updatePayload)) {
+      Logger.debug('[Scanner] Updating details with payload', updatePayload)
+      libraryItem.media.set(updatePayload)
+      if (libraryItem.media.changed()) {
+        Logger.debug(`[Scanner] Updating library item "${libraryItem.media.title}" keys`, libraryItem.media.changed())
         hasUpdated = true
       }
     }
 
     if (hasUpdated) {
-      if (libraryItem.isPodcast && libraryItem.media.metadata.feedUrl) {
+      if (libraryItem.isPodcast && libraryItem.media.feedURL) {
         // Quick match all unmatched podcast episodes
         await this.quickMatchPodcastEpisodes(libraryItem, options)
       }
 
-      await Database.updateLibraryItem(libraryItem)
-      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      await libraryItem.media.save()
 
-      // Check if any authors or series are now empty and should be removed
-      if (libraryItem.isBook) {
-        const authorsRemoved = existingAuthors.filter((aid) => !libraryItem.media.metadata.authors.find((au) => au.id === aid))
-        const seriesRemoved = existingSeries.filter((sid) => !libraryItem.media.metadata.series.find((se) => se.id === sid))
+      libraryItem.changed('updatedAt', true)
+      await libraryItem.save()
 
-        if (authorsRemoved.length) {
-          await apiRouterCtx.checkRemoveAuthorsWithNoBooks(authorsRemoved)
-        }
-        if (seriesRemoved.length) {
-          await apiRouterCtx.checkRemoveEmptySeries(seriesRemoved)
-        }
-      }
+      await libraryItem.saveMetadataFile()
+
+      SocketAuthority.emitter('item_updated', libraryItem.toOldJSONExpanded())
     }
 
     return {
       updated: hasUpdated,
-      libraryItem: libraryItem.toJSONExpanded()
+      libraryItem: libraryItem.toOldJSONExpanded()
     }
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} matchData
+   * @param {QuickMatchOptions} options
+   * @returns {Map<string, any>} - Update payload
+   */
   quickMatchPodcastBuildUpdatePayload(libraryItem, matchData, options) {
     const updatePayload = {}
-    updatePayload.metadata = {}
 
     const matchDataTransformed = {
       title: matchData.title || null,
@@ -158,7 +167,7 @@ class Scanner {
     for (const key in matchDataTransformed) {
       if (matchDataTransformed[key]) {
         if (key === 'genres') {
-          if (!libraryItem.media.metadata.genres.length || options.overrideDetails) {
+          if (!libraryItem.media.genres.length || options.overrideDetails) {
             var genresArray = []
             if (Array.isArray(matchDataTransformed[key])) genresArray = [...matchDataTransformed[key]]
             else {
@@ -169,46 +178,42 @@ class Scanner {
                 .map((v) => v.trim())
                 .filter((v) => !!v)
             }
-            updatePayload.metadata[key] = genresArray
+            updatePayload[key] = genresArray
           }
-        } else if (libraryItem.media.metadata[key] !== matchDataTransformed[key] && (!libraryItem.media.metadata[key] || options.overrideDetails)) {
-          updatePayload.metadata[key] = matchDataTransformed[key]
+        } else if (libraryItem.media[key] !== matchDataTransformed[key] && (!libraryItem.media[key] || options.overrideDetails)) {
+          updatePayload[key] = matchDataTransformed[key]
         }
       }
     }
 
-    if (!Object.keys(updatePayload.metadata).length) {
-      delete updatePayload.metadata
-    }
-
     return updatePayload
   }
 
   /**
    *
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../routers/ApiRouter')} apiRouterCtx
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {*} matchData
    * @param {QuickMatchOptions} options
-   * @returns
+   * @returns {Promise<{updatePayload: Map<string, any>, seriesIdsRemoved: string[], hasSeriesUpdates: boolean, authorIdsRemoved: string[], hasAuthorUpdates: boolean}>}
    */
-  async quickMatchBookBuildUpdatePayload(libraryItem, matchData, options) {
+  async quickMatchBookBuildUpdatePayload(apiRouterCtx, libraryItem, matchData, options) {
     // Update media metadata if not set OR overrideDetails flag
     const detailKeysToUpdate = ['title', 'subtitle', 'description', 'narrator', 'publisher', 'publishedYear', 'genres', 'tags', 'language', 'explicit', 'abridged', 'asin', 'isbn']
     const updatePayload = {}
-    updatePayload.metadata = {}
 
     for (const key in matchData) {
       if (matchData[key] && detailKeysToUpdate.includes(key)) {
         if (key === 'narrator') {
-          if (!libraryItem.media.metadata.narratorName || options.overrideDetails) {
-            updatePayload.metadata.narrators = matchData[key]
+          if (!libraryItem.media.narrators?.length || options.overrideDetails) {
+            updatePayload.narrators = matchData[key]
               .split(',')
               .map((v) => v.trim())
               .filter((v) => !!v)
           }
         } else if (key === 'genres') {
-          if (!libraryItem.media.metadata.genres.length || options.overrideDetails) {
-            var genresArray = []
+          if (!libraryItem.media.genres.length || options.overrideDetails) {
+            let genresArray = []
             if (Array.isArray(matchData[key])) genresArray = [...matchData[key]]
             else {
               // Genres should always be passed in as an array but just incase handle a string
@@ -218,11 +223,11 @@ class Scanner {
                 .map((v) => v.trim())
                 .filter((v) => !!v)
             }
-            updatePayload.metadata[key] = genresArray
+            updatePayload[key] = genresArray
           }
         } else if (key === 'tags') {
           if (!libraryItem.media.tags.length || options.overrideDetails) {
-            var tagsArray = []
+            let tagsArray = []
             if (Array.isArray(matchData[key])) tagsArray = [...matchData[key]]
             else
               tagsArray = matchData[key]
@@ -231,94 +236,174 @@ class Scanner {
                 .filter((v) => !!v)
             updatePayload[key] = tagsArray
           }
-        } else if (!libraryItem.media.metadata[key] || options.overrideDetails) {
-          updatePayload.metadata[key] = matchData[key]
+        } else if (!libraryItem.media[key] || options.overrideDetails) {
+          updatePayload[key] = matchData[key]
         }
       }
     }
 
     // Add or set author if not set
-    if (matchData.author && (!libraryItem.media.metadata.authorName || options.overrideDetails)) {
+    let hasAuthorUpdates = false
+    if (matchData.author && (!libraryItem.media.authorName || options.overrideDetails)) {
       if (!Array.isArray(matchData.author)) {
         matchData.author = matchData.author
           .split(',')
           .map((au) => au.trim())
           .filter((au) => !!au)
       }
-      const authorPayload = []
+      const authorIdsRemoved = []
       for (const authorName of matchData.author) {
-        let author = await Database.authorModel.getByNameAndLibrary(authorName, libraryItem.libraryId)
-        if (!author) {
-          author = await Database.authorModel.create({
-            name: authorName,
-            lastFirst: Database.authorModel.getLastFirst(authorName),
-            libraryId: libraryItem.libraryId
-          })
-          SocketAuthority.emitter('author_added', author.toOldJSON())
-          // Update filter data
-          Database.addAuthorToFilterData(libraryItem.libraryId, author.name, author.id)
+        const existingAuthor = libraryItem.media.authors.find((a) => a.name.toLowerCase() === authorName.toLowerCase())
+        if (!existingAuthor) {
+          let author = await Database.authorModel.getByNameAndLibrary(authorName, libraryItem.libraryId)
+          if (!author) {
+            author = await Database.authorModel.create({
+              name: authorName,
+              lastFirst: Database.authorModel.getLastFirst(authorName),
+              libraryId: libraryItem.libraryId
+            })
+            SocketAuthority.emitter('author_added', author.toOldJSON())
+            // Update filter data
+            Database.addAuthorToFilterData(libraryItem.libraryId, author.name, author.id)
+
+            await Database.bookAuthorModel
+              .create({
+                authorId: author.id,
+                bookId: libraryItem.media.id
+              })
+              .then(() => {
+                Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added author "${author.name}" to "${libraryItem.media.title}"`)
+                libraryItem.media.authors.push(author)
+                hasAuthorUpdates = true
+              })
+          }
+        }
+        const authorsRemoved = libraryItem.media.authors.filter((a) => !matchData.author.find((ma) => ma.toLowerCase() === a.name.toLowerCase()))
+        if (authorsRemoved.length) {
+          for (const author of authorsRemoved) {
+            await Database.bookAuthorModel.destroy({ where: { authorId: author.id, bookId: libraryItem.media.id } })
+            libraryItem.media.authors = libraryItem.media.authors.filter((a) => a.id !== author.id)
+            authorIdsRemoved.push(author.id)
+            Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Removed author "${author.name}" from "${libraryItem.media.title}"`)
+          }
+          hasAuthorUpdates = true
         }
-        authorPayload.push(author.toJSONMinimal())
       }
-      updatePayload.metadata.authors = authorPayload
+
+      // For all authors removed from book, check if they are empty now and should be removed
+      if (authorIdsRemoved.length) {
+        await apiRouterCtx.checkRemoveAuthorsWithNoBooks(authorIdsRemoved)
+      }
     }
 
     // Add or set series if not set
-    if (matchData.series && (!libraryItem.media.metadata.seriesName || options.overrideDetails)) {
+    let hasSeriesUpdates = false
+    if (matchData.series && (!libraryItem.media.seriesName || options.overrideDetails)) {
       if (!Array.isArray(matchData.series)) matchData.series = [{ series: matchData.series, sequence: matchData.sequence }]
-      const seriesPayload = []
+      const seriesIdsRemoved = []
       for (const seriesMatchItem of matchData.series) {
-        let seriesItem = await Database.seriesModel.getByNameAndLibrary(seriesMatchItem.series, libraryItem.libraryId)
-        if (!seriesItem) {
-          seriesItem = await Database.seriesModel.create({
-            name: seriesMatchItem.series,
-            nameIgnorePrefix: getTitleIgnorePrefix(seriesMatchItem.series),
-            libraryId: libraryItem.libraryId
+        const existingSeries = libraryItem.media.series.find((s) => s.name.toLowerCase() === seriesMatchItem.series.toLowerCase())
+        if (existingSeries) {
+          if (existingSeries.bookSeries.sequence !== seriesMatchItem.sequence) {
+            existingSeries.bookSeries.sequence = seriesMatchItem.sequence
+            await existingSeries.bookSeries.save()
+            Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Updated series sequence for "${existingSeries.name}" to ${seriesMatchItem.sequence} in "${libraryItem.media.title}"`)
+            hasSeriesUpdates = true
+          }
+        } else {
+          let seriesItem = await Database.seriesModel.getByNameAndLibrary(seriesMatchItem.series, libraryItem.libraryId)
+          if (!seriesItem) {
+            seriesItem = await Database.seriesModel.create({
+              name: seriesMatchItem.series,
+              nameIgnorePrefix: getTitleIgnorePrefix(seriesMatchItem.series),
+              libraryId: libraryItem.libraryId
+            })
+            // Update filter data
+            Database.addSeriesToFilterData(libraryItem.libraryId, seriesItem.name, seriesItem.id)
+            SocketAuthority.emitter('series_added', seriesItem.toOldJSON())
+          }
+          const bookSeries = await Database.bookSeriesModel.create({
+            seriesId: seriesItem.id,
+            bookId: libraryItem.media.id,
+            sequence: seriesMatchItem.sequence
           })
-          // Update filter data
-          Database.addSeriesToFilterData(libraryItem.libraryId, seriesItem.name, seriesItem.id)
-          SocketAuthority.emitter('series_added', seriesItem.toOldJSON())
+          seriesItem.bookSeries = bookSeries
+          libraryItem.media.series.push(seriesItem)
+          Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added series "${seriesItem.name}" to "${libraryItem.media.title}"`)
+          hasSeriesUpdates = true
+        }
+        const seriesRemoved = libraryItem.media.series.filter((s) => !matchData.series.find((ms) => ms.series.toLowerCase() === s.name.toLowerCase()))
+        if (seriesRemoved.length) {
+          for (const series of seriesRemoved) {
+            await series.bookSeries.destroy()
+            libraryItem.media.series = libraryItem.media.series.filter((s) => s.id !== series.id)
+            seriesIdsRemoved.push(series.id)
+            Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Removed series "${series.name}" from "${libraryItem.media.title}"`)
+          }
+          hasSeriesUpdates = true
         }
-        seriesPayload.push(seriesItem.toJSONMinimal(seriesMatchItem.sequence))
       }
-      updatePayload.metadata.series = seriesPayload
+
+      // For all series removed from book, check if it is empty now and should be removed
+      if (seriesIdsRemoved.length) {
+        await apiRouterCtx.checkRemoveEmptySeries(seriesIdsRemoved)
+      }
     }
 
-    if (!Object.keys(updatePayload.metadata).length) {
-      delete updatePayload.metadata
+    return {
+      updatePayload,
+      hasSeriesUpdates,
+      hasAuthorUpdates
     }
-
-    return updatePayload
   }
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {QuickMatchOptions} options
+   * @returns {Promise<number>} - Number of episodes updated
+   */
   async quickMatchPodcastEpisodes(libraryItem, options = {}) {
-    const episodesToQuickMatch = libraryItem.media.episodes.filter((ep) => !ep.enclosureUrl) // Only quick match episodes without enclosure
-    if (!episodesToQuickMatch.length) return false
+    /** @type {import('../models/PodcastEpisode')[]} */
+    const episodesToQuickMatch = libraryItem.media.podcastEpisodes.filter((ep) => !ep.enclosureURL) // Only quick match episodes that are not already matched
+    if (!episodesToQuickMatch.length) return 0
 
-    const feed = await getPodcastFeed(libraryItem.media.metadata.feedUrl)
+    const feed = await getPodcastFeed(libraryItem.media.feedURL)
     if (!feed) {
-      Logger.error(`[Scanner] quickMatchPodcastEpisodes: Unable to quick match episodes feed not found for "${libraryItem.media.metadata.feedUrl}"`)
-      return false
+      Logger.error(`[Scanner] quickMatchPodcastEpisodes: Unable to quick match episodes feed not found for "${libraryItem.media.feedURL}"`)
+      return 0
     }
 
     let numEpisodesUpdated = 0
     for (const episode of episodesToQuickMatch) {
       const episodeMatches = findMatchingEpisodesInFeed(feed, episode.title)
-      if (episodeMatches && episodeMatches.length) {
-        const wasUpdated = this.updateEpisodeWithMatch(libraryItem, episode, episodeMatches[0].episode, options)
+      if (episodeMatches?.length) {
+        const wasUpdated = await this.updateEpisodeWithMatch(episode, episodeMatches[0].episode, options)
         if (wasUpdated) numEpisodesUpdated++
       }
     }
+    if (numEpisodesUpdated) {
+      Logger.info(`[Scanner] quickMatchPodcastEpisodes: Updated ${numEpisodesUpdated} episodes for "${libraryItem.media.title}"`)
+    }
     return numEpisodesUpdated
   }
 
-  updateEpisodeWithMatch(libraryItem, episode, episodeToMatch, options = {}) {
+  /**
+   *
+   * @param {import('../models/PodcastEpisode')} episode
+   * @param {import('../utils/podcastUtils').RssPodcastEpisode} episodeToMatch
+   * @param {QuickMatchOptions} options
+   * @returns {Promise<boolean>} - true if episode was updated
+   */
+  async updateEpisodeWithMatch(episode, episodeToMatch, options = {}) {
     Logger.debug(`[Scanner] quickMatchPodcastEpisodes: Found episode match for "${episode.title}" => ${episodeToMatch.title}`)
     const matchDataTransformed = {
       title: episodeToMatch.title || '',
       subtitle: episodeToMatch.subtitle || '',
       description: episodeToMatch.description || '',
-      enclosure: episodeToMatch.enclosure || null,
+      enclosureURL: episodeToMatch.enclosure?.url || null,
+      enclosureSize: episodeToMatch.enclosure?.length || null,
+      enclosureType: episodeToMatch.enclosure?.type || null,
       episode: episodeToMatch.episode || '',
       episodeType: episodeToMatch.episodeType || 'full',
       season: episodeToMatch.season || '',
@@ -328,20 +413,19 @@ class Scanner {
     const updatePayload = {}
     for (const key in matchDataTransformed) {
       if (matchDataTransformed[key]) {
-        if (key === 'enclosure') {
-          if (!episode.enclosure || JSON.stringify(episode.enclosure) !== JSON.stringify(matchDataTransformed.enclosure)) {
-            updatePayload[key] = {
-              ...matchDataTransformed.enclosure
-            }
-          }
-        } else if (episode[key] !== matchDataTransformed[key] && (!episode[key] || options.overrideDetails)) {
+        if (episode[key] !== matchDataTransformed[key] && (!episode[key] || options.overrideDetails)) {
           updatePayload[key] = matchDataTransformed[key]
         }
       }
     }
 
     if (Object.keys(updatePayload).length) {
-      return libraryItem.media.updateEpisode(episode.id, updatePayload)
+      episode.set(updatePayload)
+      if (episode.changed()) {
+        Logger.debug(`[Scanner] quickMatchPodcastEpisodes: Updating episode "${episode.title}" keys`, episode.changed())
+        await episode.save()
+        return true
+      }
     }
     return false
   }
@@ -351,7 +435,7 @@ class Scanner {
    *
    * @param {import('../routers/ApiRouter')} apiRouterCtx
    * @param {import('../models/Library')} library
-   * @param {import('../objects/LibraryItem')[]} libraryItems
+   * @param {import('../models/LibraryItem')[]} libraryItems
    * @param {LibraryScan} libraryScan
    * @returns {Promise<boolean>} false if scan canceled
    */
@@ -359,20 +443,20 @@ class Scanner {
     for (let i = 0; i < libraryItems.length; i++) {
       const libraryItem = libraryItems[i]
 
-      if (libraryItem.media.metadata.asin && library.settings.skipMatchingMediaWithAsin) {
-        Logger.debug(`[Scanner] matchLibraryItems: Skipping "${libraryItem.media.metadata.title}" because it already has an ASIN (${i + 1} of ${libraryItems.length})`)
+      if (libraryItem.media.asin && library.settings.skipMatchingMediaWithAsin) {
+        Logger.debug(`[Scanner] matchLibraryItems: Skipping "${libraryItem.media.title}" because it already has an ASIN (${i + 1} of ${libraryItems.length})`)
         continue
       }
 
-      if (libraryItem.media.metadata.isbn && library.settings.skipMatchingMediaWithIsbn) {
-        Logger.debug(`[Scanner] matchLibraryItems: Skipping "${libraryItem.media.metadata.title}" because it already has an ISBN (${i + 1} of ${libraryItems.length})`)
+      if (libraryItem.media.isbn && library.settings.skipMatchingMediaWithIsbn) {
+        Logger.debug(`[Scanner] matchLibraryItems: Skipping "${libraryItem.media.title}" because it already has an ISBN (${i + 1} of ${libraryItems.length})`)
         continue
       }
 
-      Logger.debug(`[Scanner] matchLibraryItems: Quick matching "${libraryItem.media.metadata.title}" (${i + 1} of ${libraryItems.length})`)
+      Logger.debug(`[Scanner] matchLibraryItems: Quick matching "${libraryItem.media.title}" (${i + 1} of ${libraryItems.length})`)
       const result = await this.quickMatchLibraryItem(apiRouterCtx, libraryItem, { provider: library.provider })
       if (result.warning) {
-        Logger.warn(`[Scanner] matchLibraryItems: Match warning ${result.warning} for library item "${libraryItem.media.metadata.title}"`)
+        Logger.warn(`[Scanner] matchLibraryItems: Match warning ${result.warning} for library item "${libraryItem.media.title}"`)
       } else if (result.updated) {
         libraryScan.resultsUpdated++
       }
@@ -430,9 +514,8 @@ class Scanner {
 
       offset += limit
       hasMoreChunks = libraryItems.length === limit
-      let oldLibraryItems = libraryItems.map((li) => Database.libraryItemModel.getOldLibraryItem(li))
 
-      const shouldContinue = await this.matchLibraryItemsChunk(apiRouterCtx, library, oldLibraryItems, libraryScan)
+      const shouldContinue = await this.matchLibraryItemsChunk(apiRouterCtx, library, libraryItems, libraryScan)
       if (!shouldContinue) {
         isCanceled = true
         break
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index d28c3b9d..bc9892b2 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -330,6 +330,12 @@ module.exports.findMatchingEpisodes = async (feedUrl, searchTitle) => {
   return this.findMatchingEpisodesInFeed(feed, searchTitle)
 }
 
+/**
+ *
+ * @param {RssPodcast} feed
+ * @param {string} searchTitle
+ * @returns {Array<{ episode: RssPodcastEpisode, levenshtein: number }>}
+ */
 module.exports.findMatchingEpisodesInFeed = (feed, searchTitle) => {
   searchTitle = searchTitle.toLowerCase().trim()
   if (!feed?.episodes) {

From ac159bea72732855d54bda122f5e3563bb5445a8 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 5 Jan 2025 12:12:20 -0600
Subject: [PATCH 137/143] Update unit test stub function

---
 test/server/controllers/LibraryItemController.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index fb65cc4b..9972bd90 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -157,7 +157,7 @@ describe('LibraryItemController', () => {
 
     it('should remove authors and series with no books on library item update media', async () => {
       const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItem1Id)
-
+      libraryItem.saveMetadataFile = sinon.stub()
       // Update library item 1 remove all authors and series
       const fakeReq = {
         query: {},

From 108eaba022e35a0f950d4acc33b77081883520e9 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 5 Jan 2025 14:09:03 -0600
Subject: [PATCH 138/143] Migrate tools and collapse series. fix continue
 shelves. remove old objects

---
 server/controllers/ToolsController.js         |  21 ++-
 server/managers/AbMergeManager.js             |  14 +-
 server/managers/AudioMetadataManager.js       |  14 +-
 server/models/Book.js                         | 124 --------------
 server/models/LibraryItem.js                  | 136 +++------------
 server/models/MediaProgress.js                |  39 +----
 server/models/Podcast.js                      |  60 -------
 server/models/PodcastEpisode.js               |  71 --------
 server/models/User.js                         |   3 +-
 server/objects/LibraryItem.js                 | 153 -----------------
 server/objects/entities/PodcastEpisode.js     | 149 ----------------
 server/objects/mediaTypes/Book.js             | 138 ---------------
 server/objects/mediaTypes/Podcast.js          | 161 ------------------
 server/objects/metadata/BookMetadata.js       | 154 -----------------
 server/objects/metadata/PodcastMetadata.js    | 105 ------------
 server/scanner/Scanner.js                     |   2 +-
 server/utils/ffmpegHelpers.js                 |  33 ++--
 server/utils/libraryHelpers.js                |  71 +++++---
 server/utils/migrations/dbMigration.js        |   6 +-
 server/utils/queries/libraryFilters.js        |   2 +-
 .../queries/libraryItemsPodcastFilters.js     |  17 +-
 21 files changed, 132 insertions(+), 1341 deletions(-)
 delete mode 100644 server/objects/LibraryItem.js
 delete mode 100644 server/objects/entities/PodcastEpisode.js
 delete mode 100644 server/objects/mediaTypes/Book.js
 delete mode 100644 server/objects/mediaTypes/Podcast.js
 delete mode 100644 server/objects/metadata/BookMetadata.js
 delete mode 100644 server/objects/metadata/PodcastMetadata.js

diff --git a/server/controllers/ToolsController.js b/server/controllers/ToolsController.js
index 8aa9f832..94122b46 100644
--- a/server/controllers/ToolsController.js
+++ b/server/controllers/ToolsController.js
@@ -7,6 +7,11 @@ const Database = require('../Database')
  * @property {import('../models/User')} user
  *
  * @typedef {Request & RequestUserObject} RequestWithUser
+ *
+ * @typedef RequestEntityObject
+ * @property {import('../models/LibraryItem')} libraryItem
+ *
+ * @typedef {RequestWithUser & RequestEntityObject} RequestWithLibraryItem
  */
 
 class ToolsController {
@@ -18,7 +23,7 @@ class ToolsController {
    *
    * @this import('../routers/ApiRouter')
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async encodeM4b(req, res) {
@@ -27,12 +32,12 @@ class ToolsController {
       return res.status(404).send('Audiobook not found')
     }
 
-    if (req.libraryItem.mediaType !== 'book') {
+    if (!req.libraryItem.isBook) {
       Logger.error(`[MiscController] encodeM4b: Invalid library item ${req.params.id}: not a book`)
       return res.status(400).send('Invalid library item: not a book')
     }
 
-    if (req.libraryItem.media.tracks.length <= 0) {
+    if (!req.libraryItem.hasAudioTracks) {
       Logger.error(`[MiscController] encodeM4b: Invalid audiobook ${req.params.id}: no audio tracks`)
       return res.status(400).send('Invalid audiobook: no audio tracks')
     }
@@ -72,11 +77,11 @@ class ToolsController {
    *
    * @this import('../routers/ApiRouter')
    *
-   * @param {RequestWithUser} req
+   * @param {RequestWithLibraryItem} req
    * @param {Response} res
    */
   async embedAudioFileMetadata(req, res) {
-    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioFiles || !req.libraryItem.isBook) {
+    if (req.libraryItem.isMissing || !req.libraryItem.hasAudioTracks || !req.libraryItem.isBook) {
       Logger.error(`[ToolsController] Invalid library item`)
       return res.sendStatus(400)
     }
@@ -111,7 +116,7 @@ class ToolsController {
 
     const libraryItems = []
     for (const libraryItemId of libraryItemIds) {
-      const libraryItem = await Database.libraryItemModel.getOldById(libraryItemId)
+      const libraryItem = await Database.libraryItemModel.getExpandedById(libraryItemId)
       if (!libraryItem) {
         Logger.error(`[ToolsController] Batch embed metadata library item (${libraryItemId}) not found`)
         return res.sendStatus(404)
@@ -123,7 +128,7 @@ class ToolsController {
         return res.sendStatus(403)
       }
 
-      if (libraryItem.isMissing || !libraryItem.hasAudioFiles || !libraryItem.isBook) {
+      if (libraryItem.isMissing || !libraryItem.hasAudioTracks || !libraryItem.isBook) {
         Logger.error(`[ToolsController] Batch embed invalid library item (${libraryItemId})`)
         return res.sendStatus(400)
       }
@@ -157,7 +162,7 @@ class ToolsController {
     }
 
     if (req.params.id) {
-      const item = await Database.libraryItemModel.getOldById(req.params.id)
+      const item = await Database.libraryItemModel.getExpandedById(req.params.id)
       if (!item?.media) return res.sendStatus(404)
 
       // Check user can access this library item
diff --git a/server/managers/AbMergeManager.js b/server/managers/AbMergeManager.js
index ea70d73c..f6a56160 100644
--- a/server/managers/AbMergeManager.js
+++ b/server/managers/AbMergeManager.js
@@ -51,7 +51,7 @@ class AbMergeManager {
   /**
    *
    * @param {string} userId
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {AbMergeEncodeOptions} [options={}]
    */
   async startAudiobookMerge(userId, libraryItem, options = {}) {
@@ -67,7 +67,7 @@ class AbMergeManager {
       libraryItemId: libraryItem.id,
       libraryItemDir,
       userId,
-      originalTrackPaths: libraryItem.media.tracks.map((t) => t.metadata.path),
+      originalTrackPaths: libraryItem.media.includedAudioFiles.map((t) => t.metadata.path),
       inos: libraryItem.media.includedAudioFiles.map((f) => f.ino),
       tempFilepath,
       targetFilename,
@@ -86,9 +86,9 @@ class AbMergeManager {
       key: 'MessageTaskEncodingM4b'
     }
     const taskDescriptionString = {
-      text: `Encoding audiobook "${libraryItem.media.metadata.title}" into a single m4b file.`,
+      text: `Encoding audiobook "${libraryItem.media.title}" into a single m4b file.`,
       key: 'MessageTaskEncodingM4bDescription',
-      subs: [libraryItem.media.metadata.title]
+      subs: [libraryItem.media.title]
     }
     task.setData('encode-m4b', taskTitleString, taskDescriptionString, false, taskData)
     TaskManager.addTask(task)
@@ -103,7 +103,7 @@ class AbMergeManager {
 
   /**
    *
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {Task} task
    * @param {AbMergeEncodeOptions} encodingOptions
    */
@@ -141,7 +141,7 @@ class AbMergeManager {
     const embedFraction = 1 - encodeFraction
     try {
       const trackProgressMonitor = new TrackProgressMonitor(
-        libraryItem.media.tracks.map((t) => t.duration),
+        libraryItem.media.includedAudioFiles.map((t) => t.duration),
         (trackIndex) => SocketAuthority.adminEmitter('track_started', { libraryItemId: libraryItem.id, ino: task.data.inos[trackIndex] }),
         (trackIndex, progressInTrack, taskProgress) => {
           SocketAuthority.adminEmitter('track_progress', { libraryItemId: libraryItem.id, ino: task.data.inos[trackIndex], progress: progressInTrack })
@@ -150,7 +150,7 @@ class AbMergeManager {
         (trackIndex) => SocketAuthority.adminEmitter('track_finished', { libraryItemId: libraryItem.id, ino: task.data.inos[trackIndex] })
       )
       task.data.ffmpeg = new Ffmpeg()
-      await ffmpegHelpers.mergeAudioFiles(libraryItem.media.tracks, task.data.duration, task.data.itemCachePath, task.data.tempFilepath, encodingOptions, (progress) => trackProgressMonitor.update(progress), task.data.ffmpeg)
+      await ffmpegHelpers.mergeAudioFiles(libraryItem.media.includedAudioFiles, task.data.duration, task.data.itemCachePath, task.data.tempFilepath, encodingOptions, (progress) => trackProgressMonitor.update(progress), task.data.ffmpeg)
       delete task.data.ffmpeg
       trackProgressMonitor.finish()
     } catch (error) {
diff --git a/server/managers/AudioMetadataManager.js b/server/managers/AudioMetadataManager.js
index 36aecb97..7471a1ca 100644
--- a/server/managers/AudioMetadataManager.js
+++ b/server/managers/AudioMetadataManager.js
@@ -40,14 +40,14 @@ class AudioMetadataMangaer {
    * @returns
    */
   getMetadataObjectForApi(libraryItem) {
-    return ffmpegHelpers.getFFMetadataObject(libraryItem.toOldJSONExpanded(), libraryItem.media.includedAudioFiles.length)
+    return ffmpegHelpers.getFFMetadataObject(libraryItem, libraryItem.media.includedAudioFiles.length)
   }
 
   /**
    *
    * @param {string} userId
-   * @param {*} libraryItems
-   * @param {*} options
+   * @param {import('../models/LibraryItem')[]} libraryItems
+   * @param {UpdateMetadataOptions} options
    */
   handleBatchEmbed(userId, libraryItems, options = {}) {
     libraryItems.forEach((li) => {
@@ -58,7 +58,7 @@ class AudioMetadataMangaer {
   /**
    *
    * @param {string} userId
-   * @param {import('../objects/LibraryItem')} libraryItem
+   * @param {import('../models/LibraryItem')} libraryItem
    * @param {UpdateMetadataOptions} [options={}]
    */
   async updateMetadataForItem(userId, libraryItem, options = {}) {
@@ -108,14 +108,14 @@ class AudioMetadataMangaer {
       key: 'MessageTaskEmbeddingMetadata'
     }
     const taskDescriptionString = {
-      text: `Embedding metadata in audiobook "${libraryItem.media.metadata.title}".`,
+      text: `Embedding metadata in audiobook "${libraryItem.media.title}".`,
       key: 'MessageTaskEmbeddingMetadataDescription',
-      subs: [libraryItem.media.metadata.title]
+      subs: [libraryItem.media.title]
     }
     task.setData('embed-metadata', taskTitleString, taskDescriptionString, false, taskData)
 
     if (this.tasksRunning.length >= this.MAX_CONCURRENT_TASKS) {
-      Logger.info(`[AudioMetadataManager] Queueing embed metadata for audiobook "${libraryItem.media.metadata.title}"`)
+      Logger.info(`[AudioMetadataManager] Queueing embed metadata for audiobook "${libraryItem.media.title}"`)
       SocketAuthority.adminEmitter('metadata_embed_queue_update', {
         libraryItemId: libraryItem.id,
         queued: true
diff --git a/server/models/Book.js b/server/models/Book.js
index dff79da2..5a4eee54 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -130,130 +130,6 @@ class Book extends Model {
     this.series
   }
 
-  static getOldBook(libraryItemExpanded) {
-    const bookExpanded = libraryItemExpanded.media
-    let authors = []
-    if (bookExpanded.authors?.length) {
-      authors = bookExpanded.authors.map((au) => {
-        return {
-          id: au.id,
-          name: au.name
-        }
-      })
-    } else if (bookExpanded.bookAuthors?.length) {
-      authors = bookExpanded.bookAuthors
-        .map((ba) => {
-          if (ba.author) {
-            return {
-              id: ba.author.id,
-              name: ba.author.name
-            }
-          } else {
-            Logger.error(`[Book] Invalid bookExpanded bookAuthors: no author`, ba)
-            return null
-          }
-        })
-        .filter((a) => a)
-    }
-
-    let series = []
-    if (bookExpanded.series?.length) {
-      series = bookExpanded.series.map((se) => {
-        return {
-          id: se.id,
-          name: se.name,
-          sequence: se.bookSeries.sequence
-        }
-      })
-    } else if (bookExpanded.bookSeries?.length) {
-      series = bookExpanded.bookSeries
-        .map((bs) => {
-          if (bs.series) {
-            return {
-              id: bs.series.id,
-              name: bs.series.name,
-              sequence: bs.sequence
-            }
-          } else {
-            Logger.error(`[Book] Invalid bookExpanded bookSeries: no series`, bs)
-            return null
-          }
-        })
-        .filter((s) => s)
-    }
-
-    return {
-      id: bookExpanded.id,
-      libraryItemId: libraryItemExpanded.id,
-      coverPath: bookExpanded.coverPath,
-      tags: bookExpanded.tags,
-      audioFiles: bookExpanded.audioFiles,
-      chapters: bookExpanded.chapters,
-      ebookFile: bookExpanded.ebookFile,
-      metadata: {
-        title: bookExpanded.title,
-        subtitle: bookExpanded.subtitle,
-        authors: authors,
-        narrators: bookExpanded.narrators,
-        series: series,
-        genres: bookExpanded.genres,
-        publishedYear: bookExpanded.publishedYear,
-        publishedDate: bookExpanded.publishedDate,
-        publisher: bookExpanded.publisher,
-        description: bookExpanded.description,
-        isbn: bookExpanded.isbn,
-        asin: bookExpanded.asin,
-        language: bookExpanded.language,
-        explicit: bookExpanded.explicit,
-        abridged: bookExpanded.abridged
-      }
-    }
-  }
-
-  /**
-   * @param {object} oldBook
-   * @returns {boolean} true if updated
-   */
-  static saveFromOld(oldBook) {
-    const book = this.getFromOld(oldBook)
-    return this.update(book, {
-      where: {
-        id: book.id
-      }
-    })
-      .then((result) => result[0] > 0)
-      .catch((error) => {
-        Logger.error(`[Book] Failed to save book ${book.id}`, error)
-        return false
-      })
-  }
-
-  static getFromOld(oldBook) {
-    return {
-      id: oldBook.id,
-      title: oldBook.metadata.title,
-      titleIgnorePrefix: oldBook.metadata.titleIgnorePrefix,
-      subtitle: oldBook.metadata.subtitle,
-      publishedYear: oldBook.metadata.publishedYear,
-      publishedDate: oldBook.metadata.publishedDate,
-      publisher: oldBook.metadata.publisher,
-      description: oldBook.metadata.description,
-      isbn: oldBook.metadata.isbn,
-      asin: oldBook.metadata.asin,
-      language: oldBook.metadata.language,
-      explicit: !!oldBook.metadata.explicit,
-      abridged: !!oldBook.metadata.abridged,
-      narrators: oldBook.metadata.narrators,
-      ebookFile: oldBook.ebookFile?.toJSON() || null,
-      coverPath: oldBook.coverPath,
-      duration: oldBook.duration,
-      audioFiles: oldBook.audioFiles?.map((af) => af.toJSON()) || [],
-      chapters: oldBook.chapters,
-      tags: oldBook.tags,
-      genres: oldBook.metadata.genres
-    }
-  }
-
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index d19816a3..4035630d 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -1,11 +1,8 @@
-const util = require('util')
 const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
 const fsExtra = require('../libs/fsExtra')
 const Logger = require('../Logger')
-const oldLibraryItem = require('../objects/LibraryItem')
 const libraryFilters = require('../utils/queries/libraryFilters')
-const { areEquivalent } = require('../utils/index')
 const { filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
 const LibraryFile = require('../objects/files/LibraryFile')
 const Book = require('./Book')
@@ -122,44 +119,6 @@ class LibraryItem extends Model {
     })
   }
 
-  /**
-   * Convert an expanded LibraryItem into an old library item
-   *
-   * @param {Model<LibraryItem>} libraryItemExpanded
-   * @returns {oldLibraryItem}
-   */
-  static getOldLibraryItem(libraryItemExpanded) {
-    let media = null
-    if (libraryItemExpanded.mediaType === 'book') {
-      media = this.sequelize.models.book.getOldBook(libraryItemExpanded)
-    } else if (libraryItemExpanded.mediaType === 'podcast') {
-      media = this.sequelize.models.podcast.getOldPodcast(libraryItemExpanded)
-    }
-
-    return new oldLibraryItem({
-      id: libraryItemExpanded.id,
-      ino: libraryItemExpanded.ino,
-      oldLibraryItemId: libraryItemExpanded.extraData?.oldLibraryItemId || null,
-      libraryId: libraryItemExpanded.libraryId,
-      folderId: libraryItemExpanded.libraryFolderId,
-      path: libraryItemExpanded.path,
-      relPath: libraryItemExpanded.relPath,
-      isFile: libraryItemExpanded.isFile,
-      mtimeMs: libraryItemExpanded.mtime?.valueOf(),
-      ctimeMs: libraryItemExpanded.ctime?.valueOf(),
-      birthtimeMs: libraryItemExpanded.birthtime?.valueOf(),
-      addedAt: libraryItemExpanded.createdAt.valueOf(),
-      updatedAt: libraryItemExpanded.updatedAt.valueOf(),
-      lastScan: libraryItemExpanded.lastScan?.valueOf(),
-      scanVersion: libraryItemExpanded.lastScanVersion,
-      isMissing: !!libraryItemExpanded.isMissing,
-      isInvalid: !!libraryItemExpanded.isInvalid,
-      mediaType: libraryItemExpanded.mediaType,
-      media,
-      libraryFiles: libraryItemExpanded.libraryFiles
-    })
-  }
-
   /**
    * Remove library item by id
    *
@@ -318,61 +277,12 @@ class LibraryItem extends Model {
     return libraryItem
   }
 
-  /**
-   * Get old library item by id
-   * @param {string} libraryItemId
-   * @returns {oldLibraryItem}
-   */
-  static async getOldById(libraryItemId) {
-    if (!libraryItemId) return null
-
-    const libraryItem = await this.findByPk(libraryItemId)
-    if (!libraryItem) {
-      Logger.error(`[LibraryItem] Library item not found with id "${libraryItemId}"`)
-      return null
-    }
-
-    if (libraryItem.mediaType === 'podcast') {
-      libraryItem.media = await libraryItem.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.podcastEpisode
-          }
-        ]
-      })
-    } else {
-      libraryItem.media = await libraryItem.getMedia({
-        include: [
-          {
-            model: this.sequelize.models.author,
-            through: {
-              attributes: []
-            }
-          },
-          {
-            model: this.sequelize.models.series,
-            through: {
-              attributes: ['sequence']
-            }
-          }
-        ],
-        order: [
-          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
-          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
-        ]
-      })
-    }
-
-    if (!libraryItem.media) return null
-    return this.getOldLibraryItem(libraryItem)
-  }
-
   /**
    * Get library items using filter and sort
    * @param {import('./Library')} library
    * @param {import('./User')} user
    * @param {object} options
-   * @returns {{ libraryItems:oldLibraryItem[], count:number }}
+   * @returns {{ libraryItems:Object[], count:number }}
    */
   static async getByFilterAndSort(library, user, options) {
     let start = Date.now()
@@ -426,17 +336,19 @@ class LibraryItem extends Model {
     // "Continue Listening" shelf
     const itemsInProgressPayload = await libraryFilters.getMediaItemsInProgress(library, user, include, limit, false)
     if (itemsInProgressPayload.items.length) {
-      const ebookOnlyItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.isEBookOnly)
-      const audioOnlyItemsInProgress = itemsInProgressPayload.items.filter((li) => !li.media.isEBookOnly)
+      const ebookOnlyItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
+      const audioItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.numTracks)
 
-      shelves.push({
-        id: 'continue-listening',
-        label: 'Continue Listening',
-        labelStringKey: 'LabelContinueListening',
-        type: library.isPodcast ? 'episode' : 'book',
-        entities: audioOnlyItemsInProgress,
-        total: itemsInProgressPayload.count
-      })
+      if (audioItemsInProgress.length) {
+        shelves.push({
+          id: 'continue-listening',
+          label: 'Continue Listening',
+          labelStringKey: 'LabelContinueListening',
+          type: library.isPodcast ? 'episode' : 'book',
+          entities: audioItemsInProgress,
+          total: itemsInProgressPayload.count
+        })
+      }
 
       if (ebookOnlyItemsInProgress.length) {
         // "Continue Reading" shelf
@@ -535,17 +447,19 @@ class LibraryItem extends Model {
     // "Listen Again" shelf
     const mediaFinishedPayload = await libraryFilters.getMediaFinished(library, user, include, limit)
     if (mediaFinishedPayload.items.length) {
-      const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.isEBookOnly)
-      const audioOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => !li.media.isEBookOnly)
+      const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
+      const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks)
 
-      shelves.push({
-        id: 'listen-again',
-        label: 'Listen Again',
-        labelStringKey: 'LabelListenAgain',
-        type: library.isPodcast ? 'episode' : 'book',
-        entities: audioOnlyItemsInProgress,
-        total: mediaFinishedPayload.count
-      })
+      if (audioItemsInProgress.length) {
+        shelves.push({
+          id: 'listen-again',
+          label: 'Listen Again',
+          labelStringKey: 'LabelListenAgain',
+          type: library.isPodcast ? 'episode' : 'book',
+          entities: audioItemsInProgress,
+          total: mediaFinishedPayload.count
+        })
+      }
 
       // "Read Again" shelf
       if (ebookOnlyItemsInProgress.length) {
diff --git a/server/models/MediaProgress.js b/server/models/MediaProgress.js
index 80204ef5..bb827682 100644
--- a/server/models/MediaProgress.js
+++ b/server/models/MediaProgress.js
@@ -36,33 +36,6 @@ class MediaProgress extends Model {
     this.createdAt
   }
 
-  static upsertFromOld(oldMediaProgress) {
-    const mediaProgress = this.getFromOld(oldMediaProgress)
-    return this.upsert(mediaProgress)
-  }
-
-  static getFromOld(oldMediaProgress) {
-    return {
-      id: oldMediaProgress.id,
-      userId: oldMediaProgress.userId,
-      mediaItemId: oldMediaProgress.mediaItemId,
-      mediaItemType: oldMediaProgress.mediaItemType,
-      duration: oldMediaProgress.duration,
-      currentTime: oldMediaProgress.currentTime,
-      ebookLocation: oldMediaProgress.ebookLocation || null,
-      ebookProgress: oldMediaProgress.ebookProgress || null,
-      isFinished: !!oldMediaProgress.isFinished,
-      hideFromContinueListening: !!oldMediaProgress.hideFromContinueListening,
-      finishedAt: oldMediaProgress.finishedAt,
-      createdAt: oldMediaProgress.startedAt || oldMediaProgress.lastUpdate,
-      updatedAt: oldMediaProgress.lastUpdate,
-      extraData: {
-        libraryItemId: oldMediaProgress.libraryItemId,
-        progress: oldMediaProgress.progress
-      }
-    }
-  }
-
   static removeById(mediaProgressId) {
     return this.destroy({
       where: {
@@ -71,12 +44,6 @@ class MediaProgress extends Model {
     })
   }
 
-  getMediaItem(options) {
-    if (!this.mediaItemType) return Promise.resolve(null)
-    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaItemType)}`
-    return this[mixinMethodName](options)
-  }
-
   /**
    * Initialize model
    *
@@ -162,6 +129,12 @@ class MediaProgress extends Model {
     MediaProgress.belongsTo(user)
   }
 
+  getMediaItem(options) {
+    if (!this.mediaItemType) return Promise.resolve(null)
+    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.mediaItemType)}`
+    return this[mixinMethodName](options)
+  }
+
   getOldMediaProgress() {
     const isPodcastEpisode = this.mediaItemType === 'podcastEpisode'
 
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index aa7afbac..084911bf 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -66,66 +66,6 @@ class Podcast extends Model {
     this.podcastEpisodes
   }
 
-  static getOldPodcast(libraryItemExpanded) {
-    const podcastExpanded = libraryItemExpanded.media
-    const podcastEpisodes = podcastExpanded.podcastEpisodes?.map((ep) => ep.getOldPodcastEpisode(libraryItemExpanded.id).toJSON()).sort((a, b) => a.index - b.index)
-    return {
-      id: podcastExpanded.id,
-      libraryItemId: libraryItemExpanded.id,
-      metadata: {
-        title: podcastExpanded.title,
-        author: podcastExpanded.author,
-        description: podcastExpanded.description,
-        releaseDate: podcastExpanded.releaseDate,
-        genres: podcastExpanded.genres,
-        feedUrl: podcastExpanded.feedURL,
-        imageUrl: podcastExpanded.imageURL,
-        itunesPageUrl: podcastExpanded.itunesPageURL,
-        itunesId: podcastExpanded.itunesId,
-        itunesArtistId: podcastExpanded.itunesArtistId,
-        explicit: podcastExpanded.explicit,
-        language: podcastExpanded.language,
-        type: podcastExpanded.podcastType
-      },
-      coverPath: podcastExpanded.coverPath,
-      tags: podcastExpanded.tags,
-      episodes: podcastEpisodes || [],
-      autoDownloadEpisodes: podcastExpanded.autoDownloadEpisodes,
-      autoDownloadSchedule: podcastExpanded.autoDownloadSchedule,
-      lastEpisodeCheck: podcastExpanded.lastEpisodeCheck?.valueOf() || null,
-      maxEpisodesToKeep: podcastExpanded.maxEpisodesToKeep,
-      maxNewEpisodesToDownload: podcastExpanded.maxNewEpisodesToDownload
-    }
-  }
-
-  static getFromOld(oldPodcast) {
-    const oldPodcastMetadata = oldPodcast.metadata
-    return {
-      id: oldPodcast.id,
-      title: oldPodcastMetadata.title,
-      titleIgnorePrefix: oldPodcastMetadata.titleIgnorePrefix,
-      author: oldPodcastMetadata.author,
-      releaseDate: oldPodcastMetadata.releaseDate,
-      feedURL: oldPodcastMetadata.feedUrl,
-      imageURL: oldPodcastMetadata.imageUrl,
-      description: oldPodcastMetadata.description,
-      itunesPageURL: oldPodcastMetadata.itunesPageUrl,
-      itunesId: oldPodcastMetadata.itunesId,
-      itunesArtistId: oldPodcastMetadata.itunesArtistId,
-      language: oldPodcastMetadata.language,
-      podcastType: oldPodcastMetadata.type,
-      explicit: !!oldPodcastMetadata.explicit,
-      autoDownloadEpisodes: !!oldPodcast.autoDownloadEpisodes,
-      autoDownloadSchedule: oldPodcast.autoDownloadSchedule,
-      lastEpisodeCheck: oldPodcast.lastEpisodeCheck,
-      maxEpisodesToKeep: oldPodcast.maxEpisodesToKeep,
-      maxNewEpisodesToDownload: oldPodcast.maxNewEpisodesToDownload,
-      coverPath: oldPodcast.coverPath,
-      tags: oldPodcast.tags,
-      genres: oldPodcastMetadata.genres
-    }
-  }
-
   /**
    * Payload from the /api/podcasts POST endpoint
    *
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index c1e66fdf..c6a1b9fa 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -1,5 +1,4 @@
 const { DataTypes, Model } = require('sequelize')
-const oldPodcastEpisode = require('../objects/entities/PodcastEpisode')
 
 /**
  * @typedef ChapterObject
@@ -53,40 +52,6 @@ class PodcastEpisode extends Model {
     this.updatedAt
   }
 
-  static createFromOld(oldEpisode) {
-    const podcastEpisode = this.getFromOld(oldEpisode)
-    return this.create(podcastEpisode)
-  }
-
-  static getFromOld(oldEpisode) {
-    const extraData = {}
-    if (oldEpisode.oldEpisodeId) {
-      extraData.oldEpisodeId = oldEpisode.oldEpisodeId
-    }
-    if (oldEpisode.guid) {
-      extraData.guid = oldEpisode.guid
-    }
-    return {
-      id: oldEpisode.id,
-      index: oldEpisode.index,
-      season: oldEpisode.season,
-      episode: oldEpisode.episode,
-      episodeType: oldEpisode.episodeType,
-      title: oldEpisode.title,
-      subtitle: oldEpisode.subtitle,
-      description: oldEpisode.description,
-      pubDate: oldEpisode.pubDate,
-      enclosureURL: oldEpisode.enclosure?.url || null,
-      enclosureSize: oldEpisode.enclosure?.length || null,
-      enclosureType: oldEpisode.enclosure?.type || null,
-      publishedAt: oldEpisode.publishedAt,
-      podcastId: oldEpisode.podcastId,
-      audioFile: oldEpisode.audioFile?.toJSON() || null,
-      chapters: oldEpisode.chapters,
-      extraData
-    }
-  }
-
   /**
    *
    * @param {import('../utils/podcastUtils').RssPodcastEpisode} rssPodcastEpisode
@@ -208,42 +173,6 @@ class PodcastEpisode extends Model {
     return track
   }
 
-  /**
-   * @param {string} libraryItemId
-   * @returns {oldPodcastEpisode}
-   */
-  getOldPodcastEpisode(libraryItemId = null) {
-    let enclosure = null
-    if (this.enclosureURL) {
-      enclosure = {
-        url: this.enclosureURL,
-        type: this.enclosureType,
-        length: this.enclosureSize !== null ? String(this.enclosureSize) : null
-      }
-    }
-    return new oldPodcastEpisode({
-      libraryItemId: libraryItemId || null,
-      podcastId: this.podcastId,
-      id: this.id,
-      oldEpisodeId: this.extraData?.oldEpisodeId || null,
-      index: this.index,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      title: this.title,
-      subtitle: this.subtitle,
-      description: this.description,
-      enclosure,
-      guid: this.extraData?.guid || null,
-      pubDate: this.pubDate,
-      chapters: this.chapters,
-      audioFile: this.audioFile,
-      publishedAt: this.publishedAt?.valueOf() || null,
-      addedAt: this.createdAt.valueOf(),
-      updatedAt: this.updatedAt.valueOf()
-    })
-  }
-
   toOldJSON(libraryItemId) {
     if (!libraryItemId) {
       throw new Error(`[PodcastEpisode] Cannot convert to old JSON because libraryItemId is not provided`)
diff --git a/server/models/User.js b/server/models/User.js
index b2a4fd2b..56d6ba0e 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -563,9 +563,8 @@ class User extends Model {
 
   /**
    * Check user can access library item
-   * TODO: Currently supports both old and new library item models
    *
-   * @param {import('../objects/LibraryItem')|import('./LibraryItem')} libraryItem
+   * @param {import('./LibraryItem')} libraryItem
    * @returns {boolean}
    */
   checkCanAccessLibraryItem(libraryItem) {
diff --git a/server/objects/LibraryItem.js b/server/objects/LibraryItem.js
deleted file mode 100644
index 3cf89b10..00000000
--- a/server/objects/LibraryItem.js
+++ /dev/null
@@ -1,153 +0,0 @@
-const fs = require('../libs/fsExtra')
-const Path = require('path')
-const Logger = require('../Logger')
-const LibraryFile = require('./files/LibraryFile')
-const Book = require('./mediaTypes/Book')
-const Podcast = require('./mediaTypes/Podcast')
-const { areEquivalent, copyValue } = require('../utils/index')
-const { filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
-
-class LibraryItem {
-  constructor(libraryItem = null) {
-    this.id = null
-    this.ino = null // Inode
-    this.oldLibraryItemId = null
-
-    this.libraryId = null
-    this.folderId = null
-
-    this.path = null
-    this.relPath = null
-    this.isFile = false
-    this.mtimeMs = null
-    this.ctimeMs = null
-    this.birthtimeMs = null
-    this.addedAt = null
-    this.updatedAt = null
-    this.lastScan = null
-    this.scanVersion = null
-
-    // Was scanned and no longer exists
-    this.isMissing = false
-    // Was scanned and no longer has media files
-    this.isInvalid = false
-
-    this.mediaType = null
-    this.media = null
-
-    /** @type {LibraryFile[]} */
-    this.libraryFiles = []
-
-    if (libraryItem) {
-      this.construct(libraryItem)
-    }
-
-    // Temporary attributes
-    this.isSavingMetadata = false
-  }
-
-  construct(libraryItem) {
-    this.id = libraryItem.id
-    this.ino = libraryItem.ino || null
-    this.oldLibraryItemId = libraryItem.oldLibraryItemId
-    this.libraryId = libraryItem.libraryId
-    this.folderId = libraryItem.folderId
-    this.path = libraryItem.path
-    this.relPath = libraryItem.relPath
-    this.isFile = !!libraryItem.isFile
-    this.mtimeMs = libraryItem.mtimeMs || 0
-    this.ctimeMs = libraryItem.ctimeMs || 0
-    this.birthtimeMs = libraryItem.birthtimeMs || 0
-    this.addedAt = libraryItem.addedAt
-    this.updatedAt = libraryItem.updatedAt || this.addedAt
-    this.lastScan = libraryItem.lastScan || null
-    this.scanVersion = libraryItem.scanVersion || null
-
-    this.isMissing = !!libraryItem.isMissing
-    this.isInvalid = !!libraryItem.isInvalid
-
-    this.mediaType = libraryItem.mediaType
-    if (this.mediaType === 'book') {
-      this.media = new Book(libraryItem.media)
-    } else if (this.mediaType === 'podcast') {
-      this.media = new Podcast(libraryItem.media)
-    }
-    this.media.libraryItemId = this.id
-
-    this.libraryFiles = libraryItem.libraryFiles.map((f) => new LibraryFile(f))
-
-    // Migration for v2.2.23 to set ebook library files as supplementary
-    if (this.isBook && this.media.ebookFile) {
-      for (const libraryFile of this.libraryFiles) {
-        if (libraryFile.isEBookFile && libraryFile.isSupplementary === null) {
-          libraryFile.isSupplementary = this.media.ebookFile.ino !== libraryFile.ino
-        }
-      }
-    }
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      ino: this.ino,
-      oldLibraryItemId: this.oldLibraryItemId,
-      libraryId: this.libraryId,
-      folderId: this.folderId,
-      path: this.path,
-      relPath: this.relPath,
-      isFile: this.isFile,
-      mtimeMs: this.mtimeMs,
-      ctimeMs: this.ctimeMs,
-      birthtimeMs: this.birthtimeMs,
-      addedAt: this.addedAt,
-      updatedAt: this.updatedAt,
-      lastScan: this.lastScan,
-      scanVersion: this.scanVersion,
-      isMissing: !!this.isMissing,
-      isInvalid: !!this.isInvalid,
-      mediaType: this.mediaType,
-      media: this.media.toJSON(),
-      libraryFiles: this.libraryFiles.map((f) => f.toJSON())
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      id: this.id,
-      ino: this.ino,
-      oldLibraryItemId: this.oldLibraryItemId,
-      libraryId: this.libraryId,
-      folderId: this.folderId,
-      path: this.path,
-      relPath: this.relPath,
-      isFile: this.isFile,
-      mtimeMs: this.mtimeMs,
-      ctimeMs: this.ctimeMs,
-      birthtimeMs: this.birthtimeMs,
-      addedAt: this.addedAt,
-      updatedAt: this.updatedAt,
-      isMissing: !!this.isMissing,
-      isInvalid: !!this.isInvalid,
-      mediaType: this.mediaType,
-      media: this.media.toJSONMinified(),
-      numFiles: this.libraryFiles.length,
-      size: this.size
-    }
-  }
-
-  get isPodcast() {
-    return this.mediaType === 'podcast'
-  }
-  get isBook() {
-    return this.mediaType === 'book'
-  }
-  get size() {
-    let total = 0
-    this.libraryFiles.forEach((lf) => (total += lf.metadata.size))
-    return total
-  }
-  get hasAudioFiles() {
-    return this.libraryFiles.some((lf) => lf.fileType === 'audio')
-  }
-}
-module.exports = LibraryItem
diff --git a/server/objects/entities/PodcastEpisode.js b/server/objects/entities/PodcastEpisode.js
deleted file mode 100644
index 6a3f4cf6..00000000
--- a/server/objects/entities/PodcastEpisode.js
+++ /dev/null
@@ -1,149 +0,0 @@
-const { areEquivalent, copyValue } = require('../../utils/index')
-const AudioFile = require('../files/AudioFile')
-const AudioTrack = require('../files/AudioTrack')
-
-class PodcastEpisode {
-  constructor(episode) {
-    this.libraryItemId = null
-    this.podcastId = null
-    this.id = null
-    this.oldEpisodeId = null
-    this.index = null
-
-    this.season = null
-    this.episode = null
-    this.episodeType = null
-    this.title = null
-    this.subtitle = null
-    this.description = null
-    this.enclosure = null
-    this.guid = null
-    this.pubDate = null
-    this.chapters = []
-
-    this.audioFile = null
-    this.publishedAt = null
-    this.addedAt = null
-    this.updatedAt = null
-
-    if (episode) {
-      this.construct(episode)
-    }
-  }
-
-  construct(episode) {
-    this.libraryItemId = episode.libraryItemId
-    this.podcastId = episode.podcastId
-    this.id = episode.id
-    this.oldEpisodeId = episode.oldEpisodeId
-    this.index = episode.index
-    this.season = episode.season
-    this.episode = episode.episode
-    this.episodeType = episode.episodeType
-    this.title = episode.title
-    this.subtitle = episode.subtitle
-    this.description = episode.description
-    this.enclosure = episode.enclosure ? { ...episode.enclosure } : null
-    this.guid = episode.guid || null
-    this.pubDate = episode.pubDate
-    this.chapters = episode.chapters?.map((ch) => ({ ...ch })) || []
-    this.audioFile = episode.audioFile ? new AudioFile(episode.audioFile) : null
-    this.publishedAt = episode.publishedAt
-    this.addedAt = episode.addedAt
-    this.updatedAt = episode.updatedAt
-
-    if (this.audioFile) {
-      this.audioFile.index = 1 // Only 1 audio file per episode
-    }
-  }
-
-  toJSON() {
-    return {
-      libraryItemId: this.libraryItemId,
-      podcastId: this.podcastId,
-      id: this.id,
-      oldEpisodeId: this.oldEpisodeId,
-      index: this.index,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      title: this.title,
-      subtitle: this.subtitle,
-      description: this.description,
-      enclosure: this.enclosure ? { ...this.enclosure } : null,
-      guid: this.guid,
-      pubDate: this.pubDate,
-      chapters: this.chapters.map((ch) => ({ ...ch })),
-      audioFile: this.audioFile?.toJSON() || null,
-      publishedAt: this.publishedAt,
-      addedAt: this.addedAt,
-      updatedAt: this.updatedAt
-    }
-  }
-
-  toJSONExpanded() {
-    return {
-      libraryItemId: this.libraryItemId,
-      podcastId: this.podcastId,
-      id: this.id,
-      oldEpisodeId: this.oldEpisodeId,
-      index: this.index,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      title: this.title,
-      subtitle: this.subtitle,
-      description: this.description,
-      enclosure: this.enclosure ? { ...this.enclosure } : null,
-      guid: this.guid,
-      pubDate: this.pubDate,
-      chapters: this.chapters.map((ch) => ({ ...ch })),
-      audioFile: this.audioFile?.toJSON() || null,
-      audioTrack: this.audioTrack?.toJSON() || null,
-      publishedAt: this.publishedAt,
-      addedAt: this.addedAt,
-      updatedAt: this.updatedAt,
-      duration: this.duration,
-      size: this.size
-    }
-  }
-
-  get audioTrack() {
-    if (!this.audioFile) return null
-    const audioTrack = new AudioTrack()
-    audioTrack.setData(this.libraryItemId, this.audioFile, 0)
-    return audioTrack
-  }
-  get tracks() {
-    return [this.audioTrack]
-  }
-  get duration() {
-    return this.audioFile?.duration || 0
-  }
-  get size() {
-    return this.audioFile?.metadata.size || 0
-  }
-  get enclosureUrl() {
-    return this.enclosure?.url || null
-  }
-
-  update(payload) {
-    let hasUpdates = false
-    for (const key in this.toJSON()) {
-      let newValue = payload[key]
-      if (newValue === '') newValue = null
-      let existingValue = this[key]
-      if (existingValue === '') existingValue = null
-
-      if (newValue != undefined && !areEquivalent(newValue, existingValue)) {
-        this[key] = copyValue(newValue)
-        hasUpdates = true
-      }
-    }
-    if (hasUpdates) {
-      this.updatedAt = Date.now()
-    }
-    return hasUpdates
-  }
-}
-module.exports = PodcastEpisode
diff --git a/server/objects/mediaTypes/Book.js b/server/objects/mediaTypes/Book.js
deleted file mode 100644
index b270e0e7..00000000
--- a/server/objects/mediaTypes/Book.js
+++ /dev/null
@@ -1,138 +0,0 @@
-const Logger = require('../../Logger')
-const BookMetadata = require('../metadata/BookMetadata')
-const { areEquivalent, copyValue } = require('../../utils/index')
-const { filePathToPOSIX } = require('../../utils/fileUtils')
-const AudioFile = require('../files/AudioFile')
-const AudioTrack = require('../files/AudioTrack')
-const EBookFile = require('../files/EBookFile')
-
-class Book {
-  constructor(book) {
-    this.id = null
-    this.libraryItemId = null
-    this.metadata = null
-
-    this.coverPath = null
-    this.tags = []
-
-    this.audioFiles = []
-    this.chapters = []
-    this.ebookFile = null
-
-    this.lastCoverSearch = null
-    this.lastCoverSearchQuery = null
-
-    if (book) {
-      this.construct(book)
-    }
-  }
-
-  construct(book) {
-    this.id = book.id
-    this.libraryItemId = book.libraryItemId
-    this.metadata = new BookMetadata(book.metadata)
-    this.coverPath = book.coverPath
-    this.tags = [...book.tags]
-    this.audioFiles = book.audioFiles.map((f) => new AudioFile(f))
-    this.chapters = book.chapters.map((c) => ({ ...c }))
-    this.ebookFile = book.ebookFile ? new EBookFile(book.ebookFile) : null
-    this.lastCoverSearch = book.lastCoverSearch || null
-    this.lastCoverSearchQuery = book.lastCoverSearchQuery || null
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      libraryItemId: this.libraryItemId,
-      metadata: this.metadata.toJSON(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      audioFiles: this.audioFiles.map((f) => f.toJSON()),
-      chapters: this.chapters.map((c) => ({ ...c })),
-      ebookFile: this.ebookFile ? this.ebookFile.toJSON() : null
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      id: this.id,
-      metadata: this.metadata.toJSONMinified(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      numTracks: this.tracks.length,
-      numAudioFiles: this.audioFiles.length,
-      numChapters: this.chapters.length,
-      duration: this.duration,
-      size: this.size,
-      ebookFormat: this.ebookFile?.ebookFormat
-    }
-  }
-
-  toJSONForMetadataFile() {
-    return {
-      tags: [...this.tags],
-      chapters: this.chapters.map((c) => ({ ...c })),
-      ...this.metadata.toJSONForMetadataFile()
-    }
-  }
-
-  get size() {
-    var total = 0
-    this.audioFiles.forEach((af) => (total += af.metadata.size))
-    if (this.ebookFile) {
-      total += this.ebookFile.metadata.size
-    }
-    return total
-  }
-  get includedAudioFiles() {
-    return this.audioFiles.filter((af) => !af.exclude)
-  }
-  get tracks() {
-    let startOffset = 0
-    return this.includedAudioFiles.map((af) => {
-      const audioTrack = new AudioTrack()
-      audioTrack.setData(this.libraryItemId, af, startOffset)
-      startOffset += audioTrack.duration
-      return audioTrack
-    })
-  }
-  get duration() {
-    let total = 0
-    this.tracks.forEach((track) => (total += track.duration))
-    return total
-  }
-  get numTracks() {
-    return this.tracks.length
-  }
-  get isEBookOnly() {
-    return this.ebookFile && !this.numTracks
-  }
-
-  update(payload) {
-    const json = this.toJSON()
-
-    let hasUpdates = false
-    for (const key in json) {
-      if (payload[key] !== undefined) {
-        if (key === 'metadata') {
-          if (this.metadata.update(payload.metadata)) {
-            hasUpdates = true
-          }
-        } else if (!areEquivalent(payload[key], json[key])) {
-          this[key] = copyValue(payload[key])
-          Logger.debug('[Book] Key updated', key, this[key])
-          hasUpdates = true
-        }
-      }
-    }
-    return hasUpdates
-  }
-
-  updateCover(coverPath) {
-    coverPath = filePathToPOSIX(coverPath)
-    if (this.coverPath === coverPath) return false
-    this.coverPath = coverPath
-    return true
-  }
-}
-module.exports = Book
diff --git a/server/objects/mediaTypes/Podcast.js b/server/objects/mediaTypes/Podcast.js
deleted file mode 100644
index 2ec4a873..00000000
--- a/server/objects/mediaTypes/Podcast.js
+++ /dev/null
@@ -1,161 +0,0 @@
-const Logger = require('../../Logger')
-const PodcastEpisode = require('../entities/PodcastEpisode')
-const PodcastMetadata = require('../metadata/PodcastMetadata')
-const { areEquivalent, copyValue } = require('../../utils/index')
-const { filePathToPOSIX } = require('../../utils/fileUtils')
-
-class Podcast {
-  constructor(podcast) {
-    this.id = null
-    this.libraryItemId = null
-    this.metadata = null
-    this.coverPath = null
-    this.tags = []
-    this.episodes = []
-
-    this.autoDownloadEpisodes = false
-    this.autoDownloadSchedule = null
-    this.lastEpisodeCheck = 0
-    this.maxEpisodesToKeep = 0
-    this.maxNewEpisodesToDownload = 3
-
-    this.lastCoverSearch = null
-    this.lastCoverSearchQuery = null
-
-    if (podcast) {
-      this.construct(podcast)
-    }
-  }
-
-  construct(podcast) {
-    this.id = podcast.id
-    this.libraryItemId = podcast.libraryItemId
-    this.metadata = new PodcastMetadata(podcast.metadata)
-    this.coverPath = podcast.coverPath
-    this.tags = [...podcast.tags]
-    this.episodes = podcast.episodes.map((e) => {
-      var podcastEpisode = new PodcastEpisode(e)
-      podcastEpisode.libraryItemId = this.libraryItemId
-      return podcastEpisode
-    })
-    this.autoDownloadEpisodes = !!podcast.autoDownloadEpisodes
-    this.autoDownloadSchedule = podcast.autoDownloadSchedule || '0 * * * *' // Added in 2.1.3 so default to hourly
-    this.lastEpisodeCheck = podcast.lastEpisodeCheck || 0
-    this.maxEpisodesToKeep = podcast.maxEpisodesToKeep || 0
-
-    // Default is 3 but 0 is allowed
-    if (typeof podcast.maxNewEpisodesToDownload !== 'number') {
-      this.maxNewEpisodesToDownload = 3
-    } else {
-      this.maxNewEpisodesToDownload = podcast.maxNewEpisodesToDownload
-    }
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      libraryItemId: this.libraryItemId,
-      metadata: this.metadata.toJSON(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      episodes: this.episodes.map((e) => e.toJSON()),
-      autoDownloadEpisodes: this.autoDownloadEpisodes,
-      autoDownloadSchedule: this.autoDownloadSchedule,
-      lastEpisodeCheck: this.lastEpisodeCheck,
-      maxEpisodesToKeep: this.maxEpisodesToKeep,
-      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      id: this.id,
-      metadata: this.metadata.toJSONMinified(),
-      coverPath: this.coverPath,
-      tags: [...this.tags],
-      numEpisodes: this.episodes.length,
-      autoDownloadEpisodes: this.autoDownloadEpisodes,
-      autoDownloadSchedule: this.autoDownloadSchedule,
-      lastEpisodeCheck: this.lastEpisodeCheck,
-      maxEpisodesToKeep: this.maxEpisodesToKeep,
-      maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
-      size: this.size
-    }
-  }
-
-  toJSONForMetadataFile() {
-    return {
-      tags: [...this.tags],
-      title: this.metadata.title,
-      author: this.metadata.author,
-      description: this.metadata.description,
-      releaseDate: this.metadata.releaseDate,
-      genres: [...this.metadata.genres],
-      feedURL: this.metadata.feedUrl,
-      imageURL: this.metadata.imageUrl,
-      itunesPageURL: this.metadata.itunesPageUrl,
-      itunesId: this.metadata.itunesId,
-      itunesArtistId: this.metadata.itunesArtistId,
-      explicit: this.metadata.explicit,
-      language: this.metadata.language,
-      podcastType: this.metadata.type
-    }
-  }
-
-  get size() {
-    var total = 0
-    this.episodes.forEach((ep) => (total += ep.size))
-    return total
-  }
-  get duration() {
-    let total = 0
-    this.episodes.forEach((ep) => (total += ep.duration))
-    return total
-  }
-  get numTracks() {
-    return this.episodes.length
-  }
-
-  update(payload) {
-    var json = this.toJSON()
-    delete json.episodes // do not update media entities here
-    var hasUpdates = false
-    for (const key in json) {
-      if (payload[key] !== undefined) {
-        if (key === 'metadata') {
-          if (this.metadata.update(payload.metadata)) {
-            hasUpdates = true
-          }
-        } else if (!areEquivalent(payload[key], json[key])) {
-          this[key] = copyValue(payload[key])
-          Logger.debug('[Podcast] Key updated', key, this[key])
-          hasUpdates = true
-        }
-      }
-    }
-    return hasUpdates
-  }
-
-  updateEpisode(id, payload) {
-    var episode = this.episodes.find((ep) => ep.id == id)
-    if (!episode) return false
-    return episode.update(payload)
-  }
-
-  updateCover(coverPath) {
-    coverPath = filePathToPOSIX(coverPath)
-    if (this.coverPath === coverPath) return false
-    this.coverPath = coverPath
-    return true
-  }
-
-  getEpisode(episodeId) {
-    if (!episodeId) return null
-
-    // Support old episode ids for mobile downloads
-    if (episodeId.startsWith('ep_')) return this.episodes.find((ep) => ep.oldEpisodeId == episodeId)
-
-    return this.episodes.find((ep) => ep.id == episodeId)
-  }
-}
-module.exports = Podcast
diff --git a/server/objects/metadata/BookMetadata.js b/server/objects/metadata/BookMetadata.js
deleted file mode 100644
index 5116f2f4..00000000
--- a/server/objects/metadata/BookMetadata.js
+++ /dev/null
@@ -1,154 +0,0 @@
-const Logger = require('../../Logger')
-const { areEquivalent, copyValue, getTitleIgnorePrefix, getTitlePrefixAtEnd } = require('../../utils/index')
-const parseNameString = require('../../utils/parsers/parseNameString')
-class BookMetadata {
-  constructor(metadata) {
-    this.title = null
-    this.subtitle = null
-    this.authors = []
-    this.narrators = [] // Array of strings
-    this.series = []
-    this.genres = [] // Array of strings
-    this.publishedYear = null
-    this.publishedDate = null
-    this.publisher = null
-    this.description = null
-    this.isbn = null
-    this.asin = null
-    this.language = null
-    this.explicit = false
-    this.abridged = false
-
-    if (metadata) {
-      this.construct(metadata)
-    }
-  }
-
-  construct(metadata) {
-    this.title = metadata.title
-    this.subtitle = metadata.subtitle
-    this.authors = metadata.authors?.map ? metadata.authors.map((a) => ({ ...a })) : []
-    this.narrators = metadata.narrators ? [...metadata.narrators].filter((n) => n) : []
-    this.series = metadata.series?.map
-      ? metadata.series.map((s) => ({
-          ...s,
-          name: s.name || 'No Title'
-        }))
-      : []
-    this.genres = metadata.genres ? [...metadata.genres] : []
-    this.publishedYear = metadata.publishedYear || null
-    this.publishedDate = metadata.publishedDate || null
-    this.publisher = metadata.publisher
-    this.description = metadata.description
-    this.isbn = metadata.isbn
-    this.asin = metadata.asin
-    this.language = metadata.language
-    this.explicit = !!metadata.explicit
-    this.abridged = !!metadata.abridged
-  }
-
-  toJSON() {
-    return {
-      title: this.title,
-      subtitle: this.subtitle,
-      authors: this.authors.map((a) => ({ ...a })), // Author JSONMinimal with name and id
-      narrators: [...this.narrators],
-      series: this.series.map((s) => ({ ...s })), // Series JSONMinimal with name, id and sequence
-      genres: [...this.genres],
-      publishedYear: this.publishedYear,
-      publishedDate: this.publishedDate,
-      publisher: this.publisher,
-      description: this.description,
-      isbn: this.isbn,
-      asin: this.asin,
-      language: this.language,
-      explicit: this.explicit,
-      abridged: this.abridged
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      title: this.title,
-      titleIgnorePrefix: this.titlePrefixAtEnd,
-      subtitle: this.subtitle,
-      authorName: this.authorName,
-      authorNameLF: this.authorNameLF,
-      narratorName: this.narratorName,
-      seriesName: this.seriesName,
-      genres: [...this.genres],
-      publishedYear: this.publishedYear,
-      publishedDate: this.publishedDate,
-      publisher: this.publisher,
-      description: this.description,
-      isbn: this.isbn,
-      asin: this.asin,
-      language: this.language,
-      explicit: this.explicit,
-      abridged: this.abridged
-    }
-  }
-
-  toJSONForMetadataFile() {
-    const json = this.toJSON()
-    json.authors = json.authors.map((au) => au.name)
-    json.series = json.series.map((se) => {
-      if (!se.sequence) return se.name
-      return `${se.name} #${se.sequence}`
-    })
-    return json
-  }
-
-  clone() {
-    return new BookMetadata(this.toJSON())
-  }
-
-  get titleIgnorePrefix() {
-    return getTitleIgnorePrefix(this.title)
-  }
-  get titlePrefixAtEnd() {
-    return getTitlePrefixAtEnd(this.title)
-  }
-  get authorName() {
-    if (!this.authors.length) return ''
-    return this.authors.map((au) => au.name).join(', ')
-  }
-  get authorNameLF() {
-    // Last, First
-    if (!this.authors.length) return ''
-    return this.authors.map((au) => parseNameString.nameToLastFirst(au.name)).join(', ')
-  }
-  get seriesName() {
-    if (!this.series.length) return ''
-    return this.series
-      .map((se) => {
-        if (!se.sequence) return se.name
-        return `${se.name} #${se.sequence}`
-      })
-      .join(', ')
-  }
-  get narratorName() {
-    return this.narrators.join(', ')
-  }
-
-  getSeries(seriesId) {
-    return this.series.find((se) => se.id == seriesId)
-  }
-
-  update(payload) {
-    const json = this.toJSON()
-    let hasUpdates = false
-
-    for (const key in json) {
-      if (payload[key] !== undefined) {
-        if (!areEquivalent(payload[key], json[key])) {
-          this[key] = copyValue(payload[key])
-          Logger.debug('[BookMetadata] Key updated', key, this[key])
-          hasUpdates = true
-        }
-      }
-    }
-    return hasUpdates
-  }
-}
-module.exports = BookMetadata
diff --git a/server/objects/metadata/PodcastMetadata.js b/server/objects/metadata/PodcastMetadata.js
deleted file mode 100644
index ccc94ce0..00000000
--- a/server/objects/metadata/PodcastMetadata.js
+++ /dev/null
@@ -1,105 +0,0 @@
-const Logger = require('../../Logger')
-const { areEquivalent, copyValue, getTitleIgnorePrefix, getTitlePrefixAtEnd } = require('../../utils/index')
-
-class PodcastMetadata {
-  constructor(metadata) {
-    this.title = null
-    this.author = null
-    this.description = null
-    this.releaseDate = null
-    this.genres = []
-    this.feedUrl = null
-    this.imageUrl = null
-    this.itunesPageUrl = null
-    this.itunesId = null
-    this.itunesArtistId = null
-    this.explicit = false
-    this.language = null
-    this.type = null
-
-    if (metadata) {
-      this.construct(metadata)
-    }
-  }
-
-  construct(metadata) {
-    this.title = metadata.title
-    this.author = metadata.author
-    this.description = metadata.description
-    this.releaseDate = metadata.releaseDate
-    this.genres = [...metadata.genres]
-    this.feedUrl = metadata.feedUrl
-    this.imageUrl = metadata.imageUrl
-    this.itunesPageUrl = metadata.itunesPageUrl
-    this.itunesId = metadata.itunesId
-    this.itunesArtistId = metadata.itunesArtistId
-    this.explicit = metadata.explicit
-    this.language = metadata.language || null
-    this.type = metadata.type || 'episodic'
-  }
-
-  toJSON() {
-    return {
-      title: this.title,
-      author: this.author,
-      description: this.description,
-      releaseDate: this.releaseDate,
-      genres: [...this.genres],
-      feedUrl: this.feedUrl,
-      imageUrl: this.imageUrl,
-      itunesPageUrl: this.itunesPageUrl,
-      itunesId: this.itunesId,
-      itunesArtistId: this.itunesArtistId,
-      explicit: this.explicit,
-      language: this.language,
-      type: this.type
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      title: this.title,
-      titleIgnorePrefix: this.titlePrefixAtEnd,
-      author: this.author,
-      description: this.description,
-      releaseDate: this.releaseDate,
-      genres: [...this.genres],
-      feedUrl: this.feedUrl,
-      imageUrl: this.imageUrl,
-      itunesPageUrl: this.itunesPageUrl,
-      itunesId: this.itunesId,
-      itunesArtistId: this.itunesArtistId,
-      explicit: this.explicit,
-      language: this.language,
-      type: this.type
-    }
-  }
-
-  clone() {
-    return new PodcastMetadata(this.toJSON())
-  }
-
-  get titleIgnorePrefix() {
-    return getTitleIgnorePrefix(this.title)
-  }
-
-  get titlePrefixAtEnd() {
-    return getTitlePrefixAtEnd(this.title)
-  }
-
-  update(payload) {
-    const json = this.toJSON()
-    let hasUpdates = false
-    for (const key in json) {
-      if (payload[key] !== undefined) {
-        if (!areEquivalent(payload[key], json[key])) {
-          this[key] = copyValue(payload[key])
-          Logger.debug('[PodcastMetadata] Key updated', key, this[key])
-          hasUpdates = true
-        }
-      }
-    }
-    return hasUpdates
-  }
-}
-module.exports = PodcastMetadata
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index 5d4e1cc5..1a2a7aaf 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -32,7 +32,7 @@ class Scanner {
    * @param {import('../routers/ApiRouter')} apiRouterCtx
    * @param {import('../models/LibraryItem')} libraryItem
    * @param {QuickMatchOptions} options
-   * @returns {Promise<{updated: boolean, libraryItem: import('../objects/LibraryItem')}>}
+   * @returns {Promise<{updated: boolean, libraryItem: Object}>}
    */
   async quickMatchLibraryItem(apiRouterCtx, libraryItem, options = {}) {
     const provider = options.provider || 'google'
diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index 8771ae7a..f81f889c 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -5,7 +5,6 @@ const fs = require('../libs/fsExtra')
 const Path = require('path')
 const Logger = require('../Logger')
 const { filePathToPOSIX, copyToExisting } = require('./fileUtils')
-const LibraryItem = require('../objects/LibraryItem')
 
 function escapeSingleQuotes(path) {
   // A ' within a quoted string is escaped with '\'' in ffmpeg (see https://www.ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping)
@@ -365,28 +364,26 @@ function escapeFFMetadataValue(value) {
 /**
  * Retrieves the FFmpeg metadata object for a given library item.
  *
- * @param {LibraryItem} libraryItem - The library item containing the media metadata.
+ * @param {import('../models/LibraryItem')} libraryItem - The library item containing the media metadata.
  * @param {number} audioFilesLength - The length of the audio files.
  * @returns {Object} - The FFmpeg metadata object.
  */
 function getFFMetadataObject(libraryItem, audioFilesLength) {
-  const metadata = libraryItem.media.metadata
-
   const ffmetadata = {
-    title: metadata.title,
-    artist: metadata.authorName,
-    album_artist: metadata.authorName,
-    album: (metadata.title || '') + (metadata.subtitle ? `: ${metadata.subtitle}` : ''),
-    TIT3: metadata.subtitle, // mp3 only
-    genre: metadata.genres?.join('; '),
-    date: metadata.publishedYear,
-    comment: metadata.description,
-    description: metadata.description,
-    composer: metadata.narratorName,
-    copyright: metadata.publisher,
-    publisher: metadata.publisher, // mp3 only
+    title: libraryItem.media.title,
+    artist: libraryItem.media.authorName,
+    album_artist: libraryItem.media.authorName,
+    album: (libraryItem.media.title || '') + (libraryItem.media.subtitle ? `: ${libraryItem.media.subtitle}` : ''),
+    TIT3: libraryItem.media.subtitle, // mp3 only
+    genre: libraryItem.media.genres?.join('; '),
+    date: libraryItem.media.publishedYear,
+    comment: libraryItem.media.description,
+    description: libraryItem.media.description,
+    composer: (libraryItem.media.narrators || []).join(', '),
+    copyright: libraryItem.media.publisher,
+    publisher: libraryItem.media.publisher, // mp3 only
     TRACKTOTAL: `${audioFilesLength}`, // mp3 only
-    grouping: metadata.series?.map((s) => s.name + (s.sequence ? ` #${s.sequence}` : '')).join('; ')
+    grouping: libraryItem.media.series?.map((s) => s.name + (s.bookSeries.sequence ? ` #${s.bookSeries.sequence}` : '')).join('; ')
   }
   Object.keys(ffmetadata).forEach((key) => {
     if (!ffmetadata[key]) {
@@ -402,7 +399,7 @@ module.exports.getFFMetadataObject = getFFMetadataObject
 /**
  * Merges audio files into a single output file using FFmpeg.
  *
- * @param {Array} audioTracks - The audio tracks to merge.
+ * @param {import('../models/Book').AudioFileObject} audioTracks - The audio tracks to merge.
  * @param {number} duration - The total duration of the audio tracks.
  * @param {string} itemCachePath - The path to the item cache.
  * @param {string} outputFilePath - The path to the output file.
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 664bd6e3..5702071e 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -6,35 +6,41 @@ const naturalSort = createNewSortInstance({
 })
 
 module.exports = {
-  getSeriesFromBooks(books, filterSeries, hideSingleBookSeries) {
+  /**
+   *
+   * @param {import('../models/LibraryItem')[]} libraryItems
+   * @param {*} filterSeries
+   * @param {*} hideSingleBookSeries
+   * @returns
+   */
+  getSeriesFromBooks(libraryItems, filterSeries, hideSingleBookSeries) {
     const _series = {}
     const seriesToFilterOut = {}
-    books.forEach((libraryItem) => {
+    libraryItems.forEach((libraryItem) => {
       // get all book series for item that is not already filtered out
-      const bookSeries = (libraryItem.media.metadata.series || []).filter((se) => !seriesToFilterOut[se.id])
-      if (!bookSeries.length) return
+      const allBookSeries = (libraryItem.media.series || []).filter((se) => !seriesToFilterOut[se.id])
+      if (!allBookSeries.length) return
 
-      bookSeries.forEach((bookSeriesObj) => {
-        // const series = allSeries.find(se => se.id === bookSeriesObj.id)
-
-        const abJson = libraryItem.toJSONMinified()
-        abJson.sequence = bookSeriesObj.sequence
+      allBookSeries.forEach((bookSeries) => {
+        const abJson = libraryItem.toOldJSONMinified()
+        abJson.sequence = bookSeries.bookSeries.sequence
         if (filterSeries) {
-          abJson.filterSeriesSequence = libraryItem.media.metadata.getSeries(filterSeries).sequence
+          const series = libraryItem.media.series.find((se) => se.id === filterSeries)
+          abJson.filterSeriesSequence = series.bookSeries.sequence
         }
-        if (!_series[bookSeriesObj.id]) {
-          _series[bookSeriesObj.id] = {
-            id: bookSeriesObj.id,
-            name: bookSeriesObj.name,
-            nameIgnorePrefix: getTitlePrefixAtEnd(bookSeriesObj.name),
-            nameIgnorePrefixSort: getTitleIgnorePrefix(bookSeriesObj.name),
+        if (!_series[bookSeries.id]) {
+          _series[bookSeries.id] = {
+            id: bookSeries.id,
+            name: bookSeries.name,
+            nameIgnorePrefix: getTitlePrefixAtEnd(bookSeries.name),
+            nameIgnorePrefixSort: getTitleIgnorePrefix(bookSeries.name),
             type: 'series',
             books: [abJson],
             totalDuration: isNullOrNaN(abJson.media.duration) ? 0 : Number(abJson.media.duration)
           }
         } else {
-          _series[bookSeriesObj.id].books.push(abJson)
-          _series[bookSeriesObj.id].totalDuration += isNullOrNaN(abJson.media.duration) ? 0 : Number(abJson.media.duration)
+          _series[bookSeries.id].books.push(abJson)
+          _series[bookSeries.id].totalDuration += isNullOrNaN(abJson.media.duration) ? 0 : Number(abJson.media.duration)
         }
       })
     })
@@ -52,6 +58,13 @@ module.exports = {
     })
   },
 
+  /**
+   *
+   * @param {import('../models/LibraryItem')[]} libraryItems
+   * @param {string} filterSeries - series id
+   * @param {boolean} hideSingleBookSeries
+   * @returns
+   */
   collapseBookSeries(libraryItems, filterSeries, hideSingleBookSeries) {
     // Get series from the library items. If this list is being collapsed after filtering for a series,
     // don't collapse that series, only books that are in other series.
@@ -123,8 +136,9 @@ module.exports = {
     let libraryItems = books
       .map((book) => {
         const libraryItem = book.libraryItem
+        delete book.libraryItem
         libraryItem.media = book
-        return Database.libraryItemModel.getOldLibraryItem(libraryItem)
+        return libraryItem
       })
       .filter((li) => {
         return user.checkCanAccessLibraryItem(li)
@@ -143,15 +157,18 @@ module.exports = {
     if (!payload.sortBy || payload.sortBy === 'sequence') {
       sortArray = [
         {
-          [direction]: (li) => li.media.metadata.getSeries(seriesId).sequence
+          [direction]: (li) => {
+            const series = li.media.series.find((se) => se.id === seriesId)
+            return series.bookSeries.sequence
+          }
         },
         {
           // If no series sequence then fallback to sorting by title (or collapsed series name for sub-series)
           [direction]: (li) => {
             if (sortingIgnorePrefix) {
-              return li.collapsedSeries?.nameIgnorePrefix || li.media.metadata.titleIgnorePrefix
+              return li.collapsedSeries?.nameIgnorePrefix || li.media.titleIgnorePrefix
             } else {
-              return li.collapsedSeries?.name || li.media.metadata.title
+              return li.collapsedSeries?.name || li.media.title
             }
           }
         }
@@ -174,9 +191,9 @@ module.exports = {
         [direction]: (li) => {
           if (payload.sortBy === 'media.metadata.title') {
             if (sortingIgnorePrefix) {
-              return li.collapsedSeries?.nameIgnorePrefix || li.media.metadata.titleIgnorePrefix
+              return li.collapsedSeries?.nameIgnorePrefix || li.media.titleIgnorePrefix
             } else {
-              return li.collapsedSeries?.name || li.media.metadata.title
+              return li.collapsedSeries?.name || li.media.title
             }
           } else {
             return payload.sortBy.split('.').reduce((a, b) => a[b], li)
@@ -194,12 +211,12 @@ module.exports = {
 
     return Promise.all(
       libraryItems.map(async (li) => {
-        const filteredSeries = li.media.metadata.getSeries(seriesId)
-        const json = li.toJSONMinified()
+        const filteredSeries = li.media.series.find((se) => se.id === seriesId)
+        const json = li.toOldJSONMinified()
         json.media.metadata.series = {
           id: filteredSeries.id,
           name: filteredSeries.name,
-          sequence: filteredSeries.sequence
+          sequence: filteredSeries.bookSeries.sequence
         }
 
         if (li.collapsedSeries) {
diff --git a/server/utils/migrations/dbMigration.js b/server/utils/migrations/dbMigration.js
index eb42c81c..1d4c4798 100644
--- a/server/utils/migrations/dbMigration.js
+++ b/server/utils/migrations/dbMigration.js
@@ -1200,7 +1200,7 @@ async function migrationPatchNewColumns(queryInterface) {
  */
 async function handleOldLibraryItems(ctx) {
   const oldLibraryItems = await oldDbFiles.loadOldData('libraryItems')
-  const libraryItems = (await ctx.models.libraryItem.findAllExpandedWhere()).map((li) => ctx.models.libraryItem.getOldLibraryItem(li))
+  const libraryItems = await ctx.models.libraryItem.findAllExpandedWhere()
 
   const bulkUpdateItems = []
   const bulkUpdateEpisodes = []
@@ -1218,8 +1218,8 @@ async function handleOldLibraryItems(ctx) {
         }
       })
 
-      if (libraryItem.media.episodes?.length && matchingOldLibraryItem.media.episodes?.length) {
-        for (const podcastEpisode of libraryItem.media.episodes) {
+      if (libraryItem.media.podcastEpisodes?.length && matchingOldLibraryItem.media.episodes?.length) {
+        for (const podcastEpisode of libraryItem.media.podcastEpisodes) {
           // Find matching old episode by audio file ino
           const matchingOldPodcastEpisode = matchingOldLibraryItem.media.episodes.find((oep) => oep.audioFile?.ino && oep.audioFile.ino === podcastEpisode.audioFile?.ino)
           if (matchingOldPodcastEpisode) {
diff --git a/server/utils/queries/libraryFilters.js b/server/utils/queries/libraryFilters.js
index 60c07805..5d5f0c83 100644
--- a/server/utils/queries/libraryFilters.js
+++ b/server/utils/queries/libraryFilters.js
@@ -415,7 +415,7 @@ module.exports = {
    * @param {import('../../models/User')} user
    * @param {number} limit
    * @param {number} offset
-   * @returns {Promise<{ libraryItems:import('../../objects/LibraryItem')[], count:number }>}
+   * @returns {Promise<{ libraryItems:import('../../models/LibraryItem')[], count:number }>}
    */
   async getLibraryItemsForAuthor(author, user, limit, offset) {
     const { libraryItems, count } = await libraryItemsBookFilters.getFilteredLibraryItems(author.libraryId, user, 'authors', author.id, 'addedAt', true, false, [], limit, offset)
diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js
index 0aaf6f4b..36241f33 100644
--- a/server/utils/queries/libraryItemsPodcastFilters.js
+++ b/server/utils/queries/libraryItemsPodcastFilters.js
@@ -297,7 +297,7 @@ module.exports = {
       delete podcast.libraryItem
       libraryItem.media = podcast
 
-      libraryItem.recentEpisode = ep.getOldPodcastEpisode(libraryItem.id).toJSON()
+      libraryItem.recentEpisode = ep.toOldJSON(libraryItem.id)
       return libraryItem
     })
 
@@ -460,13 +460,14 @@ module.exports = {
     })
 
     const episodeResults = episodes.map((ep) => {
-      const libraryItem = ep.podcast.libraryItem
-      libraryItem.media = ep.podcast
-      const oldPodcast = Database.podcastModel.getOldPodcast(libraryItem)
-      const oldPodcastEpisode = ep.getOldPodcastEpisode(libraryItem.id).toJSONExpanded()
-      oldPodcastEpisode.podcast = oldPodcast
-      oldPodcastEpisode.libraryId = libraryItem.libraryId
-      return oldPodcastEpisode
+      ep.podcast.podcastEpisodes = [] // Not needed
+      const oldPodcastJson = ep.podcast.toOldJSON(ep.podcast.libraryItem.id)
+
+      const oldPodcastEpisodeJson = ep.toOldJSONExpanded(ep.podcast.libraryItem.id)
+
+      oldPodcastEpisodeJson.podcast = oldPodcastJson
+      oldPodcastEpisodeJson.libraryId = ep.podcast.libraryItem.libraryId
+      return oldPodcastEpisodeJson
     })
 
     return episodeResults

From a1ec10bd0d9579cc644dda13327311906f362b5b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 6 Jan 2025 11:39:55 -0600
Subject: [PATCH 139/143] Fix sync request responding with 500 status code

---
 server/managers/PlaybackSessionManager.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/managers/PlaybackSessionManager.js b/server/managers/PlaybackSessionManager.js
index 25992f0a..76c140fd 100644
--- a/server/managers/PlaybackSessionManager.js
+++ b/server/managers/PlaybackSessionManager.js
@@ -343,20 +343,20 @@ class PlaybackSessionManager {
    * @param {import('../models/User')} user
    * @param {*} session
    * @param {*} syncData
-   * @returns
+   * @returns {Promise<boolean>}
    */
   async syncSession(user, session, syncData) {
     // TODO: Combine libraryItem query with library query
     const libraryItem = await Database.libraryItemModel.getExpandedById(session.libraryItemId)
     if (!libraryItem) {
       Logger.error(`[PlaybackSessionManager] syncSession Library Item not found "${session.libraryItemId}"`)
-      return null
+      return false
     }
 
     const library = await Database.libraryModel.findByPk(libraryItem.libraryId)
     if (!library) {
       Logger.error(`[PlaybackSessionManager] syncSession Library not found "${libraryItem.libraryId}"`)
-      return null
+      return false
     }
 
     session.currentTime = syncData.currentTime
@@ -382,6 +382,8 @@ class PlaybackSessionManager {
       })
     }
     this.saveSession(session)
+
+    return true
   }
 
   /**

From 977bdbf0bbacaa401751c1aadb42f2a731994cf8 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 6 Jan 2025 13:30:31 -0600
Subject: [PATCH 140/143] Fix podcast episode AudioTrack object

---
 server/models/PodcastEpisode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index c6a1b9fa..9eb14632 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -168,7 +168,7 @@ class PodcastEpisode extends Model {
   getAudioTrack(libraryItemId) {
     const track = structuredClone(this.audioFile)
     track.startOffset = 0
-    track.title = this.audioFile.metadata.title
+    track.title = this.audioFile.metadata.filename
     track.contentUrl = `${global.RouterBasePath}/api/items/${libraryItemId}/file/${track.ino}`
     return track
   }

From 0eed38b771778f8c7c5cec299e178d65c616e450 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Mon, 6 Jan 2025 14:32:10 -0600
Subject: [PATCH 141/143] Fix playback sessions num days listened in last year
 to be accurate for smaller screen sizes

---
 client/components/stats/Heatmap.vue | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/client/components/stats/Heatmap.vue b/client/components/stats/Heatmap.vue
index 4e491621..4fc8ca04 100644
--- a/client/components/stats/Heatmap.vue
+++ b/client/components/stats/Heatmap.vue
@@ -63,9 +63,6 @@ export default {
     dayOfWeekToday() {
       return new Date().getDay()
     },
-    firstWeekStart() {
-      return this.$addDaysToToday(-this.daysToShow)
-    },
     dayLabels() {
       return [
         {
@@ -198,12 +195,25 @@ export default {
       let minValue = 0
 
       const dates = []
-      for (let i = 0; i < this.daysToShow + 1; i++) {
-        const date = i === 0 ? this.firstWeekStart : this.$addDaysToDate(this.firstWeekStart, i)
+
+      const numDaysInTheLastYear = 52 * 7 + this.dayOfWeekToday
+      const firstDay = this.$addDaysToToday(-numDaysInTheLastYear)
+      for (let i = 0; i < numDaysInTheLastYear + 1; i++) {
+        const date = i === 0 ? firstDay : this.$addDaysToDate(firstDay, i)
         const dateString = this.$formatJsDate(date, 'yyyy-MM-dd')
+
+        if (this.daysListening[dateString] > 0) {
+          this.daysListenedInTheLastYear++
+        }
+
+        const visibleDayIndex = i - (numDaysInTheLastYear - this.daysToShow)
+        if (visibleDayIndex < 0) {
+          continue
+        }
+
         const dateObj = {
-          col: Math.floor(i / 7),
-          row: i % 7,
+          col: Math.floor(visibleDayIndex / 7),
+          row: visibleDayIndex % 7,
           date,
           dateString,
           datePretty: this.$formatJsDate(date, 'MMM d, yyyy'),
@@ -215,7 +225,6 @@ export default {
         dates.push(dateObj)
 
         if (dateObj.value > 0) {
-          this.daysListenedInTheLastYear++
           if (dateObj.value > maxValue) maxValue = dateObj.value
           if (!minValue || dateObj.value < minValue) minValue = dateObj.value
         }

From ed5960825b6e298d4f4ab14501dfc367182b65b2 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 7 Jan 2025 08:37:05 -0600
Subject: [PATCH 142/143] Fix podcast episode continue and listen again home
 page shelves

---
 server/models/LibraryItem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 4035630d..d581c309 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -337,7 +337,7 @@ class LibraryItem extends Model {
     const itemsInProgressPayload = await libraryFilters.getMediaItemsInProgress(library, user, include, limit, false)
     if (itemsInProgressPayload.items.length) {
       const ebookOnlyItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
-      const audioItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.numTracks)
+      const audioItemsInProgress = itemsInProgressPayload.items.filter((li) => li.media.numTracks || li.mediaType === 'podcast')
 
       if (audioItemsInProgress.length) {
         shelves.push({
@@ -448,7 +448,7 @@ class LibraryItem extends Model {
     const mediaFinishedPayload = await libraryFilters.getMediaFinished(library, user, include, limit)
     if (mediaFinishedPayload.items.length) {
       const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
-      const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks)
+      const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks || li.mediaType === 'podcast')
 
       if (audioItemsInProgress.length) {
         shelves.push({

From 8286aad7a4f66f1ffb50dbfa4747795552bfd11d Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Tue, 7 Jan 2025 09:05:53 -0600
Subject: [PATCH 143/143] Fix updating cover from match requests #3807

---
 server/controllers/LibraryItemController.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 3a4fb159..2e696ff0 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -266,7 +266,7 @@ class LibraryItemController {
    *
    * @param {LibraryItemControllerRequest} req
    * @param {Response} res
-   * @param {boolean} [updateAndReturnJson=true]
+   * @param {boolean} [updateAndReturnJson=true] - Allows the function to be used for both direct API calls and internally
    */
   async uploadCover(req, res, updateAndReturnJson = true) {
     if (!req.user.canUpload) {
@@ -291,11 +291,11 @@ class LibraryItemController {
       return res.status(500).send('Unknown error occurred')
     }
 
-    if (updateAndReturnJson) {
-      req.libraryItem.media.coverPath = result.cover
-      req.libraryItem.media.changed('coverPath', true)
-      await req.libraryItem.media.save()
+    req.libraryItem.media.coverPath = result.cover
+    req.libraryItem.media.changed('coverPath', true)
+    await req.libraryItem.media.save()
 
+    if (updateAndReturnJson) {
       // client uses updatedAt timestamp in URL to force refresh cover
       req.libraryItem.changed('updatedAt', true)
       await req.libraryItem.save()