Merge af9c58ef95 into 5ade152bc5

i18n/en.json

@@ -826,6 +826,10 @@
   "day": "Day",
   "days": "Days",
   "deduplicate_all": "Deduplicate All",
+  "deduplicate_prefer_default": "Default",
+  "deduplicate_prefer_external": "Prefer external",
+  "deduplicate_prefer_internal": "Prefer internal",
+  "deduplicate_source_preference": "Source preference",
   "deduplication_criteria_1": "Image size in bytes",
   "deduplication_criteria_2": "Count of EXIF data",
   "deduplication_info": "Deduplication Info",
@@ -905,6 +909,7 @@
   "drop_files_to_upload": "Drop files anywhere to upload",
   "duplicates": "Duplicates",
   "duplicates_description": "Resolve each group by indicating which, if any, are duplicates",
+  "duplicates_settings": "Duplicates Settings",
   "duration": "Duration",
   "edit": "Edit",
   "edit_album": "Edit album",

web/eslint.config.js

@@ -130,6 +130,7 @@ export default typescriptEslint.config(
       '@typescript-eslint/require-await': 'error',
       'object-shorthand': ['error', 'always'],
       'svelte/no-navigation-without-resolve': 'off',
+      'svelte/no-unnecessary-state-wrap': ['error', { allowReassign: true }],
     },
   },
   {

web/src/lib/components/utilities-page/duplicates/duplicates-compare-control.svelte

@@ -4,16 +4,16 @@
   import Portal from '$lib/elements/Portal.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
+  import { duplicateTiePreference } from '$lib/stores/duplicate-tie-preferences-manager.svelte';
   import { handlePromiseError } from '$lib/utils';
-  import { suggestDuplicate } from '$lib/utils/duplicate-utils';
+  import { suggestBestDuplicate } from '$lib/utils/duplicate-utils';
   import { navigate } from '$lib/utils/navigation';
   import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';
   import { Button } from '@immich/ui';
   import { mdiCheck, mdiImageMultipleOutline, mdiTrashCanOutline } from '@mdi/js';
-  import { onDestroy, onMount } from 'svelte';
+  import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
   import { SvelteSet } from 'svelte/reactivity';
-
   interface Props {
     assets: AssetResponseDto[];
     onResolve: (duplicateAssetIds: string[], trashIds: string[]) => void;
@@ -24,19 +24,18 @@
   const { isViewing: showAssetViewer, asset: viewingAsset, setAsset } = assetViewingStore;
   const getAssetIndex = (id: string) => assets.findIndex((asset) => asset.id === id);
 
-  // eslint-disable-next-line svelte/no-unnecessary-state-wrap
   let selectedAssetIds = $state(new SvelteSet<string>());
   let trashCount = $derived(assets.length - selectedAssetIds.size);
 
-  onMount(() => {
-    const suggestedAsset = suggestDuplicate(assets);
-
-    if (!suggestedAsset) {
-      selectedAssetIds = new SvelteSet(assets[0].id);
+  $effect(() => {
+    if (assets.length === 0) {
+      selectedAssetIds = new SvelteSet<string>();
       return;
     }
 
-    selectedAssetIds.add(suggestedAsset.id);
+    const suggestedAsset = suggestBestDuplicate(assets, duplicateTiePreference.value) ?? assets[0];
+
+    selectedAssetIds = new SvelteSet<string>([suggestedAsset.id]);
   });
 
   onDestroy(() => {
@@ -117,7 +116,7 @@
   ]}
 />
 
-<div class="rounded-3xl border dark:border-2 border-gray-300 dark:border-gray-700 max-w-256 mx-auto mb-4 py-6 px-0.2">
+<div class="rounded-3xl border dark:border-2 border-gray-300 dark:border-gray-700 max-w-5xl mx-auto mb-4 py-6 px-0.2">
   <div class="flex flex-wrap gap-y-6 mb-4 px-6 w-full place-content-end justify-between">
     <!-- MARK ALL BUTTONS -->
     <div class="flex text-xs text-black">

web/src/lib/modals/DuplicatesSettingsModal.svelte

@@ -0,0 +1,86 @@
+<script lang="ts">
+  import {
+    duplicateTiePreference,
+    findDuplicateTiePreference,
+    setDuplicateTiePreference,
+  } from '$lib/stores/duplicate-tie-preferences-manager.svelte';
+  import { Button, ConfirmModal, Text, VStack } from '@immich/ui';
+  import { mdiCogOutline } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    onClose: () => void;
+  };
+
+  const { onClose }: Props = $props();
+
+  let tiePreferenceLocal = $state(duplicateTiePreference.value);
+
+  const handleConfirm = () => {
+    setDuplicateTiePreference(tiePreferenceLocal);
+    onClose();
+  };
+
+  const makeSourcePreference = (priority: 'internal' | 'external') => ({
+    variant: 'source' as const,
+    priority,
+  });
+</script>
+
+<ConfirmModal
+  title={$t('duplicates_settings')}
+  icon={mdiCogOutline}
+  confirmColor="primary"
+  confirmText={$t('save')}
+  onClose={(confirmed) => (confirmed ? handleConfirm() : onClose())}
+>
+  {#snippet promptSnippet()}
+    <VStack class="items-start">
+      <Text class="font-bold">{$t('deduplicate_source_preference')}</Text>
+
+      <div
+        class="inline-flex rounded-full overflow-hidden border border-gray-700"
+        role="group"
+        aria-label={$t('duplicates_settings')}
+      >
+        <Button
+          size="small"
+          variant="ghost"
+          class="rounded-none"
+          color={findDuplicateTiePreference(tiePreferenceLocal, 'source')?.priority === 'external'
+            ? 'primary'
+            : 'secondary'}
+          aria-pressed={findDuplicateTiePreference(tiePreferenceLocal, 'source')?.priority === 'external'}
+          title={$t('deduplicate_prefer_external')}
+          onclick={() => (tiePreferenceLocal = [makeSourcePreference('external')])}
+        >
+          <Text class="hidden md:block">{$t('deduplicate_prefer_external')}</Text>
+        </Button>
+        <Button
+          size="small"
+          variant="ghost"
+          class="rounded-none"
+          color={tiePreferenceLocal === undefined ? 'primary' : 'secondary'}
+          aria-pressed={tiePreferenceLocal === undefined}
+          title={$t('deduplicate_prefer_default')}
+          onclick={() => (tiePreferenceLocal = undefined)}
+        >
+          <Text class="hidden md:block">{$t('deduplicate_prefer_default')}</Text>
+        </Button>
+        <Button
+          size="small"
+          variant="ghost"
+          class="rounded-none"
+          color={findDuplicateTiePreference(tiePreferenceLocal, 'source')?.priority === 'internal'
+            ? 'primary'
+            : 'secondary'}
+          aria-pressed={findDuplicateTiePreference(tiePreferenceLocal, 'source')?.priority === 'internal'}
+          title={$t('deduplicate_prefer_internal')}
+          onclick={() => (tiePreferenceLocal = [makeSourcePreference('internal')])}
+        >
+          <Text class="hidden md:block">{$t('deduplicate_prefer_internal')}</Text>
+        </Button>
+      </div>
+    </VStack>
+  {/snippet}
+</ConfirmModal>

web/src/lib/stores/duplicate-tie-preferences-manager.svelte.ts

@@ -0,0 +1,24 @@
+/**
+ * Current (optional) rule: keep by source.
+ * To add more rules later, extend `PreferenceItem` with new
+ * `{ variant: 'x'; priority: string[] }` types.
+ * `undefined` = no saved preference (fallback to default).
+ */
+export type SourcePreference = { variant: 'source'; priority: 'internal' | 'external' };
+
+export type DuplicateTiePreferencesSvelte = PreferenceDuplicateTieItem[];
+
+export type PreferenceDuplicateTieItem = SourcePreference;
+
+export const duplicateTiePreference = $state<{
+  value: DuplicateTiePreferencesSvelte | undefined;
+}>({ value: undefined });
+
+export const findDuplicateTiePreference = <T extends PreferenceDuplicateTieItem['variant']>(
+  preference: DuplicateTiePreferencesSvelte | undefined,
+  variant: T,
+) => preference?.find((preference) => preference.variant === variant);
+
+export function setDuplicateTiePreference(nextDuplicateTiePreferences: DuplicateTiePreferencesSvelte | undefined) {
+  duplicateTiePreference.value = nextDuplicateTiePreferences;
+}

web/src/lib/utils/duplicate-utils.spec.ts

@@ -1,6 +1,9 @@
-import { suggestDuplicate } from '$lib/utils/duplicate-utils';
+import type { SourcePreference } from '$lib/stores/duplicate-tie-preferences-manager.svelte';
+import { suggestBestDuplicate } from '$lib/utils/duplicate-utils';
 import type { AssetResponseDto } from '@immich/sdk';
 
+const suggestDuplicate = (assets: AssetResponseDto[]) => suggestBestDuplicate(assets, undefined);
+
 describe('choosing a duplicate', () => {
   it('picks the asset with the largest file size', () => {
     const assets = [
@@ -34,4 +37,22 @@ describe('choosing a duplicate', () => {
     const assets = [{ exifInfo: { rating: 5, fNumber: 1 } }, { exifInfo: { rating: 5 } }];
     expect(suggestDuplicate(assets as AssetResponseDto[])).toEqual(assets[0]);
   });
+
+  it('respects source preference when provided', () => {
+    const assets = [
+      { exifInfo: { fileSizeInByte: 200 }, libraryId: null }, // internal
+      { exifInfo: { fileSizeInByte: 200 }, libraryId: 'lib1' }, // external
+    ];
+    const preference: SourcePreference[] = [{ variant: 'source', priority: 'external' }];
+    expect(suggestBestDuplicate(assets as AssetResponseDto[], preference)).toEqual(assets[1]);
+  });
+
+  it('falls back to size and exif when source preference yields no candidates', () => {
+    const assets = [
+      { exifInfo: { fileSizeInByte: 200 }, libraryId: null }, // internal
+      { exifInfo: { fileSizeInByte: 200 }, libraryId: null }, // internal
+    ];
+    const preference: SourcePreference[] = [{ variant: 'source', priority: 'external' }];
+    expect(suggestBestDuplicate(assets as AssetResponseDto[], preference)).toEqual(assets[0]);
+  });
 });

web/src/lib/utils/duplicate-utils.ts

@@ -1,6 +1,11 @@
+import {
+  type DuplicateTiePreferencesSvelte,
+  findDuplicateTiePreference,
+} from '$lib/stores/duplicate-tie-preferences-manager.svelte';
 import { getExifCount } from '$lib/utils/exif-utils';
 import type { AssetResponseDto } from '@immich/sdk';
-import { sortBy } from 'lodash-es';
+
+const sizeOf = (asset: AssetResponseDto) => asset.exifInfo?.fileSizeInByte ?? 0;
 
 /**
  * Suggests the best duplicate asset to keep from a list of duplicates.
@@ -8,23 +13,34 @@ import { sortBy } from 'lodash-es';
  * The best asset is determined by the following criteria:
  *  - Largest image file size in bytes
  *  - Largest count of exif data
+ *  - Optional source preference (internal vs external)
  *
- * @param assets List of duplicate assets
- * @returns The best asset to keep
  */
-export const suggestDuplicate = (assets: AssetResponseDto[]): AssetResponseDto | undefined => {
-  let duplicateAssets = sortBy(assets, (asset) => asset.exifInfo?.fileSizeInByte ?? 0);
-
-  // Update the list to only include assets with the largest file size
-  duplicateAssets = duplicateAssets.filter(
-    (asset) => asset.exifInfo?.fileSizeInByte === duplicateAssets.at(-1)?.exifInfo?.fileSizeInByte,
-  );
-
-  // If there are multiple assets with the same file size, sort the list by the count of exif data
-  if (duplicateAssets.length >= 2) {
-    duplicateAssets = sortBy(duplicateAssets, getExifCount);
+export function suggestBestDuplicate(
+  assets: AssetResponseDto[],
+  preference: DuplicateTiePreferencesSvelte | undefined,
+): AssetResponseDto | undefined {
+  if (assets.length === 0) {
+    return;
   }
+  let candidates = filterBySizeAndExif(assets);
 
-  // Return the last asset in the list
-  return duplicateAssets.pop();
+  const source = findDuplicateTiePreference(preference, 'source');
+  if (source && candidates.length > 1) {
+    candidates = filterBySource(candidates, source.priority);
+  }
+  return candidates[0];
+}
+
+const filterBySizeAndExif = (assets: AssetResponseDto[]): AssetResponseDto[] => {
+  const maxSize = Math.max(...assets.map((asset) => sizeOf(asset)));
+  const sizeFilteredAssets = assets.filter((assets) => sizeOf(assets) === maxSize);
+
+  const maxExif = Math.max(...sizeFilteredAssets.map((asset) => getExifCount(asset)));
+  return sizeFilteredAssets.filter((assets) => getExifCount(assets) === maxExif);
+};
+
+const filterBySource = (assets: AssetResponseDto[], priority: 'internal' | 'external'): AssetResponseDto[] => {
+  const filtered = assets.filter((asset) => (priority === 'external') === !!asset.libraryId);
+  return filtered.length > 0 ? filtered : assets;
 };

web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -7,11 +7,13 @@
   import { AppRoute } from '$lib/constants';
   import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
   import DuplicatesInformationModal from '$lib/modals/DuplicatesInformationModal.svelte';
+  import DuplicatesSettingsModal from '$lib/modals/DuplicatesSettingsModal.svelte';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
+  import { duplicateTiePreference } from '$lib/stores/duplicate-tie-preferences-manager.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { stackAssets } from '$lib/utils/asset-utils';
-  import { suggestDuplicate } from '$lib/utils/duplicate-utils';
+  import { suggestBestDuplicate } from '$lib/utils/duplicate-utils';
   import { handleError } from '$lib/utils/handle-error';
   import type { AssetResponseDto } from '@immich/sdk';
   import { deleteAssets, deleteDuplicates, updateAssets } from '@immich/sdk';
@@ -20,6 +22,7 @@
     mdiCheckOutline,
     mdiChevronLeft,
     mdiChevronRight,
+    mdiCogOutline,
     mdiInformationOutline,
     mdiKeyboard,
     mdiPageFirst,
@@ -39,6 +42,7 @@
     general: ExplainedShortcut[];
     actions: ExplainedShortcut[];
   }
+
   interface ExplainedShortcut {
     key: string[];
     action: string;
@@ -123,9 +127,10 @@
   };
 
   const handleDeduplicateAll = async () => {
-    const idsToKeep = duplicates.map((group) => suggestDuplicate(group.assets)).map((asset) => asset?.id);
+    const idsToKeep = duplicates.map((group) => suggestBestDuplicate(group.assets, duplicateTiePreference.value)?.id);
+
     const idsToDelete = duplicates.flatMap((group, i) =>
-      group.assets.map((asset) => asset.id).filter((asset) => asset !== idsToKeep[i]),
+      group.assets.map(({ id }) => id).filter((id) => id !== idsToKeep[i]),
     );
 
     let prompt, confirmText;
@@ -142,7 +147,7 @@
         await deleteAssets({ assetBulkDeleteDto: { ids: idsToDelete, force: !featureFlagsManager.value.trash } });
         await updateAssets({
           assetBulkUpdateDto: {
-            ids: [...idsToDelete, ...idsToKeep.filter((id): id is string => !!id)],
+            ids: [...idsToDelete, ...idsToKeep.filter((id) => id !== undefined)],
             duplicateId: null,
           },
         });
@@ -216,6 +221,22 @@
 <UserPageLayout title={data.meta.title + ` (${duplicates.length.toLocaleString($locale)})`} scrollbar={true}>
   {#snippet buttons()}
     <HStack gap={0}>
+      <Button
+        size="small"
+        variant="ghost"
+        color={(duplicateTiePreference.value ?? []).length > 0 ? 'primary' : 'secondary'}
+        leadingIcon={mdiCogOutline}
+        onclick={() => modalManager.show(DuplicatesSettingsModal)}
+        title={$t('settings')}
+        aria-label={$t('settings')}
+        class="relative"
+      >
+        <Text class="hidden md:block">{$t('settings')}</Text>
+        {#if (duplicateTiePreference.value ?? []).length > 0}
+          <span class="ml-2 inline-block h-2 w-2 rounded-full bg-primary" aria-hidden="true"></span>
+        {/if}
+      </Button>
+
       <Button
         leadingIcon={mdiTrashCanOutline}
         onclick={() => handleDeduplicateAll()}