github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-18 03:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/immich-app/immich into feat/crawl-wrapper

Browse Source
This commit is contained in:
Jonathan Jogenfors
2026-02-18 22:13:48 +01:00
parent f812c5846a 227ff70b6e
commit ee2c3e14c3
140 changed files with 2950 additions and 2373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/test/medium/specs/repositories/storage.repository.spec.ts
+11 -8
View File
@@ -30,14 +30,14 @@ const createTestFiles = async (basePath: string, files: string[]) => {
const tests: Test[] = [
{
test: 'should return empty when crawling an empty path list',
test: 'should return empty when walking an empty path list',
options: {
pathsToWalk: [],
},
files: {},
},
{
test: 'should crawl a single path',
test: 'should walk a single path',
options: {
pathsToWalk: ['/photos/'],
},
@@ -80,11 +80,11 @@ const tests: Test[] = [
'/photos/raw/image.jpg': false,
'/photos/raw2/image.jpg': true,
'/photos/folder/raw/image.jpg': false,
'/photos/crawl/image.jpg': true,
'/photos/walk/image.jpg': true,
},
},
{
test: 'should crawl multiple paths',
test: 'should walk multiple paths',
options: {
pathsToWalk: ['/photos/', '/images/', '/albums/'],
},
@@ -95,7 +95,7 @@ const tests: Test[] = [
},
},
{
test: 'should crawl a single path without trailing slash',
test: 'should walk a single path without trailing slash',
options: {
pathsToWalk: ['/photos'],
},
@@ -104,7 +104,7 @@ const tests: Test[] = [
},
},
{
test: 'should crawl a single path',
test: 'should walk a single path',
options: {
pathsToWalk: ['/photos/'],
},
@@ -206,7 +206,7 @@ describe(StorageRepository.name, () => {
({ sut } = setup());
});
describe('crawl', () => {
describe('walk', () => {
for (const { test, options, files } of tests) {
describe(test, () => {
const fileList = Object.keys(files);
@@ -227,7 +227,10 @@ describe(StorageRepository.name, () => {
pathsToWalk: options.pathsToWalk.map((p) => path.join(tempDir, p.replace(/^\//, ''))),
};
const actual = await sut.walk(adjustedOptions);
const actual: string[] = [];
for await (const batch of sut.walk(adjustedOptions)) {
actual.push(...batch);
}
const expected = Object.entries(files)
.filter((entry) => entry[1])
.map(([file]) => path.join(tempDir, file.replace(/^\//, '')));
server/test/medium/specs/services/asset.service.spec.ts
+56 -2
View File
@@ -398,6 +398,23 @@ describe(AssetService.name, () => {
}),
);
});
it('should update dateTimeOriginal with time zone UTC+0', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queue.mockResolvedValue();
const { user } = await ctx.newUser();
const auth = factory.auth({ user });
const { asset } = await ctx.newAsset({ ownerId: user.id });
await ctx.newExif({ assetId: asset.id, description: 'test', timeZone: 'UTC-7' });
await sut.update(auth, asset.id, { dateTimeOriginal: '2023-11-19T18:11:00.000Z' });
await expect(ctx.get(AssetRepository).getById(asset.id, { exifInfo: true })).resolves.toEqual(
expect.objectContaining({
exifInfo: expect.objectContaining({ dateTimeOriginal: '2023-11-19T18:11:00+00:00', timeZone: 'UTC' }),
}),
);
});
});
describe('updateAll', () => {
@@ -456,7 +473,7 @@ describe(AssetService.name, () => {
);
});
it('should relatively update an assets with timezone', async () => {
it('should relatively update assets with timezone', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queueAll.mockResolvedValue();
const { user } = await ctx.newUser();
@@ -477,7 +494,7 @@ describe(AssetService.name, () => {
);
});
it('should relatively update an assets and set a timezone', async () => {
it('should relatively update assets and set a timezone', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queueAll.mockResolvedValue();
const { user } = await ctx.newUser();
@@ -497,6 +514,26 @@ describe(AssetService.name, () => {
);
});
it('should set asset time zones to UTC', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queueAll.mockResolvedValue();
const { user } = await ctx.newUser();
const auth = factory.auth({ user });
const { asset } = await ctx.newAsset({ ownerId: user.id });
await ctx.newExif({ assetId: asset.id, dateTimeOriginal: '2023-11-19T18:11:00', timeZone: 'UTC-7' });
await sut.updateAll(auth, { ids: [asset.id], timeZone: 'UTC' });
await expect(ctx.get(AssetRepository).getById(asset.id, { exifInfo: true })).resolves.toEqual(
expect.objectContaining({
exifInfo: expect.objectContaining({
dateTimeOriginal: '2023-11-19T18:11:00+00:00',
timeZone: 'UTC',
}),
}),
);
});
it('should update dateTimeOriginal', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queueAll.mockResolvedValue();
@@ -530,6 +567,23 @@ describe(AssetService.name, () => {
}),
);
});
it('should update dateTimeOriginal with UTC time zone', async () => {
const { sut, ctx } = setup();
ctx.getMock(JobRepository).queueAll.mockResolvedValue();
const { user } = await ctx.newUser();
const auth = factory.auth({ user });
const { asset } = await ctx.newAsset({ ownerId: user.id });
await ctx.newExif({ assetId: asset.id, description: 'test', timeZone: 'UTC-7' });
await sut.updateAll(auth, { ids: [asset.id], dateTimeOriginal: '2023-11-19T18:11:00.000Z' });
await expect(ctx.get(AssetRepository).getById(asset.id, { exifInfo: true })).resolves.toEqual(
expect.objectContaining({
exifInfo: expect.objectContaining({ dateTimeOriginal: '2023-11-19T18:11:00+00:00', timeZone: 'UTC' }),
}),
);
});
});
describe('upsertBulkMetadata', () => {