Compare commits

..

No commits in common. "64cbf596094e4d51fc47cb75af7f0c35ede76816" and "c4c8b8d0f2e57e4f6861f75ee36e788dd1e84fac" have entirely different histories.

3 changed files with 7 additions and 9 deletions

View file

@ -462,7 +462,7 @@ class LibraryController {
} }
} }
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from folder "${folder.path}"`) Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from folder "${folder.path}"`)
await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id) await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
} }
if (authorIds.length) { if (authorIds.length) {
@ -563,7 +563,7 @@ class LibraryController {
mediaItemIds.push(libraryItem.mediaId) mediaItemIds.push(libraryItem.mediaId)
} }
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from library "${req.library.name}"`) Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from library "${req.library.name}"`)
await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id) await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
} }
// Set PlaybackSessions libraryId to null // Set PlaybackSessions libraryId to null
@ -714,7 +714,7 @@ class LibraryController {
} }
} }
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" with issue`) Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" with issue`)
await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id) await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
} }
if (authorIds.length) { if (authorIds.length) {

View file

@ -111,7 +111,7 @@ class LibraryItemController {
} }
} }
await this.handleDeleteLibraryItem(req.libraryItem.id, mediaItemIds, req.libraryItem.libraryId) await this.handleDeleteLibraryItem(req.libraryItem.id, mediaItemIds)
if (hardDelete) { if (hardDelete) {
Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`) Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`)
await fs.remove(libraryItemPath).catch((error) => { await fs.remove(libraryItemPath).catch((error) => {
@ -565,7 +565,7 @@ class LibraryItemController {
authorIds.push(...libraryItem.media.authors.map((au) => au.id)) authorIds.push(...libraryItem.media.authors.map((au) => au.id))
} }
} }
await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, libraryItem.libraryId) await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
if (hardDelete) { if (hardDelete) {
Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`) Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`)
await fs.remove(libraryItemPath).catch((error) => { await fs.remove(libraryItemPath).catch((error) => {

View file

@ -363,9 +363,8 @@ class ApiRouter {
* Remove library item and associated entities * Remove library item and associated entities
* @param {string} libraryItemId * @param {string} libraryItemId
* @param {string[]} mediaItemIds array of bookId or podcastEpisodeId * @param {string[]} mediaItemIds array of bookId or podcastEpisodeId
* @param {string} libraryId
*/ */
async handleDeleteLibraryItem(libraryItemId, mediaItemIds, libraryId) { async handleDeleteLibraryItem(libraryItemId, mediaItemIds) {
const numProgressRemoved = await Database.mediaProgressModel.destroy({ const numProgressRemoved = await Database.mediaProgressModel.destroy({
where: { where: {
mediaItemId: mediaItemIds mediaItemId: mediaItemIds
@ -396,8 +395,7 @@ class ApiRouter {
await Database.libraryItemModel.removeById(libraryItemId) await Database.libraryItemModel.removeById(libraryItemId)
SocketAuthority.emitter('item_removed', { SocketAuthority.emitter('item_removed', {
id: libraryItemId, id: libraryItemId
libraryId
}) })
} }