Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2024-12-13 07:56:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved descriptive upload progress again

Browse Source 
Bumped v1 version string
This commit is contained in:
Bobby Wibowo 2019-11-27 00:57:55 +07:00
parent c4c45a5857
commit df1e835272
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/home.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/home.js.map vendored
View File

File diff suppressed because one or more lines are too long

37
src/js/home.js
View File

@ -341,36 +341,45 @@ page.prepareDropzone = () => {
if (page.uploadAge !== null) xhr.setRequestHeader('age', page.uploadAge)
}
if (file.upload.chunked)
file.previewElement.querySelector('.descriptive-progress').innerHTML =
`Uploading chunk ${file.upload.chunks.length}/${file.upload.totalChunkCount}\u2026${file._percentage ? ` ${file._percentage}%` : ''}`
else
if (!file.upload.chunked)
file.previewElement.querySelector('.descriptive-progress').innerHTML = 'Uploading\u2026'
else if (file.upload.chunks.length === 1)
file.previewElement.querySelector('.descriptive-progress').innerHTML = `Uploading chunk 1/${file.upload.totalChunkCount}\u2026`
})
// Update descriptive progress
this.on('uploadprogress', (file, progress) => {
// Total bytes will eventually be bigger than file size when chunked
const total = Math.max(file.size, file.upload.total)
file._percentage = (file.upload.bytesSent / total * 100).toFixed(0)
const prefix = file.upload.chunked
? `Uploading chunk ${file.upload.chunks.length}/${file.upload.totalChunkCount}\u2026`
: 'Uploading\u2026'
const percentage = (file.upload.bytesSent / total * 100).toFixed(0)
const upl = file.upload.chunked
? file.upload.chunks[file.upload.chunks.length - 1]
: file.upload
const xhr = upl.xhr || file.xhr
const bytesSent = upl.bytesSent
const elapsed = (Date.now() - xhr._start) / 1000
let prefix = 'Uploading\u2026'
let skipProgress = false
if (file.upload.chunked) {
const done = upl.bytesSent === upl.total
const last = file.upload.chunks.length === file.upload.totalChunkCount
let chunkIndex = file.upload.chunks.length
if (done && !last) {
chunkIndex++
skipProgress = true
}
prefix = `Uploading chunk ${chunkIndex}/${file.upload.totalChunkCount}\u2026`
}
const bytesPerSec = elapsed ? (bytesSent / elapsed) : 0
const prettyBytesPerSec = page.getPrettyBytes(bytesPerSec)
let prettyBytesPerSec
if (!skipProgress) {
const elapsed = (Date.now() - xhr._start) / 1000
const bytesPerSec = elapsed ? (upl.bytesSent / elapsed) : 0
prettyBytesPerSec = page.getPrettyBytes(bytesPerSec)
}
file.previewElement.querySelector('.descriptive-progress').innerHTML =
`${prefix} ${file._percentage}%${prettyBytesPerSec ? ` at ~${prettyBytesPerSec}/s` : ''}`
`${prefix} ${percentage}%${prettyBytesPerSec ? ` at ~${prettyBytesPerSec}/s` : ''}`
})
this.on('success', (file, response) => {

2
src/versions.json
View File

@ -1,5 +1,5 @@
{
"1": "1574788369",
"1": "1574791009",
"2": "1568894058",
"3": "1568894058",
"4": "1568894058",