tbelway/immich-quadlet
1
0
Fork 0
forked from Cutlery/immich
Code Pull Requests Activity

test for import paths

Browse Source
This commit is contained in:
Jonathan Jogenfors 2024-03-20 08:01:56 +01:00
parent b288743707
commit 9a707874e4
2 changed files with 145 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
server/e2e/jobs/specs/library.e2e-spec.ts
View File

@ -35,48 +35,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
}); });
describe('POST /library/:id/scan', () => { describe('POST /library/:id/scan', () => {
it('should mark a rediscovered file as back online', async () => {
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
const library = await api.libraryApi.create(server, admin.accessToken, {
ownerId: admin.userId,
type: LibraryType.EXTERNAL,
importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const onlineAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(onlineAssets.length).toBeGreaterThan(1);
await fs.promises.rm(`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature/silver_fir.jpg`);
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(assets).toEqual(
expect.arrayContaining([
expect.objectContaining({
isOffline: false,
originalFileName: 'silver_fir.jpg',
}),
expect.objectContaining({
isOffline: false,
originalFileName: 'tanners_ridge.jpg',
}),
]),
);
});
it('should scan new files', async () => { it('should scan new files', async () => {
const library = await api.libraryApi.create(server, admin.accessToken, { const library = await api.libraryApi.create(server, admin.accessToken, {
ownerId: admin.userId, ownerId: admin.userId,
@ -246,9 +204,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
); );
}); });
}); });
});
describe('POST /library/:id/scanDeleted', () => {
it('should offline a missing file', async () => { it('should offline a missing file', async () => {
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, { await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true, recursive: true,
@ -284,6 +240,149 @@ describe(`${LibraryController.name} (e2e)`, () => {
]), ]),
); );
}); });
it('should offline a file on disk not in import paths', async () => {
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
await fs.promises.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/other`);
const library = await api.libraryApi.create(server, admin.accessToken, {
type: LibraryType.EXTERNAL,
ownerId: admin.userId,
importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}/albums`],
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const onlineAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(onlineAssets.length).toBeGreaterThan(1);
await api.libraryApi.setImportPaths(server, admin.accessToken, library.id, [
`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/other`,
]);
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(assets).toEqual(
expect.arrayContaining([
expect.objectContaining({
isOffline: true,
originalFileName: 'silver_fir.jpg',
}),
expect.objectContaining({
isOffline: true,
originalFileName: 'tanners_ridge.jpg',
}),
]),
);
});
it('should mark a rediscovered file as back online', async () => {
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
const library = await api.libraryApi.create(server, admin.accessToken, {
ownerId: admin.userId,
type: LibraryType.EXTERNAL,
importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const onlineAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(onlineAssets.length).toBeGreaterThan(1);
await fs.promises.rm(`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature/silver_fir.jpg`);
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(assets).toEqual(
expect.arrayContaining([
expect.objectContaining({
isOffline: false,
originalFileName: 'silver_fir.jpg',
}),
expect.objectContaining({
isOffline: false,
originalFileName: 'tanners_ridge.jpg',
}),
]),
);
});
it('should mark a rediscovered file in import paths as back online', async () => {
await fs.promises.cp(`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`, {
recursive: true,
});
await fs.promises.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/other`);
const library = await api.libraryApi.create(server, admin.accessToken, {
ownerId: admin.userId,
type: LibraryType.EXTERNAL,
importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/`],
});
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const initialAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(initialAssets.length).toBeGreaterThan(1);
await api.libraryApi.setImportPaths(server, admin.accessToken, library.id, [
`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/other`,
]);
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const offlineAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(offlineAssets).toEqual(
expect.arrayContaining([
expect.objectContaining({
isOffline: true,
originalFileName: 'silver_fir.jpg',
}),
expect.objectContaining({
isOffline: true,
originalFileName: 'tanners_ridge.jpg',
}),
]),
);
await api.libraryApi.setImportPaths(server, admin.accessToken, library.id, [
`${IMMICH_TEST_ASSET_TEMP_PATH}/albums/nature`,
]);
await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
const onlineAssets = await api.assetApi.getAllAssets(server, admin.accessToken);
expect(onlineAssets).toEqual(
expect.arrayContaining([
expect.objectContaining({
isOffline: false,
originalFileName: 'silver_fir.jpg',
}),
expect.objectContaining({
isOffline: false,
originalFileName: 'tanners_ridge.jpg',
}),
]),
);
});
}); });
describe('POST /library/:id/removeOffline', () => { describe('POST /library/:id/removeOffline', () => {

3
server/src/domain/library/library.service.ts
View File

@ -479,6 +479,7 @@ export class LibraryService extends EventEmitter {
sidecarPath = `${assetPath}.xmp`; sidecarPath = `${assetPath}.xmp`;
} }
// TODO: device asset id is deprecated, remove it
const deviceAssetId = `${basename(assetPath)}`.replaceAll(/\s+/g, ''); const deviceAssetId = `${basename(assetPath)}`.replaceAll(/\s+/g, '');
let assetId; let assetId;
@ -573,7 +574,7 @@ export class LibraryService extends EventEmitter {
return JobStatus.SUCCESS; return JobStatus.SUCCESS;
} }
// Check if an asset is has no file, marking it as offline // Check if an asset is has no file or is outside of import paths, marking it as offline
async handleOfflineCheck(job: IEntityJob): Promise<JobStatus> { async handleOfflineCheck(job: IEntityJob): Promise<JobStatus> {
const asset = await this.assetRepository.getById(job.id); const asset = await this.assetRepository.getById(job.id);