Skip to content

Commit 32f8508

Browse files
committed
fix: add file.size and add missing object param
1 parent e5c9ab6 commit 32f8508

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/client.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ async function fileEvent(event) {
151151
if (!files[i].src)
152152
await readFile(files[i])
153153

154+
if (!files[i].size)
155+
files[i].size = handle.size
156+
154157
files[i].directory = handle.directory || '/'
155158
files[i].path = handle.path || '/'
156159
files[i].pathname = handle.pathname || '/' + handle.name
@@ -232,9 +235,11 @@ async function getFiles(fileInputs) {
232235
for (let file of Array.from(selected.values())) {
233236
if (!file.src)
234237
await readFile(file)
238+
let fileObject = { ...file }
239+
fileObject.size = file.size
240+
await getCustomData(fileObject)
235241

236-
file = await getCustomData({ ...file })
237-
files.push(file)
242+
files.push(fileObject)
238243
}
239244
}
240245
}
@@ -267,14 +272,11 @@ function readFile(file) {
267272

268273
if (fileType[1] === 'directory') {
269274
return resolve(file)
270-
} else if (['jpg', 'jpeg', 'png', 'gif', 'bmp'].includes(fileType[1])
271-
|| fileType[0] === 'image') {
275+
} else if (fileType[0] === 'image') {
272276
readAs = 'readAsDataURL';
273-
} else if (['mp4', 'avi', 'mov', 'mpeg', 'flv'].includes(fileType[1])
274-
|| fileType[0] === 'video') {
277+
} else if (fileType[0] === 'video') {
275278
readAs = 'readAsDataURL';
276-
} else if (['mp3', 'wav', 'wma', 'aac', 'ogg'].includes(fileType[1])
277-
|| fileType[0] === 'audio') { // updated condition
279+
} else if (fileType[0] === 'audio') {
278280
readAs = 'readAsDataURL';
279281
} else if (fileType[1] === 'pdf') {
280282
readAs = 'readAsDataURL';
@@ -429,13 +431,11 @@ async function upload(element, data) {
429431
if (Data.type === 'key')
430432
Data.type = 'object'
431433

432-
if (Data.type === 'object') {
433-
let object = input.getAttribute('object')
434-
if (key) {
435-
Data[Data.type] = { _id: object, [key]: files }
436-
} else {
437-
Data[Data.type] = files
438-
}
434+
let object = input.getAttribute('object')
435+
if (key) {
436+
Data[Data.type] = { _id: object, [key]: files }
437+
} else {
438+
Data[Data.type] = files
439439
}
440440

441441
Data.method = Data.type + '.update'

0 commit comments

Comments
 (0)