chore: test fix concurrency database

.devcontainer/server/container-compose-overrides.yml

@@ -26,7 +26,7 @@ services:
     env_file: !reset []
   init:
     env_file: !reset []
-    command: sh -c 'find /data -maxdepth 1 ! -path "/data/postgres" -type d -exec chown ${UID:-0}:${GID:-0} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-0}:${GID:-0} "$$path" || true; done'
+    command: sh -c 'find /data -maxdepth 1 ! -path "/data/postgres" -type d -exec chown ${UID:-1000}:${GID:-1000} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'
   immich-machine-learning:
     env_file: !reset []
   database:

.github/workflows/close-duplicates.yml

@@ -35,7 +35,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:1669c75a5542333ff6b03c13d5fd259ea8d798188b84d5d99093d62e4542eb05
+      image: yshavit/mdq:0.9.0@sha256:4399483ca857fb1a7ed28a596f754c7373e358647de31ce14b79a27c91e1e35e
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:

.github/workflows/merge-translations.yml

@@ -1,15 +1,8 @@
 name: Merge translations
 
 on:
-  workflow_dispatch:
   workflow_call:
-    secrets:
-      PUSH_O_MATIC_APP_ID:
-        required: true
-      PUSH_O_MATIC_APP_KEY:
-        required: true
-      WEBLATE_TOKEN:
-        required: true
+  workflow_dispatch:
 
 permissions: {}
 

Makefile

@@ -70,9 +70,11 @@ VOLUME_DIRS = \
 
 # Helper function to chown, on error suggest remediation and exit
 define safe_chown
-	CURRENT_OWNER=$$(stat -c '%u:%g' "$(1)" 2>/dev/null || echo "none"); \
-	DESIRED_OWNER="$(or $(UID),0):$(or $(GID),0)"; \
-	if [ "$$CURRENT_OWNER" != "$$DESIRED_OWNER" ] && ! chown -v $(2) $$DESIRED_OWNER "$(1)" 2>/dev/null; then \
+	if chown $(2) $(or $(UID),1000):$(or $(GID),1000) "$(1)" 2>/dev/null; then \
+		true; \
+	else \
+	  	STATUS=$$?; echo "Exit code: $$STATUS $(1)"; \
+		echo "$$STATUS $(1)"; \
 		echo "Permission denied when changing owner of volumes and upload location. Try running 'sudo make prepare-volumes' first."; \
 		exit 1; \
 	fi;

cli/package.json

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

docker/docker-compose.dev.yml

@@ -21,7 +21,7 @@ services:
     # extends:
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
-    user: '${UID:-0}:${GID:-0}'
+    user: '${UID:-1000}:${GID:-1000}'
     build:
       context: ../
       dockerfile: server/Dockerfile
@@ -82,7 +82,7 @@ services:
     image: immich-web-dev:latest
     # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
     # user: 0:0
-    user: '${UID:-0}:${GID:-0}'
+    user: '${UID:-1000}:${GID:-1000}'
     build:
       context: ../
       dockerfile: server/Dockerfile
@@ -189,7 +189,7 @@ services:
     env_file:
       - .env
     user: 0:0
-    command: sh -c 'find /data -maxdepth 1 -type d -exec chown ${UID:-0}:${GID:-0} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-0}:${GID:-0} "$$path" || true; done'
+    command: sh -c 'find /data -maxdepth 1 -type d -exec chown ${UID:-1000}:${GID:-1000} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'
     volumes:
       - pnpm-store:/usr/src/app/.pnpm-store
       - server-node_modules:/usr/src/app/server/node_modules

docs/static/archived-versions.json

