//
// SPDX-License-Identifier: AGPL-3.0
-import { CollectionResource } from "~/models/collection";
+import { CollectionResource } from "models/collection";
import { AxiosInstance } from "axios";
-import { CollectionFile, CollectionDirectory } from "~/models/collection-file";
-import { WebDAV } from "~/common/webdav";
+import { CollectionFile, CollectionDirectory } from "models/collection-file";
+import { WebDAV } from "common/webdav";
import { AuthService } from "../auth-service/auth-service";
import { extractFilesData } from "./collection-service-files-response";
-import { TrashableResourceService } from "~/services/common-service/trashable-resource-service";
-import { ApiActions } from "~/services/api/api-actions";
+import { TrashableResourceService } from "services/common-service/trashable-resource-service";
+import { ApiActions } from "services/api/api-actions";
+import { customEncodeURI } from "common/url";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
}
async deleteFiles(collectionUuid: string, filePaths: string[]) {
- if (collectionUuid === "" || filePaths.length === 0) { return; }
- for (const path of filePaths) {
- const splittedPath = path.split('/');
- if (collectionUuid) {
- await this.webdavClient.delete(`c=${collectionUuid}/${splittedPath[1]}`);
- } else {
+ const sortedUniquePaths = Array.from(new Set(filePaths))
+ .sort((a, b) => a.length - b.length)
+ .reduce((acc, currentPath) => {
+ const parentPathFound = acc.find((parentPath) => currentPath.indexOf(`${parentPath}/`) > -1);
+
+ if (!parentPathFound) {
+ return [...acc, currentPath];
+ }
+
+ return acc;
+ }, []);
+
+ for (const path of sortedUniquePaths) {
+ if (path.indexOf(collectionUuid) === -1) {
await this.webdavClient.delete(`c=${collectionUuid}${path}`);
+ } else {
+ await this.webdavClient.delete(`c=${path}`);
}
}
await this.update(collectionUuid, { preserveVersion: true });
async moveFile(collectionUuid: string, oldPath: string, newPath: string) {
await this.webdavClient.move(
`c=${collectionUuid}${oldPath}`,
- `c=${collectionUuid}${encodeURI(newPath)}`
+ `c=${collectionUuid}/${customEncodeURI(newPath)}`
);
await this.update(collectionUuid, { preserveVersion: true });
}
},
onUploadProgress: (e: ProgressEvent) => {
onProgress(fileId, e.loaded, e.total, Date.now());
- }
+ },
};
return this.webdavClient.upload(fileURL, [file], requestConfig);
}