Merge 6c6e148a90ed14e98d6cd00983450e36c8efe7fe into d46e50213a0d72c5cd7ca0feabc2df89196bb6d3

fix(server): offline assets don't restore when coming back online (#13087 )
chore(deps): update base-image to v20241001 (major) (#13089 )
2025-08-07 09:03:52 -04:00 · 2024-10-01 14:38:33 +01:00 · 2024-10-01 14:03:19 +01:00 · 2024-10-01 12:26:00 +00:00 · 2024-10-01 12:25:08 +00:00 · 2024-10-01 13:09:08 +01:00
7 changed files with 77 additions and 53 deletions
--- a/e2e/package-lock.json
+++ b/e2e/package-lock.json
@ -1131,10 +1131,11 @@
      }
    },
    "node_modules/@photostructure/tz-lookup": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-10.0.0.tgz",
-      "integrity": "sha512-8ZAjoj/irCuvUlyEinQ/HB6A8hP3bD1dgTOZvfl1b9nAwqniutFDHOQRcGM6Crea68bOwPj010f0Z4KkmuLHEA==",
-      "dev": true
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-11.0.0.tgz",
+      "integrity": "sha512-QMV5/dWtY/MdVPXZs/EApqzyhnqDq1keYEqpS+Xj2uidyaqw2Nk/fWcsszdruIXjdqp1VoWNzsgrO6bUHU1mFw==",
+      "dev": true,
+      "license": "CC0-1.0"
    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
@ -3267,27 +3268,27 @@
      }
    },
    "node_modules/exiftool-vendored": {
-      "version": "28.2.1",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.2.1.tgz",
-      "integrity": "sha512-D3YsKErr3BbjKeJzUVsv6CVZ+SQNgAJKPFWVLXu0CBtr24FNuE3CZBXWKWysGu0MjzeDCNwQrQI5+bXUFeiYVA==",
+      "version": "28.3.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.3.0.tgz",
+      "integrity": "sha512-2DOSOvj5c1gkbKtubAnlGglxdYp9h55n0GxjK2nypVivoaCdgP/le3MOZRKgEUNObfJHmYHj4u/NnYVneu/gUw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@photostructure/tz-lookup": "^10.0.0",
+        "@photostructure/tz-lookup": "^11.0.0",
        "@types/luxon": "^3.4.2",
        "batch-cluster": "^13.0.0",
        "he": "^1.2.0",
        "luxon": "^3.5.0"
      },
      "optionalDependencies": {
-        "exiftool-vendored.exe": "12.91.0",
-        "exiftool-vendored.pl": "12.91.0"
+        "exiftool-vendored.exe": "12.96.0",
+        "exiftool-vendored.pl": "12.96.0"
      }
    },
    "node_modules/exiftool-vendored.exe": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.91.0.tgz",
-      "integrity": "sha512-nxcoGBaJL/D+Wb0jVe8qwyV8QZpRcCzU0aCKhG0S1XNGWGjJJJ4QV851aobcfDwI4NluFOdqkjTSf32pVijvHg==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.96.0.tgz",
+      "integrity": "sha512-pKPN9F/Evw2yyO5/+ml3spbXIqejzOxyF7jEnj8tLU2JPSmIlziPUZ75XIhcPbilX86jVKmuiso7FUDicOg8pQ==",
      "dev": true,
      "license": "MIT",
      "optional": true,
@ -3296,9 +3297,9 @@
      ]
    },
    "node_modules/exiftool-vendored.pl": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.91.0.tgz",
-      "integrity": "sha512-GZMy9+Jiv8/C7R4uYe1kWtXsAaJdgVezTwYa+wDeoqvReHiX2t5uzkCrzWdjo4LGl5mPQkyKhN7/uPLYk5Ak6w==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.96.0.tgz",
+      "integrity": "sha512-v4nGnovAMBsTfOWhwAcOiRiq/8kuJOo3GUMHNpug7Mr4jLz3tmWEo7DdNyOYmpcvWbA6smOTG0SmwsrY8fsW+A==",
      "dev": true,
      "license": "MIT",
      "optional": true,
