fix(server): check if sidecarPath exists (#6293)

* check if sidecarPath exists

* Revert "check if sidecarPath exists"

This reverts commit 954a1097b870585afee34974d466e51c5172fed9.

* sidecar sync remove dead sidecarPaths and discover new ones

* tests and minor cleanup

* chore: linting

---------

Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Jan
2024-02-07 18:30:38 +01:00
committed by GitHub
parent cab79c04d3
commit 4ea15a5b0c
3 changed files with 81 additions and 27 deletions
+37 -20
View File
@@ -25,7 +25,6 @@ import {
IStorageRepository,
ISystemConfigRepository,
ImmichTags,
WithProperty,
WithoutProperty,
} from '../repositories';
import { StorageCore } from '../storage';
@@ -267,7 +266,7 @@ export class MetadataService {
const { force } = job;
const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) => {
return force
? this.assetRepository.getWith(pagination, WithProperty.SIDECAR)
? this.assetRepository.getAll(pagination)
: this.assetRepository.getWithout(pagination, WithoutProperty.SIDECAR);
});
@@ -283,26 +282,12 @@ export class MetadataService {
return true;
}
async handleSidecarSync() {
// TODO: optimize to only queue assets with recent xmp changes
return true;
handleSidecarSync({ id }: IEntityJob) {
return this.processSidecar(id, true);
}
async handleSidecarDiscovery({ id }: IEntityJob) {
const [asset] = await this.assetRepository.getByIds([id]);
if (!asset || !asset.isVisible || asset.sidecarPath) {
return false;
}
const sidecarPath = `${asset.originalPath}.xmp`;
const exists = await this.storageRepository.checkFileExists(sidecarPath, constants.R_OK);
if (!exists) {
return false;
}
await this.assetRepository.save({ id: asset.id, sidecarPath });
return true;
handleSidecarDiscovery({ id }: IEntityJob) {
return this.processSidecar(id, false);
}
async handleSidecarWrite(job: ISidecarWriteJob) {
@@ -565,4 +550,36 @@ export class MetadataService {
return Duration.fromObject({ seconds: _seconds }).toFormat('hh:mm:ss.SSS');
}
private async processSidecar(id: string, isSync: boolean) {
const [asset] = await this.assetRepository.getByIds([id]);
if (!asset) {
return false;
}
if (isSync && !asset.sidecarPath) {
return false;
}
if (!isSync && (!asset.isVisible || asset.sidecarPath)) {
return false;
}
const sidecarPath = `${asset.originalPath}.xmp`;
const exists = await this.storageRepository.checkFileExists(sidecarPath, constants.R_OK);
if (exists) {
await this.assetRepository.save({ id: asset.id, sidecarPath });
return true;
}
if (!isSync) {
return false;
}
this.logger.debug(`Sidecar File '${sidecarPath}' was not found, removing sidecarPath for asset ${asset.id}`);
await this.assetRepository.save({ id: asset.id, sidecarPath: null });
return true;
}
}