//
// SPDX-License-Identifier: AGPL-3.0
-import { createCollectionFilesTree, CollectionDirectory, CollectionFile, CollectionFileType, createCollectionDirectory, createCollectionFile } from "../../models/collection-file";
-import { getTagValue } from "~/common/xml";
-import { getNodeChildren, Tree, mapTree } from '~/models/tree';
-
-export const parseFilesResponse = (document: Document) => {
- const files = extractFilesData(document);
- const tree = createCollectionFilesTree(files);
- return sortFilesTree(tree);
-};
+import { CollectionDirectory, CollectionFile, CollectionFileType, createCollectionDirectory, createCollectionFile } from "../../models/collection-file";
+import { getTagValue } from "common/xml";
+import { getNodeChildren, Tree, mapTree } from 'models/tree';
export const sortFilesTree = (tree: Tree<CollectionDirectory | CollectionFile>) => {
return mapTree<CollectionDirectory | CollectionFile>(node => {
};
export const extractFilesData = (document: Document) => {
- const collectionUrlPrefix = /\/c=([0-9a-zA-Z\-]*)/;
+ const collectionUrlPrefix = /\/c=([^/]*)/;
return Array
.from(document.getElementsByTagName('D:response'))
.slice(1) // omit first element which is collection itself
.map(element => {
- const name = getTagValue(element, 'D:displayname', '');
- const size = parseInt(getTagValue(element, 'D:getcontentlength', '0'), 10);
- const url = getTagValue(element, 'D:href', '');
- const nameSuffix = `/${name || ''}`;
+ const name = getTagValue(element, 'D:displayname', '', true); // skip decoding as value should be already decoded
+ const size = parseInt(getTagValue(element, 'D:getcontentlength', '0', true), 10);
+ const url = getTagValue(element, 'D:href', '', true);
const collectionUuidMatch = collectionUrlPrefix.exec(url);
const collectionUuid = collectionUuidMatch ? collectionUuidMatch.pop() : '';
- const directory = url
+ const pathArray = url.split(`/`);
+ if (!pathArray.pop()) {
+ pathArray.pop();
+ }
+ const directory = pathArray.join('/')
.replace(collectionUrlPrefix, '')
- .replace(nameSuffix, '');
-
+ .replace(/\/\//g, '/');
+ const parentPath = directory.replace(/\/$/, '');
const data = {
url,
id: [
collectionUuid ? collectionUuid : '',
- directory ? '/' + directory : '',
+ directory ? unescape(parentPath) : '',
'/' + name
].join(''),
name,
- path: directory,
+ path: unescape(parentPath),
};
- return getTagValue(element, 'D:resourcetype', '')
+ const result = getTagValue(element, 'D:resourcetype', '')
? createCollectionDirectory(data)
: createCollectionFile({ ...data, size });
+ return result;
});
};
-export const getFileFullPath = ({ name, path }: CollectionFile | CollectionDirectory) =>
- `${path}/${name}`;
+export const getFileFullPath = ({ name, path }: CollectionFile | CollectionDirectory) => {
+ return `${path}/${name}`;
+};