--- a/server/Dockerfile
+++ b/server/Dockerfile
@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:20240924@sha256:fff4358d435065a626c64a4c015cbfce6ee714b05fabe39aa0d83d8cff3951f2 AS dev
+FROM ghcr.io/immich-app/base-server-dev:20241001@sha256:bb10832c2567f5625df68bb790523e85a358031ddcb3d7ac98b669f62ed8de27 AS dev

 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
@ -41,7 +41,7 @@ RUN npm run build


 # prod build
-FROM ghcr.io/immich-app/base-server-prod:20240924@sha256:af3089fe48d7ff162594bd7edfffa56ba4e7014ad10ad69c4ebfd428e39b06ff
+FROM ghcr.io/immich-app/base-server-prod:20241001@sha256:a9a0745a486e9cbd73fa06b49168e985f8f2c1be0fca9fb0a8e06916246c7087

 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
--- a/server/package-lock.json
+++ b/server/package-lock.json
@ -4207,9 +4207,9 @@
      }
    },
    "node_modules/@photostructure/tz-lookup": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-10.0.0.tgz",
-      "integrity": "sha512-8ZAjoj/irCuvUlyEinQ/HB6A8hP3bD1dgTOZvfl1b9nAwqniutFDHOQRcGM6Crea68bOwPj010f0Z4KkmuLHEA=="
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-11.0.0.tgz",
+      "integrity": "sha512-QMV5/dWtY/MdVPXZs/EApqzyhnqDq1keYEqpS+Xj2uidyaqw2Nk/fWcsszdruIXjdqp1VoWNzsgrO6bUHU1mFw=="
    },
    "node_modules/@pkgjs/parseargs": {
      "version": "0.11.0",
@ -8515,34 +8515,34 @@
      }
    },
    "node_modules/exiftool-vendored": {
-      "version": "28.2.1",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.2.1.tgz",
-      "integrity": "sha512-D3YsKErr3BbjKeJzUVsv6CVZ+SQNgAJKPFWVLXu0CBtr24FNuE3CZBXWKWysGu0MjzeDCNwQrQI5+bXUFeiYVA==",
+      "version": "28.3.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.3.0.tgz",
+      "integrity": "sha512-2DOSOvj5c1gkbKtubAnlGglxdYp9h55n0GxjK2nypVivoaCdgP/le3MOZRKgEUNObfJHmYHj4u/NnYVneu/gUw==",
      "dependencies": {
-        "@photostructure/tz-lookup": "^10.0.0",
+        "@photostructure/tz-lookup": "^11.0.0",
        "@types/luxon": "^3.4.2",
        "batch-cluster": "^13.0.0",
        "he": "^1.2.0",
        "luxon": "^3.5.0"
      },
      "optionalDependencies": {
-        "exiftool-vendored.exe": "12.91.0",
-        "exiftool-vendored.pl": "12.91.0"
+        "exiftool-vendored.exe": "12.96.0",
+        "exiftool-vendored.pl": "12.96.0"
      }
    },
    "node_modules/exiftool-vendored.exe": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.91.0.tgz",
-      "integrity": "sha512-nxcoGBaJL/D+Wb0jVe8qwyV8QZpRcCzU0aCKhG0S1XNGWGjJJJ4QV851aobcfDwI4NluFOdqkjTSf32pVijvHg==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.96.0.tgz",
+      "integrity": "sha512-pKPN9F/Evw2yyO5/+ml3spbXIqejzOxyF7jEnj8tLU2JPSmIlziPUZ75XIhcPbilX86jVKmuiso7FUDicOg8pQ==",
      "optional": true,
      "os": [
        "win32"
      ]
    },
    "node_modules/exiftool-vendored.pl": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.91.0.tgz",
-      "integrity": "sha512-GZMy9+Jiv8/C7R4uYe1kWtXsAaJdgVezTwYa+wDeoqvReHiX2t5uzkCrzWdjo4LGl5mPQkyKhN7/uPLYk5Ak6w==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.96.0.tgz",
+      "integrity": "sha512-v4nGnovAMBsTfOWhwAcOiRiq/8kuJOo3GUMHNpug7Mr4jLz3tmWEo7DdNyOYmpcvWbA6smOTG0SmwsrY8fsW+A==",
      "optional": true,
      "os": [
        "!win32"
@ -17880,9 +17880,9 @@
      }
    },
    "@photostructure/tz-lookup": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-10.0.0.tgz",