@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v1.142.0",
-    "url": "https://v1.142.0.archive.immich.app"
-  },
   {
     "label": "v1.141.1",
     "url": "https://v1.141.1.archive.immich.app"

e2e/package.json

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

i18n/ja.json

@@ -1473,9 +1473,9 @@
   "permission_onboarding_permission_limited": "写真へのアクセスが制限されています。Immichが写真のバックアップと管理を行うには、システム設定から写真と動画のアクセス権限を変更してください。",
   "permission_onboarding_request": "Immichは写真へのアクセス許可が必要です",
   "person": "人物",
-  "person_age_months": "生後 {months, plural, one {# ヶ月} other {# ヶ月}}",
-  "person_age_year_months": "1 歳と, {months, plural, one {# ヶ月} other {# ヶ月}}",
-  "person_age_years": "{years, plural, other {# 歳}}",
+  "person_age_months": "{months, plural, one {# ヶ月} other {# ヶ月}} 前",
+  "person_age_year_months": "1 年, {months, plural, one {# ヶ月} other {# ヶ月}} 前",
+  "person_age_years": "{years, plural, other {# 年}}前",
   "person_birthdate": "{date}生まれ",
   "person_hidden": "{name}{hidden, select, true { (非表示)} other {}}",
   "photo_shared_all_users": "写真をすべてのユーザーと共有したか、共有するユーザーがいないようです。",
@@ -2024,7 +2024,7 @@
   "upload_success": "アップロード成功、新しくアップロードされたアセットを見るにはページを更新してください。",
   "upload_to_immich": "Immichにアップロード ({count})",
   "uploading": "アップロード中",
-  "uploading_media": "メディアをアップロード中",
+  "uploading_media": "メディアをアップロード",
   "url": "URL",
   "usage": "使用容量",
   "use_biometric": "生体認証をご利用ください",

i18n/ru.json

@@ -35,7 +35,7 @@
   "add_url": "Добавить URL",
   "added_to_archive": "Добавлено в архив",
   "added_to_favorites": "Добавлено в избранное",
-  "added_to_favorites_count": "{count, plural, one {# объект добавлен} many {# объектов добавлено} other {# объекта добавлено}} в избранное",
+  "added_to_favorites_count": "Добавлено{count, number} в избранное",
   "admin": {
     "add_exclusion_pattern_description": "Добавьте шаблоны исключений. Поддерживаются символы подстановки *, ** и ?. Чтобы игнорировать все файлы в любом каталоге с именем \"Raw\", укажите \"**/Raw/**\". Чтобы игнорировать все файлы, заканчивающиеся на \".tif\", используйте \"**/*.tif\". Чтобы игнорировать путь целиком, укажите \"/path/to/ignore/**\".",
     "admin_user": "Администратор",
@@ -448,7 +448,7 @@
   "all_albums": "Все альбомы",
   "all_people": "Все люди",
   "all_videos": "Все видео",
-  "allow_dark_mode": "Разрешить тёмный режим",
+  "allow_dark_mode": "Разрешить темный режим",
   "allow_edits": "Разрешить редактирование",
   "allow_public_user_to_download": "Разрешить скачивание",
   "allow_public_user_to_upload": "Разрешить добавление файлов",
@@ -1112,14 +1112,14 @@
   "home_page_add_to_album_conflicts": "Добавлено {added} медиа в альбом {album}. {failed} медиа уже в альбоме.",
   "home_page_add_to_album_err_local": "Пока нельзя добавлять локальные объекты в альбомы, пропуск",
   "home_page_add_to_album_success": "Добавлено {added} медиа в альбом {album}.",
-  "home_page_album_err_partner": "Невозможно добавить объекты партнёра в альбом, пропуск",
+  "home_page_album_err_partner": "Пока нельзя добавить медиа партнера в альбом, пропуск",
   "home_page_archive_err_local": "Пока нельзя добавить локальные файлы в архив, пропуск",
-  "home_page_archive_err_partner": "Невозможно добавить объекты партнёра в архив, пропуск",
+  "home_page_archive_err_partner": "Невозможно архивировать медиа партнера, пропуск",
   "home_page_building_timeline": "Построение хронологии",
-  "home_page_delete_err_partner": "Невозможно удалить объекты партнёра, пропуск",
+  "home_page_delete_err_partner": "Невозможно удалить медиа партнера, пропуск",
   "home_page_delete_remote_err_local": "Невозможно удалить локальные файлы с сервера, пропуск",
   "home_page_favorite_err_local": "Пока нельзя добавить в избранное локальные файлы, пропуск",
-  "home_page_favorite_err_partner": "Невозможно добавить объекты партнёра в избранное, пропуск",
+  "home_page_favorite_err_partner": "Пока нельзя добавить в избранное медиа партнера, пропуск",
   "home_page_first_time_notice": "Перед началом использования приложения выберите альбом с объектами для резервного копирования, чтобы они отобразились на временной шкале",
   "home_page_locked_error_local": "Невозможно переместить локальные объекты в личную папку, пропуск",
   "home_page_locked_error_partner": "Невозможно переместить объекты партнёра в личную папку, пропуск",
@@ -1154,8 +1154,8 @@
   "in_albums": "В {count, plural, one {# альбоме} other {# альбомах}}",
   "in_archive": "В архиве",
   "include_archived": "Отображать архив",
-  "include_shared_albums": "Включать объекты общих альбомов",
-  "include_shared_partner_assets": "Включать объекты партнёров",
+  "include_shared_albums": "Включать общие альбомы",
+  "include_shared_partner_assets": "Включать общие ресурсы партнера",
   "individual_share": "Индивидуальная подборка",
   "individual_shares": "Подборки",
   "info": "Информация",
@@ -1367,7 +1367,7 @@
   "no_duplicates_found": "Дубликатов не обнаружено.",
   "no_exif_info_available": "Нет доступной информации exif",
   "no_explore_results_message": "Загружайте больше фотографий, чтобы наслаждаться вашей коллекцией.",
-  "no_favorites_message": "Добавляйте объекты в избранное, чтобы быстрее находить свои лучшие фото и видео",
+  "no_favorites_message": "Добавляйте в избранное, чтобы быстро найти свои лучшие фотографии и видео",
   "no_libraries_message": "Создайте внешнюю библиотеку для просмотра в Immich сторонних фотографий и видео",
   "no_locked_photos_message": "Фото и видео, перемещенные в личную папку, скрыты и не отображаются при просмотре библиотеки.",
   "no_name": "Нет имени",
@@ -1422,18 +1422,18 @@
   "other_variables": "Другие переменные",
   "owned": "Мои",
   "owner": "Владелец",
-  "partner": "Партнёр",
-  "partner_can_access": "Пользователю {partner} доступны",
-  "partner_can_access_assets": "Все ваши фото и видео, кроме тех, что находятся в архиве и корзине",
-  "partner_can_access_location": "Места, где были сделаны ваши фото и видео",
-  "partner_list_user_photos": "Фото и видео пользователя {user}",
+  "partner": "Партнер",
+  "partner_can_access": "{partner} имеет доступ",
+  "partner_can_access_assets": "Все ваши фотографии и видеозаписи, кроме тех, которые находятся в Архиве и Корзине",
+  "partner_can_access_location": "Местоположение, где были сделаны ваши фотографии",
+  "partner_list_user_photos": "Фотографии пользователя {user}",
   "partner_list_view_all": "Посмотреть все",
-  "partner_page_empty_message": "Вы пока никому из партнёров не предоставили доступ к своим фото и видео.",
+  "partner_page_empty_message": "У вашего партнёра еще нет доступа к вашим фото.",
   "partner_page_no_more_users": "Выбраны все доступные пользователи",
   "partner_page_partner_add_failed": "Не удалось добавить партнёра",
   "partner_page_select_partner": "Выбрать партнёра",
   "partner_page_shared_to_title": "Поделиться с...",
-  "partner_page_stop_sharing_content": "Пользователь {partner} больше не будет иметь доступ к вашим фото и видео.",
+  "partner_page_stop_sharing_content": "Пользователь {partner} больше не сможет получить доступ к вашим фото.",
   "partner_sharing": "Совместное использование",
   "partners": "Партнёры",
   "password": "Пароль",
@@ -1796,7 +1796,7 @@
   "shared_by": "Поделился",
   "shared_by_user": "Владелец: {user}",
   "shared_by_you": "Вы поделились",
-  "shared_from_partner": "Пользователь {partner} предоставил вам доступ",
+  "shared_from_partner": "Фото и видео пользователя {partner}",
   "shared_intent_upload_button_progress_text": "{current} / {total} Загружено",
   "shared_link_app_bar_title": "Публичные ссылки",
   "shared_link_clipboard_copied_massage": "Скопировано в буфер обмена",
@@ -1833,7 +1833,7 @@
   "shared_links_description": "Делитесь фотографиями и видео по ссылке",
   "shared_photos_and_videos_count": "{assetCount, plural, other {# фото и видео.}}",
   "shared_with_me": "Доступные мне",
-  "shared_with_partner": "Вы предоставили доступ пользователю {partner}",
+  "shared_with_partner": "Совместно с {partner}",
   "sharing": "Общие",
   "sharing_enter_password": "Пожалуйста, введите пароль для просмотра этой страницы.",
   "sharing_page_album": "Общие альбомы",
@@ -1851,7 +1851,7 @@
   "show_gallery": "Показать галерею",
   "show_hidden_people": "Показать скрытых людей",
   "show_in_timeline": "Показать на временной шкале",
-  "show_in_timeline_setting_description": "Отображать фото и видео этого пользователя на своей временной шкале",
+  "show_in_timeline_setting_description": "Отображать фото и видео этого пользователя в своей ленте",
   "show_keyboard_shortcuts": "Показать сочетания клавиш",
   "show_metadata": "Показывать метаданные",
   "show_or_hide_info": "Показать или скрыть информацию",
@@ -1897,9 +1897,9 @@
   "status": "Состояние",
   "stop_casting": "Остановить трансляцию",
   "stop_motion_photo": "Покадровая анимация",
-  "stop_photo_sharing": "Закрыть доступ партнёру?",
+  "stop_photo_sharing": "Закрыть доступ партнёра к вашим фото?",
   "stop_photo_sharing_description": "Пользователь {partner} больше не имеет доступа к вашим фотографиям.",
-  "stop_sharing_photos_with_user": "Прекратить делиться своими фото и видео с этим пользователем",
+  "stop_sharing_photos_with_user": "Прекратить делиться своими фотографиями с этим пользователем",
   "storage": "Хранилище",
   "storage_label": "Метка хранилища",
   "storage_quota": "Квота хранилища",

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 3014,
-        "android.injected.version.name" => "1.142.0",
+        "android.injected.version.code" => 3013,
+        "android.injected.version.name" => "1.141.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.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -133,8 +133,6 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -521,10 +519,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -553,10 +555,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -705,7 +711,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -849,7 +855,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -879,7 +885,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -913,7 +919,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -956,7 +962,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -996,7 +1002,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1035,7 +1041,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1079,7 +1085,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1120,7 +1126,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 223;
+				CURRENT_PROJECT_VERSION = 219;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;

mobile/ios/Runner/Info.plist

@@ -80,7 +80,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.142.0</string>
+	<string>1.140.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -107,7 +107,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>223</string>
+	<string>219</string>
 	<key>FLTEnableImpeller</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -22,7 +22,7 @@ platform :ios do
       path: "./Runner.xcodeproj",
     )
     increment_version_number(
-      version_number: "1.142.0"
+      version_number: "1.141.1"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/domain/services/background_worker.service.dart

@@ -169,10 +169,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     }
 
     try {
-      final backgroundSyncManager = _ref.read(backgroundSyncProvider);
       _isCleanedUp = true;
-      _ref.dispose();
-
       _cancellationToken.cancel();
       _logger.info("Cleaning up background worker");
       final cleanupFutures = [
@@ -182,13 +179,14 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         }),
         _drift.close(),
         _driftLogger.close(),
-        backgroundSyncManager.cancel(),
-        backgroundSyncManager.cancelLocal(),
+        _ref.read(backgroundSyncProvider).cancel(),
+        _ref.read(backgroundSyncProvider).cancelLocal(),
       ];
 
       if (_isar.isOpen) {
         cleanupFutures.add(_isar.close());
       }
