Merge master

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "2.17.2",
+  "version": "2.17.3",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast client",
   "main": "index.js",

client/strings/de.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Erlaube das Überschreiben bestehender Details für die ausgewählten Hörbücher, wenn eine Übereinstimmung gefunden wird",
   "LabelUpdatedAt": "Aktualisiert am",
   "LabelUploaderDragAndDrop": "Ziehen und Ablegen von Dateien oder Ordnern",
+  "LabelUploaderDragAndDropFilesOnly": "Dateien per Drag & Drop hierher ziehen",
   "LabelUploaderDropFiles": "Dateien löschen",
   "LabelUploaderItemFetchMetadataHelp": "Automatisches Aktualisieren von Titel, Autor und Serie",
   "LabelUseAdvancedOptions": "Nutze Erweiterte Optionen",

client/strings/es.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Permitir sobrescribir detalles existentes de los libros seleccionados cuando sean encontrados",
   "LabelUpdatedAt": "Actualizado En",
   "LabelUploaderDragAndDrop": "Arrastre y suelte archivos o carpetas",
+  "LabelUploaderDragAndDropFilesOnly": "Arrastrar y soltar archivos",
   "LabelUploaderDropFiles": "Suelte los Archivos",
   "LabelUploaderItemFetchMetadataHelp": "Buscar título, autor y series automáticamente",
   "LabelUseAdvancedOptions": "Usar opciones avanzadas",

client/strings/fr.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Autoriser la mise à jour des détails existants lorsqu’une correspondance est trouvée",
   "LabelUpdatedAt": "Mis à jour à",
   "LabelUploaderDragAndDrop": "Glisser et déposer des fichiers ou dossiers",
+  "LabelUploaderDragAndDropFilesOnly": "Glisser & déposer des fichiers",
   "LabelUploaderDropFiles": "Déposer des fichiers",
   "LabelUploaderItemFetchMetadataHelp": "Récupérer automatiquement le titre, l’auteur et la série",
   "LabelUseAdvancedOptions": "Utiliser les options avancées",
@@ -869,10 +870,10 @@
   "MessageTaskScanningFileChanges": "Analyse des modifications du fichier dans « {0} »",
   "MessageTaskScanningLibrary": "Analyse de la bibliothèque « {0} »",
   "MessageTaskTargetDirectoryNotWritable": "Le répertoire cible n’est pas accessible en écriture",
-  "MessageThinking": "Je cherche…",
+  "MessageThinking": "À la recherche de…",
   "MessageUploaderItemFailed": "Échec du téléversement",
   "MessageUploaderItemSuccess": "Téléversement effectué !",
-  "MessageUploading": "Téléversement…",
+  "MessageUploading": "Téléchargement…",
   "MessageValidCronExpression": "Expression cron valide",
   "MessageWatcherIsDisabledGlobally": "La surveillance est désactivée par un paramètre global du serveur",
   "MessageXLibraryIsEmpty": "La bibliothèque {0} est vide !",

client/strings/hr.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Dopusti prepisivanje postojećih podataka za odabrane knjige kada se prepoznaju",
   "LabelUpdatedAt": "Ažurirano",
   "LabelUploaderDragAndDrop": "Pritisni i prevuci datoteke ili mape",
+  "LabelUploaderDragAndDropFilesOnly": "Pritisni i prevuci datoteke",
   "LabelUploaderDropFiles": "Ispusti datoteke",
   "LabelUploaderItemFetchMetadataHelp": "Automatski dohvati naslov, autora i serijal",
   "LabelUseAdvancedOptions": "Koristi se naprednim opcijama",

client/strings/ru.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Позволяет перезаписывать текущие подробности для выбранных книг если будут найдены",
   "LabelUpdatedAt": "Обновлено в",
   "LabelUploaderDragAndDrop": "Перетащите файлы или каталоги",
+  "LabelUploaderDragAndDropFilesOnly": "Перетаскивание файлов",
   "LabelUploaderDropFiles": "Перетащите файлы",
   "LabelUploaderItemFetchMetadataHelp": "Автоматическое извлечение названия, автора и серии",
   "LabelUseAdvancedOptions": "Используйте расширенные опции",

client/strings/sl.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Dovoli prepisovanje obstoječih podrobnosti za izbrane knjige, ko se najde ujemanje",
   "LabelUpdatedAt": "Posodobljeno ob",
   "LabelUploaderDragAndDrop": "Povleci in spusti datoteke ali mape",
+  "LabelUploaderDragAndDropFilesOnly": "Povleci in spusti datoteke",
   "LabelUploaderDropFiles": "Spusti datoteke",
   "LabelUploaderItemFetchMetadataHelp": "Samodejno pridobi naslov, avtorja in serijo",
   "LabelUseAdvancedOptions": "Uporabi napredne možnosti",

client/strings/uk.json

@@ -663,6 +663,7 @@
   "LabelUpdateDetailsHelp": "Дозволити перезапис наявних подробиць обраних книг після віднайдення",
   "LabelUpdatedAt": "Оновлення",
   "LabelUploaderDragAndDrop": "Перетягніть файли або теки",
+  "LabelUploaderDragAndDropFilesOnly": "Перетягніть і скиньте файли",
   "LabelUploaderDropFiles": "Перетягніть файли",
   "LabelUploaderItemFetchMetadataHelp": "Автоматично шукати назву, автора та серію",
   "LabelUseAdvancedOptions": "Використовувати розширені налаштування",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "2.17.2",
+  "version": "2.17.3",
   "buildNumber": 1,
   "description": "Self-hosted audiobook and podcast server",
   "main": "index.js",

server/controllers/LibraryController.js

@@ -400,19 +400,48 @@ class LibraryController {
                   model: Database.podcastEpisodeModel,
                   attributes: ['id']
                 }
+              },
+              {
+                model: Database.bookModel,
+                attributes: ['id'],
+                include: [
+                  {
+                    model: Database.bookAuthorModel,
+                    attributes: ['authorId']
+                  },
+                  {
+                    model: Database.bookSeriesModel,
+                    attributes: ['seriesId']
+                  }
+                ]
               }
             ]
           })
           Logger.info(`[LibraryController] Removed folder "${folder.path}" from library "${req.library.name}" with ${libraryItemsInFolder.length} library items`)
+          const seriesIds = []
+          const authorIds = []
           for (const libraryItem of libraryItemsInFolder) {
             let mediaItemIds = []
             if (req.library.isPodcast) {
               mediaItemIds = libraryItem.media.podcastEpisodes.map((pe) => pe.id)
             } else {
               mediaItemIds.push(libraryItem.mediaId)
+              if (libraryItem.media.bookAuthors.length) {
+                authorIds.push(...libraryItem.media.bookAuthors.map((ba) => ba.authorId))
+              }
+              if (libraryItem.media.bookSeries.length) {
+                seriesIds.push(...libraryItem.media.bookSeries.map((bs) => bs.seriesId))
+              }
             }
             Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from folder "${folder.path}"`)
-            await this.handleDeleteLibraryItem(libraryItem.mediaType, libraryItem.id, mediaItemIds)
+            await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
+          }
+
+          if (authorIds.length) {
+            await this.checkRemoveAuthorsWithNoBooks(authorIds)
+          }
+          if (seriesIds.length) {
+            await this.checkRemoveEmptySeries(seriesIds)
           }
 
           // Remove folder
@@ -501,7 +530,7 @@ class LibraryController {
         mediaItemIds.push(libraryItem.mediaId)
       }
       Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from library "${req.library.name}"`)
-      await this.handleDeleteLibraryItem(libraryItem.mediaType, libraryItem.id, mediaItemIds)
+      await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
     }
 
     // Set PlaybackSessions libraryId to null
@@ -580,6 +609,8 @@ class LibraryController {
    * DELETE: /api/libraries/:id/issues
    * Remove all library items missing or invalid
    *
+   * @this {import('../routers/ApiRouter')}
+   *
    * @param {LibraryControllerRequest} req
    * @param {Response} res
    */
@@ -605,6 +636,20 @@ class LibraryController {
             model: Database.podcastEpisodeModel,
             attributes: ['id']
           }
+        },
+        {
+          model: Database.bookModel,
+          attributes: ['id'],
+          include: [
+            {
+              model: Database.bookAuthorModel,
+              attributes: ['authorId']
+            },
+            {
+              model: Database.bookSeriesModel,
+              attributes: ['seriesId']
+            }
+          ]
         }
       ]
     })
@@ -615,15 +660,30 @@ class LibraryController {
     }
 
     Logger.info(`[LibraryController] Removing ${libraryItemsWithIssues.length} items with issues`)
+    const authorIds = []
+    const seriesIds = []
     for (const libraryItem of libraryItemsWithIssues) {
       let mediaItemIds = []
       if (req.library.isPodcast) {
         mediaItemIds = libraryItem.media.podcastEpisodes.map((pe) => pe.id)
       } else {
         mediaItemIds.push(libraryItem.mediaId)
+        if (libraryItem.media.bookAuthors.length) {
+          authorIds.push(...libraryItem.media.bookAuthors.map((ba) => ba.authorId))
+        }
+        if (libraryItem.media.bookSeries.length) {
+          seriesIds.push(...libraryItem.media.bookSeries.map((bs) => bs.seriesId))
+        }
       }
       Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" with issue`)
-      await this.handleDeleteLibraryItem(libraryItem.mediaType, libraryItem.id, mediaItemIds)
+      await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
+    }
+
+    if (authorIds.length) {
+      await this.checkRemoveAuthorsWithNoBooks(authorIds)
+    }
+    if (seriesIds.length) {
+      await this.checkRemoveEmptySeries(seriesIds)
     }
 
     // Set numIssues to 0 for library filter data