-      "integrity": "sha512-8ZAjoj/irCuvUlyEinQ/HB6A8hP3bD1dgTOZvfl1b9nAwqniutFDHOQRcGM6Crea68bOwPj010f0Z4KkmuLHEA=="
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@photostructure/tz-lookup/-/tz-lookup-11.0.0.tgz",
+      "integrity": "sha512-QMV5/dWtY/MdVPXZs/EApqzyhnqDq1keYEqpS+Xj2uidyaqw2Nk/fWcsszdruIXjdqp1VoWNzsgrO6bUHU1mFw=="
    },
    "@pkgjs/parseargs": {
      "version": "0.11.0",
@ -21033,29 +21033,29 @@
      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
    },
    "exiftool-vendored": {
-      "version": "28.2.1",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.2.1.tgz",
-      "integrity": "sha512-D3YsKErr3BbjKeJzUVsv6CVZ+SQNgAJKPFWVLXu0CBtr24FNuE3CZBXWKWysGu0MjzeDCNwQrQI5+bXUFeiYVA==",
+      "version": "28.3.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-28.3.0.tgz",
+      "integrity": "sha512-2DOSOvj5c1gkbKtubAnlGglxdYp9h55n0GxjK2nypVivoaCdgP/le3MOZRKgEUNObfJHmYHj4u/NnYVneu/gUw==",
      "requires": {
-        "@photostructure/tz-lookup": "^10.0.0",
+        "@photostructure/tz-lookup": "^11.0.0",
        "@types/luxon": "^3.4.2",
        "batch-cluster": "^13.0.0",
-        "exiftool-vendored.exe": "12.91.0",
-        "exiftool-vendored.pl": "12.91.0",
+        "exiftool-vendored.exe": "12.96.0",
+        "exiftool-vendored.pl": "12.96.0",
        "he": "^1.2.0",
        "luxon": "^3.5.0"
      }
    },
    "exiftool-vendored.exe": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.91.0.tgz",
