From d5a9350a4ddf8847d048128833a8a100ec2d3eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=B1=CE=B5=D1=8F=D1=8F=CE=B5?=
 <47398145+AiroPi@users.noreply.github.com>
Date: Thu, 11 Apr 2024 18:51:33 -0700
Subject: [PATCH 1/8] change chooseNcFolder "type" argument to "buttonFactory"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"type" is deprecated, and using "buttonFactory" allow to add more than one button the the modal.

Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 15 ++++++++++++-
 src/services/utils/dialog.ts               | 26 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 7c5698b0c..989db385a 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -26,6 +26,7 @@ import ModalMixin from './ModalMixin';
 import * as dav from '@services/dav';
 import * as utils from '@services/utils';
 
+import type { Node } from '@nextcloud/files';
 import type { IPhoto } from '@typings';
 
 export default defineComponent({
@@ -61,11 +62,23 @@ export default defineComponent({
     },
 
     async chooseFolderPath() {
+      let moveByDate = false;
       let destination = await utils.chooseNcFolder(
         this.t('memories', 'Choose a folder'),
         this.config.folders_path,
-        FilePickerType.Move,
+        (selectedNodes: Node[], currentPath: string, currentView: string) => [
+          {
+            label: 'Move',
+            type: 'primary',
+            callback: (_) => null,
+          },
+          {
+            label: 'Move and organize',
+            callback: (_) => (moveByDate = true),
+          },
+        ],
       );
+
       // Fails if the target exists, same behavior with Nextcloud files implementation.
       const gen = dav.movePhotos(this.photos, destination, false);
       this.show = true;
diff --git a/src/services/utils/dialog.ts b/src/services/utils/dialog.ts
index 111dfb8b0..7c1f6cf67 100644
--- a/src/services/utils/dialog.ts
+++ b/src/services/utils/dialog.ts
@@ -1,5 +1,7 @@
-import { FilePickerType, getFilePickerBuilder } from '@nextcloud/dialogs';
+import { getFilePickerBuilder } from '@nextcloud/dialogs';
 import { showError } from '@nextcloud/dialogs';
+import type { IFilePickerButton } from '@nextcloud/dialogs';
+import type { Node } from '@nextcloud/files';
 
 import { translate as t, translatePlural as n } from '@services/l10n';
 import { bus } from './event-bus';
@@ -8,6 +10,12 @@ import { fragment } from './fragment';
 // https://github.com/nextcloud/server/blob/4b7ec0a0c18d4e2007565dc28ee214814940161e/core/src/OC/dialogs.js
 const oc_dialogs = (<any>OC).dialogs;
 
+type IFilePickerButtonFactory = (
+  selectedNodes: Node[],
+  currentPath: string,
+  currentView: string,
+) => IFilePickerButton[];
+
 type ConfirmOptions = {
   /** Title of dialog */
   title?: string;
@@ -154,18 +162,28 @@ export async function prompt(opts: PromptOptions): Promise<string | null> {
  *
  * @param title Title of the file picker
  * @param initial Initial path
- * @param type Type of the file picker
+ * @param buttonFactory Buttons factory
  *
  * @returns The path of the chosen folder
  */
 export async function chooseNcFolder(
   title: string,
   initial: string = '/',
-  type: FilePickerType = FilePickerType.Choose,
+  buttonFactory: IFilePickerButtonFactory = (i, _) => {
+    const r = i?.[0]?.attributes?.displayName || i?.[0]?.basename;
+    let a = i.length === 1 ? t('memories', 'Choose {file}', { file: r }) : t('memories', 'Choose');
+    return [
+      {
+        callback: () => {},
+        type: 'primary',
+        label: a,
+      },
+    ];
+  },
 ): Promise<string> {
   const picker = getFilePickerBuilder(title)
     .setMultiSelect(false)
-    .setType(type)
+    .setButtonFactory(buttonFactory)
     .addMimeTypeFilter('httpd/unix-directory')
     .allowDirectories()
     .startAt(initial)

From 8a9f204c894f7cbb534574a4921db30bb2fa953a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=B1=CE=B5=D1=8F=D1=8F=CE=B5?=
 <47398145+AiroPi@users.noreply.github.com>
Date: Fri, 12 Apr 2024 08:04:34 -0700
Subject: [PATCH 2/8] allow multiple path move
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pıεяяε <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 38 +++++++++----
 src/services/dav/base.ts                   | 63 ++++++++++++++++------
 src/services/utils/dialog.ts               | 24 +++++----
 3 files changed, 88 insertions(+), 37 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 989db385a..de4e21937 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -66,26 +66,44 @@ export default defineComponent({
       let destination = await utils.chooseNcFolder(
         this.t('memories', 'Choose a folder'),
         this.config.folders_path,
-        (selectedNodes: Node[], currentPath: string, currentView: string) => [
+        () => [
           {
             label: 'Move',
             type: 'primary',
-            callback: (_) => null,
+            callback: () => null,
           },
           {
             label: 'Move and organize',
-            callback: (_) => (moveByDate = true),
+            callback: () => (moveByDate = true),
           },
         ],
       );
 
-      // Fails if the target exists, same behavior with Nextcloud files implementation.
-      const gen = dav.movePhotos(this.photos, destination, false);
-      this.show = true;
-
-      for await (const fids of gen) {
-        this.photosDone += fids.filter(Boolean).length;
-        utils.bus.emit('memories:timeline:soft-refresh', null);
+      if (moveByDate) {
+        const grouped: Map<string, IPhoto[]> = new Map();
+        for (const photo of this.photos) {
+          const date = utils.dayIdToDate(photo.dayid);
+          const datePath = `/${date.getFullYear()}/${date.getMonth() + 1}`;
+          if (grouped.has(datePath)) {
+            grouped.get(datePath)?.push(photo);
+          } else {
+            grouped.set(datePath, [photo]);
+          }
+        }
+
+        for (const group of grouped) {
+          
+          console.log(`Move ${group[1].length} photos to ${destination}${group[0]}`);
+        }
+      } else {
+        // Fails if the target exists, same behavior with Nextcloud files implementation.
+        const gen = dav.movePhotos(this.photos, destination, false);
+        this.show = true;
+
+        for await (const fids of gen) {
+          this.photosDone += fids.filter(Boolean).length;
+          utils.bus.emit('memories:timeline:soft-refresh', null);
+        }
       }
 
       const n = this.photosDone;
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index fb632e766..9cf136a09 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -1,13 +1,13 @@
-import { showError } from '@nextcloud/dialogs';
 import axios from '@nextcloud/axios';
+import { showError } from '@nextcloud/dialogs';
 
 import { getAlbumFileInfos } from './albums';
 import client, { remotePath } from './client';
 
+import * as nativex from '@native';
 import { API } from '@services/API';
 import { translate as t } from '@services/l10n';
 import * as utils from '@services/utils';
-import * as nativex from '@native';
 
 import type { IFileInfo, IImageInfo, IPhoto } from '@typings';
 import type { ResponseDataDetailed, SearchResult } from 'webdav';
@@ -298,30 +298,61 @@ export async function* movePhotos(photos: IPhoto[], destination: string, overwri
     return;
   }
 
-  // Set absolute target path
-  const prefixPath = `files/${utils.uid}`;
-  let targetPath = prefixPath + destination;
-  if (!targetPath.endsWith('/')) {
-    targetPath += '/';
+  const destinations = new Map();
+  destinations.set(destination, photos);
+  yield* movePhotosToMultiplePaths(destinations, overwrite)
+}
+
+/**
+ * Move multiple files in given lists of Ids to corresponding destinations
+ *
+ * @param destinations to move photos into
+ * @param overwrite behaviour if the target exists. `true` overwrites, `false` fails.
+ * @returns list of file ids that were moved
+ */
+export async function* movePhotosToMultiplePaths(destinations: Map<string, IPhoto[]>, overwrite: boolean) {
+  const filteredEntries = Array.from(destinations.entries()).filter(([_, value]) => {
+    return value.length > 0;
+  });
+  if (filteredEntries.length === 0) {
+    return;
   }
 
-  // Also move the stack files
-  photos = await extendWithStack(photos);
-  const fileIdsSet = new Set(photos.map((p) => p.fileid));
+  const prefixPath = `files/${utils.uid}`;
 
-  // Get files data
-  let fileInfos: IFileInfo[] = [];
+  let fileInfosByPath: [string, IFileInfo[]][];
   try {
-    fileInfos = await getFiles(photos);
+    fileInfosByPath = await Promise.all(filteredEntries.map(async ([path, photos]) => {
+      let targetPath = prefixPath + path;
+      if (!targetPath.endsWith('/')) {
+        targetPath += '/';
+      }
+
+      photos = await extendWithStack(photos);
+      // Also move the stack files
+      const fileIdsSet = new Set(photos.map((p) => p.fileid));
+
+      // Get files data
+      let fileInfos: IFileInfo[] = [];
+
+      // This can thrown some errors
+      fileInfos = await getFiles(photos);
+      fileInfos = fileInfos.filter((f) => fileIdsSet.has(f.fileid));
+      
+      return [targetPath, fileInfos]
+    }))
   } catch (e) {
-    console.error('Failed to get file info for files to move', photos, e);
+    console.error('Failed to get file info for files to move', filteredEntries, e);
     showError(t('memories', 'Failed to move files.'));
     return;
   }
 
+  let flattened: [string, IFileInfo][] = fileInfosByPath.flatMap(([key, values]) =>
+    values.map(value => [key, value] as [string, IFileInfo])
+  );
+
   // Move each file
-  fileInfos = fileInfos.filter((f) => fileIdsSet.has(f.fileid));
-  const calls = fileInfos.map((fileInfo) => async () => {
+  const calls = flattened.map(([targetPath, fileInfo]) => async () => {
     try {
       await client.moveFile(
         fileInfo.originalFilename,
diff --git a/src/services/utils/dialog.ts b/src/services/utils/dialog.ts
index 7c1f6cf67..869b95a49 100644
--- a/src/services/utils/dialog.ts
+++ b/src/services/utils/dialog.ts
@@ -157,6 +157,18 @@ export async function prompt(opts: PromptOptions): Promise<string | null> {
   );
 }
 
+function chooseButtonFactory(nodes: Node[]): IFilePickerButton[] {
+  const fileName = nodes?.[0]?.attributes?.displayName || nodes?.[0]?.basename;
+  let label = nodes.length === 1 ? t('memories', 'Choose {file}', { file: fileName }) : t('memories', 'Choose');
+  return [
+    {
+      callback: () => {},
+      type: 'primary',
+      label: label,
+    },
+  ];
+}
+
 /**
  * Choose a folder using the NC file picker
  *
@@ -169,17 +181,7 @@ export async function prompt(opts: PromptOptions): Promise<string | null> {
 export async function chooseNcFolder(
   title: string,
   initial: string = '/',
-  buttonFactory: IFilePickerButtonFactory = (i, _) => {
-    const r = i?.[0]?.attributes?.displayName || i?.[0]?.basename;
-    let a = i.length === 1 ? t('memories', 'Choose {file}', { file: r }) : t('memories', 'Choose');
-    return [
-      {
-        callback: () => {},
-        type: 'primary',
-        label: a,
-      },
-    ];
-  },
+  buttonFactory: IFilePickerButtonFactory = chooseButtonFactory,
 ): Promise<string> {
   const picker = getFilePickerBuilder(title)
     .setMultiSelect(false)

From 2ffa384f62e0daa85eb85ed7352d10fba54de9eb Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Sun, 14 Apr 2024 21:31:49 +0200
Subject: [PATCH 3/8] first implementation of organized move

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue |  61 ++++-----
 src/services/dav/base.ts                   | 144 ++++++++++++++++-----
 2 files changed, 140 insertions(+), 65 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index de4e21937..691191c96 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -13,7 +13,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 
-import { FilePickerType } from '@nextcloud/dialogs';
 import { showInfo } from '@nextcloud/dialogs';
 
 const NcProgressBar = () => import('@nextcloud/vue/dist/Components/NcProgressBar.js');
@@ -26,7 +25,8 @@ import ModalMixin from './ModalMixin';
 import * as dav from '@services/dav';
 import * as utils from '@services/utils';
 
-import type { Node } from '@nextcloud/files';
+import path from 'path';
+
 import type { IPhoto } from '@typings';
 
 export default defineComponent({
@@ -62,50 +62,51 @@ export default defineComponent({
     },
 
     async chooseFolderPath() {
-      let moveByDate = false;
+      let mode = 'move' as 'move' | 'organise' | 'copy';
       let destination = await utils.chooseNcFolder(
         this.t('memories', 'Choose a folder'),
         this.config.folders_path,
         () => [
           {
-            label: 'Move',
-            type: 'primary',
-            callback: () => null,
+            label: 'Move and organise',
+            callback: () => (mode = 'organise'),
           },
           {
-            label: 'Move and organize',
-            callback: () => (moveByDate = true),
+            label: 'Copy',
+            callback: () => (mode = 'copy'),
+          },
+          {
+            label: 'Move',
+            type: 'primary',
+            callback: () => (mode = 'move'),
           },
         ],
       );
+      console.log(mode);
 
-      if (moveByDate) {
-        const grouped: Map<string, IPhoto[]> = new Map();
-        for (const photo of this.photos) {
-          const date = utils.dayIdToDate(photo.dayid);
-          const datePath = `/${date.getFullYear()}/${date.getMonth() + 1}`;
-          if (grouped.has(datePath)) {
-            grouped.get(datePath)?.push(photo);
-          } else {
-            grouped.set(datePath, [photo]);
-          }
+      let gen;
+      switch (mode) {
+        case 'organise' : {
+          gen = dav.movePhotosByDate(this.photos, destination, false);
+          break;
         }
-
-        for (const group of grouped) {
-          
-          console.log(`Move ${group[1].length} photos to ${destination}${group[0]}`);
+        case 'copy' : {
+          gen = dav.movePhotos(this.photos, destination, false);
+          break;
         }
-      } else {
-        // Fails if the target exists, same behavior with Nextcloud files implementation.
-        const gen = dav.movePhotos(this.photos, destination, false);
-        this.show = true;
-
-        for await (const fids of gen) {
-          this.photosDone += fids.filter(Boolean).length;
-          utils.bus.emit('memories:timeline:soft-refresh', null);
+        case 'move' : {
+          gen = dav.movePhotos(this.photos, destination, false);
+          break;
         }
       }
 
+      this.show = true;
+
+      for await (const fids of gen) {
+        this.photosDone += fids.filter(Boolean).length;
+        utils.bus.emit('memories:timeline:soft-refresh', null);
+      }
+
       const n = this.photosDone;
       showInfo(this.n('memories', '{n} item moved to folder', '{n} items moved to folder', n, { n }));
       this.close();
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index 9cf136a09..5b4e34bae 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -10,6 +10,7 @@ import { translate as t } from '@services/l10n';
 import * as utils from '@services/utils';
 
 import type { IFileInfo, IImageInfo, IPhoto } from '@typings';
+import path from 'path';
 import type { ResponseDataDetailed, SearchResult } from 'webdav';
 
 const GET_FILE_CHUNK_SIZE = 50;
@@ -298,65 +299,138 @@ export async function* movePhotos(photos: IPhoto[], destination: string, overwri
     return;
   }
 
-  const destinations = new Map();
-  destinations.set(destination, photos);
-  yield* movePhotosToMultiplePaths(destinations, overwrite)
+  // Set absolute target path
+  const prefixPath = `files/${utils.uid}`;
+  let targetPath = prefixPath + destination;
+  if (!targetPath.endsWith('/')) {
+    targetPath += '/';
+  }
+
+  // Also move the stack files
+  photos = await extendWithStack(photos);
+  const fileIdsSet = new Set(photos.map((p) => p.fileid));
+
+  // Get files data
+  let fileInfos: IFileInfo[] = [];
+  try {
+    fileInfos = await getFiles(photos);
+  } catch (e) {
+    console.error('Failed to get file info for files to move', photos, e);
+    showError(t('memories', 'Failed to move files.'));
+    return;
+  }
+
+  // Move each file
+  fileInfos = fileInfos.filter((f) => fileIdsSet.has(f.fileid));
+  const calls = fileInfos.map((fileInfo) => async () => {
+    try {
+      await client.moveFile(
+        fileInfo.originalFilename,
+        targetPath + fileInfo.basename,
+        // @ts-ignore - https://github.com/perry-mitchell/webdav-client/issues/329
+        { headers: { Overwrite: overwrite ? 'T' : 'F' } },
+      );
+      return fileInfo.fileid;
+    } catch (error) {
+      console.error('Failed to move', fileInfo, error);
+      if (error.response?.status === 412) {
+        // Precondition failed (only if `overwrite` flag set to false)
+        showError(
+          t('memories', 'Could not move {fileName}, target exists.', {
+            fileName: fileInfo.filename,
+          }),
+        );
+        return 0;
+      }
+
+      showError(
+        t('memories', 'Failed to move {fileName}.', {
+          fileName: fileInfo.filename,
+        }),
+      );
+      return 0;
+    }
+  });
+
+  yield* runInParallel(calls, 10);
 }
 
 /**
- * Move multiple files in given lists of Ids to corresponding destinations
+ * Move multiple files in given lists of Ids to corresponding destinations in a year/month folder structure.
  *
- * @param destinations to move photos into
+ * @param photos list of photos to move
+ * @param destination to move photos into
  * @param overwrite behaviour if the target exists. `true` overwrites, `false` fails.
  * @returns list of file ids that were moved
  */
-export async function* movePhotosToMultiplePaths(destinations: Map<string, IPhoto[]>, overwrite: boolean) {
-  const filteredEntries = Array.from(destinations.entries()).filter(([_, value]) => {
-    return value.length > 0;
-  });
-  if (filteredEntries.length === 0) {
+export async function* movePhotosByDate(photos: IPhoto[], destination: string, overwrite: boolean) {
+  if (photos.length === 0) {
     return;
   }
 
+  // Set absolute target path
   const prefixPath = `files/${utils.uid}`;
+  destination = path.join(prefixPath, destination);
+  const datePaths: Map<string, Set<string>> = new Map();  // {'year': {'month1', 'month2'}}
 
-  let fileInfosByPath: [string, IFileInfo[]][];
-  try {
-    fileInfosByPath = await Promise.all(filteredEntries.map(async ([path, photos]) => {
-      let targetPath = prefixPath + path;
-      if (!targetPath.endsWith('/')) {
-        targetPath += '/';
-      }
-
-      photos = await extendWithStack(photos);
-      // Also move the stack files
-      const fileIdsSet = new Set(photos.map((p) => p.fileid));
+  photos = await extendWithStack(photos);
+  const fileIdsSet = new Set(photos.map((p) => p.fileid));
 
-      // Get files data
-      let fileInfos: IFileInfo[] = [];
+  let fileInfos: IFileInfo[] = [];
 
-      // This can thrown some errors
-      fileInfos = await getFiles(photos);
-      fileInfos = fileInfos.filter((f) => fileIdsSet.has(f.fileid));
-      
-      return [targetPath, fileInfos]
-    }))
+  try {
+    fileInfos = await getFiles(photos);
   } catch (e) {
-    console.error('Failed to get file info for files to move', filteredEntries, e);
+    console.error('Failed to get file info for files to move', photos, e);
     showError(t('memories', 'Failed to move files.'));
     return;
   }
 
-  let flattened: [string, IFileInfo][] = fileInfosByPath.flatMap(([key, values]) =>
-    values.map(value => [key, value] as [string, IFileInfo])
-  );
+  const moveDirectives: Array<[string, IFileInfo]> = new Array();
+
+  photos.forEach((photo, i) => {
+    if (!fileIdsSet.has(fileInfos[i].fileid)) {
+      return;
+    }
+
+    const date = utils.dayIdToDate(photo.dayid);
+
+    const year = date.getFullYear().toString()
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+
+    const months = datePaths.get(year) || new Set();
+    months.add(month);
+    datePaths.set(year, months);
+
+    const datePath = path.join(destination,`/${year}/${month}`);
+
+    moveDirectives.push([datePath, fileInfos[i]])
+  })
+
+  async function createIfNotExist(directory: string, subDirectories: Iterable<string>) {
+    let existing = (await client.getDirectoryContents(directory));
+    if ('data' in existing) {
+      existing = existing.data
+    }
+    existing = existing.filter((f) => f.type === 'directory');
+    for (const subDirectory of subDirectories) {
+      if (!existing.some((f) => f.basename === subDirectory)) {
+        await client.createDirectory(path.join(directory, subDirectory));
+      }
+    }
+  }
+
+  await createIfNotExist(destination, datePaths.keys())
+  for (const [year, months] of datePaths) {
+    await createIfNotExist(path.join(destination, year), months)
+  }
 
   // Move each file
-  const calls = flattened.map(([targetPath, fileInfo]) => async () => {
+  const calls = moveDirectives.map(([targetPath, fileInfo]) => async () => {
     try {
       await client.moveFile(
         fileInfo.originalFilename,
-        targetPath + fileInfo.basename,
+        path.join(targetPath, fileInfo.basename),
         // @ts-ignore - https://github.com/perry-mitchell/webdav-client/issues/329
         { headers: { Overwrite: overwrite ? 'T' : 'F' } },
       );

From b806552ad62edb4702fb382eb962872df3bcb140 Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:21:52 +0200
Subject: [PATCH 4/8] Copy implementation

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue |  8 ++-
 src/services/dav/base.ts                   | 69 ++++++++++++++++++++++
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 691191c96..9078eede0 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -91,7 +91,7 @@ export default defineComponent({
           break;
         }
         case 'copy' : {
-          gen = dav.movePhotos(this.photos, destination, false);
+          gen = dav.copyPhotos(this.photos, destination, false);
           break;
         }
         case 'move' : {
@@ -108,7 +108,11 @@ export default defineComponent({
       }
 
       const n = this.photosDone;
-      showInfo(this.n('memories', '{n} item moved to folder', '{n} items moved to folder', n, { n }));
+      if (mode === 'copy') {
+        showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
+      } else {
+        showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
+      }
       this.close();
     },
   },
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index 5b4e34bae..3dc21a655 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -286,6 +286,75 @@ export async function* deletePhotos(photos: IPhoto[], confirm: boolean = true) {
   yield* runInParallel(calls, 10);
 }
 
+/**
+ * copy all files in a given list of Ids to given destination
+ *
+ * @param photos list of photos to copy
+ * @param destination to copy photos into
+ * @param overwrite behaviour if the target exists. `true` overwrites, `false` fails.
+ * @returns list of file ids that were copied
+ */
+export async function* copyPhotos(photos: IPhoto[], destination: string, overwrite: boolean) {
+  if (photos.length === 0) {
+    return;
+  }
+
+  // Set absolute target path
+  const prefixPath = `files/${utils.uid}`;
+  let targetPath = prefixPath + destination;
+  if (!targetPath.endsWith('/')) {
+    targetPath += '/';
+  }
+
+  // Also copy the stack files
+  photos = await extendWithStack(photos);
+  const fileIdsSet = new Set(photos.map((p) => p.fileid));
+
+  // Get files data
+  let fileInfos: IFileInfo[] = [];
+  try {
+    fileInfos = await getFiles(photos);
+  } catch (e) {
+    console.error('Failed to get file info for files to copy', photos, e);
+    showError(t('memories', 'Failed to copy files.'));
+    return;
+  }
+
+  // Copy each file
+  fileInfos = fileInfos.filter((f) => fileIdsSet.has(f.fileid));
+  const calls = fileInfos.map((fileInfo) => async () => {
+    try {
+      await client.copyFile(
+        fileInfo.originalFilename,
+        targetPath + fileInfo.basename,
+        // @ts-ignore - https://github.com/perry-mitchell/webdav-client/issues/329
+        { headers: { Overwrite: overwrite ? 'T' : 'F' } },
+      );
+      return fileInfo.fileid;
+    } catch (error) {
+      console.error('Failed to copy', fileInfo, error);
+      if (error.response?.status === 412) {
+        // Precondition failed (only if `overwrite` flag set to false)
+        showError(
+          t('memories', 'Could not copy {fileName}, target exists.', {
+            fileName: fileInfo.filename,
+          }),
+        );
+        return 0;
+      }
+
+      showError(
+        t('memories', 'Failed to copy {fileName}.', {
+          fileName: fileInfo.filename,
+        }),
+      );
+      return 0;
+    }
+  });
+
+  yield* runInParallel(calls, 10);
+}
+
 /**
  * Move all files in a given list of Ids to given destination
  *

From dbf883a2f604aca294e8f829a83b99911368a529 Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:43:41 +0200
Subject: [PATCH 5/8] remove debug console.log

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 2 +-
 src/services/utils/dialog.ts               | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 9078eede0..1222c9989 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -82,9 +82,9 @@ export default defineComponent({
           },
         ],
       );
-      console.log(mode);
 
       let gen;
+      // Fails if the target exists, same behavior with Nextcloud files implementation.
       switch (mode) {
         case 'organise' : {
           gen = dav.movePhotosByDate(this.photos, destination, false);
diff --git a/src/services/utils/dialog.ts b/src/services/utils/dialog.ts
index 869b95a49..f6983ba6d 100644
--- a/src/services/utils/dialog.ts
+++ b/src/services/utils/dialog.ts
@@ -1,9 +1,8 @@
-import { getFilePickerBuilder } from '@nextcloud/dialogs';
-import { showError } from '@nextcloud/dialogs';
 import type { IFilePickerButton } from '@nextcloud/dialogs';
+import { getFilePickerBuilder, showError } from '@nextcloud/dialogs';
 import type { Node } from '@nextcloud/files';
 
-import { translate as t, translatePlural as n } from '@services/l10n';
+import { translatePlural as n, translate as t } from '@services/l10n';
 import { bus } from './event-bus';
 import { fragment } from './fragment';
 

From 107247ca9ce57ec6a13da9303ebcb9568334e052 Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:02:40 +0200
Subject: [PATCH 6/8] remove unused imports

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 2 --
 src/services/dav/base.ts                   | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 1222c9989..3a93bf7ff 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -25,8 +25,6 @@ import ModalMixin from './ModalMixin';
 import * as dav from '@services/dav';
 import * as utils from '@services/utils';
 
-import path from 'path';
-
 import type { IPhoto } from '@typings';
 
 export default defineComponent({
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index 3dc21a655..7bd0022b4 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -1,3 +1,5 @@
+import path from 'path';
+
 import axios from '@nextcloud/axios';
 import { showError } from '@nextcloud/dialogs';
 
@@ -10,7 +12,6 @@ import { translate as t } from '@services/l10n';
 import * as utils from '@services/utils';
 
 import type { IFileInfo, IImageInfo, IPhoto } from '@typings';
-import path from 'path';
 import type { ResponseDataDetailed, SearchResult } from 'webdav';
 
 const GET_FILE_CHUNK_SIZE = 50;

From 87d6eaf144033c462f0da4153831a709af684b37 Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:25:56 +0200
Subject: [PATCH 7/8] Use enum instead of literals union

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 21 +++++++++++++--------
 src/services/dav/base.ts                   | 18 +++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 3a93bf7ff..2ba1e544e 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -60,23 +60,28 @@ export default defineComponent({
     },
 
     async chooseFolderPath() {
-      let mode = 'move' as 'move' | 'organise' | 'copy';
+      enum Mode {
+        Move = 1,
+        Copy = 2,
+        Organise = 3,
+      }
+      let mode: Mode = Mode.Move as Mode;
       let destination = await utils.chooseNcFolder(
         this.t('memories', 'Choose a folder'),
         this.config.folders_path,
         () => [
           {
             label: 'Move and organise',
-            callback: () => (mode = 'organise'),
+            callback: () => (mode = Mode.Organise),
           },
           {
             label: 'Copy',
-            callback: () => (mode = 'copy'),
+            callback: () => (mode = Mode.Copy),
           },
           {
             label: 'Move',
             type: 'primary',
-            callback: () => (mode = 'move'),
+            callback: () => (mode = Mode.Move),
           },
         ],
       );
@@ -84,15 +89,15 @@ export default defineComponent({
       let gen;
       // Fails if the target exists, same behavior with Nextcloud files implementation.
       switch (mode) {
-        case 'organise' : {
+        case Mode.Organise: {
           gen = dav.movePhotosByDate(this.photos, destination, false);
           break;
         }
-        case 'copy' : {
+        case Mode.Copy: {
           gen = dav.copyPhotos(this.photos, destination, false);
           break;
         }
-        case 'move' : {
+        case Mode.Move: {
           gen = dav.movePhotos(this.photos, destination, false);
           break;
         }
@@ -106,7 +111,7 @@ export default defineComponent({
       }
 
       const n = this.photosDone;
-      if (mode === 'copy') {
+      if (mode === Mode.Copy) {
         showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
       } else {
         showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
diff --git a/src/services/dav/base.ts b/src/services/dav/base.ts
index 7bd0022b4..43bbf232a 100644
--- a/src/services/dav/base.ts
+++ b/src/services/dav/base.ts
@@ -441,7 +441,7 @@ export async function* movePhotosByDate(photos: IPhoto[], destination: string, o
   // Set absolute target path
   const prefixPath = `files/${utils.uid}`;
   destination = path.join(prefixPath, destination);
-  const datePaths: Map<string, Set<string>> = new Map();  // {'year': {'month1', 'month2'}}
+  const datePaths: Map<string, Set<string>> = new Map(); // {'year': {'month1', 'month2'}}
 
   photos = await extendWithStack(photos);
   const fileIdsSet = new Set(photos.map((p) => p.fileid));
@@ -465,22 +465,22 @@ export async function* movePhotosByDate(photos: IPhoto[], destination: string, o
 
     const date = utils.dayIdToDate(photo.dayid);
 
-    const year = date.getFullYear().toString()
+    const year = date.getFullYear().toString();
     const month = String(date.getMonth() + 1).padStart(2, '0');
 
     const months = datePaths.get(year) || new Set();
     months.add(month);
     datePaths.set(year, months);
 
-    const datePath = path.join(destination,`/${year}/${month}`);
+    const datePath = path.join(destination, `/${year}/${month}`);
 
-    moveDirectives.push([datePath, fileInfos[i]])
-  })
+    moveDirectives.push([datePath, fileInfos[i]]);
+  });
 
   async function createIfNotExist(directory: string, subDirectories: Iterable<string>) {
-    let existing = (await client.getDirectoryContents(directory));
+    let existing = await client.getDirectoryContents(directory);
     if ('data' in existing) {
-      existing = existing.data
+      existing = existing.data;
     }
     existing = existing.filter((f) => f.type === 'directory');
     for (const subDirectory of subDirectories) {
@@ -490,9 +490,9 @@ export async function* movePhotosByDate(photos: IPhoto[], destination: string, o
     }
   }
 
-  await createIfNotExist(destination, datePaths.keys())
+  await createIfNotExist(destination, datePaths.keys());
   for (const [year, months] of datePaths) {
-    await createIfNotExist(path.join(destination, year), months)
+    await createIfNotExist(path.join(destination, year), months);
   }
 
   // Move each file

From c18b33401eff73e56d4159fbfabd232cb7dd3f04 Mon Sep 17 00:00:00 2001
From: "airo.pi_" <47398145+AiroPi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:38:28 +0200
Subject: [PATCH 8/8] Wrong message for move

Signed-off-by: airo.pi_ <47398145+AiroPi@users.noreply.github.com>
---
 src/components/modal/MoveToFolderModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/modal/MoveToFolderModal.vue b/src/components/modal/MoveToFolderModal.vue
index 2ba1e544e..e48b1a380 100644
--- a/src/components/modal/MoveToFolderModal.vue
+++ b/src/components/modal/MoveToFolderModal.vue
@@ -114,7 +114,7 @@ export default defineComponent({
       if (mode === Mode.Copy) {
         showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
       } else {
-        showInfo(this.n('memories', '{n} item copied to folder', '{n} items copied to folder', n, { n }));
+        showInfo(this.n('memories', '{n} item moved to folder', '{n} items moved to folder', n, { n }));
       }
       this.close();
     },