+      _ref.dispose();
       await Future.wait(cleanupFutures);
       _logger.info("Background worker resources cleaned up");
     } catch (error, stack) {
@@ -197,42 +195,35 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   }
 
   Future<void> _handleBackup() async {
-    await runZonedGuarded(
-      () async {
-        if (!_isBackupEnabled || _isCleanedUp) {
-          _logger.info("[_handleBackup 1] Backup is disabled. Skipping backup routine");
-          return;
-        }
+    if (!_isBackupEnabled || _isCleanedUp) {
+      _logger.info("[_handleBackup 1] Backup is disabled. Skipping backup routine");
+      return;
+    }
 
-        _logger.info("[_handleBackup 2] Enqueuing assets for backup from the background service");
+    _logger.info("[_handleBackup 2] Enqueuing assets for backup from the background service");
 
-        final currentUser = _ref.read(currentUserProvider);
-        if (currentUser == null) {
-          _logger.warning("[_handleBackup 3] No current user found. Skipping backup from background");
-          return;
-        }
+    final currentUser = _ref.read(currentUserProvider);
+    if (currentUser == null) {
+      _logger.warning("[_handleBackup 3] No current user found. Skipping backup from background");
+      return;
+    }
 
-        _logger.info("[_handleBackup 4] Resume backup from background");
-        if (Platform.isIOS) {
-          return _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
-        }
+    _logger.info("[_handleBackup 4] Resume backup from background");
+    if (Platform.isIOS) {
+      return _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
+    }
 
-        final canPing = await _ref.read(serverInfoServiceProvider).ping();
-        if (!canPing) {
-          _logger.warning("[_handleBackup 5] Server is not reachable. Skipping backup from background");
-          return;
-        }
+    final canPing = await _ref.read(serverInfoServiceProvider).ping();
+    if (!canPing) {
+      _logger.warning("[_handleBackup 5] Server is not reachable. Skipping backup from background");
+      return;
+    }
 
-        final networkCapabilities = await _ref.read(connectivityApiProvider).getCapabilities();
+    final networkCapabilities = await _ref.read(connectivityApiProvider).getCapabilities();
 
-        return _ref
-            .read(uploadServiceProvider)
-            .startBackupWithHttpClient(currentUser.id, networkCapabilities.hasWifi, _cancellationToken);
-      },
-      (error, stack) {
-        debugPrint("Error in backup zone $error, $stack");
-      },
-    );
+    return _ref
+        .read(uploadServiceProvider)
+        .startBackupWithHttpClient(currentUser.id, networkCapabilities.hasWifi, _cancellationToken);
   }
 
   Future<void> _syncAssets({Duration? hashTimeout}) async {

mobile/lib/domain/utils/background_sync.dart

@@ -169,7 +169,7 @@ class BackgroundSyncManager {
       return _linkedAlbumSyncTask!.future;
     }
 
-    _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated);
+    _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated, debugLabel: "LinkedAlbumSync");
     return _linkedAlbumSyncTask!.whenComplete(() {
       _linkedAlbumSyncTask = null;
     });

