mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-24 18:00:40 +00:00
fixed upload files in the nested levels of folders
This commit is contained in:
Vendored
+27
-33
@@ -185,16 +185,6 @@ const Helpers = {
|
||||
})
|
||||
}
|
||||
|
||||
// Push items to file queue
|
||||
// [...event.dataTransfer.items].map(item => {
|
||||
// console.log(item.getAsFile(), 'b')
|
||||
// this.$store.commit('ADD_FILES_TO_QUEUE', {
|
||||
// folder_id: parent_id ? parent_id : '',
|
||||
// file: item.getAsFile(),
|
||||
// })
|
||||
// });
|
||||
|
||||
|
||||
// Start uploading if uploading process isn't running
|
||||
if (this.$store.getters.filesInQueueTotal == 0)
|
||||
this.$handleUploading(this.$store.getters.fileQueue[0])
|
||||
@@ -203,6 +193,7 @@ const Helpers = {
|
||||
this.$store.commit('INCREASE_FILES_IN_QUEUES_TOTAL', items.length)
|
||||
}
|
||||
|
||||
// Get File from FileEntry
|
||||
Vue.prototype.$getFile = async function (fileEntry) {
|
||||
try {
|
||||
return await new Promise((resolve, reject) => fileEntry.file(resolve, reject));
|
||||
@@ -212,10 +203,11 @@ const Helpers = {
|
||||
}
|
||||
|
||||
Vue.prototype.$getAllFileEntries = async function (dataTransferItemList) {
|
||||
|
||||
let fileEntries = [];
|
||||
// Use BFS to traverse entire directory/file structure
|
||||
|
||||
let queue = [];
|
||||
// Unfortunately dataTransferItemList is not iterable i.e. no forEach
|
||||
|
||||
for (let i = 0; i < dataTransferItemList.length; i++) {
|
||||
queue.push(dataTransferItemList[i].webkitGetAsEntry());
|
||||
}
|
||||
@@ -224,32 +216,34 @@ const Helpers = {
|
||||
if (entry.isFile) {
|
||||
fileEntries.push(entry);
|
||||
} else if (entry.isDirectory) {
|
||||
queue.push(...await this.$readAllDirectoryEntries(entry.createReader()));
|
||||
queue.push(...await readAllDirectoryEntries(entry.createReader()));
|
||||
}
|
||||
}
|
||||
|
||||
async function readAllDirectoryEntries (directoryReader) {
|
||||
|
||||
let entries = [];
|
||||
let readEntries = await readEntriesPromise(directoryReader);
|
||||
while (readEntries.length > 0) {
|
||||
entries.push(...readEntries);
|
||||
readEntries = await readEntriesPromise(directoryReader);
|
||||
}
|
||||
return entries;
|
||||
}
|
||||
|
||||
async function readEntriesPromise (directoryReader) {
|
||||
|
||||
try {
|
||||
return await new Promise((resolve, reject) => {
|
||||
directoryReader.readEntries(resolve, reject);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
}
|
||||
return fileEntries;
|
||||
}
|
||||
|
||||
Vue.prototype.$readAllDirectoryEntries = async function (directoryReader) {
|
||||
let entries = [];
|
||||
let readEntries = await this.$readEntriesPromise(directoryReader);
|
||||
while (readEntries.length > 0) {
|
||||
entries.push(...readEntries);
|
||||
readEntries = await this.$readEntriesPromise(directoryReader);
|
||||
}
|
||||
return entries;
|
||||
}
|
||||
|
||||
Vue.prototype.$readEntriesPromise = async function (directoryReader) {
|
||||
try {
|
||||
return await new Promise((resolve, reject) => {
|
||||
directoryReader.readEntries(resolve, reject);
|
||||
});
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
}
|
||||
|
||||
Vue.prototype.$handleUploading = async function (item) {
|
||||
|
||||
// Create ceil
|
||||
|
||||
Reference in New Issue
Block a user