Merge branch 'dev' of https://github.com/Pl4yep2on/webtransfer into dev
This commit is contained in:
commit
aee99b1d82
@ -444,14 +444,20 @@ export default {
|
|||||||
async moveListOfFiles(files) {
|
async moveListOfFiles(files) {
|
||||||
for (const file of files.children) {
|
for (const file of files.children) {
|
||||||
this.transferProgress += 100 / files.children.length;
|
this.transferProgress += 100 / files.children.length;
|
||||||
|
let listOfFolder = [];
|
||||||
if (file.isDirectory) {
|
if (file.isDirectory) {
|
||||||
//just create the folder
|
//just create the folder
|
||||||
await this.createFolder(file, file.parentPath + '/');
|
await this.createFolder(file, file.parentPath + '/');
|
||||||
|
listOfFolder.push(file.parentPath + '/' + file.name);
|
||||||
} else {
|
} else {
|
||||||
if (file.content && typeof file.content.arrayBuffer === 'function') {
|
if (file.content && typeof file.content.arrayBuffer === 'function') {
|
||||||
file.content = await file.content.arrayBuffer();
|
file.content = await file.content.arrayBuffer();
|
||||||
}
|
}
|
||||||
await this.moveFileToTarget(file, file.parentPath + '/');
|
if (listOfFolder.includes(file.parentPath)) {
|
||||||
|
await this.moveFileToTarget(file, file.parentPath + '/', file.name);
|
||||||
|
} else {
|
||||||
|
await this.createFolder(file, '');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user