mobile/lib/domain/utils/sync_linked_album.dart

@@ -1,10 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 
 Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
-  final user = Store.tryGet(StoreKey.currentUser);
+  final user = ref.read(currentUserProvider);
   if (user == null) {
     return Future.value();
   }

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

@@ -23,6 +23,7 @@ import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
+import 'package:immich_mobile/infrastructure/repositories/drirft_native.dart';
 import 'package:isar/isar.dart' hide Index;
 
 import 'db.repository.drift.dart';
@@ -67,7 +68,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
 )
 class Drift extends $Drift implements IDatabaseRepository {
   Drift([QueryExecutor? executor])
-    : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
+    : super(executor ?? driftDatabaseTest(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
 
   @override
   int get schemaVersion => 10;

mobile/lib/infrastructure/repositories/drirft_native.dart

@@ -0,0 +1,151 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:isolate';
+import 'dart:ui';
+
+import 'package:drift/drift.dart';
+import 'package:drift/isolate.dart';
+import 'package:drift/native.dart';
+import 'package:drift_flutter/drift_flutter.dart';
+import 'package:meta/meta.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as p;
+import 'package:sqlite3/sqlite3.dart';
+import 'package:sqlite3_flutter_libs/sqlite3_flutter_libs.dart';
+
+@internal
+bool hasConfiguredSqlite = false;
+
+String portName(String databaseName) {
+  return 'drift-db/$databaseName';
+}
+
+String isolateControlPortName(String databaseName) {
+  return 'drift-db/$databaseName/control';
+}
+
+QueryExecutor driftDatabaseTest({required String name, DriftWebOptions? web, DriftNativeOptions? native}) {
+  Future<File> databaseFile() async {
+    if (native?.databasePath case final lookupPath?) {
+      return File(await lookupPath());
+    } else {
+      final resolvedDirectory = await (native?.databaseDirectory ?? getApplicationDocumentsDirectory)();
+
+      return File(
+        p.join(switch (resolvedDirectory) {
+          Directory(:final path) => path,
+          final String path => path,
+          final other => throw ArgumentError.value(
+            other,
+            'other',
+            'databaseDirectory on DriftNativeOptions must resolve to a '
+                'directory or a path as string.',
+          ),
+        }, '$name.sqlite'),
+      );
+    }
+  }
+
+  return DatabaseConnection.delayed(
+    Future(() async {
+      if (!hasConfiguredSqlite) {
+        // Also work around limitations on old Android versions
+        if (Platform.isAndroid) {
+          await applyWorkaroundToOpenSqlite3OnOldAndroidVersions();
+        }
+
+        // Make sqlite3 pick a more suitable location for temporary files - the
+        // one from the system may be inaccessible due to sandboxing.
+        final cachebase = await (native?.tempDirectoryPath?.call() ?? getTemporaryDirectory().then((d) => d.path));
+
+        if (cachebase != null) {
+          // We can't access /tmp on Android, which sqlite3 would try by default.
+          // Explicitly tell it about the correct temporary directory.
+          sqlite3.tempDirectory = cachebase;
+        }
+
+        hasConfiguredSqlite = true;
+      }
+
+      if (native != null && native.shareAcrossIsolates) {
+        const connectTimeout = Duration(seconds: 1);
+
+        while (true) {
+          if (IsolateNameServer.lookupPortByName(portName(name)) case final port?) {
+            final isolate = DriftIsolate.fromConnectPort(port);
+            try {
+              return await isolate.connect(connectTimeout: connectTimeout, isolateDebugLog: true);
+            } on TimeoutException {
+              // Isolate has stopped shortly after the register call. It should
+              // also remove the port mapping, so we can just try again in another
+              // iteration.
+              // However, it's possible for the isolate to become unreachable
+              // without unregistering itself (either due to a fatal error or when
+              // doing a hot restart). Check if the isolate is still reachable,
+              // and remove the mapping if it's not.
+              final controlPort = IsolateNameServer.lookupPortByName(isolateControlPortName(name));
+              if (controlPort == null) {
+                continue;
+              }
+              final supposedIsolate = Isolate(controlPort);
+              if (!await supposedIsolate.pingWithTimeout()) {
+                // Yup, gone!
+                IsolateNameServer.removePortNameMapping(portName(name));
+              }
+              // Otherwise, the isolate is probably paused. Keep trying...
+            }
+          } else {
+            // No port has been registered yet! Spawn an isolate that will try to
+            // register itself as the database server.
+            final receiveFromPending = ReceivePort();
+            final firstMessage = receiveFromPending.first;
+            await Isolate.spawn(_isolateEntrypoint, (
+              name: name,
+              options: native,
+              sendResponses: receiveFromPending.sendPort,
+              path: (await databaseFile()).path,
+            ), onExit: receiveFromPending.sendPort);
+
+            // The isolate will either succeed in registering its connect port to
+            // the name server (in which case it sends us the port), or it fails
+            // due to a race condition (in which case it exits).
+            final first = await firstMessage;
+            if (first case SendPort port) {
+              return await DriftIsolate.fromConnectPort(port).connect(isolateDebugLog: true);
+            }
+          }
+        }
+      }
+
+      return NativeDatabase.createBackgroundConnection(await databaseFile());
+    }),
+  );
+}
+
+typedef _EntrypointMessage = ({String name, String path, DriftNativeOptions options, SendPort sendResponses});
+
+void _isolateEntrypoint(_EntrypointMessage message) {
+  final connections = ReceivePort();
+  if (IsolateNameServer.registerPortWithName(connections.sendPort, portName(message.name))) {
+    final controlPortName = isolateControlPortName(message.name);
+    final server = DriftIsolate.inCurrent(
+      () => NativeDatabase(File(message.path)),
+      port: connections,
+      beforeShutdown: () {
+        IsolateNameServer.removePortNameMapping(portName(message.name));
+        IsolateNameServer.removePortNameMapping(controlPortName);
+      },
+      killIsolateWhenDone: true,
+      shutdownAfterLastDisconnect: true,
+    );
+
+    message.sendResponses.send(server.connectPort);
+
+    IsolateNameServer.removePortNameMapping(controlPortName);
+    IsolateNameServer.registerPortWithName(Isolate.current.controlPort, controlPortName);
+  } else {
+    // Another isolate is responsible for hosting this database, abort.
+    connections.close();
+    return;
+  }
+}

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

@@ -2,6 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:immich_mobile/domain/interfaces/db.interface.dart';
 import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/drirft_native.dart';
 
 import 'logger_db.repository.drift.dart';
 
@@ -9,7 +10,7 @@ import 'logger_db.repository.drift.dart';
 class DriftLogger extends $DriftLogger implements IDatabaseRepository {
   DriftLogger([QueryExecutor? executor])
     : super(
-        executor ?? driftDatabase(name: 'immich_logs', native: const DriftNativeOptions(shareAcrossIsolates: true)),
+        executor ?? driftDatabaseTest(name: 'immich_logs', native: const DriftNativeOptions(shareAcrossIsolates: true)),
       );
 
   @override

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

@@ -595,7 +595,7 @@ extension on String {
       GroupAssetsBy.none => throw ArgumentError("GroupAssetsBy.none is not supported for date formatting"),
     };
     try {
-      return DateFormat(format, 'en').parse(this);
+      return DateFormat(format).parse(this);
     } catch (e) {
       throw FormatException("Invalid date format: $this", e);
     }

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

@@ -78,9 +78,13 @@ class DriftAuthUserRepository extends DriftDatabaseRepository {
     if (user == null) return null;
 
     final query = _db.userMetadataEntity.select()..where((e) => e.userId.equals(id));
+
+    print("getting metadata for user $id");
     final metadata = await query.map((row) => row.toDto()).get();
 
-    return user.toDto(metadata);
+    final a = user.toDto(metadata);
+    print("get user $id metadata $a");
+    return a;
   }
 
   Future<UserDto> upsert(UserDto user) async {

mobile/lib/main.dart

@@ -46,7 +46,7 @@ void main() async {
   await Bootstrap.initDomain(isar, drift, logDb);
   await initApp();
   // Warm-up isolate pool for worker manager
-  await workerManager.init(dynamicSpawning: true);
+  await workerManager.init(dynamicSpawning: false);
   await migrateDatabaseIfNeeded(isar, drift);
   HttpSSLOptions.apply();
 

mobile/lib/services/upload.service.dart

@@ -17,7 +17,6 @@ import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -31,7 +30,6 @@ final uploadServiceProvider = Provider((ref) {
     ref.watch(storageRepositoryProvider),
     ref.watch(localAssetRepository),
     ref.watch(appSettingsServiceProvider),
-    ref.watch(assetMediaRepositoryProvider),
   );
 
   ref.onDispose(service.dispose);
@@ -45,7 +43,6 @@ class UploadService {
     this._storageRepository,
     this._localAssetRepository,
     this._appSettingsService,
-    this._assetMediaRepository,
   ) {
     _uploadRepository.onUploadStatus = _onUploadCallback;
     _uploadRepository.onTaskProgress = _onTaskProgressCallback;
@@ -56,7 +53,6 @@ class UploadService {
   final StorageRepository _storageRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final AppSettingsService _appSettingsService;
-  final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('UploadService');
 
   final StreamController<TaskStatusUpdate> _taskStatusController = StreamController<TaskStatusUpdate>.broadcast();
@@ -325,8 +321,7 @@ class UploadService {
       return null;
     }
 
-    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+    final originalFileName = entity.isLivePhoto ? p.setExtension(asset.name, p.extension(file.path)) : asset.name;
 
     String metadata = UploadTaskMetadata(
       localAssetId: asset.id,
@@ -364,13 +359,12 @@ class UploadService {
     final fields = {'livePhotoVideoId': livePhotoVideoId};
 
     final requiresWiFi = _shouldRequireWiFi(asset);
-    final originalFileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
 
     return buildUploadTask(
       file,
       createdAt: asset.createdAt,
       modifiedAt: asset.updatedAt,
-      originalFileName: originalFileName,
+      originalFileName: asset.name,
       deviceAssetId: asset.id,
       fields: fields,
       group: kBackupLivePhotoGroup,

mobile/lib/utils/isolate.dart

@@ -59,34 +59,43 @@ Cancelable<T?> runInIsolateGentle<T>({
           log.severe("Error in runInIsolateGentle ${debugLabel == null ? '' : ' for $debugLabel'}", error, stack);
         } finally {
           try {
-            ref.dispose();
-
+            print("1 close logs service");
             await LogService.I.dispose();
+
+            print("2 close logs db");
             await logDb.close();
-            await drift.close();
+
+            print("3 close drift $debugLabel");
+            await ref.read(driftProvider).close();
 
             // Close Isar safely
             try {
+              print("4 close isar");
+              final isar = ref.read(isarProvider);
               if (isar.isOpen) {
                 await isar.close();
               }
+              print("5 closed isar");
             } catch (e) {
               debugPrint("Error closing Isar: $e");
             }
+
+            print("6 dispose ref");
           } catch (error, stack) {
             debugPrint("Error closing resources in isolate: $error, $stack");
           } finally {
+            print("finished isolate ${debugLabel == null ? '' : ' for $debugLabel'}");
             ref.dispose();
+
             // Delay to ensure all resources are released
             await Future.delayed(const Duration(seconds: 2));
           }
         }
         return null;
       },
-      (error, stack) {
-        debugPrint("Error in isolate zone: $error, $stack");
+      (error, stackTrace) {
+        print("Run zoned error in isolate ${debugLabel == null ? '' : ' for $debugLabel'}: $error, $stackTrace");
       },
     );
-    return null;
   });
 }

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.142.0
+- API version: 1.141.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.142.0+3014
+version: 1.141.1+3013
 
 environment:
   sdk: '>=3.8.0 <4.0.0'

open-api/immich-openapi-specs.json

@@ -9858,7 +9858,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.142.0",
+    "version": "1.141.1",
     "contact": {}
   },
   "tags": [],

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.142.0",
+  "version": "1.141.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
- * 1.142.0
+ * 1.141.1
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */

server/package.json

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

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "1.142.0",
+  "version": "1.141.1",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
   "scripts": {

web/src/lib/components/shared-components/map/map.svelte

@@ -353,7 +353,7 @@
           <div
             class="rounded-full w-[40px] h-[40px] bg-immich-primary text-white flex justify-center items-center font-mono font-bold shadow-lg hover:bg-immich-dark-primary transition-all duration-200 hover:text-immich-dark-bg opacity-90"
           >
-            {feature.properties?.point_count?.toLocaleString()}
+            {feature.properties?.point_count}
           </div>
         {/snippet}
       </MarkerLayer>

web/src/lib/utils/timeline-util.spec.ts

@@ -1,6 +1,6 @@
 import { locale } from '$lib/stores/preferences.store';
 import { parseUtcDate } from '$lib/utils/date-time';
-import { formatGroupTitle, toISOYearMonthUTC } from '$lib/utils/timeline-util';
+import { formatGroupTitle } from '$lib/utils/timeline-util';
 import { DateTime } from 'luxon';
 
 describe('formatGroupTitle', () => {
@@ -77,13 +77,3 @@ describe('formatGroupTitle', () => {
     expect(formatGroupTitle(date)).toBe('Invalid DateTime');
   });
 });
-
-describe('toISOYearMonthUTC', () => {
-  it('should prefix year with 0s', () => {
-    expect(toISOYearMonthUTC({ year: 28, month: 1 })).toBe('0028-01-01T00:00:00.000Z');
-  });
-
-  it('should prefix month with 0s', () => {
-    expect(toISOYearMonthUTC({ year: 2025, month: 1 })).toBe('2025-01-01T00:00:00.000Z');
-  });
-});

web/src/lib/utils/timeline-util.ts

@@ -94,11 +94,8 @@ export const fromTimelinePlainYearMonth = (timelineYearMonth: TimelineYearMonth)
     { zone: 'local', locale: get(locale) },
   ) as DateTime<true>;
 
-export const toISOYearMonthUTC = ({ year, month }: TimelineYearMonth): string => {
-  const yearFull = `${year}`.padStart(4, '0');
-  const monthFull = `${month}`.padStart(2, '0');
-  return `${yearFull}-${monthFull}-01T00:00:00.000Z`;
-};
+export const toISOYearMonthUTC = ({ year, month }: TimelineYearMonth): string =>
+  `${year}-${month.toString().padStart(2, '0')}-01T00:00:00.000Z`;
 
 export function formatMonthGroupTitle(_date: DateTime): string {
   if (!_date.isValid) {