-      "integrity": "sha512-nxcoGBaJL/D+Wb0jVe8qwyV8QZpRcCzU0aCKhG0S1XNGWGjJJJ4QV851aobcfDwI4NluFOdqkjTSf32pVijvHg==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.exe/-/exiftool-vendored.exe-12.96.0.tgz",
+      "integrity": "sha512-pKPN9F/Evw2yyO5/+ml3spbXIqejzOxyF7jEnj8tLU2JPSmIlziPUZ75XIhcPbilX86jVKmuiso7FUDicOg8pQ==",
      "optional": true
    },
    "exiftool-vendored.pl": {
-      "version": "12.91.0",
-      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.91.0.tgz",
-      "integrity": "sha512-GZMy9+Jiv8/C7R4uYe1kWtXsAaJdgVezTwYa+wDeoqvReHiX2t5uzkCrzWdjo4LGl5mPQkyKhN7/uPLYk5Ak6w==",
+      "version": "12.96.0",
+      "resolved": "https://registry.npmjs.org/exiftool-vendored.pl/-/exiftool-vendored.pl-12.96.0.tgz",
+      "integrity": "sha512-v4nGnovAMBsTfOWhwAcOiRiq/8kuJOo3GUMHNpug7Mr4jLz3tmWEo7DdNyOYmpcvWbA6smOTG0SmwsrY8fsW+A==",
      "optional": true
    },
    "express": {
--- a/server/src/migrations/1727781844613-IsOfflineSetDeletedAt.ts
+++ b/server/src/migrations/1727781844613-IsOfflineSetDeletedAt.ts
@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class IsOfflineSetDeletedAt1727781844613 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(
+        `UPDATE assets SET "deletedAt" = now() WHERE "isOffline" = true AND "deletedAt" IS NULL`,
+      );
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+      await queryRunner.query(
+        `UPDATE assets SET "deletedAt" = null WHERE "isOffline" = true`,
+      );
+    }
+}
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@ -15,6 +15,7 @@ export class MetadataRepository implements IMetadataRepository {
    defaultVideosToUTC: true,
    backfillTimezones: true,
    inferTimezoneFromDatestamps: true,
+    inferTimezoneFromTimeStamp: true,
    useMWG: true,
    numericTags: [...DefaultReadTaskOptions.numericTags, 'FocalLength'],
    /* eslint unicorn/no-array-callback-reference: off, unicorn/no-array-method-this-argument: off */
--- a/server/src/services/library.service.ts
+++ b/server/src/services/library.service.ts
@ -141,7 +141,13 @@ export class LibraryService extends BaseService {
          const handler = async () => {
            this.logger.debug(`File add event received for ${path} in library ${library.id}}`);
            if (matcher(path)) {
-              await this.syncFiles(library, [path]);
+              const asset = await this.assetRepository.getByLibraryIdAndOriginalPath(library.id, path);
+              if (asset) {
+                await this.syncAssets(library, [asset.id]);
+              }
+              if (matcher(path)) {
+                await this.syncFiles(library, [path]);
+              }
            }
          };
          return handlePromiseError(handler(), this.logger);
@ -604,7 +610,7 @@ export class LibraryService extends BaseService {
    this.logger.log(`Scanning library ${library.id} for removed assets`);

    const onlineAssets = usePagination(JOBS_LIBRARY_PAGINATION_SIZE, (pagination) =>
-      this.assetRepository.getAll(pagination, { libraryId: job.id }),
+      this.assetRepository.getAll(pagination, { libraryId: job.id, withDeleted: true }),
    );

    let assetCount = 0;
--- a/web/package-lock.json
+++ b/web/package-lock.json
@ -6129,9 +6129,9 @@
      }
    },
    "node_modules/prettier-plugin-svelte": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.6.tgz",
-      "integrity": "sha512-Y1XWLw7vXUQQZmgv1JAEiLcErqUniAF2wO7QJsw8BVMvpLET2dI5WpEIEJx1r11iHVdSMzQxivyfrH9On9t2IQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.7.tgz",
+      "integrity": "sha512-/Dswx/ea0lV34If1eDcG3nulQ63YNr5KPDfMsjbdtpSWOxKKJ7nAc2qlVuYwEvCr4raIuredNoR7K4JCkmTGaQ==",
      "dev": true,
      "license": "MIT",
      "peerDependencies": {
Author	SHA1	Message	Date
Max	95e51cd2ef	Merge 6c6e148a90ed14e98d6cd00983450e36c8efe7fe into d46e50213a0d72c5cd7ca0feabc2df89196bb6d3	2024-10-01 14:38:33 +01:00
Zack Pollard	d46e50213a	fix(server): offline assets don't restore when coming back online (#13087 )	2024-10-01 14:03:19 +01:00
renovate[bot]	49486f2d26	chore(deps): update base-image to v20241001 (major) (#13089 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-10-01 12:26:00 +00:00
renovate[bot]	eac189a9e5	chore(deps): update dependency prettier-plugin-svelte to v3.2.7 (#13088 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-10-01 12:25:08 +00:00
Zack Pollard	3b968707a7	fix: deletedAt not set for offline assets during 1.116.0 migration (#13086 )	2024-10-01 13:09:08 +01:00
Carsten Otto	67aa124de9	feat(server): parse offset from "Image_UTC_Data" (Samsung) (#13080 ) * fix(deps): update dependency exiftool-vendored to v28.3.0 * feat(server): parse offset from "Image_UTC_Data" (Samsung) A Samsung phone might provide the local time (e.g. 09:00) without any timezone or offset information. If the file also includes the non-standard trailer tag "TimeStamp" in "Image_UTC_Data", we can use the unix timestamp contained within to deduce the offset. As an example, if the local date/time is "2024-09-15T09:00" and the unix timestamp is 1726408800 (which is 2024-09-15T16:00 UTC), we know that the offset is -07:00. The actual computation/fix is done in exiftool-vendored. Also see `0f63a78090/lib/Image/ExifTool/Samsung.pm (L996-L1001)` https://github.com/photostructure/exiftool-vendored.js/issues/209 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-10-01 12:08:06 +00:00