[pull] main from immich-app:main

.github/workflows/build-mobile.yml

@@ -269,6 +269,8 @@ jobs:
           ENVIRONMENT: ${{ inputs.environment || 'development' }}
           BUNDLE_ID_SUFFIX: ${{ inputs.environment == 'production' && '' || 'development' }}
           GITHUB_REF: ${{ github.ref }}
+          FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
+          FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 6
         working-directory: ./mobile/ios
         run: |
           # Only upload to TestFlight on main branch

.github/workflows/cli.yml

@@ -24,10 +24,11 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      id-token: write
+      packages: write
     defaults:
       run:
         working-directory: ./cli
-
     steps:
       - id: token
         uses: immich-app/devtools/actions/create-workflow-token@da177fa133657503ddb7503f8ba53dccefec5da1 # create-workflow-token-action-v1.0.0
@@ -57,10 +58,8 @@ jobs:
 
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
-      - run: pnpm publish --no-git-checks
+      - run: pnpm publish --provenance --no-git-checks
         if: ${{ github.event_name == 'release' }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   docker:
     name: Docker

.github/workflows/sdk.yml

@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      id-token: write
+      packages: write
     defaults:
       run:
         working-directory: ./open-api/typescript-sdk
@@ -42,6 +44,4 @@ jobs:
       - name: Build
         run: pnpm build
       - name: Publish
-        run: pnpm publish --no-git-checks
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: pnpm publish --provenance --no-git-checks

.github/workflows/weblate-lock.yml

@@ -36,7 +36,7 @@ jobs:
           github-token: ${{ steps.token.outputs.token }}
           filters: |
             i18n:
-              - modified: 'i18n/!(en)**\.json'
+              - modified: 'i18n/!(en|package)**\.json'
           skip-force-logic: 'true'
 
   enforce-lock:

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.106",
+  "version": "2.5.1",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",

docs/static/archived-versions.json

@@ -1,40 +1,20 @@
 [
   {
-    "label": "v2.5.0",
-    "url": "https://docs.v2.5.0.archive.immich.app"
+    "label": "v2.5.1",
+    "url": "https://docs.v2.5.1.archive.immich.app"
   },
   {
     "label": "v2.4.1",
     "url": "https://docs.v2.4.1.archive.immich.app"
   },
-  {
-    "label": "v2.4.0",
-    "url": "https://docs.v2.4.0.archive.immich.app"
-  },
   {
     "label": "v2.3.1",
     "url": "https://docs.v2.3.1.archive.immich.app"
   },
-  {
-    "label": "v2.3.0",
-    "url": "https://docs.v2.3.0.archive.immich.app"
-  },
   {
     "label": "v2.2.3",
     "url": "https://docs.v2.2.3.archive.immich.app"
   },
-  {
-    "label": "v2.2.2",
-    "url": "https://docs.v2.2.2.archive.immich.app"
-  },
-  {
-    "label": "v2.2.1",
-    "url": "https://docs.v2.2.1.archive.immich.app"
-  },
-  {
-    "label": "v2.2.0",
-    "url": "https://docs.v2.2.0.archive.immich.app"
-  },
   {
     "label": "v2.1.0",
     "url": "https://docs.v2.1.0.archive.immich.app"
@@ -43,18 +23,10 @@
     "label": "v2.0.1",
     "url": "https://docs.v2.0.1.archive.immich.app"
   },
-  {
-    "label": "v2.0.0",
-    "url": "https://docs.v2.0.0.archive.immich.app"
-  },
   {
     "label": "v1.144.1",
     "url": "https://docs.v1.144.1.archive.immich.app"
   },
-  {
-    "label": "v1.144.0",
-    "url": "https://docs.v1.144.0.archive.immich.app"
-  },
   {
     "label": "v1.143.1",
     "url": "https://docs.v1.143.1.archive.immich.app"

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "",
   "main": "index.js",
   "type": "module",

i18n/cs.json

@@ -572,6 +572,9 @@
   "asset_list_layout_sub_title": "Rozložení",
   "asset_list_settings_subtitle": "Nastavení rozložení mřížky fotografií",
   "asset_list_settings_title": "Mřížka fotografií",
+  "asset_not_found_on_device_android": "Položka nebyla nalezena na zařízení",
+  "asset_not_found_on_device_ios": "Položka nebyla nalezena na zařízení. Pokud používáte iCloud, položka může být nepřístupná kvůli poškozenému souboru uloženému na iCloudu",
+  "asset_not_found_on_icloud": "Položka nebyla nalezena na iCloudu. Položka může být nepřístupná kvůli poškozenému souboru uloženému na iCloudu",
   "asset_offline": "Offline položka",
   "asset_offline_description": "Toto externí položka se již na disku nenachází. Obraťte se na správce Immich a požádejte o pomoc.",
   "asset_restored_successfully": "Položka úspěšně obnovena",
@@ -2295,6 +2298,7 @@
   "upload_details": "Detaily nahrávání",
   "upload_dialog_info": "Chcete zálohovat vybrané položky na server?",
   "upload_dialog_title": "Nahrát položku",
+  "upload_error_with_count": "Chyba při nahrávání {count, plural, one {# položky} other {# položek}}",
   "upload_errors": "Nahrávání bylo dokončeno s {count, plural, one {# chybou} other {# chybami}}, obnovte stránku pro zobrazení nových položek.",
   "upload_finished": "Nahrávání dokončeno",
   "upload_progress": "Zbývá {remaining, number} - Zpracováno {processed, number}/{total, number}",

i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-i18n",
-  "version": "1.0.0",
+  "version": "2.5.1",
   "private": true,
   "scripts": {
     "format": "prettier --check .",

i18n/pl.json

@@ -763,7 +763,7 @@
   "cleanup_found_assets": "Znaleziono {count} zasobów z przesłaną kopią zapasową",
   "cleanup_found_assets_with_size": "Znaleziono {count} zasobów z kopią zapasową ({size})",
   "cleanup_icloud_shared_albums_excluded": "Udostępniane albumy iCloud są wyłączone ze skanowania",
-  "cleanup_no_assets_found": "Nie znaleziono żadnych zasobów spełniających podane kryteria. Zwolnij Miejsce może usuwać jedynie zasoby, które posiadają kopię zapasową na serwerze.",
+  "cleanup_no_assets_found": "Nie znaleziono żadnych zasobów spełniających podane kryteria. Zwolnij Miejsce może usuwać jedynie zasoby, które posiadają kopię zapasową na serwerze",
   "cleanup_preview_title": "Zasoby do usunięcia ({count})",
   "cleanup_step3_description": "Wyszukaj zasoby z kopią zapasową, zgodne z Twoimi ustawieniami.",
   "cleanup_step4_summary": "{count} zasoby (utworzone przed {date}) zostaną usunięte z tego urządzenia. Zdjęcia będą nadal dostępne w aplikacji Immich.",

i18n/ru.json

@@ -2298,6 +2298,7 @@
   "upload_details": "Подробности загрузки",
   "upload_dialog_info": "Хотите загрузить выбранные объекты на сервер?",
   "upload_dialog_title": "Загрузить объект",
+  "upload_error_with_count": "Ошибка при загрузке {count, plural, one {# объекта} other {# объектов}}",
   "upload_errors": "Загрузка завершена с {count, plural, one {# ошибкой} other {# ошибками}}, обновите страницу, чтобы увидеть новые загруженные объекты.",
   "upload_finished": "Загрузка завершена",
   "upload_progress": "Осталось {remaining, number} - Обработано {processed, number}/{total, number}",

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.5.0"
+version = "2.5.1"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.11,<4.0"

misc/release/archive-version.js

@@ -1,17 +1,45 @@
 #! /usr/bin/env node
 const { readFileSync, writeFileSync } = require('node:fs');
 
+const asVersion = (item) => {
+  const { label, url } = item;
+  const [major, minor, patch] = label.substring(1).split('.').map(Number);
+  return { major, minor, patch, label, url };
+};
+
 const nextVersion = process.argv[2];
 if (!nextVersion) {
   console.log('Usage: archive-version.js <version>');
   process.exit(1);
 }
 
 const filename = './docs/static/archived-versions.json';
-const oldVersions = JSON.parse(readFileSync(filename));
-const newVersions = [
-  { label: `v${nextVersion}`, url: `https://docs.v${nextVersion}.archive.immich.app` },
-  ...oldVersions,
-];
+let versions = JSON.parse(readFileSync(filename));
+const newVersion = {
+  label: `v${nextVersion}`,
+  url: `https://docs.v${nextVersion}.archive.immich.app`,
+};
+
+let lastVersion = asVersion(newVersion);
+for (const item of versions) {
+  const version = asVersion(item);
+  // only keep the latest patch version for each minor release
+  if (
+    lastVersion.major === version.major &&
+    lastVersion.minor === version.minor &&
+    lastVersion.patch >= version.patch
+  ) {
+    versions = versions.filter((item) => item.label !== version.label);
+    console.log(
+      `Removed ${version.label} (replaced with ${lastVersion.label})`
+    );
+    continue;
+  }
+
+  lastVersion = version;
+}
 
-writeFileSync(filename, JSON.stringify(newVersions, null, 2) + '\n');
+writeFileSync(
+  filename,
+  JSON.stringify([newVersion, ...versions], null, 2) + '\n'
+);

misc/release/pump-version.sh

@@ -61,26 +61,23 @@ fi
 
 if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; then
   echo "Pumping Server: $CURRENT_SERVER => $NEXT_SERVER"
-  jq --arg version "$NEXT_SERVER" '.version = $version' server/package.json > server/package.json.tmp && mv server/package.json.tmp server/package.json
+
+  pnpm version "$NEXT_SERVER" --no-git-tag-version
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix server
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix i18n
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix cli
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix web
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix e2e
+  pnpm version "$NEXT_SERVER" --no-git-tag-version --prefix open-api/typescript-sdk
+
+  # copy version to open-api spec
   pnpm install --frozen-lockfile --prefix server
   pnpm --prefix server run build
-
   ( cd ./open-api && bash ./bin/generate-open-api.sh )
 
-  jq --arg version "$NEXT_SERVER" '.version = $version' open-api/typescript-sdk/package.json > open-api/typescript-sdk/package.json.tmp && mv open-api/typescript-sdk/package.json.tmp open-api/typescript-sdk/package.json
-
-  # TODO use $SERVER_PUMP once we pass 2.2.x
-  CURRENT_CLI_VERSION=$(jq -r '.version' cli/package.json)
-  CLI_PATCH_VERSION=$(echo "$CURRENT_CLI_VERSION" | awk -F. '{print $1"."$2"."($3+1)}')
-  jq --arg version "$CLI_PATCH_VERSION" '.version = $version' cli/package.json > cli/package.json.tmp && mv cli/package.json.tmp cli/package.json
-  pnpm install --frozen-lockfile --prefix cli
-
-  jq --arg version "$NEXT_SERVER" '.version = $version' web/package.json > web/package.json.tmp && mv web/package.json.tmp web/package.json
-  pnpm install --frozen-lockfile --prefix web
-
-  jq --arg version "$NEXT_SERVER" '.version = $version' e2e/package.json > e2e/package.json.tmp && mv e2e/package.json.tmp e2e/package.json
-  pnpm install --frozen-lockfile --prefix e2e
   uvx --from=toml-cli toml set --toml-path=machine-learning/pyproject.toml project.version "$NEXT_SERVER"
+
+  ./misc/release/archive-version.js "$NEXT_SERVER"
 fi
 
 if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then
@@ -92,6 +89,5 @@ sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.in
 sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml
 perl -i -p0e "s/(<key>CFBundleShortVersionString<\/key>\s*<string>)$CURRENT_SERVER(<\/string>)/\${1}$NEXT_SERVER\${2}/s" mobile/ios/Runner/Info.plist
 
-./misc/release/archive-version.js "$NEXT_SERVER"
 
 echo "IMMICH_VERSION=v$NEXT_SERVER" >>"$GITHUB_ENV"

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 3031,
-        "android.injected.version.name" => "2.5.0",
+        "android.injected.version.code" => 3032,
+        "android.injected.version.name" => "2.5.1",
       }
     )
     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/ios/Runner/Info.plist

@@ -80,7 +80,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -193,7 +193,13 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.addColumn(v14.localAssetEntity, v14.localAssetEntity.longitude);
           },
           from14To15: (m, v15) async {
-            await m.addColumn(v15.trashedLocalAssetEntity, v15.trashedLocalAssetEntity.source);
+            await m.alterTable(
+              TableMigration(
+                v15.trashedLocalAssetEntity,
+                columnTransformer: {v15.trashedLocalAssetEntity.source: Constant(TrashOrigin.localSync.index)},
+                newColumns: [v15.trashedLocalAssetEntity.source],
+              ),
+            );
           },
           from15To16: (m, v16) async {
             // Add i_cloud_id to local and remote asset tables

mobile/lib/widgets/settings/free_up_space_settings.dart

@@ -13,6 +13,7 @@ import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 class FreeUpSpaceSettings extends ConsumerStatefulWidget {
   const FreeUpSpaceSettings({super.key});
@@ -29,6 +30,7 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
   @override
   void initState() {
     super.initState();
+    WakelockPlus.enable();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _initializeAlbumDefaults();
     });
@@ -168,6 +170,12 @@ class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
     context.pushRoute(CleanupPreviewRoute(assets: assets));
   }
 
+  @override
+  dispose() {
+    super.dispose();
+    WakelockPlus.disable();
+  }
+
   @override
   Widget build(BuildContext context) {
     final state = ref.watch(cleanupProvider);

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 2.5.0+3031
+version: 2.5.1+3032
 
 environment:
   sdk: '>=3.8.0 <4.0.0'

open-api/immich-openapi-specs.json

@@ -14951,7 +14951,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "contact": {}
   },
   "tags": [

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",

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

@@ -1,6 +1,6 @@
 /**
  * Immich
- * 2.5.0
+ * 2.5.1
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */