wip first working version

format

docker/docker-compose.yml

@@ -60,12 +60,12 @@ services:
 
   redis:
     container_name: immich_redis
-    image: registry.hub.docker.com/library/redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
+    image: redis:6.2-alpine@sha256:51d6c56749a4243096327e3fb964a48ed92254357108449cb6e23999c37773c5
     restart: always
 
   database:
     container_name: immich_postgres
-    image: registry.hub.docker.com/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+    image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}

docs/docs/features/libraries.md

@@ -88,7 +88,10 @@ Some basic examples:
 
 This feature - currently hidden in the config file - is considered experimental and for advanced users only. If enabled, it will allow automatic watching of the filesystem which means new assets are automatically imported to Immich without needing to rescan. Deleted assets are, as always, marked as offline and can be removed with the "Remove offline files" button.
 
-If your photos are on a network drive, automatic file watching likely won't work. In that case, you will have to rely on a periodic library refresh to pull in your changes.
+If your photos are on a network drive you will likely have to enable filesystem polling. The performance hit for polling large libraries is currently unknown, feel free to test this feature and report back. In addition to the boolean feature flag, the configuration file allows customization of the following parameters, please see the [chokidar documentation](https://github.com/paulmillr/chokidar?tab=readme-ov-file#performance) for reference.
+
+- `usePolling` (default: `false`).
+- `interval`. (default: 10000). When using polling, this is how often (in milliseconds) the filesystem is polled.
 
 ### Nightly job
 

e2e/package-lock.json

@@ -17,7 +17,6 @@
         "@types/pg": "^8.11.0",
         "@types/supertest": "^6.0.2",
         "@vitest/coverage-v8": "^1.3.0",
-        "exiftool-vendored": "^24.5.0",
         "luxon": "^3.4.4",
         "pg": "^8.11.3",
         "socket.io-client": "^4.7.4",
@@ -595,12 +594,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@photostructure/tz-lookup": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-9.0.2.tgz",
-      "integrity": "sha512-H8+tTt7ilJNkFyb+QgPnLEGUjQzGwiMb9n7lwRZNBgSKL3VZs9AkjI1E//FcwPjNafwAH932U92+xTqJiF3Bbw==",
-      "dev": true
-    },
     "node_modules/@playwright/test": {
       "version": "1.41.2",
       "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.41.2.tgz",
@@ -1081,15 +1074,6 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
-    "node_modules/batch-cluster": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/batch-cluster/-/batch-cluster-13.0.0.tgz",
-      "integrity": "sha512-EreW0Vi8TwovhYUHBXXRA5tthuU2ynGsZFlboyMJHCCUXYa2AjgwnE3ubBOJs2xJLcuXFJbi6c/8pH5+FVj8Og==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1407,43 +1391,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/exiftool-vendored": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-24.5.0.tgz",
-      "integrity": "sha512-uLGYfeshak3mYn2ucCsebXfNFdOpeAULlMb84wiJv+4B236n+ypgK/vr8bJgAcsIPSRJXFSz9WonvjjQYYqR3w==",
-      "dev": true,
-      "dependencies": {
-        "@photostructure/tz-lookup": "^9.0.1",
-        "@types/luxon": "^3.4.2",
-        "batch-cluster": "^13.0.0",
-        "he": "^1.2.0",
-        "luxon": "^3.4.4"
-      },
-      "optionalDependencies": {
-        "exiftool-vendored.exe": "12.76.0",
-        "exiftool-vendored.pl": "12.76.0"
-      }
-    },
-    "node_modules/exiftool-vendored.exe": {
-      "version": "12.76.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.76.0.tgz",
-      "integrity": "sha512-lbKPPs31qpjnhFiMRaVxJX+iNcJ+p0NrRSFLHHaX6KTsfMba6e5i6NykSvU3wMiafzUTef1Fen3XQ+8n1tjjNw==",
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/exiftool-vendored.pl": {
-      "version": "12.76.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.76.0.tgz",
-      "integrity": "sha512-4DxqgnvL71YziVoY27ZMgVfLAWDH3pQLljuV5+ffTnTPvz/BWeV+/bVFwRvDqCD3lkCWds0YfVcsycfJgbQ5fA==",
-      "dev": true,
-      "optional": true,
-      "os": [
-        "!win32"
-      ]
-    },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
@@ -1637,15 +1584,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
     "node_modules/hexoid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",

e2e/package.json

@@ -21,7 +21,6 @@
     "@types/pg": "^8.11.0",
     "@types/supertest": "^6.0.2",
     "@vitest/coverage-v8": "^1.3.0",
-    "exiftool-vendored": "^24.5.0",
     "luxon": "^3.4.4",
     "pg": "^8.11.3",
     "socket.io-client": "^4.7.4",

e2e/src/api/specs/asset.e2e-spec.ts

@@ -1,39 +1,16 @@
 import {
   AssetFileUploadResponseDto,
   AssetResponseDto,
-  AssetTypeEnum,
   LoginResponseDto,
   SharedLinkType,
 } from '@immich/sdk';
-import { exiftool } from 'exiftool-vendored';
 import { DateTime } from 'luxon';
-import { createHash } from 'node:crypto';
-import { readFile, writeFile } from 'node:fs/promises';
-import { basename, join } from 'node:path';
 import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
-import {
-  apiUtils,
-  app,
-  dbUtils,
-  tempDir,
-  testAssetDir,
-  wsUtils,
-} from 'src/utils';
+import { apiUtils, app, dbUtils } from 'src/utils';
 import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-const locationAssetFilepath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
