c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-28 22:51:59 +00:00
Code Releases Activity

Move logic to asset deletion check

Browse source
This commit is contained in:
Jonathan Jogenfors 2024-12-19 14:48:43 +01:00
parent e8c5fcf64d
commit b6631cdf1f
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/src/services/asset.service.ts
View file

@ -188,7 +188,7 @@ export class AssetService extends BaseService {
name: JobName.ASSET_DELETION, name: JobName.ASSET_DELETION,
data: { data: {
id: asset.id, id: asset.id,
deleteOnDisk: true, deleteOnDisk: !asset.isOffline,
}, },
})), })),
); );
@ -250,17 +250,7 @@ export class AssetService extends BaseService {
const { thumbnailFile, previewFile } = getAssetFiles(asset.files); const { thumbnailFile, previewFile } = getAssetFiles(asset.files);
const files = [thumbnailFile?.path, previewFile?.path, asset.encodedVideoPath]; const files = [thumbnailFile?.path, previewFile?.path, asset.encodedVideoPath];
let willDelete = deleteOnDisk; if (deleteOnDisk) {
if (asset.isOffline) {
/* We don't want to delete an offline asset because it is either...
...missing from disk => don't delete the file since it doesn't exist where we expect
...outside of any import path => don't delete the file since we're not responsible for it
...matching an exclusion pattern => don't delete the file since we're not responsible for it */
willDelete = false;
}
if (willDelete) {
files.push(asset.sidecarPath, asset.originalPath); files.push(asset.sidecarPath, asset.originalPath);
} }