From 8cff68ca64069f93ecb2997042d42f69ef0c400b Mon Sep 17 00:00:00 2001 From: advplyr Date: Mon, 10 Jul 2023 17:00:31 -0500 Subject: [PATCH] Fix purge metadata/items paths --- server/Server.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/Server.js b/server/Server.js index 3d80e773..38a01022 100644 --- a/server/Server.js +++ b/server/Server.js @@ -251,15 +251,19 @@ class Server { let purged = 0 await Promise.all(foldersInItemsMetadata.map(async foldername => { - const hasMatchingItem = Database.libraryItems.find(ab => ab.id === foldername) - if (!hasMatchingItem) { - const folderPath = Path.join(itemsMetadata, foldername) - Logger.debug(`[Server] Purging unused metadata ${folderPath}`) + const itemFullPath = fileUtils.filePathToPOSIX(Path.join(itemsMetadata, foldername)) - await fs.remove(folderPath).then(() => { + const hasMatchingItem = Database.libraryItems.find(li => { + if (!li.media.coverPath) return false + return itemFullPath === fileUtils.filePathToPOSIX(Path.dirname(li.media.coverPath)) + }) + if (!hasMatchingItem) { + Logger.debug(`[Server] Purging unused metadata ${itemFullPath}`) + + await fs.remove(itemFullPath).then(() => { purged++ }).catch((err) => { - Logger.error(`[Server] Failed to delete folder path ${folderPath}`, err) + Logger.error(`[Server] Failed to delete folder path ${itemFullPath}`, err) }) } }))