-
-const sha1 = (bytes: Buffer) =>
-  createHash('sha1').update(bytes).digest('base64');
-
-const readTags = async (bytes: Buffer, filename: string) => {
-  const filepath = join(tempDir, filename);
-  await writeFile(filepath, bytes);
-  return exiftool.read(filepath);
-};
+import { beforeAll, describe, expect, it } from 'vitest';
 
 const today = DateTime.fromObject({
   year: 2023,
@@ -47,36 +24,25 @@ describe('/asset', () => {
   let user1: LoginResponseDto;
   let user2: LoginResponseDto;
   let userStats: LoginResponseDto;
-  let user1Assets: AssetFileUploadResponseDto[];
-  let user2Assets: AssetFileUploadResponseDto[];
-  let assetLocation: AssetFileUploadResponseDto;
+  let asset1: AssetFileUploadResponseDto;
+  let asset2: AssetFileUploadResponseDto;
+  let asset3: AssetFileUploadResponseDto;
+  let asset4: AssetFileUploadResponseDto; // user2 asset
+  let asset5: AssetFileUploadResponseDto;
+  let asset6: AssetFileUploadResponseDto;
   let ws: Socket;
 
   beforeAll(async () => {
     apiUtils.setup();
     await dbUtils.reset();
     admin = await apiUtils.adminSetup({ onboarding: false });
-
-    [ws, user1, user2, userStats] = await Promise.all([
-      wsUtils.connect(admin.accessToken),
+    [user1, user2, userStats] = await Promise.all([
       apiUtils.userSetup(admin.accessToken, createUserDto.user1),
       apiUtils.userSetup(admin.accessToken, createUserDto.user2),
       apiUtils.userSetup(admin.accessToken, createUserDto.user3),
     ]);
 
-    // asset location
-    assetLocation = await apiUtils.createAsset(
-      admin.accessToken,
-      {},
-      {
-        filename: 'thompson-springs.jpg',
-        bytes: await readFile(locationAssetFilepath),
-      },
-    );
-
-    await wsUtils.waitForEvent({ event: 'upload', assetId: assetLocation.id });
-
-    user1Assets = await Promise.all([
+    [asset1, asset2, asset3, asset4, asset5, asset6] = await Promise.all([
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(
@@ -90,13 +56,10 @@ describe('/asset', () => {
         },
         { filename: 'example.mp4' },
       ),
+      apiUtils.createAsset(user2.accessToken),
       apiUtils.createAsset(user1.accessToken),
       apiUtils.createAsset(user1.accessToken),
-    ]);
 
-    user2Assets = await Promise.all([apiUtils.createAsset(user2.accessToken)]);
-
-    await Promise.all([
       // stats
       apiUtils.createAsset(userStats.accessToken),
       apiUtils.createAsset(userStats.accessToken, { isFavorite: true }),
@@ -114,14 +77,7 @@ describe('/asset', () => {
     const person1 = await apiUtils.createPerson(user1.accessToken, {
       name: 'Test Person',
     });
-    await dbUtils.createFace({
-      assetId: user1Assets[0].id,
-      personId: person1.id,
-    });
-  }, 30_000);
-
-  afterAll(() => {
-    wsUtils.disconnect(ws);
+    await dbUtils.createFace({ assetId: asset1.id, personId: person1.id });
   });
 
   describe('GET /asset/:id', () => {
@@ -143,7 +99,7 @@ describe('/asset', () => {
 
     it('should require access', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user2Assets[0].id}`)
+        .get(`/asset/${asset4.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.noPermission);
@@ -151,33 +107,33 @@ describe('/asset', () => {
 
     it('should get the asset info', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user1Assets[0].id}`)
+        .get(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(200);
-      expect(body).toMatchObject({ id: user1Assets[0].id });
+      expect(body).toMatchObject({ id: asset1.id });
     });
 
     it('should work with a shared link', async () => {
       const sharedLink = await apiUtils.createSharedLink(user1.accessToken, {
         type: SharedLinkType.Individual,
-        assetIds: [user1Assets[0].id],
+        assetIds: [asset1.id],
       });
 
       const { status, body } = await request(app).get(
-        `/asset/${user1Assets[0].id}?key=${sharedLink.key}`,
+        `/asset/${asset1.id}?key=${sharedLink.key}`,
       );
       expect(status).toBe(200);
-      expect(body).toMatchObject({ id: user1Assets[0].id });
+      expect(body).toMatchObject({ id: asset1.id });
     });
 
     it('should not send people data for shared links for un-authenticated users', async () => {
       const { status, body } = await request(app)
-        .get(`/asset/${user1Assets[0].id}`)
+        .get(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
 
       expect(status).toEqual(200);
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         isFavorite: false,
         people: [
           {
@@ -192,11 +148,11 @@ describe('/asset', () => {
 
       const sharedLink = await apiUtils.createSharedLink(user1.accessToken, {
         type: SharedLinkType.Individual,
-        assetIds: [user1Assets[0].id],
+        assetIds: [asset1.id],
       });
 
       const data = await request(app).get(
-        `/asset/${user1Assets[0].id}?key=${sharedLink.key}`,
+        `/asset/${asset1.id}?key=${sharedLink.key}`,
       );
       expect(data.status).toBe(200);
       expect(data.body).toMatchObject({ people: [] });
@@ -290,11 +246,11 @@ describe('/asset', () => {
       const assets: AssetResponseDto[] = body;
       expect(assets.length).toBe(1);
       expect(assets[0].ownerId).toBe(user1.userId);
-
-      // assets owned by user1
-      expect([user1Assets.map(({ id }) => id)]).toContain(assets[0].id);
+      //
       // assets owned by user2
-      expect([user1Assets.map(({ id }) => id)]).not.toContain(assets[0].id);
+      expect(assets[0].id).not.toBe(asset4.id);
+      // assets owned by user1
+      expect([asset1.id, asset2.id, asset3.id]).toContain(assets[0].id);
     });
 
     it.each(Array(10))('should return 2 random assets', async () => {
@@ -310,9 +266,9 @@ describe('/asset', () => {
       for (const asset of assets) {
         expect(asset.ownerId).toBe(user1.userId);
         // assets owned by user1
-        expect([user1Assets.map(({ id }) => id)]).toContain(asset.id);
+        expect([asset1.id, asset2.id, asset3.id]).toContain(asset.id);
         // assets owned by user2
-        expect([user2Assets.map(({ id }) => id)]).not.toContain(asset.id);
+        expect(asset.id).not.toBe(asset4.id);
       }
     });
 
@@ -324,9 +280,7 @@ describe('/asset', () => {
           .set('Authorization', `Bearer ${user2.accessToken}`);
 
         expect(status).toBe(200);
-        expect(body).toEqual([
-          expect.objectContaining({ id: user2Assets[0].id }),
-        ]);
+        expect(body).toEqual([expect.objectContaining({ id: asset4.id })]);
       },
     );
 
@@ -358,50 +312,44 @@ describe('/asset', () => {
 
     it('should require access', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user2Assets[0].id}`)
+        .put(`/asset/${asset4.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`);
       expect(status).toBe(400);
       expect(body).toEqual(errorDto.noPermission);
     });
 
     it('should favorite an asset', async () => {
-      const before = await apiUtils.getAssetInfo(
-        user1.accessToken,
-        user1Assets[0].id,
-      );
+      const before = await apiUtils.getAssetInfo(user1.accessToken, asset1.id);
       expect(before.isFavorite).toBe(false);
 
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isFavorite: true });
-      expect(body).toMatchObject({ id: user1Assets[0].id, isFavorite: true });
+      expect(body).toMatchObject({ id: asset1.id, isFavorite: true });
       expect(status).toEqual(200);
     });
 
     it('should archive an asset', async () => {
-      const before = await apiUtils.getAssetInfo(
-        user1.accessToken,
-        user1Assets[0].id,
-      );
+      const before = await apiUtils.getAssetInfo(user1.accessToken, asset1.id);
       expect(before.isArchived).toBe(false);
 
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isArchived: true });
-      expect(body).toMatchObject({ id: user1Assets[0].id, isArchived: true });
+      expect(body).toMatchObject({ id: asset1.id, isArchived: true });
       expect(status).toEqual(200);
     });
 
     it('should update date time original', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ dateTimeOriginal: '2023-11-19T18:11:00.000-07:00' });
 
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({
           dateTimeOriginal: '2023-11-20T01:11:00.000Z',
         }),
@@ -423,7 +371,7 @@ describe('/asset', () => {
         { latitude: 12, longitude: 181 },
       ]) {
         const { status, body } = await request(app)
-          .put(`/asset/${user1Assets[0].id}`)
+          .put(`/asset/${asset1.id}`)
           .send(test)
           .set('Authorization', `Bearer ${user1.accessToken}`);
         expect(status).toBe(400);
@@ -433,12 +381,12 @@ describe('/asset', () => {
 
     it('should update gps data', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ latitude: 12, longitude: 12 });
 
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({ latitude: 12, longitude: 12 }),
       });
       expect(status).toEqual(200);
@@ -446,11 +394,11 @@ describe('/asset', () => {
 
     it('should set the description', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ description: 'Test asset description' });
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         exifInfo: expect.objectContaining({
           description: 'Test asset description',
         }),
@@ -460,12 +408,12 @@ describe('/asset', () => {
 
     it('should return tagged people', async () => {
       const { status, body } = await request(app)
-        .put(`/asset/${user1Assets[0].id}`)
+        .put(`/asset/${asset1.id}`)
         .set('Authorization', `Bearer ${user1.accessToken}`)
         .send({ isFavorite: true });
       expect(status).toEqual(200);
       expect(body).toMatchObject({
-        id: user1Assets[0].id,
+        id: asset1.id,
         isFavorite: true,
         people: [
           {
@@ -530,279 +478,4 @@ describe('/asset', () => {
       expect(after.isTrashed).toBe(true);
     });
   });
-
-  describe('POST /asset/upload', () => {
-    const tests = [
-      {
-        input: 'formats/jpg/el_torcal_rocks.jpg',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'el_torcal_rocks',
-          resized: true,
-          exifInfo: {
-            dateTimeOriginal: '2012-08-05T11:39:59.000Z',
-            exifImageWidth: 512,
-            exifImageHeight: 341,
-            latitude: null,
-            longitude: null,
-            focalLength: 75,
-            iso: 200,
-            fNumber: 11,
-            exposureTime: '1/160',
-            fileSizeInByte: 53_493,
-            make: 'SONY',
-            model: 'DSLR-A550',
-            orientation: null,
-            description: 'SONY DSC',
-          },
-        },
-      },
-      {
-        input: 'formats/heic/IMG_2682.heic',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'IMG_2682',
-          resized: true,
-          fileCreatedAt: '2019-03-21T16:04:22.348Z',
-          exifInfo: {
-            dateTimeOriginal: '2019-03-21T16:04:22.348Z',
-            exifImageWidth: 4032,
-            exifImageHeight: 3024,
-            latitude: 41.2203,
-            longitude: -96.071_625,
-            make: 'Apple',
-            model: 'iPhone 7',
-            lensModel: 'iPhone 7 back camera 3.99mm f/1.8',
-            fileSizeInByte: 880_703,
-            exposureTime: '1/887',
-            iso: 20,
-            focalLength: 3.99,
-            fNumber: 1.8,
-            timeZone: 'America/Chicago',
-          },
-        },
-      },
-      {
-        input: 'formats/png/density_plot.png',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'density_plot',
-          resized: true,
-          exifInfo: {
-            exifImageWidth: 800,
-            exifImageHeight: 800,
-            latitude: null,
-            longitude: null,
-            fileSizeInByte: 25_408,
-          },
-        },
-      },
-      {
-        input: 'formats/raw/Nikon/D80/glarus.nef',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'glarus',
-          resized: true,
-          fileCreatedAt: '2010-07-20T17:27:12.000Z',
-          exifInfo: {
-            make: 'NIKON CORPORATION',
-            model: 'NIKON D80',
-            exposureTime: '1/200',
-            fNumber: 10,
-            focalLength: 18,
-            iso: 100,
-            fileSizeInByte: 9_057_784,
-            dateTimeOriginal: '2010-07-20T17:27:12.000Z',
-            latitude: null,
-            longitude: null,
-            orientation: '1',
-          },
-        },
-      },
-      {
-        input: 'formats/raw/Nikon/D700/philadelphia.nef',
-        expected: {
-          type: AssetTypeEnum.Image,
-          originalFileName: 'philadelphia',
-          resized: true,
-          fileCreatedAt: '2016-09-22T22:10:29.060Z',
-          exifInfo: {
-            make: 'NIKON CORPORATION',
-            model: 'NIKON D700',
-            exposureTime: '1/400',
-            fNumber: 11,
-            focalLength: 85,
-            iso: 200,
-            fileSizeInByte: 15_856_335,
-            dateTimeOriginal: '2016-09-22T22:10:29.060Z',
-            latitude: null,
-            longitude: null,
-            orientation: '1',
-            timeZone: 'UTC-5',
-          },
-        },
-      },
-    ];
-
-    for (const { input, expected } of tests) {
-      it(`should generate a thumbnail for ${input}`, async () => {
-        const filepath = join(testAssetDir, input);
-        const { id, duplicate } = await apiUtils.createAsset(
-          admin.accessToken,
-          {},
-          { bytes: await readFile(filepath), filename: basename(filepath) },
-        );
-
-        expect(duplicate).toBe(false);
-
-        await wsUtils.waitForEvent({ event: 'upload', assetId: id });
-
-        const asset = await apiUtils.getAssetInfo(admin.accessToken, id);
-
-        expect(asset.exifInfo).toBeDefined();
-        expect(asset.exifInfo).toMatchObject(expected.exifInfo);
-        expect(asset).toMatchObject(expected);
-      });
-    }
-
-    it('should handle a duplicate', async () => {
-      const filepath = 'formats/jpeg/el_torcal_rocks.jpeg';
-      const { duplicate } = await apiUtils.createAsset(
-        admin.accessToken,
-        {},
-        {
-          bytes: await readFile(join(testAssetDir, filepath)),
-          filename: basename(filepath),
-        },
-      );
-
-      expect(duplicate).toBe(true);
-    });
-
-    // These hashes were created by copying the image files to a Samsung phone,
-    // exporting the video from Samsung's stock Gallery app, and hashing them locally.
-    // This ensures that immich+exiftool are extracting the videos the same way Samsung does.
-    // DO NOT assume immich+exiftool are doing things correctly and just copy whatever hash it gives
-    // into the test here.
-    const motionTests = [
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 5.jpg',
-        checksum: 'fr14niqCq6N20HB8rJYEvpsUVtI=',
-      },
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 6.jpg',
-        checksum: 'lT9Uviw/FFJYCjfIxAGPTjzAmmw=',
-      },
-      {
-        filepath: 'formats/motionphoto/Samsung One UI 6.heic',
-        checksum: '/ejgzywvgvzvVhUYVfvkLzFBAF0=',
-      },
-    ];
-
-    for (const { filepath, checksum } of motionTests) {
-      it(`should extract motionphoto video from ${filepath}`, async () => {
-        const response = await apiUtils.createAsset(
-          admin.accessToken,
-          {},
-          {
-            bytes: await readFile(join(testAssetDir, filepath)),
-            filename: basename(filepath),
-          },
-        );
-
-        await wsUtils.waitForEvent({ event: 'upload', assetId: response.id });
-
-        expect(response.duplicate).toBe(false);
-
-        const asset = await apiUtils.getAssetInfo(
-          admin.accessToken,
-          response.id,
-        );
-        expect(asset.livePhotoVideoId).toBeDefined();
-
-        const video = await apiUtils.getAssetInfo(
-          admin.accessToken,
-          asset.livePhotoVideoId as string,
-        );
-        expect(video.checksum).toStrictEqual(checksum);
-      });
-    }
-  });
-
-  describe('GET /asset/thumbnail/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(
-        `/asset/thumbnail/${assetLocation.id}`,
-      );
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should not include gps data for webp thumbnails', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${assetLocation.id}?format=WEBP`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      await wsUtils.waitForEvent({
-        event: 'upload',
-        assetId: assetLocation.id,
-      });
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/webp');
-
-      const exifData = await readTags(body, 'thumbnail.webp');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
-
-    it('should not include gps data for jpeg thumbnails', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/thumbnail/${assetLocation.id}?format=JPEG`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const exifData = await readTags(body, 'thumbnail.jpg');
-      expect(exifData).not.toHaveProperty('GPSLongitude');
-      expect(exifData).not.toHaveProperty('GPSLatitude');
-    });
-  });
-
-  describe('GET /asset/file/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(
-        `/asset/thumbnail/${assetLocation.id}`,
-      );
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should download the original', async () => {
-      const { status, body, type } = await request(app)
-        .get(`/asset/file/${assetLocation.id}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toBeDefined();
-      expect(type).toBe('image/jpeg');
-
-      const asset = await apiUtils.getAssetInfo(
-        admin.accessToken,
-        assetLocation.id,
-      );
-
-      const original = await readFile(locationAssetFilepath);
-      const originalChecksum = sha1(original);
-      const downloadChecksum = sha1(body);
-
-      expect(originalChecksum).toBe(downloadChecksum);
-      expect(downloadChecksum).toBe(asset.checksum);
-    });
-  });
 });

e2e/src/api/specs/audit.e2e-spec.ts

@@ -29,14 +29,14 @@ describe('/audit', () => {
       await Promise.all([
         deleteAssets(
           { assetBulkDeleteDto: { ids: [trashedAsset.id] } },
-          { headers: asBearerAuth(admin.accessToken) },
+          { headers: asBearerAuth(admin.accessToken) }
         ),
         updateAsset(
           {
             id: archivedAsset.id,
             updateAssetDto: { isArchived: true },
           },
-          { headers: asBearerAuth(admin.accessToken) },
+          { headers: asBearerAuth(admin.accessToken) }
         ),
       ]);
 

e2e/src/api/specs/trash.e2e-spec.ts

@@ -44,7 +44,7 @@ describe('/trash', () => {
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(204);
 
-      await wsUtils.waitForEvent({ event: 'delete', assetId });
+      await wsUtils.once(ws, 'on_asset_delete');
 
       const after = await getAllAssets(
         {},

e2e/src/fixtures.ts

@@ -44,6 +44,7 @@ export const userDto = {
     email: signupDto.admin.email,
     password: signupDto.admin.password,
     storageLabel: 'admin',
+    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',
@@ -62,6 +63,7 @@ export const userDto = {
     email: createUserDto.user1.email,
     password: createUserDto.user1.password,
     storageLabel: null,
+    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',

e2e/src/responses.ts

@@ -65,6 +65,7 @@ export const signupResponseDto = {
     name: 'Immich Admin',
     email: 'admin@immich.cloud',
     storageLabel: 'admin',
+    externalPath: null,
     profileImagePath: '',
     // why? lol
     shouldChangePassword: true,

e2e/src/setup.ts

@@ -2,25 +2,25 @@ import { spawn, exec } from 'child_process';
 
 export default async () => {
   let _resolve: () => unknown;
-  const ready = new Promise<void>((resolve) => (_resolve = resolve));
+  const promise = new Promise<void>((resolve) => (_resolve = resolve));
 
   const child = spawn('docker', ['compose', 'up'], { stdio: 'pipe' });
 
   child.stdout.on('data', (data) => {
     const input = data.toString();
     console.log(input);
-    if (input.includes('Immich Microservices is listening')) {
+    if (input.includes('Immich Server is listening')) {
       _resolve();
     }
   });
 
   child.stderr.on('data', (data) => console.log(data.toString()));
 
-  await ready;
+  await promise;
 
   return async () => {
     await new Promise<void>((resolve) =>
-      exec('docker compose down', () => resolve()),
+      exec('docker compose down', () => resolve())
     );
   };
 };

e2e/src/utils.ts

@@ -1,6 +1,5 @@
 import {
   AssetFileUploadResponseDto,
-  AssetResponseDto,
   CreateAlbumDto,
   CreateAssetDto,
   CreateUserDto,
@@ -20,12 +19,10 @@ import {
   updatePerson,
 } from '@immich/sdk';
 import { BrowserContext } from '@playwright/test';
-import { exec, spawn } from 'node:child_process';
+import { exec, spawn } from 'child_process';
 import { randomBytes } from 'node:crypto';
 import { access } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
 import path from 'node:path';
-import { EventEmitter } from 'node:stream';
 import { promisify } from 'node:util';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
@@ -43,7 +40,6 @@ const directoryExists = (directory: string) =>
 
 // TODO move test assets into e2e/assets
 export const testAssetDir = path.resolve(`./../server/test/assets/`);
-export const tempDir = tmpdir();
 
 const serverContainerName = 'immich-e2e-server';
 const mediaDir = '/usr/src/app/upload';
@@ -51,7 +47,6 @@ const dirs = [
   `"${mediaDir}/thumbs"`,
   `"${mediaDir}/upload"`,
   `"${mediaDir}/library"`,
-  `"${mediaDir}/encoded-video"`,
 ].join(' ');
 
 if (!(await directoryExists(`${testAssetDir}/albums`))) {
@@ -182,85 +177,33 @@ export interface AdminSetupOptions {
   onboarding?: boolean;
 }
 
-export enum SocketEvent {
-  UPLOAD = 'upload',
-  DELETE = 'delete',
-}
-
-export type EventType = 'upload' | 'delete';
-export interface WaitOptions {
-  event: EventType;
-  assetId: string;
-  timeout?: number;
-}
-
-const events: Record<EventType, Set<string>> = {
-  upload: new Set<string>(),
-  delete: new Set<string>(),
-};
-
-const callbacks: Record<string, () => void> = {};
-
-const onEvent = ({ event, assetId }: { event: EventType; assetId: string }) => {
-  events[event].add(assetId);
-  const callback = callbacks[assetId];
-  if (callback) {
-    callback();
-    delete callbacks[assetId];
-  }
-};
-
 export const wsUtils = {
   connect: async (accessToken: string) => {
     const websocket = io('http://127.0.0.1:2283', {
       path: '/api/socket.io',
       transports: ['websocket'],
       extraHeaders: { Authorization: `Bearer ${accessToken}` },
-      autoConnect: true,
+      autoConnect: false,
       forceNew: true,
     });
 
     return new Promise<Socket>((resolve) => {
-      websocket
-        .on('connect', () => resolve(websocket))
-        .on('on_upload_success', (data: AssetResponseDto) =>
-          onEvent({ event: 'upload', assetId: data.id }),
-        )
-        .on('on_asset_delete', (assetId: string) =>
-          onEvent({ event: 'delete', assetId }),
-        )
-        .connect();
+      websocket.on('connect', () => resolve(websocket));
+      websocket.connect();
     });
   },
   disconnect: (ws: Socket) => {
     if (ws?.connected) {
       ws.disconnect();
     }
-
-    for (const set of Object.values(events)) {
-      set.clear();
-    }
   },
-  waitForEvent: async ({
-    event,
-    assetId,
-    timeout: ms,
-  }: WaitOptions): Promise<void> => {
-    const set = events[event];
-    if (set.has(assetId)) {
-      return;
-    }
-
-    return new Promise<void>((resolve, reject) => {
-      const timeout = setTimeout(
-        () => reject(new Error(`Timed out waiting for ${event} event`)),
-        ms || 5000,
-      );
-
-      callbacks[assetId] = () => {
+  once: <T = any>(ws: Socket, event: string): Promise<T> => {
+    return new Promise<T>((resolve, reject) => {
+      const timeout = setTimeout(() => reject(new Error('Timeout')), 4000);
+      ws.once(event, (data: T) => {
         clearTimeout(timeout);
-        resolve();
-      };
+        resolve(data);
+      });
     });
   },
 };

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.97.0"
+version = "1.96.0"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/android/app/src/main/kotlin/com/example/mobile/BackupWorker.kt

@@ -276,7 +276,7 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
         private const val NOTIFICATION_CHANNEL_ERROR_ID = "immich/backgroundServiceError"
         private const val NOTIFICATION_DEFAULT_TITLE = "Immich"
         private const val NOTIFICATION_ID = 1
-        private const val NOTIFICATION_ERROR_ID = 2 
+        private const val NOTIFICATION_ERROR_ID = 2
         private const val NOTIFICATION_DETAIL_ID = 3
         private const val ONE_MINUTE = 60000L
 
@@ -304,12 +304,12 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
                 val workInfoList = workInfoFuture.get(1000, TimeUnit.MILLISECONDS)
                 if (workInfoList != null) {
                     for (workInfo in workInfoList) {
-                        if (workInfo.getState() == WorkInfo.State.ENQUEUED) {
+                        //if (workInfo.getState() == WorkInfo.State.ENQUEUED) {
                             val workRequest = buildWorkRequest(requireWifi, requireCharging)
                             wm.enqueueUniqueWork(TASK_NAME_BACKUP, ExistingWorkPolicy.REPLACE, workRequest)
                             Log.d(TAG, "updateBackupWorker updated BackupWorker constraints")
                             return
-                        }
+                        // }
                     }
                 }
                 Log.d(TAG, "updateBackupWorker: BackupWorker not enqueued")
@@ -346,7 +346,7 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
                 .setRequiresBatteryNotLow(true)
                 .setRequiresCharging(requireCharging)
                 .build();
-            
+
             val work = OneTimeWorkRequest.Builder(BackupWorker::class.java)
                 .setConstraints(constraints)
                 .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, ONE_MINUTE, TimeUnit.MILLISECONDS)
@@ -359,4 +359,4 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
     }
 }
 
-private const val TAG = "BackupWorker"
+private const val TAG = "BackupWorker"

mobile/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.20'
+    ext.kotlin_version = '1.9.21'
     ext.kotlin_coroutines_version = '1.7.1'
     ext.work_version = '2.7.1'
     ext.concurrent_version = '1.1.0'

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 125,
-        "android.injected.version.name" => "1.97.0",
+        "android.injected.version.code" => 124,
+        "android.injected.version.name" => "1.96.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000266">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000232">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="81.342186">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="78.881681">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="48.746195">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="32.080999">
         
       </testcase>
     

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 141;
+				CURRENT_PROJECT_VERSION = 139;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -55,11 +55,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.97.0</string>
+    <string>1.95.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>141</string>
+    <string>139</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.97.0"
+      version_number: "1.96.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000304">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000255">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.272646">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.157832">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="3.560896">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.825919">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.235745">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.18815">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="114.820395">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="110.912709">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="68.950812">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="78.396901">
         
       </testcase>
     

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'dart:ui' as ui;
@@ -133,7 +132,7 @@ class GalleryViewerPage extends HookConsumerWidget {
     void toggleFavorite(Asset asset) =>
         ref.read(assetProvider.notifier).toggleFavorite([asset]);
 
-    Future<void> precacheNextImage(int index) async {
+    void precacheNextImage(int index) {
       void onError(Object exception, StackTrace? stackTrace) {
         // swallow error silently
         debugPrint('Error precaching next image: $exception, $stackTrace');
@@ -141,7 +140,7 @@ class GalleryViewerPage extends HookConsumerWidget {
 
       if (index < totalAssets && index >= 0) {
         final asset = loadAsset(index);
-        await precacheImage(
+        precacheImage(
           ImmichImage.imageProvider(asset: asset),
           context,
           onError: onError,
@@ -712,21 +711,6 @@ class GalleryViewerPage extends HookConsumerWidget {
       [],
     );
 
-    useEffect(
-      () {
-        // No need to await this
-        unawaited(
-          // Delay this a bit so we can finish loading the page
-          Future.delayed(const Duration(milliseconds: 400)).then(
-            // Precache the next image
-            (_) => precacheNextImage(currentIndex.value + 1),
-          ),
-        );
-        return null;
-      },
-      [],
-    );
-
     ref.listen(showControlsProvider, (_, show) {
       if (show) {
         SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
@@ -751,21 +735,14 @@ class GalleryViewerPage extends HookConsumerWidget {
                 isZoomed.value = state != PhotoViewScaleState.initial;
                 ref.read(showControlsProvider.notifier).show = !isZoomed.value;
               },
-              loadingBuilder: (context, event, index) => ClipRect(
-                child: Stack(
-                  fit: StackFit.expand,
-                  children: [
-                    BackdropFilter(
-                      filter: ui.ImageFilter.blur(
-                        sigmaX: 10,
-                        sigmaY: 10,
-                      ),
-                    ),
-                    ImmichThumbnail(
-                      asset: asset(),
-                      fit: BoxFit.contain,
-                    ),
-                  ],
+              loadingBuilder: (context, event, index) => ImageFiltered(
+                imageFilter: ui.ImageFilter.blur(
+                  sigmaX: 1,
+                  sigmaY: 1,
+                ),
+                child: ImmichThumbnail(
+                  asset: asset(),
+                  fit: BoxFit.contain,
                 ),
               ),
               pageController: controller,
@@ -777,16 +754,12 @@ class GalleryViewerPage extends HookConsumerWidget {
                   ),
               itemCount: totalAssets,
               scrollDirection: Axis.horizontal,
-              onPageChanged: (value) async {
+              onPageChanged: (value) {
                 final next = currentIndex.value < value ? value + 1 : value - 1;
-                HapticFeedback.selectionClick();
+                precacheNextImage(next);
                 currentIndex.value = value;
                 stackIndex.value = -1;
-
-                // Wait for page change animation to finish
-                await Future.delayed(const Duration(milliseconds: 400));
-                // Then precache the next image
-                unawaited(precacheNextImage(next));
+                HapticFeedback.selectionClick();
               },
               builder: (context, index) {
                 final a =
@@ -845,7 +818,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                       isMotionVideo: isPlayingMotionVideo.value,
                       placeholder: Image(
                         image: provider,
-                        fit: BoxFit.contain,
+                        fit: BoxFit.fitWidth,
                         height: context.height,
                         width: context.width,
                         alignment: Alignment.center,

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -40,7 +40,7 @@ class VideoViewerPage extends HookWidget {
       controlsSafeAreaMinimum: const EdgeInsets.only(
         bottom: 100,
       ),
-      placeholder: placeholder,
+      placeholder: SizedBox.expand(child: placeholder),
       showControls: showControls && !isMotionVideo,
       hideControlsTimer: hideControlsTimer,
       customControls: const VideoPlayerControls(),
@@ -58,13 +58,9 @@ class VideoViewerPage extends HookWidget {
             if (controller == null) {
               return Stack(
                 children: [
-                  if (placeholder != null) placeholder!,
-                  const Positioned.fill(
-                    child: Center(
-                      child: DelayedLoadingIndicator(
-                        fadeInDuration: Duration(milliseconds: 500),
-                      ),
-                    ),
+                  if (placeholder != null) SizedBox.expand(child: placeholder!),
+                  const DelayedLoadingIndicator(
+                    fadeInDuration: Duration(milliseconds: 500),
                   ),
                 ],
               );

mobile/lib/modules/backup/services/backup.service.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:background_downloader/background_downloader.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -33,6 +34,7 @@ final backupServiceProvider = Provider(
 
 class BackupService {
   final httpClient = http.Client();
+  final _fileDownloader = FileDownloader();
   final ApiService _apiService;
   final Isar _db;
   final Logger _log = Logger("BackupService");
@@ -242,117 +244,146 @@ class BackupService {
           )
         : assetList.toList();
 
+    final tasks = <UploadTask>[];
     for (var entity in assetsToUpload) {
-      File? file;
-      File? livePhotoFile;
+      final isAvailableLocally =
+          await entity.isLocallyAvailable(isOrigin: true);
 
-      try {
-        final isAvailableLocally =
-            await entity.isLocallyAvailable(isOrigin: true);
-
-        // Handle getting files from iCloud
-        if (!isAvailableLocally && Platform.isIOS) {
-          // Skip iCloud assets if the user has disabled this feature
-          if (isIgnoreIcloudAssets) {
-            continue;
-          }
-
-          setCurrentUploadAssetCb(
-            CurrentUploadAsset(
-              id: entity.id,
-              fileCreatedAt: entity.createDateTime.year == 1970
-                  ? entity.modifiedDateTime
-                  : entity.createDateTime,
-              fileName: await entity.titleAsync,
-              fileType: _getAssetType(entity.type),
-              iCloudAsset: true,
-            ),
-          );
-
-          file = await entity.loadFile(progressHandler: pmProgressHandler);
-          livePhotoFile = await entity.loadFile(
-            withSubtype: true,
-            progressHandler: pmProgressHandler,
-          );
-        } else {
-          if (entity.type == AssetType.video) {
-            file = await entity.originFile;
-          } else {
-            file = await entity.originFile.timeout(const Duration(seconds: 5));
-            if (entity.isLivePhoto) {
-              livePhotoFile = await entity.originFileWithSubtype
-                  .timeout(const Duration(seconds: 5));
-            }
-          }
+      // Handle getting files from iCloud
+      if (!isAvailableLocally && Platform.isIOS) {
+        // Skip iCloud assets if the user has disabled this feature
+        if (isIgnoreIcloudAssets) {
+          continue;
         }
 
-        if (file != null) {
-          String originalFileName = await entity.titleAsync;
-          var fileStream = file.openRead();
-          var assetRawUploadData = http.MultipartFile(
-            "assetData",
-            fileStream,
-            file.lengthSync(),
-            filename: originalFileName,
-          );
+        setCurrentUploadAssetCb(
+          CurrentUploadAsset(
+            id: entity.id,
+            fileCreatedAt: entity.createDateTime.year == 1970
+                ? entity.modifiedDateTime
+                : entity.createDateTime,
+            fileName: await entity.titleAsync,
+            fileType: _getAssetType(entity.type),
+            iCloudAsset: true,
+          ),
+        );
+      }
 
-          var req = MultipartRequest(
-            'POST',
-            Uri.parse('$savedEndpoint/asset/upload'),
-            onProgress: ((bytes, totalBytes) =>
-                uploadProgressCb(bytes, totalBytes)),
-          );
-          req.headers["x-immich-user-token"] = Store.get(StoreKey.accessToken);
-          req.headers["Transfer-Encoding"] = "chunked";
+      final files = [];
+      // TODO: This is silly to have to load the file just to access the path
+      // But there doesn't seem to be any other way to do it
+      final fileName = (await entity.originFile)?.path;
+      files.add(fileName);
 
-          req.fields['deviceAssetId'] = entity.id;
-          req.fields['deviceId'] = deviceId;
-          req.fields['fileCreatedAt'] =
-              entity.createDateTime.toUtc().toIso8601String();
-          req.fields['fileModifiedAt'] =
-              entity.modifiedDateTime.toUtc().toIso8601String();
-          req.fields['isFavorite'] = entity.isFavorite.toString();
-          req.fields['duration'] = entity.videoDuration.toString();
+      if (entity.isLivePhoto) {
+        final livePhotoFileName = (await entity.originFileWithSubtype)?.path;
+        if (livePhotoFileName != null) {
+          files.add(livePhotoFileName);
+        }
+      }
 
-          req.files.add(assetRawUploadData);
+      final url = '$savedEndpoint/asset/upload';
+      final headers = {
+        'x-immich-user-token': Store.get(StoreKey.accessToken),
+        'Transfer-Encoding': 'chunked',
+      };
 
-          if (entity.isLivePhoto) {
-            if (livePhotoFile != null) {
-              final livePhotoTitle = p.setExtension(
-                originalFileName,
-                p.extension(livePhotoFile.path),
-              );
-              final fileStream = livePhotoFile.openRead();
-              final livePhotoRawUploadData = http.MultipartFile(
-                "livePhotoData",
-                fileStream,
-                livePhotoFile.lengthSync(),
-                filename: livePhotoTitle,
-              );
-              req.files.add(livePhotoRawUploadData);
-            } else {
-              _log.warning(
-                "Failed to obtain motion part of the livePhoto - $originalFileName",
-              );
-            }
-          }
+      final fields = {
+        'deviceAssetId': entity.id,
+        'deviceId': deviceId,
+        'fileCreatedAt': entity.createDateTime.toUtc().toIso8601String(),
+        'fileModifiedAt': entity.modifiedDateTime.toUtc().toIso8601String(),
+        'isFavorite': entity.isFavorite.toString(),
+        'duration': entity.videoDuration.toString(),
+      };
 
-          setCurrentUploadAssetCb(
-            CurrentUploadAsset(
-              id: entity.id,
-              fileCreatedAt: entity.createDateTime.year == 1970
-                  ? entity.modifiedDateTime
-                  : entity.createDateTime,
-              fileName: originalFileName,
-              fileType: _getAssetType(entity.type),
-              iCloudAsset: false,
-            ),
-          );
+      if (files.length == 1) {
+        final String file = files.first;
+        final split = file.split('/');
+        final name = split.last;
+        final directory = split.take(split.length - 1).join('/');
 
-          var response =
-              await httpClient.send(req, cancellationToken: cancelToken);
+        final task = UploadTask(
+          url: url,
+          group: 'backup',
+          fileField: 'assetData',
+          taskId: entity.id,
+          fields: fields,
+          headers: headers,
+          updates: Updates.statusAndProgress,
+          retries: 0,
+          httpRequestMethod: 'POST',
+          displayName: 'Immich',
+          filename: name,
+          directory: directory,
+          baseDirectory: BaseDirectory.root,
+        );
+        tasks.add(task);
+      } else {
+        final task = MultiUploadTask(
+          url: url,
+          files: files,
+          headers: headers,
+          fields: fields,
+          updates: Updates.statusAndProgress,
+          group: 'backup',
+          taskId: entity.id,
+          retries: 0,
+          displayName: 'Immich',
+          httpRequestMethod: 'POST',
+          baseDirectory: BaseDirectory.root,
+        );
 
-          if (response.statusCode == 200) {
+        print('created task $task for files $files');
+
+        tasks.add(task);
+      }
+    }
+
+    final permission = await _fileDownloader.permissions
+        .status(PermissionType.androidSharedStorage);
+    print('has permission $permission');
+
+    if (tasks.length == 1) {
+      final result = await _fileDownloader.upload(
+        tasks.first,
+        onProgress: (percent) => print('${percent * 100} done'),
+        onStatus: (status) => print('status $status'),
+        onElapsedTime: (t) => print('time is $t'),
+        elapsedTimeInterval: const Duration(seconds: 1),
+      );
+
+      print('$result is done with ${result.status}');
+      print('result ${result.responseBody}');
+      print('result ${result.responseHeaders}');
+    } else {
+      final result = await _fileDownloader.uploadBatch(
+        tasks,
+        batchProgressCallback: (succeeded, failed) =>
+            print('$succeeded succeeded, $failed failed'),
+        taskStatusCallback: (status) => print('status $status'),
+        taskProgressCallback: (update) => print('update $update'),
+        onElapsedTime: (t) => print('time is $t'),
+        elapsedTimeInterval: const Duration(seconds: 1),
+      );
+
+      print(
+        '$result is done with ${result.succeeded.length} succeeded and ${result.failed.length} failed',
+      );
+
+      for (final task in result.succeeded) {
+        final r = result.results[task];
+        print('successful task $task with result $r');
+      }
+
+      for (final task in result.failed) {
+        final r = result.results[task];
+        print('failed task $task with result $r');
+      }
+    }
+
+    /*
+          if (result.status == 200) {
             // asset is a duplicate (already exists on the server)
             duplicatedAssetIds.add(entity.id);
             uploadSuccessCb(entity.id, deviceId, true);
@@ -405,6 +436,7 @@ class BackupService {
         }
       }
     }
+    */
     if (duplicatedAssetIds.isNotEmpty) {
       await _saveDuplicatedAssetIds(duplicatedAssetIds);
     }

mobile/lib/modules/map/providers/map_state.provider.g.dart

@@ -6,7 +6,7 @@ part of 'map_state.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$mapStateNotifierHash() => r'3b509b57b7400b09817e9caee9debf899172cd52';
+String _$mapStateNotifierHash() => r'6408d616ec9fc0d1ff26e25692417c43504ff754';
 
 /// See also [MapStateNotifier].
 @ProviderFor(MapStateNotifier)

mobile/lib/modules/memories/views/memory_page.dart

@@ -124,14 +124,11 @@ class MemoryPage extends HookConsumerWidget {
           .then((_) => precacheAsset(1));
     }
 
-    Future<void> onAssetChanged(int otherIndex) async {
+    onAssetChanged(int otherIndex) {
       HapticFeedback.selectionClick();
       currentAssetPage.value = otherIndex;
+      precacheAsset(otherIndex + 1);
       updateProgressText();
-      // Wait for page change animation to finish
-      await Future.delayed(const Duration(milliseconds: 400));
-      // And then precache the next asset
-      await precacheAsset(otherIndex + 1);
     }
 
     /* Notification listener is used instead of OnPageChanged callback since OnPageChanged is called

mobile/lib/routing/router.gr.dart

@@ -1393,7 +1393,7 @@ class VideoViewerRoute extends PageRouteInfo<VideoViewerRouteArgs> {
     void Function()? onPaused,
     Widget? placeholder,
     bool showControls = true,
-    Duration hideControlsTimer = const Duration(milliseconds: 1500),
+    Duration hideControlsTimer = const Duration(seconds: 5),
     bool showDownloadingIndicator = true,
     List<PageRouteInfo>? children,
   }) : super(
@@ -1429,7 +1429,7 @@ class VideoViewerRouteArgs {
     this.onPaused,
     this.placeholder,
     this.showControls = true,
-    this.hideControlsTimer = const Duration(milliseconds: 1500),
+    this.hideControlsTimer = const Duration(seconds: 5),
     this.showDownloadingIndicator = true,
   });
 

mobile/lib/shared/ui/delayed_loading_indicator.dart

@@ -20,24 +20,21 @@ class DelayedLoadingIndicator extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return FutureBuilder(
-      future: Future.delayed(delay),
-      builder: (context, snapshot) {
-        late Widget c;
-        if (snapshot.connectionState == ConnectionState.done) {
-          c = child ??
-              const ImmichLoadingIndicator(
-                key: ValueKey('loading'),
-              );
-        } else {
-          c = Container(key: const ValueKey('hiding'));
-        }
+    return AnimatedSwitcher(
+      duration: fadeInDuration ?? Duration.zero,
+      child: FutureBuilder(
+        future: Future.delayed(delay),
+        builder: (context, snapshot) {
+          if (snapshot.connectionState == ConnectionState.done) {
+            return child ??
+                const ImmichLoadingIndicator(
+                  key: ValueKey('loading'),
+                );
+          }
 
-        return AnimatedSwitcher(
-          duration: fadeInDuration ?? Duration.zero,
-          child: c,
-        );
-      },
+          return Container(key: const ValueKey('hiding'));
+        },
+      ),
     );
   }
 }

mobile/lib/shared/ui/immich_image.dart

@@ -58,11 +58,9 @@ class ImmichImage extends StatelessWidget {
     }
   }
 
-  // Whether to use the local asset image provider or a remote one
   static bool useLocal(Asset asset) =>
       !asset.isRemote ||
       asset.isLocal && !Store.get(StoreKey.preferRemoteImage, false);
-
   @override
   Widget build(BuildContext context) {
     if (asset == null) {

mobile/lib/shared/ui/immich_thumbnail.dart

@@ -6,7 +6,6 @@ import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_local_
 import 'package:immich_mobile/modules/asset_viewer/image_providers/immich_remote_image_provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/ui/hooks/blurhash_hook.dart';
-import 'package:immich_mobile/shared/ui/immich_image.dart';
 import 'package:immich_mobile/shared/ui/thumbhash_placeholder.dart';
 import 'package:octo_image/octo_image.dart';
 
@@ -44,7 +43,7 @@ class ImmichThumbnail extends HookWidget {
       );
     }
 
-    if (ImmichImage.useLocal(asset)) {
+    if (useLocal(asset)) {
       return ImmichLocalThumbnailProvider(
         asset: asset,
         height: thumbnailSize,
@@ -58,6 +57,8 @@ class ImmichThumbnail extends HookWidget {
     }
   }
 
+  static bool useLocal(Asset asset) => !asset.isRemote || asset.isLocal;
+
   @override
   Widget build(BuildContext context) {
     Uint8List? blurhash = useBlurHashRef(asset).value;

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.97.0
+- API version: 1.96.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements
@@ -135,8 +135,8 @@ Class | Method | HTTP request | Description
 *JobApi* | [**sendJobCommand**](doc//JobApi.md#sendjobcommand) | **PUT** /jobs/{id} | 
 *LibraryApi* | [**createLibrary**](doc//LibraryApi.md#createlibrary) | **POST** /library | 
 *LibraryApi* | [**deleteLibrary**](doc//LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-*LibraryApi* | [**getAllLibraries**](doc//LibraryApi.md#getalllibraries) | **GET** /library | 
-*LibraryApi* | [**getLibrary**](doc//LibraryApi.md#getlibrary) | **GET** /library/{id} | 
+*LibraryApi* | [**getLibraries**](doc//LibraryApi.md#getlibraries) | **GET** /library | 
+*LibraryApi* | [**getLibraryInfo**](doc//LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 *LibraryApi* | [**getLibraryStatistics**](doc//LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 *LibraryApi* | [**removeOfflineFiles**](doc//LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 *LibraryApi* | [**scanLibrary**](doc//LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 

mobile/openapi/doc/CreateLibraryDto.md

@@ -13,7 +13,6 @@ Name | Type | Description | Notes
 **isVisible** | **bool** |  | [optional] 
 **isWatched** | **bool** |  | [optional] 
 **name** | **String** |  | [optional] 
-**ownerId** | **String** |  | [optional] 
 **type** | [**LibraryType**](LibraryType.md) |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

mobile/openapi/doc/CreateUserDto.md

@@ -9,6 +9,7 @@ import 'package:openapi/api.dart';
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **email** | **String** |  | 
+**externalPath** | **String** |  | [optional] 
 **memoriesEnabled** | **bool** |  | [optional] 
 **name** | **String** |  | 
 **password** | **String** |  | 

mobile/openapi/doc/LibraryApi.md

@@ -11,8 +11,8 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**createLibrary**](LibraryApi.md#createlibrary) | **POST** /library | 
 [**deleteLibrary**](LibraryApi.md#deletelibrary) | **DELETE** /library/{id} | 
-[**getAllLibraries**](LibraryApi.md#getalllibraries) | **GET** /library | 
-[**getLibrary**](LibraryApi.md#getlibrary) | **GET** /library/{id} | 
+[**getLibraries**](LibraryApi.md#getlibraries) | **GET** /library | 
+[**getLibraryInfo**](LibraryApi.md#getlibraryinfo) | **GET** /library/{id} | 
 [**getLibraryStatistics**](LibraryApi.md#getlibrarystatistics) | **GET** /library/{id}/statistics | 
 [**removeOfflineFiles**](LibraryApi.md#removeofflinefiles) | **POST** /library/{id}/removeOffline | 
 [**scanLibrary**](LibraryApi.md#scanlibrary) | **POST** /library/{id}/scan | 
@@ -129,8 +129,8 @@ void (empty response body)
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **getAllLibraries**
-> List<LibraryResponseDto> getAllLibraries(type)
+# **getLibraries**
+> List<LibraryResponseDto> getLibraries()
 
 
 
@@ -153,21 +153,17 @@ import 'package:openapi/api.dart';
 //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
 
 final api_instance = LibraryApi();
-final type = ; // LibraryType | 
 
 try {
-    final result = api_instance.getAllLibraries(type);
+    final result = api_instance.getLibraries();
     print(result);
 } catch (e) {
-    print('Exception when calling LibraryApi->getAllLibraries: $e\n');
+    print('Exception when calling LibraryApi->getLibraries: $e\n');
 }
 ```
 
 ### Parameters
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **type** | [**LibraryType**](.md)|  | [optional] 
+This endpoint does not need any parameter.
 
 ### Return type
 
@@ -184,8 +180,8 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
-# **getLibrary**
-> LibraryResponseDto getLibrary(id)
+# **getLibraryInfo**
+> LibraryResponseDto getLibraryInfo(id)
 
 
 
@@ -211,10 +207,10 @@ final api_instance = LibraryApi();
 final id = 38400000-8cf0-11bd-b23e-10b96e4ef00d; // String | 
 
 try {
-    final result = api_instance.getLibrary(id);
+    final result = api_instance.getLibraryInfo(id);
     print(result);
 } catch (e) {
-    print('Exception when calling LibraryApi->getLibrary: $e\n');
+    print('Exception when calling LibraryApi->getLibraryInfo: $e\n');
 }
 ```
 

mobile/openapi/doc/PartnerResponseDto.md

@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **createdAt** | [**DateTime**](DateTime.md) |  | 
 **deletedAt** | [**DateTime**](DateTime.md) |  | 
 **email** | **String** |  | 
+**externalPath** | **String** |  | 
 **id** | **String** |  | 
 **inTimeline** | **bool** |  | [optional] 
 **isAdmin** | **bool** |  | 

mobile/openapi/doc/SystemConfigLibraryWatchDto.md

@@ -9,6 +9,8 @@ import 'package:openapi/api.dart';
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enabled** | **bool** |  | 
+**interval** | **int** |  | 
+**usePolling** | **bool** |  | 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

mobile/openapi/doc/UpdateUserDto.md

@@ -10,6 +10,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **avatarColor** | [**UserAvatarColor**](UserAvatarColor.md) |  | [optional] 
 **email** | **String** |  | [optional] 
+**externalPath** | **String** |  | [optional] 
 **id** | **String** |  | 
 **isAdmin** | **bool** |  | [optional] 
 **memoriesEnabled** | **bool** |  | [optional] 

mobile/openapi/doc/UserResponseDto.md

@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **createdAt** | [**DateTime**](DateTime.md) |  | 
 **deletedAt** | [**DateTime**](DateTime.md) |  | 
 **email** | **String** |  | 
+**externalPath** | **String** |  | 
 **id** | **String** |  | 
 **isAdmin** | **bool** |  | 
 **memoriesEnabled** | **bool** |  | [optional] 

mobile/openapi/lib/api/library_api.dart

@@ -104,10 +104,7 @@ class LibraryApi {
   }
 
   /// Performs an HTTP 'GET /library' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [LibraryType] type:
-  Future<Response> getAllLibrariesWithHttpInfo({ LibraryType? type, }) async {
+  Future<Response> getLibrariesWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/library';
 
@@ -118,10 +115,6 @@ class LibraryApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (type != null) {
-      queryParams.addAll(_queryParams('', 'type', type));
-    }
-
     const contentTypes = <String>[];
 
 
@@ -136,11 +129,8 @@ class LibraryApi {
     );
   }
 
-  /// Parameters:
-  ///
-  /// * [LibraryType] type:
-  Future<List<LibraryResponseDto>?> getAllLibraries({ LibraryType? type, }) async {
-    final response = await getAllLibrariesWithHttpInfo( type: type, );
+  Future<List<LibraryResponseDto>?> getLibraries() async {
+    final response = await getLibrariesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -161,7 +151,7 @@ class LibraryApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> getLibraryWithHttpInfo(String id,) async {
+  Future<Response> getLibraryInfoWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final path = r'/library/{id}'
       .replaceAll('{id}', id);
@@ -190,8 +180,8 @@ class LibraryApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<LibraryResponseDto?> getLibrary(String id,) async {
-    final response = await getLibraryWithHttpInfo(id,);
+  Future<LibraryResponseDto?> getLibraryInfo(String id,) async {
+    final response = await getLibraryInfoWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/model/create_library_dto.dart

@@ -18,7 +18,6 @@ class CreateLibraryDto {
     this.isVisible,
     this.isWatched,
     this.name,
-    this.ownerId,
     required this.type,
   });
 
@@ -50,14 +49,6 @@ class CreateLibraryDto {
   ///
   String? name;
 
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? ownerId;
-
   LibraryType type;
 
   @override
@@ -67,7 +58,6 @@ class CreateLibraryDto {
     other.isVisible == isVisible &&
     other.isWatched == isWatched &&
     other.name == name &&
-    other.ownerId == ownerId &&
     other.type == type;
 
   @override
@@ -78,11 +68,10 @@ class CreateLibraryDto {
     (isVisible == null ? 0 : isVisible!.hashCode) +
     (isWatched == null ? 0 : isWatched!.hashCode) +
     (name == null ? 0 : name!.hashCode) +
-    (ownerId == null ? 0 : ownerId!.hashCode) +
     (type.hashCode);
 
   @override
-  String toString() => 'CreateLibraryDto[exclusionPatterns=$exclusionPatterns, importPaths=$importPaths, isVisible=$isVisible, isWatched=$isWatched, name=$name, ownerId=$ownerId, type=$type]';
+  String toString() => 'CreateLibraryDto[exclusionPatterns=$exclusionPatterns, importPaths=$importPaths, isVisible=$isVisible, isWatched=$isWatched, name=$name, type=$type]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -102,11 +91,6 @@ class CreateLibraryDto {
       json[r'name'] = this.name;
     } else {
     //  json[r'name'] = null;
-    }
-    if (this.ownerId != null) {
-      json[r'ownerId'] = this.ownerId;
-    } else {
-    //  json[r'ownerId'] = null;
     }
       json[r'type'] = this.type;
     return json;
@@ -129,7 +113,6 @@ class CreateLibraryDto {
         isVisible: mapValueOfType<bool>(json, r'isVisible'),
         isWatched: mapValueOfType<bool>(json, r'isWatched'),
         name: mapValueOfType<String>(json, r'name'),
-        ownerId: mapValueOfType<String>(json, r'ownerId'),
         type: LibraryType.fromJson(json[r'type'])!,
       );
     }

mobile/openapi/lib/model/create_user_dto.dart

@@ -14,6 +14,7 @@ class CreateUserDto {
   /// Returns a new [CreateUserDto] instance.
   CreateUserDto({
     required this.email,
+    this.externalPath,
     this.memoriesEnabled,
     required this.name,
     required this.password,
@@ -23,6 +24,8 @@ class CreateUserDto {
 
   String email;
 
+  String? externalPath;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -42,6 +45,7 @@ class CreateUserDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is CreateUserDto &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
     other.password == password &&
@@ -52,6 +56,7 @@ class CreateUserDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
     (name.hashCode) +
     (password.hashCode) +
@@ -59,11 +64,16 @@ class CreateUserDto {
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'CreateUserDto[email=$email, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, storageLabel=$storageLabel]';
+  String toString() => 'CreateUserDto[email=$email, externalPath=$externalPath, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
     if (this.memoriesEnabled != null) {
       json[r'memoriesEnabled'] = this.memoriesEnabled;
     } else {
@@ -93,6 +103,7 @@ class CreateUserDto {
 
       return CreateUserDto(
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name')!,
         password: mapValueOfType<String>(json, r'password')!,

mobile/openapi/lib/model/partner_response_dto.dart

@@ -17,6 +17,7 @@ class PartnerResponseDto {
     required this.createdAt,
     required this.deletedAt,
     required this.email,
+    required this.externalPath,
     required this.id,
     this.inTimeline,
     required this.isAdmin,
@@ -39,6 +40,8 @@ class PartnerResponseDto {
 
   String email;
 
+  String? externalPath;
+
   String id;
 
   ///
@@ -81,6 +84,7 @@ class PartnerResponseDto {
     other.createdAt == createdAt &&
     other.deletedAt == deletedAt &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.inTimeline == inTimeline &&
     other.isAdmin == isAdmin &&
@@ -101,6 +105,7 @@ class PartnerResponseDto {
     (createdAt.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (inTimeline == null ? 0 : inTimeline!.hashCode) +
     (isAdmin.hashCode) +
@@ -115,7 +120,7 @@ class PartnerResponseDto {
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, externalPath=$externalPath, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -127,6 +132,11 @@ class PartnerResponseDto {
     //  json[r'deletedAt'] = null;
     }
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
       json[r'id'] = this.id;
     if (this.inTimeline != null) {
       json[r'inTimeline'] = this.inTimeline;
@@ -174,6 +184,7 @@ class PartnerResponseDto {
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         inTimeline: mapValueOfType<bool>(json, r'inTimeline'),
         isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
@@ -237,6 +248,7 @@ class PartnerResponseDto {
     'createdAt',
     'deletedAt',
     'email',
+    'externalPath',
     'id',
     'isAdmin',
     'name',

mobile/openapi/lib/model/system_config_library_watch_dto.dart

@@ -14,25 +14,37 @@ class SystemConfigLibraryWatchDto {
   /// Returns a new [SystemConfigLibraryWatchDto] instance.
   SystemConfigLibraryWatchDto({
     required this.enabled,
+    required this.interval,
+    required this.usePolling,
   });
 
   bool enabled;
 
+  int interval;
+
+  bool usePolling;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is SystemConfigLibraryWatchDto &&
-    other.enabled == enabled;
+    other.enabled == enabled &&
+    other.interval == interval &&
+    other.usePolling == usePolling;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (enabled.hashCode);
+    (enabled.hashCode) +
+    (interval.hashCode) +
+    (usePolling.hashCode);
 
   @override
-  String toString() => 'SystemConfigLibraryWatchDto[enabled=$enabled]';
+  String toString() => 'SystemConfigLibraryWatchDto[enabled=$enabled, interval=$interval, usePolling=$usePolling]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'enabled'] = this.enabled;
+      json[r'interval'] = this.interval;
+      json[r'usePolling'] = this.usePolling;
     return json;
   }
 
@@ -45,6 +57,8 @@ class SystemConfigLibraryWatchDto {
 
       return SystemConfigLibraryWatchDto(
         enabled: mapValueOfType<bool>(json, r'enabled')!,
+        interval: mapValueOfType<int>(json, r'interval')!,
+        usePolling: mapValueOfType<bool>(json, r'usePolling')!,
       );
     }
     return null;
@@ -93,6 +107,8 @@ class SystemConfigLibraryWatchDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'enabled',
+    'interval',
+    'usePolling',
   };
 }
 

mobile/openapi/lib/model/update_user_dto.dart

@@ -15,6 +15,7 @@ class UpdateUserDto {
   UpdateUserDto({
     this.avatarColor,
     this.email,
+    this.externalPath,
     required this.id,
     this.isAdmin,
     this.memoriesEnabled,
@@ -41,6 +42,14 @@ class UpdateUserDto {
   ///
   String? email;
 
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  String? externalPath;
+
   String id;
 
   ///
@@ -97,6 +106,7 @@ class UpdateUserDto {
   bool operator ==(Object other) => identical(this, other) || other is UpdateUserDto &&
     other.avatarColor == avatarColor &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.isAdmin == isAdmin &&
     other.memoriesEnabled == memoriesEnabled &&
@@ -111,6 +121,7 @@ class UpdateUserDto {
     // ignore: unnecessary_parenthesis
     (avatarColor == null ? 0 : avatarColor!.hashCode) +
     (email == null ? 0 : email!.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (isAdmin == null ? 0 : isAdmin!.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
@@ -121,7 +132,7 @@ class UpdateUserDto {
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'UpdateUserDto[avatarColor=$avatarColor, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
+  String toString() => 'UpdateUserDto[avatarColor=$avatarColor, email=$email, externalPath=$externalPath, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -134,6 +145,11 @@ class UpdateUserDto {
       json[r'email'] = this.email;
     } else {
     //  json[r'email'] = null;
+    }
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
     }
       json[r'id'] = this.id;
     if (this.isAdmin != null) {
@@ -184,6 +200,7 @@ class UpdateUserDto {
       return UpdateUserDto(
         avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
         email: mapValueOfType<String>(json, r'email'),
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         isAdmin: mapValueOfType<bool>(json, r'isAdmin'),
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),

mobile/openapi/lib/model/user_response_dto.dart

@@ -17,6 +17,7 @@ class UserResponseDto {
     required this.createdAt,
     required this.deletedAt,
     required this.email,
+    required this.externalPath,
     required this.id,
     required this.isAdmin,
     this.memoriesEnabled,
@@ -38,6 +39,8 @@ class UserResponseDto {
 
   String email;
 
+  String? externalPath;
+
   String id;
 
   bool isAdmin;
@@ -72,6 +75,7 @@ class UserResponseDto {
     other.createdAt == createdAt &&
     other.deletedAt == deletedAt &&
     other.email == email &&
+    other.externalPath == externalPath &&
     other.id == id &&
     other.isAdmin == isAdmin &&
     other.memoriesEnabled == memoriesEnabled &&
@@ -91,6 +95,7 @@ class UserResponseDto {
     (createdAt.hashCode) +
     (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
+    (externalPath == null ? 0 : externalPath!.hashCode) +
     (id.hashCode) +
     (isAdmin.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
@@ -104,7 +109,7 @@ class UserResponseDto {
     (updatedAt.hashCode);
 
   @override
-  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
+  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, externalPath=$externalPath, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -116,6 +121,11 @@ class UserResponseDto {
     //  json[r'deletedAt'] = null;
     }
       json[r'email'] = this.email;
+    if (this.externalPath != null) {
+      json[r'externalPath'] = this.externalPath;
+    } else {
+    //  json[r'externalPath'] = null;
+    }
       json[r'id'] = this.id;
       json[r'isAdmin'] = this.isAdmin;
     if (this.memoriesEnabled != null) {
@@ -158,6 +168,7 @@ class UserResponseDto {
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
+        externalPath: mapValueOfType<String>(json, r'externalPath'),
         id: mapValueOfType<String>(json, r'id')!,
         isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
@@ -220,6 +231,7 @@ class UserResponseDto {
     'createdAt',
     'deletedAt',
     'email',
+    'externalPath',
     'id',
     'isAdmin',
     'name',

mobile/openapi/test/create_library_dto_test.dart

@@ -41,11 +41,6 @@ void main() {
       // TODO
     });
 
-    // String ownerId
-    test('to test the property `ownerId`', () async {
-      // TODO
-    });
-
     // LibraryType type
     test('to test the property `type`', () async {
       // TODO

mobile/openapi/test/create_user_dto_test.dart

@@ -21,6 +21,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // bool memoriesEnabled
     test('to test the property `memoriesEnabled`', () async {
       // TODO

mobile/openapi/test/library_api_test.dart

@@ -27,13 +27,13 @@ void main() {
       // TODO
     });
 
-    //Future<List<LibraryResponseDto>> getAllLibraries({ LibraryType type }) async
-    test('test getAllLibraries', () async {
+    //Future<List<LibraryResponseDto>> getLibraries() async
+    test('test getLibraries', () async {
       // TODO
     });
 
-    //Future<LibraryResponseDto> getLibrary(String id) async
-    test('test getLibrary', () async {
+    //Future<LibraryResponseDto> getLibraryInfo(String id) async
+    test('test getLibraryInfo', () async {
       // TODO
     });
 

mobile/openapi/test/partner_response_dto_test.dart

@@ -36,6 +36,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // String id
     test('to test the property `id`', () async {
       // TODO

mobile/openapi/test/system_config_library_watch_dto_test.dart

@@ -21,6 +21,16 @@ void main() {
       // TODO
     });
 
+    // int interval
+    test('to test the property `interval`', () async {
+      // TODO
+    });
+
+    // bool usePolling
+    test('to test the property `usePolling`', () async {
+      // TODO
+    });
+
 
   });
 

mobile/openapi/test/update_user_dto_test.dart

@@ -26,6 +26,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // String id
     test('to test the property `id`', () async {
       // TODO

mobile/openapi/test/user_response_dto_test.dart

@@ -36,6 +36,11 @@ void main() {
       // TODO
     });
 
+    // String externalPath
+    test('to test the property `externalPath`', () async {
+      // TODO
+    });
+
     // String id
     test('to test the property `id`', () async {
       // TODO

mobile/pubspec.lock

@@ -73,6 +73,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.3.2"
+  background_downloader:
+    dependency: "direct main"
+    description:
+      name: background_downloader
+      sha256: "39ac21607259ec24012cbf81816aa209e0d765fa086ca03a3a1d112cfad68b52"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -707,10 +715,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "1.2.0"
   http_multi_server:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: "none"
-version: 1.97.0+125
+version: 1.96.0+124
 isar_version: &isar_version 3.1.0+1
 
 environment:
@@ -58,6 +58,7 @@ dependencies:
   timezone: ^0.9.2
   octo_image: ^2.0.0
   thumbhash: 0.1.0+1
+  background_downloader: ^8.0.0
 
   openapi:
     path: openapi
@@ -80,6 +81,7 @@ dependency_overrides:
 #f      url: https://github.com/Zverik/flutter-geolocator.git
 #f      ref: floss
 #f      path: geolocator_android
+  http: ^1.1.0
 
 dev_dependencies:
   flutter_test:

open-api/immich-openapi-specs.json

@@ -3299,17 +3299,8 @@
     },
     "/library": {
       "get": {
-        "operationId": "getAllLibraries",
-        "parameters": [
-          {
-            "name": "type",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "$ref": "#/components/schemas/LibraryType"
-            }
-          }
-        ],
+        "operationId": "getLibraries",
+        "parameters": [],
         "responses": {
           "200": {
             "content": {
@@ -3416,7 +3407,7 @@
         ]
       },
       "get": {
-        "operationId": "getLibrary",
+        "operationId": "getLibraryInfo",
         "parameters": [
           {
             "name": "id",
@@ -6467,7 +6458,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.97.0",
+    "version": "1.96.0",
     "contact": {}
   },
   "tags": [],
@@ -7601,10 +7592,6 @@
           "name": {
             "type": "string"
           },
-          "ownerId": {
-            "format": "uuid",
-            "type": "string"
-          },
           "type": {
             "$ref": "#/components/schemas/LibraryType"
           }
@@ -7661,6 +7648,10 @@
           "email": {
             "type": "string"
           },
+          "externalPath": {
+            "nullable": true,
+            "type": "string"
+          },
           "memoriesEnabled": {
             "type": "boolean"
           },
@@ -8558,6 +8549,10 @@
           "email": {
             "type": "string"
           },
+          "externalPath": {
+            "nullable": true,
+            "type": "string"
+          },
           "id": {
             "type": "string"
           },
@@ -8606,6 +8601,7 @@
           "createdAt",
           "deletedAt",
           "email",
+          "externalPath",
           "id",
           "isAdmin",
           "name",
@@ -9835,10 +9831,18 @@
         "properties": {
           "enabled": {
             "type": "boolean"
+          },
+          "interval": {
+            "type": "integer"
+          },
+          "usePolling": {
+            "type": "boolean"
           }
         },
         "required": [
-          "enabled"
+          "enabled",
+          "interval",
+          "usePolling"
         ],
         "type": "object"
       },
@@ -10330,6 +10334,9 @@
           "email": {
             "type": "string"
           },
+          "externalPath": {
+            "type": "string"
+          },
           "id": {
             "format": "uuid",
             "type": "string"
@@ -10456,6 +10463,10 @@
           "email": {
             "type": "string"
           },
+          "externalPath": {
+            "nullable": true,
+            "type": "string"
+          },
           "id": {
             "type": "string"
           },
@@ -10501,6 +10512,7 @@
           "createdAt",
           "deletedAt",
           "email",
+          "externalPath",
           "id",
           "isAdmin",
           "name",

open-api/typescript-sdk/axios-client/api.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.97.0
+ * The version of the OpenAPI document: 1.96.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -1399,12 +1399,6 @@ export interface CreateLibraryDto {
      * @memberof CreateLibraryDto
      */
     'name'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof CreateLibraryDto
-     */
-    'ownerId'?: string;
     /**
      * 
      * @type {LibraryType}
@@ -1466,6 +1460,12 @@ export interface CreateUserDto {
      * @memberof CreateUserDto
      */
     'email': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof CreateUserDto
+     */
+    'externalPath'?: string | null;
     /**
      * 
      * @type {boolean}
@@ -2680,6 +2680,12 @@ export interface PartnerResponseDto {
      * @memberof PartnerResponseDto
      */
     'email': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PartnerResponseDto
+     */
+    'externalPath': string | null;
     /**
      * 
      * @type {string}
@@ -4395,6 +4401,18 @@ export interface SystemConfigLibraryWatchDto {
      * @memberof SystemConfigLibraryWatchDto
      */
     'enabled': boolean;
+    /**
+     * 
+     * @type {number}
+     * @memberof SystemConfigLibraryWatchDto
+     */
+    'interval': number;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof SystemConfigLibraryWatchDto
+     */
+    'usePolling': boolean;
 }
 /**
  * 
@@ -5068,6 +5086,12 @@ export interface UpdateUserDto {
      * @memberof UpdateUserDto
      */
     'email'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UpdateUserDto
+     */
+    'externalPath'?: string;
     /**
      * 
      * @type {string}
@@ -5253,6 +5277,12 @@ export interface UserResponseDto {
      * @memberof UserResponseDto
      */
     'email': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserResponseDto
+     */
+    'externalPath': string | null;
     /**
      * 
      * @type {string}
@@ -12636,11 +12666,10 @@ export const LibraryApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @param {LibraryType} [type] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getAllLibraries: async (type?: LibraryType, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getLibraries: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/library`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -12662,10 +12691,6 @@ export const LibraryApiAxiosParamCreator = function (configuration?: Configurati
             // http bearer authentication required
             await setBearerAuthToObject(localVarHeaderParameter, configuration)
 
-            if (type !== undefined) {
-                localVarQueryParameter['type'] = type;
-            }
-
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -12683,9 +12708,9 @@ export const LibraryApiAxiosParamCreator = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getLibrary: async (id: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getLibraryInfo: async (id: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
-            assertParamExists('getLibrary', 'id', id)
+            assertParamExists('getLibraryInfo', 'id', id)
             const localVarPath = `/library/{id}`
                 .replace(`{${"id"}}`, encodeURIComponent(String(id)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -12983,14 +13008,13 @@ export const LibraryApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @param {LibraryType} [type] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getAllLibraries(type?: LibraryType, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<LibraryResponseDto>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getAllLibraries(type, options);
+        async getLibraries(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<LibraryResponseDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getLibraries(options);
             const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['LibraryApi.getAllLibraries']?.[index]?.url;
+            const operationBasePath = operationServerMap['LibraryApi.getLibraries']?.[index]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
@@ -12999,10 +13023,10 @@ export const LibraryApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getLibrary(id: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<LibraryResponseDto>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getLibrary(id, options);
+        async getLibraryInfo(id: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<LibraryResponseDto>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getLibraryInfo(id, options);
             const index = configuration?.serverIndex ?? 0;
-            const operationBasePath = operationServerMap['LibraryApi.getLibrary']?.[index]?.url;
+            const operationBasePath = operationServerMap['LibraryApi.getLibraryInfo']?.[index]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, operationBasePath || basePath);
         },
         /**
@@ -13098,21 +13122,20 @@ export const LibraryApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @param {LibraryApiGetAllLibrariesRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getAllLibraries(requestParameters: LibraryApiGetAllLibrariesRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<Array<LibraryResponseDto>> {
-            return localVarFp.getAllLibraries(requestParameters.type, options).then((request) => request(axios, basePath));
+        getLibraries(options?: RawAxiosRequestConfig): AxiosPromise<Array<LibraryResponseDto>> {
+            return localVarFp.getLibraries(options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @param {LibraryApiGetLibraryRequest} requestParameters Request parameters.
+         * @param {LibraryApiGetLibraryInfoRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getLibrary(requestParameters: LibraryApiGetLibraryRequest, options?: RawAxiosRequestConfig): AxiosPromise<LibraryResponseDto> {
-            return localVarFp.getLibrary(requestParameters.id, options).then((request) => request(axios, basePath));
+        getLibraryInfo(requestParameters: LibraryApiGetLibraryInfoRequest, options?: RawAxiosRequestConfig): AxiosPromise<LibraryResponseDto> {
+            return localVarFp.getLibraryInfo(requestParameters.id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -13191,29 +13214,15 @@ export interface LibraryApiDeleteLibraryRequest {
 }
 
 /**
- * Request parameters for getAllLibraries operation in LibraryApi.
+ * Request parameters for getLibraryInfo operation in LibraryApi.
  * @export
- * @interface LibraryApiGetAllLibrariesRequest
+ * @interface LibraryApiGetLibraryInfoRequest
  */
-export interface LibraryApiGetAllLibrariesRequest {
-    /**
-     * 
-     * @type {LibraryType}
-     * @memberof LibraryApiGetAllLibraries
-     */
-    readonly type?: LibraryType
-}
-
-/**
- * Request parameters for getLibrary operation in LibraryApi.
- * @export
- * @interface LibraryApiGetLibraryRequest
- */
-export interface LibraryApiGetLibraryRequest {
+export interface LibraryApiGetLibraryInfoRequest {
     /**
      * 
      * @type {string}
-     * @memberof LibraryApiGetLibrary
+     * @memberof LibraryApiGetLibraryInfo
      */
     readonly id: string
 }
@@ -13340,24 +13349,23 @@ export class LibraryApi extends BaseAPI {
 
     /**
      * 
-     * @param {LibraryApiGetAllLibrariesRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof LibraryApi
      */
-    public getAllLibraries(requestParameters: LibraryApiGetAllLibrariesRequest = {}, options?: RawAxiosRequestConfig) {
-        return LibraryApiFp(this.configuration).getAllLibraries(requestParameters.type, options).then((request) => request(this.axios, this.basePath));
+    public getLibraries(options?: RawAxiosRequestConfig) {
+        return LibraryApiFp(this.configuration).getLibraries(options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
-     * @param {LibraryApiGetLibraryRequest} requestParameters Request parameters.
+     * @param {LibraryApiGetLibraryInfoRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof LibraryApi
      */
-    public getLibrary(requestParameters: LibraryApiGetLibraryRequest, options?: RawAxiosRequestConfig) {
-        return LibraryApiFp(this.configuration).getLibrary(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
+    public getLibraryInfo(requestParameters: LibraryApiGetLibraryInfoRequest, options?: RawAxiosRequestConfig) {
+        return LibraryApiFp(this.configuration).getLibraryInfo(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**

open-api/typescript-sdk/axios-client/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.97.0
+ * The version of the OpenAPI document: 1.96.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/axios-client/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.97.0
+ * The version of the OpenAPI document: 1.96.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/axios-client/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.97.0
+ * The version of the OpenAPI document: 1.96.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/axios-client/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.97.0
+ * The version of the OpenAPI document: 1.96.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/fetch-client.ts

@@ -1,6 +1,6 @@
 /**
  * Immich
- * 1.97.0
+ * 1.96.0
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
@@ -66,6 +66,7 @@ export type UserResponseDto = {
     createdAt: string;
     deletedAt: string | null;
     email: string;
+    externalPath: string | null;
     id: string;
     isAdmin: boolean;
     memoriesEnabled?: boolean;
@@ -461,7 +462,6 @@ export type CreateLibraryDto = {
     isVisible?: boolean;
     isWatched?: boolean;
     name?: string;
-    ownerId?: string;
     "type": LibraryType;
 };
 export type UpdateLibraryDto = {
@@ -506,6 +506,7 @@ export type PartnerResponseDto = {
     createdAt: string;
     deletedAt: string | null;
     email: string;
+    externalPath: string | null;
     id: string;
     inTimeline?: boolean;
     isAdmin: boolean;
@@ -834,6 +835,8 @@ export type SystemConfigLibraryScanDto = {
 };
 export type SystemConfigLibraryWatchDto = {
     enabled: boolean;
+    interval: number;
+    usePolling: boolean;
 };
 export type SystemConfigLibraryDto = {
     scan: SystemConfigLibraryScanDto;
@@ -949,6 +952,7 @@ export type UpdateTagDto = {
 };
 export type CreateUserDto = {
     email: string;
+    externalPath?: string | null;
     memoriesEnabled?: boolean;
     name: string;
     password: string;
@@ -958,6 +962,7 @@ export type CreateUserDto = {
 export type UpdateUserDto = {
     avatarColor?: UserAvatarColor;
     email?: string;
+    externalPath?: string;
     id: string;
     isAdmin?: boolean;
     memoriesEnabled?: boolean;
@@ -1838,15 +1843,11 @@ export function sendJobCommand({ id, jobCommandDto }: {
         body: jobCommandDto
     })));
 }
-export function getAllLibraries({ $type }: {
-    $type?: LibraryType;
-}, opts?: Oazapfts.RequestOpts) {
+export function getLibraries(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: LibraryResponseDto[];
-    }>(`/library${QS.query(QS.explode({
-        "type": $type
-    }))}`, {
+    }>("/library", {
         ...opts
     }));
 }
@@ -1870,7 +1871,7 @@ export function deleteLibrary({ id }: {
         method: "DELETE"
     }));
 }
-export function getLibrary({ id }: {
+export function getLibraryInfo({ id }: {
     id: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{

server/e2e/api/specs/asset.e2e-spec.ts

@@ -41,7 +41,6 @@ describe(`${AssetController.name} (e2e)`, () => {
   let app: INestApplication;
   let server: any;
   let assetRepository: IAssetRepository;
-  let admin: LoginResponseDto;
   let user1: LoginResponseDto;
   let user2: LoginResponseDto;
   let userWithQuota: LoginResponseDto;
@@ -73,7 +72,7 @@ describe(`${AssetController.name} (e2e)`, () => {
     await testApp.reset();
 
     await api.authApi.adminSignUp(server);
-    admin = await api.authApi.adminLogin(server);
+    const admin = await api.authApi.adminLogin(server);
 
     await Promise.all([
       api.userApi.create(server, admin.accessToken, userDto.user1),
@@ -87,7 +86,12 @@ describe(`${AssetController.name} (e2e)`, () => {
       api.authApi.login(server, userDto.userWithQuota),
     ]);
 
-    libraries = await api.libraryApi.getAll(server, admin.accessToken);
+    const [user1Libraries, user2Libraries] = await Promise.all([
+      api.libraryApi.getAll(server, user1.accessToken),
+      api.libraryApi.getAll(server, user2.accessToken),
+    ]);
+
+    libraries = [...user1Libraries, ...user2Libraries];
   });
 
   beforeEach(async () => {
@@ -611,7 +615,7 @@ describe(`${AssetController.name} (e2e)`, () => {
 
     it("should not upload to another user's library", async () => {
       const content = randomBytes(32);
-      const [library] = await api.libraryApi.getAll(server, admin.accessToken);
+      const [library] = await api.libraryApi.getAll(server, user2.accessToken);
       await api.assetApi.upload(server, user1.accessToken, 'example-image', { content });
 
       const { body, status } = await request(server)

server/e2e/api/specs/library.e2e-spec.ts

@@ -10,7 +10,6 @@ import { testApp } from '../utils';
 describe(`${LibraryController.name} (e2e)`, () => {
   let server: any;
   let admin: LoginResponseDto;
-  let user: LoginResponseDto;
 
   beforeAll(async () => {
     const app = await testApp.create();
@@ -26,9 +25,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
     await testApp.reset();
     await api.authApi.adminSignUp(server);
     admin = await api.authApi.adminLogin(server);
-
-    await api.userApi.create(server, admin.accessToken, userDto.user1);
-    user = await api.authApi.login(server, userDto.user1);
   });
 
   describe('GET /library', () => {
@@ -43,19 +39,18 @@ describe(`${LibraryController.name} (e2e)`, () => {
         .get('/library')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            ownerId: admin.userId,
-            type: LibraryType.UPLOAD,
-            name: 'Default Library',
-            refreshedAt: null,
-            assetCount: 0,
-            importPaths: [],
-            exclusionPatterns: [],
-          }),
-        ]),
-      );
+      expect(body).toHaveLength(1);
+      expect(body).toEqual([
+        expect.objectContaining({
+          ownerId: admin.userId,
+          type: LibraryType.UPLOAD,
+          name: 'Default Library',
+          refreshedAt: null,
+          assetCount: 0,
+          importPaths: [],
+          exclusionPatterns: [],
+        }),
+      ]);
     });
   });
 
@@ -66,16 +61,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(body).toEqual(errorStub.unauthorized);
     });
 
-    it('should require admin authentication', async () => {
-      const { status, body } = await request(server)
-        .post('/library')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({ type: LibraryType.EXTERNAL });
-
-      expect(status).toBe(403);
-      expect(body).toEqual(errorStub.forbidden);
-    });
-
     it('should create an external library with defaults', async () => {
       const { status, body } = await request(server)
         .post('/library')
@@ -199,6 +184,29 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(status).toBe(400);
       expect(body).toEqual(errorStub.badRequest('Upload libraries cannot have exclusion patterns'));
     });
+
+    it('should allow a non-admin to create a library', async () => {
+      await api.userApi.create(server, admin.accessToken, userDto.user1);
+      const user1 = await api.authApi.login(server, userDto.user1);
+
+      const { status, body } = await request(server)
+        .post('/library')
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ type: LibraryType.EXTERNAL });
+
+      expect(status).toBe(201);
+      expect(body).toEqual(
+        expect.objectContaining({
+          ownerId: user1.userId,
+          type: LibraryType.EXTERNAL,
+          name: 'New External Library',
+          refreshedAt: null,
+          assetCount: 0,
+          importPaths: [],
+          exclusionPatterns: [],
+        }),
+      );
+    });
   });
 
   describe('PUT /library/:id', () => {
@@ -241,6 +249,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
       });
 
       it('should change the import paths', async () => {
+        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, IMMICH_TEST_ASSET_TEMP_PATH);
         const { status, body } = await request(server)
           .put(`/library/${library.id}`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
@@ -318,14 +327,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(body).toEqual(errorStub.unauthorized);
     });
 
-    it('should require admin access', async () => {
-      const { status, body } = await request(server)
-        .get(`/library/${uuidStub.notFound}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorStub.forbidden);
-    });
-
     it('should get library by id', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
 
@@ -346,6 +347,27 @@ describe(`${LibraryController.name} (e2e)`, () => {
         }),
       );
     });
+
+    it("should not allow getting another user's library", async () => {
+      await Promise.all([
+        api.userApi.create(server, admin.accessToken, userDto.user1),
+        api.userApi.create(server, admin.accessToken, userDto.user2),
+      ]);
+
+      const [user1, user2] = await Promise.all([
+        api.authApi.login(server, userDto.user1),
+        api.authApi.login(server, userDto.user2),
+      ]);
+
+      const library = await api.libraryApi.create(server, user1.accessToken, { type: LibraryType.EXTERNAL });
+
+      const { status, body } = await request(server)
+        .get(`/library/${library.id}`)
+        .set('Authorization', `Bearer ${user2.accessToken}`);
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorStub.badRequest('Not found or no library.read access'));
+    });
   });
 
   describe('DELETE /library/:id', () => {
@@ -368,7 +390,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(body).toEqual(errorStub.noDeleteUploadLibrary);
     });
 
-    it('should delete an external library', async () => {
+    it('should delete an empty library', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
 
       const { status, body } = await request(server)
@@ -379,6 +401,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(body).toEqual({});
 
       const libraries = await api.libraryApi.getAll(server, admin.accessToken);
+      expect(libraries).toHaveLength(1);
       expect(libraries).not.toEqual(
         expect.arrayContaining([
           expect.objectContaining({
@@ -432,42 +455,74 @@ describe(`${LibraryController.name} (e2e)`, () => {
         library = await api.libraryApi.create(server, admin.accessToken, { type: LibraryType.EXTERNAL });
       });
 
-      it('should pass with no import paths', async () => {
-        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, { importPaths: [] });
-        expect(response.importPaths).toEqual([]);
+      it('should fail with no external path set', async () => {
+        const { status, body } = await request(server)
+          .post(`/library/${library.id}/validate`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+
+          .send({ importPaths: [] });
+
+        expect(status).toBe(400);
+        expect(body).toEqual(errorStub.badRequest('User has no external path set'));
       });
 
-      it('should fail if path does not exist', async () => {
-        const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
-
-        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
-          importPaths: [pathToTest],
+      describe('With external path set', () => {
+        beforeEach(async () => {
+          await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, IMMICH_TEST_ASSET_TEMP_PATH);
         });
 
-        expect(response.importPaths?.length).toEqual(1);
-        const pathResponse = response?.importPaths?.at(0);
-
-        expect(pathResponse).toEqual({
-          importPath: pathToTest,
-          isValid: false,
-          message: `Path does not exist (ENOENT)`,
-        });
-      });
-
-      it('should fail if path is a file', async () => {
-        const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
-
-        const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
-          importPaths: [pathToTest],
+        it('should pass with no import paths', async () => {
+          const response = await api.libraryApi.validate(server, admin.accessToken, library.id, { importPaths: [] });
+          expect(response.importPaths).toEqual([]);
         });
 
-        expect(response.importPaths?.length).toEqual(1);
-        const pathResponse = response?.importPaths?.at(0);
+        it('should not allow paths outside of the external path', async () => {
+          const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/../`;
+          const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
+            importPaths: [pathToTest],
+          });
+          expect(response.importPaths?.length).toEqual(1);
+          const pathResponse = response?.importPaths?.at(0);
 
-        expect(pathResponse).toEqual({
-          importPath: pathToTest,
-          isValid: false,
-          message: `Path does not exist (ENOENT)`,
+          expect(pathResponse).toEqual({
+            importPath: pathToTest,
+            isValid: false,
+            message: `Not contained in user's external path`,
+          });
+        });
+
+        it('should fail if path does not exist', async () => {
+          const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
+
+          const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
+            importPaths: [pathToTest],
+          });
+
+          expect(response.importPaths?.length).toEqual(1);
+          const pathResponse = response?.importPaths?.at(0);
+
+          expect(pathResponse).toEqual({
+            importPath: pathToTest,
+            isValid: false,
+            message: `Path does not exist (ENOENT)`,
+          });
+        });
+
+        it('should fail if path is a file', async () => {
+          const pathToTest = `${IMMICH_TEST_ASSET_TEMP_PATH}/does/not/exist`;
+
+          const response = await api.libraryApi.validate(server, admin.accessToken, library.id, {
+            importPaths: [pathToTest],
+          });
+
+          expect(response.importPaths?.length).toEqual(1);
+          const pathResponse = response?.importPaths?.at(0);
+
+          expect(pathResponse).toEqual({
+            importPath: pathToTest,
+            isValid: false,
+            message: `Path does not exist (ENOENT)`,
+          });
         });
       });
     });

server/e2e/client/user-api.ts

@@ -26,12 +26,7 @@ export const userApi = {
 
     return body as UserResponseDto;
   },
-  delete: async (server: any, accessToken: string, id: string) => {
-    const { status, body } = await request(server).delete(`/user/${id}`).set('Authorization', `Bearer ${accessToken}`);
-
-    expect(status).toBe(200);
-    expect(body).toMatchObject({ id, deletedAt: expect.any(String) });
-
-    return body as UserResponseDto;
+  setExternalPath: async (server: any, accessToken: string, id: string, externalPath: string) => {
+    return await userApi.update(server, accessToken, { id, externalPath });
   },
 };

server/e2e/jobs/specs/formats.e2e-spec.ts

@@ -0,0 +1,158 @@
+import { LoginResponseDto } from '@app/domain';
+import { AssetType } from '@app/infra/entities';
+import { readFile } from 'node:fs/promises';
+import { basename, join } from 'node:path';
+import { IMMICH_TEST_ASSET_PATH, testApp } from '../../../src/test-utils/utils';
+import { api } from '../../client';
+
+const JPEG = {
+  type: AssetType.IMAGE,
+  originalFileName: 'el_torcal_rocks',
+  resized: true,
+  exifInfo: {
+    dateTimeOriginal: '2012-08-05T11:39:59.000Z',
+    exifImageWidth: 512,
+    exifImageHeight: 341,
+    latitude: null,
+    longitude: null,
+    focalLength: 75,
+    iso: 200,
+    fNumber: 11,
+    exposureTime: '1/160',
+    fileSizeInByte: 53_493,
+    make: 'SONY',
+    model: 'DSLR-A550',
+    orientation: null,
+    description: 'SONY DSC',
+  },
+};
+
+const tests = [
+  { input: 'formats/jpg/el_torcal_rocks.jpg', expected: JPEG },
+  { input: 'formats/jpeg/el_torcal_rocks.jpeg', expected: JPEG },
+  {
+    input: 'formats/heic/IMG_2682.heic',
+    expected: {
+      type: AssetType.IMAGE,
+      originalFileName: 'IMG_2682',
+      resized: true,
+      fileCreatedAt: '2019-03-21T16:04:22.348Z',
+      exifInfo: {
+        dateTimeOriginal: '2019-03-21T16:04:22.348Z',
+        exifImageWidth: 4032,
+        exifImageHeight: 3024,
+        latitude: 41.2203,
+        longitude: -96.071_625,
+        make: 'Apple',
+        model: 'iPhone 7',
+        lensModel: 'iPhone 7 back camera 3.99mm f/1.8',
+        fileSizeInByte: 880_703,
+        exposureTime: '1/887',
+        iso: 20,
+        focalLength: 3.99,
+        fNumber: 1.8,
+        timeZone: 'America/Chicago',
+      },
+    },
+  },
+  {
+    input: 'formats/png/density_plot.png',
+    expected: {
+      type: AssetType.IMAGE,
+      originalFileName: 'density_plot',
+      resized: true,
+      exifInfo: {
+        exifImageWidth: 800,
+        exifImageHeight: 800,
+        latitude: null,
+        longitude: null,
+        fileSizeInByte: 25_408,
+      },
+    },
+  },
+  {
+    input: 'formats/raw/Nikon/D80/glarus.nef',
+    expected: {
+      type: AssetType.IMAGE,
+      originalFileName: 'glarus',
+      resized: true,
+      fileCreatedAt: '2010-07-20T17:27:12.000Z',
+      exifInfo: {
+        make: 'NIKON CORPORATION',
+        model: 'NIKON D80',
+        exposureTime: '1/200',
+        fNumber: 10,
+        focalLength: 18,
+        iso: 100,
+        fileSizeInByte: 9_057_784,
+        dateTimeOriginal: '2010-07-20T17:27:12.000Z',
+        latitude: null,
+        longitude: null,
+        orientation: '1',
+      },
+    },
+  },
+  {
+    input: 'formats/raw/Nikon/D700/philadelphia.nef',
+    expected: {
+      type: AssetType.IMAGE,
+      originalFileName: 'philadelphia',
+      resized: true,
+      fileCreatedAt: '2016-09-22T22:10:29.060Z',
+      exifInfo: {
+        make: 'NIKON CORPORATION',
+        model: 'NIKON D700',
+        exposureTime: '1/400',
+        fNumber: 11,
+        focalLength: 85,
+        iso: 200,
+        fileSizeInByte: 15_856_335,
+        dateTimeOriginal: '2016-09-22T22:10:29.060Z',
+        latitude: null,
+        longitude: null,
+        orientation: '1',
+        timeZone: 'UTC-5',
+      },
+    },
+  },
+];
+
+describe(`Format (e2e)`, () => {
+  let server: any;
+  let admin: LoginResponseDto;
+
+  beforeAll(async () => {
+    const app = await testApp.create();
+    server = app.getHttpServer();
+  });
+
+  beforeEach(async () => {
+    await testApp.reset();
+    await api.authApi.adminSignUp(server);
+    admin = await api.authApi.adminLogin(server);
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+  });
+
+  for (const { input, expected } of tests) {
+    it(`should generate a thumbnail for ${input}`, async () => {
+      const filepath = join(IMMICH_TEST_ASSET_PATH, input);
+      const content = await readFile(filepath);
+      await api.assetApi.upload(server, admin.accessToken, 'test-device-id', {
+        content,
+        filename: basename(filepath),
+      });
+      const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
+
+      expect(assets).toHaveLength(1);
+
+      const asset = assets[0];
+
+      expect(asset.exifInfo).toBeDefined();
+      expect(asset.exifInfo).toMatchObject(expected.exifInfo);
+      expect(asset).toMatchObject(expected);
+    });
+  }
+});

server/e2e/jobs/specs/library-watcher.e2e-spec.ts

@@ -30,6 +30,8 @@ describe(`Library watcher (e2e)`, () => {
     await restoreTempFolder();
     await api.authApi.adminSignUp(server);
     admin = await api.authApi.adminLogin(server);
+
+    await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
   });
 
   afterEach(async () => {
@@ -203,6 +205,8 @@ describe(`Library watcher (e2e)`, () => {
         ],
       });
 
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
+
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir1`, { recursive: true });
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir2`, { recursive: true });
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir3`, { recursive: true });

server/e2e/jobs/specs/library.e2e-spec.ts

@@ -40,6 +40,8 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
+
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -77,6 +79,8 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
+
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -114,12 +118,16 @@ describe(`${LibraryController.name} (e2e)`, () => {
     });
 
     it('should scan external library with exclusion pattern', async () => {
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/not/a/real/path');
+
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
         exclusionPatterns: ['**/el_corcal*'],
       });
 
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
+
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -155,6 +163,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
@@ -181,11 +190,39 @@ describe(`${LibraryController.name} (e2e)`, () => {
       );
     });
 
+    it('should offline files outside of changed external path', async () => {
+      const library = await api.libraryApi.create(server, admin.accessToken, {
+        type: LibraryType.EXTERNAL,
+        importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
+      });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
+      await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
+
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/some/other/path');
+      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: 'el_torcal_rocks',
+          }),
+          expect.objectContaining({
+            isOffline: true,
+            originalFileName: 'tanners_ridge',
+          }),
+        ]),
+      );
+    });
+
     it('should scan new files', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await fs.promises.cp(
         `${IMMICH_TEST_ASSET_PATH}/albums/nature/silver_fir.jpg`,
@@ -221,6 +258,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
+        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -267,6 +305,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
+        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -306,6 +345,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
+        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -347,6 +387,72 @@ describe(`${LibraryController.name} (e2e)`, () => {
       });
     });
 
+    describe('External path', () => {
+      let library: LibraryResponseDto;
+
+      beforeEach(async () => {
+        library = await api.libraryApi.create(server, admin.accessToken, {
+          type: LibraryType.EXTERNAL,
+          importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
+        });
+      });
+
+      it('should not scan assets for user without external path', async () => {
+        await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
+        const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
+
+        expect(assets).toEqual([]);
+      });
+
+      it("should not import assets outside of user's external path", async () => {
+        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/not/a/real/path');
+        await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
+
+        const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
+        expect(assets).toEqual([]);
+      });
+
+      it.each([`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_PATH}/albums/nature/`])(
+        'should scan external library with external path %s',
+        async (externalPath: string) => {
+          await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, externalPath);
+
+          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({
+                type: AssetType.IMAGE,
+                originalFileName: 'el_torcal_rocks',
+                libraryId: library.id,
+                resized: true,
+                exifInfo: expect.objectContaining({
+                  exifImageWidth: 512,
+                  exifImageHeight: 341,
+                  latitude: null,
+                  longitude: null,
+                }),
+              }),
+              expect.objectContaining({
+                type: AssetType.IMAGE,
+                originalFileName: 'silver_fir',
+                libraryId: library.id,
+                resized: true,
+                exifInfo: expect.objectContaining({
+                  exifImageWidth: 511,
+                  exifImageHeight: 323,
+                  latitude: null,
+                  longitude: null,
+                }),
+              }),
+            ]),
+          );
+        },
+      );
+    });
+
     it('should not scan an upload library', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.UPLOAD,
@@ -378,6 +484,7 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
@@ -399,11 +506,12 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(assets).toEqual([]);
     });
 
-    it('should not remove online files', async () => {
+    it('should not remvove online files', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
+      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 

server/e2e/jobs/specs/metadata.e2e-spec.ts

@@ -0,0 +1,102 @@
+import { AssetResponseDto, LoginResponseDto } from '@app/domain';
+import { AssetController } from '@app/immich';
+import { exiftool } from 'exiftool-vendored';
+import { readFile, writeFile } from 'fs/promises';
+import {
+  IMMICH_TEST_ASSET_PATH,
+  IMMICH_TEST_ASSET_TEMP_PATH,
+  db,
+  restoreTempFolder,
+  testApp,
+} from '../../../src/test-utils/utils';
+import { api } from '../../client';
+
+describe(`${AssetController.name} (e2e)`, () => {
+  let server: any;
+  let admin: LoginResponseDto;
+
+  beforeAll(async () => {
+    server = (await testApp.create()).getHttpServer();
+  });
+
+  beforeEach(async () => {
+    await testApp.reset();
+    await restoreTempFolder();
+    await api.authApi.adminSignUp(server);
+    admin = await api.authApi.adminLogin(server);
+  });
+
+  afterAll(async () => {
+    await testApp.teardown();
+    await restoreTempFolder();
+  });
+
+  describe('should strip metadata of', () => {
+    let assetWithLocation: AssetResponseDto;
+
+    beforeEach(async () => {
+      const fileContent = await readFile(`${IMMICH_TEST_ASSET_PATH}/metadata/gps-position/thompson-springs.jpg`);
+
+      await api.assetApi.upload(server, admin.accessToken, 'test-asset-id', { content: fileContent });
+
+      const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
+
+      expect(assets).toHaveLength(1);
+      assetWithLocation = assets[0];
+
+      expect(assetWithLocation).toEqual(
+        expect.objectContaining({
+          exifInfo: expect.objectContaining({ latitude: 39.115, longitude: -108.400968333333 }),
+        }),
+      );
+    });
+
+    it('small webp thumbnails', async () => {
+      const assetId = assetWithLocation.id;
+
+      const thumbnail = await api.assetApi.getWebpThumbnail(server, admin.accessToken, assetId);
+
+      await writeFile(`${IMMICH_TEST_ASSET_TEMP_PATH}/thumbnail.webp`, thumbnail);
+
+      const exifData = await exiftool.read(`${IMMICH_TEST_ASSET_TEMP_PATH}/thumbnail.webp`);
+
+      expect(exifData).not.toHaveProperty('GPSLongitude');
+      expect(exifData).not.toHaveProperty('GPSLatitude');
+    });
+
+    it('large jpeg thumbnails', async () => {
+      const assetId = assetWithLocation.id;
+
+      const thumbnail = await api.assetApi.getJpegThumbnail(server, admin.accessToken, assetId);
+
+      await writeFile(`${IMMICH_TEST_ASSET_TEMP_PATH}/thumbnail.jpg`, thumbnail);
+
+      const exifData = await exiftool.read(`${IMMICH_TEST_ASSET_TEMP_PATH}/thumbnail.jpg`);
+
+      expect(exifData).not.toHaveProperty('GPSLongitude');
+      expect(exifData).not.toHaveProperty('GPSLatitude');
+    });
+  });
+
+  describe.each([
+    // These hashes were created by copying the image files to a Samsung phone,
+    // exporting the video from Samsung's stock Gallery app, and hashing them locally.
+    // This ensures that immich+exiftool are extracting the videos the same way Samsung does.
+    // DO NOT assume immich+exiftool are doing things correctly and just copy whatever hash it gives
+    // into the test here.
+    ['Samsung One UI 5.jpg', 'fr14niqCq6N20HB8rJYEvpsUVtI='],
+    ['Samsung One UI 6.jpg', 'lT9Uviw/FFJYCjfIxAGPTjzAmmw='],
+    ['Samsung One UI 6.heic', '/ejgzywvgvzvVhUYVfvkLzFBAF0='],
+  ])('should extract motionphoto video', (file, checksum) => {
+    it(`with checksum ${checksum} from ${file}`, async () => {
+      const fileContent = await readFile(`${IMMICH_TEST_ASSET_PATH}/formats/motionphoto/${file}`);
+
+      const response = await api.assetApi.upload(server, admin.accessToken, 'test-asset-id', { content: fileContent });
+      const asset = await api.assetApi.get(server, admin.accessToken, response.id);
+      expect(asset).toHaveProperty('livePhotoVideoId');
+      const video = await api.assetApi.get(server, admin.accessToken, asset.livePhotoVideoId as string);
+
+      expect(video.checksum).toStrictEqual(checksum);
+    });
+  });
+});

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich",
-  "version": "1.97.0",
+  "version": "1.96.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "immich",
-      "version": "1.97.0",
+      "version": "1.96.0",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@babel/runtime": "^7.22.11",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.97.0",
+  "version": "1.96.0",
   "description": "",
   "author": "",
   "private": true,

server/src/domain/job/job.service.spec.ts

@@ -286,7 +286,12 @@ describe(JobService.name, () => {
       },
       {
         item: { name: JobName.GENERATE_JPEG_THUMBNAIL, data: { id: 'asset-1' } },
-        jobs: [JobName.GENERATE_WEBP_THUMBNAIL, JobName.GENERATE_THUMBHASH_THUMBNAIL],
+        jobs: [
+          JobName.GENERATE_WEBP_THUMBNAIL,
+          JobName.GENERATE_THUMBHASH_THUMBNAIL,
+          JobName.SMART_SEARCH,
+          JobName.FACE_DETECTION,
+        ],
       },
       {
         item: { name: JobName.GENERATE_JPEG_THUMBNAIL, data: { id: 'asset-1', source: 'upload' } },

server/src/domain/job/job.service.ts

@@ -248,18 +248,16 @@ export class JobService {
         const jobs: JobItem[] = [
           { name: JobName.GENERATE_WEBP_THUMBNAIL, data: item.data },
           { name: JobName.GENERATE_THUMBHASH_THUMBNAIL, data: item.data },
+          { name: JobName.SMART_SEARCH, data: item.data },
+          { name: JobName.FACE_DETECTION, data: item.data },
         ];
 
-        if (item.data.source === 'upload') {
-          jobs.push({ name: JobName.SMART_SEARCH, data: item.data }, { name: JobName.FACE_DETECTION, data: item.data });
-
-          const [asset] = await this.assetRepository.getByIds([item.data.id]);
-          if (asset) {
-            if (asset.type === AssetType.VIDEO) {
-              jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });
-            } else if (asset.livePhotoVideoId) {
-              jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.livePhotoVideoId } });
-            }
+        const [asset] = await this.assetRepository.getByIds([item.data.id]);
+        if (asset) {
+          if (asset.type === AssetType.VIDEO) {
+            jobs.push({ name: JobName.VIDEO_CONVERSION, data: item.data });
+          } else if (asset.livePhotoVideoId) {
+            jobs.push({ name: JobName.VIDEO_CONVERSION, data: { id: asset.livePhotoVideoId } });
           }
         }
 

server/src/domain/library/library.dto.ts

@@ -1,62 +1,59 @@
 import { LibraryEntity, LibraryType } from '@app/infra/entities';
 import { ApiProperty } from '@nestjs/swagger';
-import { ArrayMaxSize, ArrayUnique, IsBoolean, IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { Optional, ValidateUUID } from '../domain.util';
+import { ArrayMaxSize, ArrayUnique, IsBoolean, IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import { ValidateUUID } from '../domain.util';
 
 export class CreateLibraryDto {
   @IsEnum(LibraryType)
   @ApiProperty({ enumName: 'LibraryType', enum: LibraryType })
   type!: LibraryType;
 
-  @ValidateUUID({ optional: true })
-  ownerId?: string;
-
   @IsString()
-  @Optional()
+  @IsOptional()
   @IsNotEmpty()
   name?: string;
 
-  @Optional()
+  @IsOptional()
   @IsBoolean()
   isVisible?: boolean;
 
-  @Optional()
+  @IsOptional()
   @IsString({ each: true })
   @IsNotEmpty({ each: true })
   @ArrayUnique()
   @ArrayMaxSize(128)
   importPaths?: string[];
 
-  @Optional()
+  @IsOptional()
   @IsString({ each: true })
   @IsNotEmpty({ each: true })
   @ArrayUnique()
   @ArrayMaxSize(128)
   exclusionPatterns?: string[];
 
-  @Optional()
+  @IsOptional()
   @IsBoolean()
   isWatched?: boolean;
 }
 
 export class UpdateLibraryDto {
-  @Optional()
+  @IsOptional()
   @IsString()
   @IsNotEmpty()
   name?: string;
 
-  @Optional()
+  @IsOptional()
   @IsBoolean()
   isVisible?: boolean;
 
-  @Optional()
+  @IsOptional()
   @IsString({ each: true })
   @IsNotEmpty({ each: true })
   @ArrayUnique()
   @ArrayMaxSize(128)
   importPaths?: string[];
 
-  @Optional()
+  @IsOptional()
   @IsNotEmpty({ each: true })
   @IsString({ each: true })
   @ArrayUnique()
@@ -71,14 +68,14 @@ export class CrawlOptionsDto {
 }
 
 export class ValidateLibraryDto {
-  @Optional()
+  @IsOptional()
   @IsString({ each: true })
   @IsNotEmpty({ each: true })
   @ArrayUnique()
   @ArrayMaxSize(128)
   importPaths?: string[];
 
-  @Optional()
+  @IsOptional()
   @IsNotEmpty({ each: true })
   @IsString({ each: true })
   @ArrayUnique()
@@ -103,21 +100,14 @@ export class LibrarySearchDto {
 
 export class ScanLibraryDto {
   @IsBoolean()
-  @Optional()
+  @IsOptional()
   refreshModifiedFiles?: boolean;
 
   @IsBoolean()
-  @Optional()
+  @IsOptional()
   refreshAllFiles?: boolean = false;
 }
 
-export class SearchLibraryDto {
-  @IsEnum(LibraryType)
-  @ApiProperty({ enumName: 'LibraryType', enum: LibraryType })
-  @Optional()
-  type?: LibraryType;
-}
-
 export class LibraryResponseDto {
   id!: string;
   ownerId!: string;

server/src/domain/library/library.service.spec.ts

@@ -140,6 +140,24 @@ describe(LibraryService.name, () => {
   });
 
   describe('handleQueueAssetRefresh', () => {
+    it("should not queue assets outside of user's external path", async () => {
+      const mockLibraryJob: ILibraryRefreshJob = {
+        id: libraryStub.externalLibrary1.id,
+        refreshModifiedFiles: false,
+        refreshAllFiles: false,
+      };
+
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
+      storageMock.crawl.mockResolvedValue(['/data/user2/photo.jpg']);
+      assetMock.getByLibraryId.mockResolvedValue([]);
+      libraryMock.getOnlineAssetPaths.mockResolvedValue([]);
+      userMock.get.mockResolvedValue(userStub.externalPath1);
+
+      await sut.handleQueueAssetRefresh(mockLibraryJob);
+
+      expect(jobMock.queue.mock.calls).toEqual([]);
+    });
+
     it('should queue new assets', async () => {
       const mockLibraryJob: ILibraryRefreshJob = {
         id: libraryStub.externalLibrary1.id,
@@ -150,7 +168,8 @@ describe(LibraryService.name, () => {
       libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
       storageMock.crawl.mockResolvedValue(['/data/user1/photo.jpg']);
       assetMock.getByLibraryId.mockResolvedValue([]);
-      userMock.get.mockResolvedValue(userStub.admin);
+      libraryMock.getOnlineAssetPaths.mockResolvedValue([]);
+      userMock.get.mockResolvedValue(userStub.externalPath1);
 
       await sut.handleQueueAssetRefresh(mockLibraryJob);
 
@@ -177,7 +196,8 @@ describe(LibraryService.name, () => {
       libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
       storageMock.crawl.mockResolvedValue(['/data/user1/photo.jpg']);
       assetMock.getByLibraryId.mockResolvedValue([]);
-      userMock.get.mockResolvedValue(userStub.admin);
+      libraryMock.getOnlineAssetPaths.mockResolvedValue([]);
+      userMock.get.mockResolvedValue(userStub.externalPath1);
 
       await sut.handleQueueAssetRefresh(mockLibraryJob);
 
@@ -194,6 +214,45 @@ describe(LibraryService.name, () => {
       ]);
     });
 
+    it("should mark assets outside of the user's external path as offline", async () => {
+      const mockLibraryJob: ILibraryRefreshJob = {
+        id: libraryStub.externalLibrary1.id,
+        refreshModifiedFiles: false,
+        refreshAllFiles: false,
+      };
+
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
+      storageMock.crawl.mockResolvedValue(['/data/user1/photo.jpg']);
+      assetMock.getByLibraryId.mockResolvedValue([assetStub.external]);
+      libraryMock.getOnlineAssetPaths.mockResolvedValue([]);
+      userMock.get.mockResolvedValue(userStub.externalPath2);
+
+      await sut.handleQueueAssetRefresh(mockLibraryJob);
+
+      expect(assetMock.updateAll.mock.calls).toEqual([
+        [
+          [assetStub.external.id],
+          {
+            isOffline: true,
+          },
+        ],
+      ]);
+    });
+
+    it('should not scan libraries owned by user without external path', async () => {
+      const mockLibraryJob: ILibraryRefreshJob = {
+        id: libraryStub.externalLibrary1.id,
+        refreshModifiedFiles: false,
+        refreshAllFiles: false,
+      };
+
+      libraryMock.get.mockResolvedValue(libraryStub.externalLibrary1);
+
+      userMock.get.mockResolvedValue(userStub.user1);
+
+      await expect(sut.handleQueueAssetRefresh(mockLibraryJob)).resolves.toBe(false);
+    });
+
     it('should not scan upload libraries', async () => {
       const mockLibraryJob: ILibraryRefreshJob = {
         id: libraryStub.externalLibrary1.id,
@@ -228,6 +287,7 @@ describe(LibraryService.name, () => {
       libraryMock.get.mockResolvedValue(libraryStub.externalLibraryWithImportPaths1);
       storageMock.crawl.mockResolvedValue([]);
       assetMock.getByLibraryId.mockResolvedValue([]);
+      libraryMock.getOnlineAssetPaths.mockResolvedValue([]);
       userMock.get.mockResolvedValue(userStub.externalPathRoot);
 
       await sut.handleQueueAssetRefresh(mockLibraryJob);
@@ -243,7 +303,7 @@ describe(LibraryService.name, () => {
     let mockUser: UserEntity;
 
     beforeEach(() => {
-      mockUser = userStub.admin;
+      mockUser = userStub.externalPath1;
       userMock.get.mockResolvedValue(mockUser);
 
       storageMock.stat.mockResolvedValue({
@@ -720,6 +780,26 @@ describe(LibraryService.name, () => {
     });
   });
 
+  describe('getAllForUser', () => {
+    it('should return all libraries for user', async () => {
+      libraryMock.getAllByUserId.mockResolvedValue([libraryStub.uploadLibrary1, libraryStub.externalLibrary1]);
+      await expect(sut.getAllForUser(authStub.admin)).resolves.toEqual([
+        expect.objectContaining({
+          id: libraryStub.uploadLibrary1.id,
+          name: libraryStub.uploadLibrary1.name,
+          ownerId: libraryStub.uploadLibrary1.ownerId,
+        }),
+        expect.objectContaining({
+          id: libraryStub.externalLibrary1.id,
+          name: libraryStub.externalLibrary1.name,
+          ownerId: libraryStub.externalLibrary1.ownerId,
+        }),
+      ]);
+
+      expect(libraryMock.getAllByUserId).toHaveBeenCalledWith(authStub.admin.user.id);
+    });
+  });
+
   describe('getStatistics', () => {
     it('should return library statistics', async () => {
       libraryMock.getStatistics.mockResolvedValue({ photos: 10, videos: 0, total: 10, usage: 1337 });
@@ -1064,12 +1144,12 @@ describe(LibraryService.name, () => {
       storageMock.checkFileExists.mockResolvedValue(true);
 
       await expect(
-        sut.update(authStub.admin, authStub.admin.user.id, { importPaths: ['/data/user1/foo'] }),
+        sut.update(authStub.external1, authStub.external1.user.id, { importPaths: ['/data/user1/foo'] }),
       ).resolves.toEqual(mapLibrary(libraryStub.externalLibraryWithImportPaths1));
 
       expect(libraryMock.update).toHaveBeenCalledWith(
         expect.objectContaining({
-          id: authStub.admin.user.id,
+          id: authStub.external1.user.id,
         }),
       );
       expect(storageMock.watch).toHaveBeenCalledWith(
@@ -1504,6 +1584,26 @@ describe(LibraryService.name, () => {
       ]);
     });
 
+    it('should error when no external path is set', async () => {
+      await expect(
+        sut.validate(authStub.admin, libraryStub.externalLibrary1.id, { importPaths: ['/photos'] }),
+      ).rejects.toBeInstanceOf(BadRequestException);
+    });
+
+    it('should detect when path is outside external path', async () => {
+      const result = await sut.validate(authStub.external1, libraryStub.externalLibraryWithImportPaths1.id, {
+        importPaths: ['/data/user2'],
+      });
+
+      expect(result.importPaths).toEqual([
+        {
+          importPath: '/data/user2',
+          isValid: false,
+          message: "Not contained in user's external path",
+        },
+      ]);
+    });
+
     it('should detect when path does not exist', async () => {
       storageMock.stat.mockImplementation(() => {
         const error = { code: 'ENOENT' } as any;

server/src/domain/library/library.service.ts

@@ -29,7 +29,6 @@ import {
   LibraryResponseDto,
   LibraryStatsResponseDto,
   ScanLibraryDto,
-  SearchLibraryDto,
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryImportPathResponseDto,
@@ -113,13 +112,20 @@ export class LibraryService extends EventEmitter {
       ignore: library.exclusionPatterns,
     });
 
+    const config = await this.configCore.getConfig();
+    const { usePolling, interval } = config.library.watch;
+
+    this.logger.debug(`Settings for watcher: usePolling: ${usePolling}, interval: ${interval}`);
+
     let _resolve: () => void;
     const ready$ = new Promise<void>((resolve) => (_resolve = resolve));
 
     this.watchers[id] = this.storageRepository.watch(
       library.importPaths,
       {
-        usePolling: false,
+        usePolling,
+        interval,
+        binaryInterval: interval,
         ignoreInitial: true,
       },
       {
@@ -183,7 +189,6 @@ export class LibraryService extends EventEmitter {
 
   async getStatistics(auth: AuthDto, id: string): Promise<LibraryStatsResponseDto> {
     await this.access.requirePermission(auth, Permission.LIBRARY_READ, id);
-
     return this.repository.getStatistics(id);
   }
 
@@ -191,16 +196,15 @@ export class LibraryService extends EventEmitter {
     return this.repository.getCountForUser(auth.user.id);
   }
 
-  async get(auth: AuthDto, id: string): Promise<LibraryResponseDto> {
-    await this.access.requirePermission(auth, Permission.LIBRARY_READ, id);
-
-    const library = await this.findOrFail(id);
-    return mapLibrary(library);
+  async getAllForUser(auth: AuthDto): Promise<LibraryResponseDto[]> {
+    const libraries = await this.repository.getAllByUserId(auth.user.id);
+    return libraries.map((library) => mapLibrary(library));
   }
 
-  async getAll(auth: AuthDto, dto: SearchLibraryDto): Promise<LibraryResponseDto[]> {
-    const libraries = await this.repository.getAll(false, dto.type);
-    return libraries.map((library) => mapLibrary(library));
+  async get(auth: AuthDto, id: string): Promise<LibraryResponseDto> {
+    await this.access.requirePermission(auth, Permission.LIBRARY_READ, id);
+    const library = await this.findOrFail(id);
+    return mapLibrary(library);
   }
 
   async handleQueueCleanup(): Promise<boolean> {
@@ -237,14 +241,8 @@ export class LibraryService extends EventEmitter {
       }
     }
 
-    let ownerId = auth.user.id;
-
-    if (dto.ownerId) {
-      ownerId = dto.ownerId;
-    }
-
     const library = await this.repository.create({
-      ownerId,
+      ownerId: auth.user.id,
       name: dto.name,
       type: dto.type,
       importPaths: dto.importPaths ?? [],
@@ -309,11 +307,24 @@ export class LibraryService extends EventEmitter {
   public async validate(auth: AuthDto, id: string, dto: ValidateLibraryDto): Promise<ValidateLibraryResponseDto> {
     await this.access.requirePermission(auth, Permission.LIBRARY_UPDATE, id);
 
+    if (!auth.user.externalPath) {
+      throw new BadRequestException('User has no external path set');
+    }
+
     const response = new ValidateLibraryResponseDto();
 
     if (dto.importPaths) {
       response.importPaths = await Promise.all(
         dto.importPaths.map(async (importPath) => {
+          const normalizedPath = path.normalize(importPath);
+
+          if (!this.isInExternalPath(normalizedPath, auth.user.externalPath)) {
+            const validation = new ValidateLibraryImportPathResponseDto();
+            validation.importPath = importPath;
+            validation.message = `Not contained in user's external path`;
+            return validation;
+          }
+
           return await this.validateImportPath(importPath);
         }),
       );
@@ -324,7 +335,6 @@ export class LibraryService extends EventEmitter {
 
   async update(auth: AuthDto, id: string, dto: UpdateLibraryDto): Promise<LibraryResponseDto> {
     await this.access.requirePermission(auth, Permission.LIBRARY_UPDATE, id);
-
     const library = await this.repository.update({ id, ...dto });
 
     if (dto.importPaths) {
@@ -401,7 +411,7 @@ export class LibraryService extends EventEmitter {
         return true;
       } else {
         // File can't be accessed and does not already exist in db
-        throw new BadRequestException('Cannot access file', { cause: error });
+        throw new BadRequestException("Can't access file", { cause: error });
       }
     }
 
@@ -588,6 +598,12 @@ export class LibraryService extends EventEmitter {
       return false;
     }
 
+    const user = await this.userRepository.get(library.ownerId, {});
+    if (!user?.externalPath) {
+      this.logger.warn('User has no external path set, cannot refresh library');
+      return false;
+    }
+
     this.logger.verbose(`Refreshing library: ${job.id}`);
 
     const pathValidation = await Promise.all(
@@ -609,7 +625,11 @@ export class LibraryService extends EventEmitter {
       exclusionPatterns: library.exclusionPatterns,
     });
 
-    const crawledAssetPaths = rawPaths.map((filePath) => path.normalize(filePath));
+    const crawledAssetPaths = rawPaths
+      // Normalize file paths. This is important to prevent security issues like path traversal
+      .map((filePath) => path.normalize(filePath))
+      // Filter out paths that are not within the user's external path
+      .filter((assetPath) => this.isInExternalPath(assetPath, user.externalPath)) as string[];
 
     this.logger.debug(`Found ${crawledAssetPaths.length} asset(s) when crawling import paths ${library.importPaths}`);
     const assetsInLibrary = await this.assetRepository.getByLibraryId([job.id]);

server/src/domain/partner/partner.service.spec.ts

@@ -18,6 +18,7 @@ const responseDto = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
+    externalPath: null,
     memoriesEnabled: true,
     avatarColor: UserAvatarColor.PRIMARY,
     quotaSizeInBytes: null,
@@ -36,6 +37,7 @@ const responseDto = {
     createdAt: new Date('2021-01-01'),
     deletedAt: null,
     updatedAt: new Date('2021-01-01'),
+    externalPath: null,
     memoriesEnabled: true,
     avatarColor: UserAvatarColor.PRIMARY,
     inTimeline: true,

server/src/domain/repositories/library.repository.ts

@@ -5,6 +5,7 @@ export const ILibraryRepository = 'ILibraryRepository';
 
 export interface ILibraryRepository {
   getCountForUser(ownerId: string): Promise<number>;
+  getAllByUserId(userId: string, type?: LibraryType): Promise<LibraryEntity[]>;
   getAll(withDeleted?: boolean, type?: LibraryType): Promise<LibraryEntity[]>;
   getAllDeleted(): Promise<LibraryEntity[]>;
   get(id: string, withDeleted?: boolean): Promise<LibraryEntity | null>;
@@ -15,5 +16,7 @@ export interface ILibraryRepository {
   getUploadLibraryCount(ownerId: string): Promise<number>;
   update(library: Partial<LibraryEntity>): Promise<LibraryEntity>;
   getStatistics(id: string): Promise<LibraryStatsResponseDto>;
+  getOnlineAssetPaths(id: string): Promise<string[]>;
   getAssetIds(id: string, withDeleted?: boolean): Promise<string[]>;
+  existsByName(name: string, withDeleted?: boolean): Promise<boolean>;
 }

server/src/domain/search/dto/search-suggestion.dto.ts

@@ -1,6 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
-import { Optional } from '../../domain.util';
+import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
 export enum SearchSuggestionType {
   COUNTRY = 'country',
@@ -17,18 +16,18 @@ export class SearchSuggestionRequestDto {
   type!: SearchSuggestionType;
 
   @IsString()
-  @Optional()
+  @IsOptional()
   country?: string;
 
   @IsString()
-  @Optional()
+  @IsOptional()
   state?: string;
 
   @IsString()
-  @Optional()
+  @IsOptional()
   make?: string;
 
   @IsString()
-  @Optional()
+  @IsOptional()
   model?: string;
 }

server/src/domain/system-config/dto/system-config-library.dto.ts

@@ -1,9 +1,12 @@
 import { validateCronExpression } from '@app/domain';
+import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import {
   IsBoolean,
+  IsInt,
   IsNotEmpty,
   IsObject,
+  IsPositive,
   IsString,
   Validate,
   ValidateIf,
@@ -35,6 +38,14 @@ export class SystemConfigLibraryScanDto {
 export class SystemConfigLibraryWatchDto {
   @IsBoolean()
   enabled!: boolean;
+
+  @IsBoolean()
+  usePolling!: boolean;
+
+  @IsInt()
+  @IsPositive()
+  @ApiProperty({ type: 'integer' })
+  interval!: number;
 }
 
 export class SystemConfigLibraryDto {

server/src/domain/system-config/system-config.core.ts

@@ -132,6 +132,8 @@ export const defaults = Object.freeze<SystemConfig>({
     },
     watch: {
       enabled: false,
+      usePolling: false,
+      interval: 10_000,
     },
   },
   server: {

server/src/domain/system-config/system-config.service.spec.ts

@@ -136,6 +136,8 @@ const updatedConfig = Object.freeze<SystemConfig>({
     },
     watch: {
       enabled: false,
+      usePolling: false,
+      interval: 10_000,
     },
   },
 });

server/src/domain/user/dto/create-user.dto.ts

@@ -21,6 +21,10 @@ export class CreateUserDto {
   @Transform(toSanitized)
   storageLabel?: string | null;
 
+  @Optional({ nullable: true })
+  @IsString()
+  externalPath?: string | null;
+
   @Optional()
   @IsBoolean()
   memoriesEnabled?: boolean;

server/src/domain/user/dto/update-user.dto.ts

@@ -25,6 +25,10 @@ export class UpdateUserDto {
   @Transform(toSanitized)
   storageLabel?: string;
 
+  @Optional()
+  @IsString()
+  externalPath?: string;
+
   @IsNotEmpty()
   @IsUUID('4')
   @ApiProperty({ format: 'uuid' })

server/src/domain/user/response-dto/user-response.dto.ts

@@ -22,6 +22,7 @@ export class UserDto {
 
 export class UserResponseDto extends UserDto {
   storageLabel!: string | null;
+  externalPath!: string | null;
   shouldChangePassword!: boolean;
   isAdmin!: boolean;
   createdAt!: Date;
@@ -49,6 +50,7 @@ export function mapUser(entity: UserEntity): UserResponseDto {
   return {
     ...mapSimpleUser(entity),
     storageLabel: entity.storageLabel,
+    externalPath: entity.externalPath,
     shouldChangePassword: entity.shouldChangePassword,
     isAdmin: entity.isAdmin,
     createdAt: entity.createdAt,

server/src/domain/user/user.core.ts

@@ -1,5 +1,6 @@
 import { LibraryType, UserEntity } from '@app/infra/entities';
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
+import path from 'node:path';
 import sanitize from 'sanitize-filename';
 import { ICryptoRepository, ILibraryRepository, IUserRepository } from '../repositories';
 import { UserResponseDto } from './response-dto';
@@ -41,6 +42,7 @@ export class UserCore {
       // Users can never update the isAdmin property.
       delete dto.isAdmin;
       delete dto.storageLabel;
+      delete dto.externalPath;
     } else if (dto.isAdmin && user.id !== id) {
       // Admin cannot create another admin.
       throw new BadRequestException('The server already has an admin');
@@ -68,6 +70,12 @@ export class UserCore {
       dto.storageLabel = null;
     }
 
+    if (dto.externalPath === '') {
+      dto.externalPath = null;
+    } else if (dto.externalPath) {
+      dto.externalPath = path.normalize(dto.externalPath);
+    }
+
     return this.userRepository.update(id, dto);
   }
 

server/src/immich/controllers/library.controller.ts

@@ -5,14 +5,13 @@ import {
   LibraryStatsResponseDto,
   LibraryResponseDto as ResponseDto,
   ScanLibraryDto,
-  SearchLibraryDto,
   UpdateLibraryDto as UpdateDto,
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
 } from '@app/domain';
-import { Body, Controller, Delete, Get, HttpCode, Param, Post, Put, Query } from '@nestjs/common';
+import { Body, Controller, Delete, Get, HttpCode, Param, Post, Put } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { AdminRoute, Auth, Authenticated } from '../app.guard';
+import { Auth, Authenticated } from '../app.guard';
 import { UseValidation } from '../app.utils';
 import { UUIDParamDto } from './dto/uuid-param.dto';
 
@@ -20,13 +19,12 @@ import { UUIDParamDto } from './dto/uuid-param.dto';
 @Controller('library')
 @Authenticated()
 @UseValidation()
-@AdminRoute()
 export class LibraryController {
   constructor(private service: LibraryService) {}
 
   @Get()
-  getAllLibraries(@Auth() auth: AuthDto, @Query() dto: SearchLibraryDto): Promise<ResponseDto[]> {
-    return this.service.getAll(auth, dto);
+  getLibraries(@Auth() auth: AuthDto): Promise<ResponseDto[]> {
+    return this.service.getAllForUser(auth);
   }
 
   @Post()
@@ -40,7 +38,7 @@ export class LibraryController {
   }
 
   @Get(':id')
-  getLibrary(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<ResponseDto> {
+  getLibraryInfo(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<ResponseDto> {
     return this.service.get(auth, id);
   }
 

server/src/infra/entities/system-config.entity.ts

@@ -51,6 +51,8 @@ export enum SystemConfigKey {
   LIBRARY_SCAN_CRON_EXPRESSION = 'library.scan.cronExpression',
 
   LIBRARY_WATCH_ENABLED = 'library.watch.enabled',
+  LIBRARY_WATCH_USE_POLLING = 'library.watch.usePolling',
+  LIBRARY_WATCH_INTERVAL = 'library.watch.interval',
 
   LOGGING_ENABLED = 'logging.enabled',
   LOGGING_LEVEL = 'logging.level',
@@ -266,6 +268,8 @@ export interface SystemConfig {
     };
     watch: {
       enabled: boolean;
+      usePolling: boolean;
+      interval: number;
     };
   };
   server: {

server/src/infra/entities/user.entity.ts

@@ -43,6 +43,9 @@ export class UserEntity {
   @Column({ type: 'varchar', unique: true, default: null })
   storageLabel!: string | null;
 
+  @Column({ type: 'varchar', default: null })
+  externalPath!: string | null;
+
   @Column({ default: '', select: false })
   password?: string;
 

server/src/infra/migrations/1708425975121-RemoveExternalPath.ts

@@ -1,13 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class RemoveExternalPath1708425975121 implements MigrationInterface {
-  name = 'RemoveExternalPath1708425975121';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "users" DROP COLUMN "externalPath"`);
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "users" ADD "externalPath" character varying`);
-  }
-}

server/src/infra/migrations/1709150004123-RemoveLibraryWatchPollingOption.ts

@@ -1,12 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class RemoveLibraryWatchPollingOption1709150004123 implements MigrationInterface {
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DELETE FROM "system_config" WHERE key = 'library.watch.usePolling'`);
-    await queryRunner.query(`DELETE FROM "system_config" WHERE key = 'library.watch.interval'`);
-  }
-
-  public async down(): Promise<void> {
-    // noop
-  }
-}

server/src/infra/sql/album.repository.sql

@@ -21,6 +21,7 @@ FROM
       "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
       "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
       "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+      "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
       "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
       "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
       "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -36,6 +37,7 @@ FROM
       "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
       "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
       "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+      "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
       "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
       "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
       "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -95,6 +97,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -110,6 +113,7 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -151,6 +155,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -166,6 +171,7 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -279,6 +285,7 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -306,6 +313,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -350,6 +358,7 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -377,6 +386,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -458,6 +468,7 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
+  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -485,6 +496,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -547,6 +559,7 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
+  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",

server/src/infra/sql/api.key.repository.sql

@@ -15,6 +15,7 @@ FROM
       "APIKeyEntity__APIKeyEntity_user"."isAdmin" AS "APIKeyEntity__APIKeyEntity_user_isAdmin",
       "APIKeyEntity__APIKeyEntity_user"."email" AS "APIKeyEntity__APIKeyEntity_user_email",
       "APIKeyEntity__APIKeyEntity_user"."storageLabel" AS "APIKeyEntity__APIKeyEntity_user_storageLabel",
+      "APIKeyEntity__APIKeyEntity_user"."externalPath" AS "APIKeyEntity__APIKeyEntity_user_externalPath",
       "APIKeyEntity__APIKeyEntity_user"."oauthId" AS "APIKeyEntity__APIKeyEntity_user_oauthId",
       "APIKeyEntity__APIKeyEntity_user"."profileImagePath" AS "APIKeyEntity__APIKeyEntity_user_profileImagePath",
       "APIKeyEntity__APIKeyEntity_user"."shouldChangePassword" AS "APIKeyEntity__APIKeyEntity_user_shouldChangePassword",

server/src/infra/sql/library.repository.sql

@@ -23,6 +23,7 @@ FROM
       "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
       "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
       "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
+      "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
       "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
       "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
       "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -138,6 +139,7 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
+  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -183,6 +185,7 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
+  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -222,6 +225,7 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
+  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",

server/src/infra/sql/shared.link.repository.sql

@@ -150,6 +150,7 @@ FROM
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."isAdmin" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_isAdmin",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."email" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_email",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."storageLabel" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_storageLabel",
+      "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."externalPath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_externalPath",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."oauthId" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_oauthId",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."profileImagePath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_profileImagePath",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."shouldChangePassword" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_shouldChangePassword",
@@ -253,6 +254,7 @@ SELECT
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."isAdmin" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_isAdmin",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."email" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_email",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."storageLabel" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_storageLabel",
+  "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."externalPath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_externalPath",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."oauthId" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_oauthId",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."profileImagePath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_profileImagePath",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."shouldChangePassword" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_shouldChangePassword",
@@ -306,6 +308,7 @@ FROM
       "SharedLinkEntity__SharedLinkEntity_user"."isAdmin" AS "SharedLinkEntity__SharedLinkEntity_user_isAdmin",
       "SharedLinkEntity__SharedLinkEntity_user"."email" AS "SharedLinkEntity__SharedLinkEntity_user_email",
       "SharedLinkEntity__SharedLinkEntity_user"."storageLabel" AS "SharedLinkEntity__SharedLinkEntity_user_storageLabel",
+      "SharedLinkEntity__SharedLinkEntity_user"."externalPath" AS "SharedLinkEntity__SharedLinkEntity_user_externalPath",
       "SharedLinkEntity__SharedLinkEntity_user"."oauthId" AS "SharedLinkEntity__SharedLinkEntity_user_oauthId",
       "SharedLinkEntity__SharedLinkEntity_user"."profileImagePath" AS "SharedLinkEntity__SharedLinkEntity_user_profileImagePath",
       "SharedLinkEntity__SharedLinkEntity_user"."shouldChangePassword" AS "SharedLinkEntity__SharedLinkEntity_user_shouldChangePassword",

server/src/infra/sql/user.repository.sql

@@ -8,6 +8,7 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
+  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",
@@ -54,6 +55,7 @@ SELECT
   "user"."isAdmin" AS "user_isAdmin",
   "user"."email" AS "user_email",
   "user"."storageLabel" AS "user_storageLabel",
+  "user"."externalPath" AS "user_externalPath",
   "user"."oauthId" AS "user_oauthId",
   "user"."profileImagePath" AS "user_profileImagePath",
   "user"."shouldChangePassword" AS "user_shouldChangePassword",
@@ -77,6 +79,7 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
+  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",
@@ -102,6 +105,7 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
+  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",

server/src/infra/sql/user.token.repository.sql

@@ -18,6 +18,7 @@ FROM
       "UserTokenEntity__UserTokenEntity_user"."isAdmin" AS "UserTokenEntity__UserTokenEntity_user_isAdmin",
       "UserTokenEntity__UserTokenEntity_user"."email" AS "UserTokenEntity__UserTokenEntity_user_email",
       "UserTokenEntity__UserTokenEntity_user"."storageLabel" AS "UserTokenEntity__UserTokenEntity_user_storageLabel",
+      "UserTokenEntity__UserTokenEntity_user"."externalPath" AS "UserTokenEntity__UserTokenEntity_user_externalPath",
       "UserTokenEntity__UserTokenEntity_user"."oauthId" AS "UserTokenEntity__UserTokenEntity_user_oauthId",
       "UserTokenEntity__UserTokenEntity_user"."profileImagePath" AS "UserTokenEntity__UserTokenEntity_user_profileImagePath",
       "UserTokenEntity__UserTokenEntity_user"."shouldChangePassword" AS "UserTokenEntity__UserTokenEntity_user_shouldChangePassword",

server/start.sh

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
-export LD_PRELOAD="$lib_path"
-
 read_file_and_export() {
 	if [ -n "${!1}" ]; then
 		content="$(cat "${!1}")"

server/test/fixtures/auth.stub.ts

@@ -52,6 +52,7 @@ export const authStub = {
       id: 'user-id',
       email: 'immich@test.com',
       isAdmin: false,
+      externalPath: '/data/user1',
     } as UserEntity,
     userToken: {
       id: 'token-id',

server/test/fixtures/library.stub.ts

@@ -20,8 +20,8 @@ export const libraryStub = {
     id: 'library-id',
     name: 'test_library',
     assets: [],
-    owner: userStub.admin,
-    ownerId: 'admin_id',
+    owner: userStub.externalPath1,
+    ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2023-01-01'),
@@ -34,8 +34,8 @@ export const libraryStub = {
     id: 'library-id2',
     name: 'test_library2',
     assets: [],
-    owner: userStub.admin,
-    ownerId: 'admin_id',
+    owner: userStub.externalPath1,
+    ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: [],
     createdAt: new Date('2021-01-01'),
@@ -48,8 +48,8 @@ export const libraryStub = {
     id: 'library-id-with-paths1',
     name: 'library-with-import-paths1',
     assets: [],
-    owner: userStub.admin,
-    ownerId: 'admin_id',
+    owner: userStub.externalPath1,
+    ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: ['/foo', '/bar'],
     createdAt: new Date('2023-01-01'),
@@ -62,8 +62,8 @@ export const libraryStub = {
     id: 'library-id-with-paths2',
     name: 'library-with-import-paths2',
     assets: [],
-    owner: userStub.admin,
-    ownerId: 'admin_id',
+    owner: userStub.externalPath1,
+    ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],
     createdAt: new Date('2023-01-01'),
@@ -76,7 +76,7 @@ export const libraryStub = {
     id: 'library-id',
     name: 'test_library',
     assets: [],
-    owner: userStub.admin,
+    owner: userStub.externalPath1,
     ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: [],
@@ -90,7 +90,7 @@ export const libraryStub = {
     id: 'library-id1337',
     name: 'importpath-exclusion-library1',
     assets: [],
-    owner: userStub.admin,
+    owner: userStub.externalPath1,
     ownerId: 'user-id',
     type: LibraryType.EXTERNAL,
     importPaths: ['/xyz', '/asdf'],