x/onedrive
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update download function

Browse source 
Rename it and turn it into async other than using callback
This commit is contained in:
myl7 2021-11-27 16:26:22 +08:00
parent 6c63aa90be
commit 1d6c40affe
No known key found for this signature in database
GPG key ID: 04F1013B67177C88
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/FileListing.tsx
View file

@ -242,7 +242,7 @@ const FileListing: FunctionComponent<{ query?: ParsedUrlQuery }> = ({ query }) =
}
// Selected file download
const handleDownloadSelected = () => {
const handleSelectedDownload = () => {
const folderName = path.substr(path.lastIndexOf('/') + 1)
const folder = folderName ? folderName : undefined
const files = getFiles()
@ -257,7 +257,7 @@ const FileListing: FunctionComponent<{ query?: ParsedUrlQuery }> = ({ query }) =
el.remove()
} else if (files.length > 1) {
setTotalGenerating(true)
saveFiles(files, folder, () => setTotalGenerating(false))
saveFiles(files, folder).then(() => setTotalGenerating(false))
}
}
@ -302,7 +302,7 @@ const FileListing: FunctionComponent<{ query?: ParsedUrlQuery }> = ({ query }) =
<span
title="Download selected files"
className="hover:bg-gray-300 dark:hover:bg-gray-600 p-2 rounded cursor-pointer"
onClick={handleDownloadSelected}
onClick={handleSelectedDownload}
>
<FontAwesomeIcon icon={['far', 'arrow-alt-circle-down']} />
</span>

27
utils/tools.ts
View file

@ -129,26 +129,21 @@ export const matchProtectedRoute = (route: string) => {
* Download multiple files after compressing them into a zip
* @param files Files to be downloaded
* @param folder Optional folder name to hold files, otherwise flatten files in the zip
* @param onFinish Optional hook triggered after sending generated zip to browser to download
*/
export const saveFiles = (files: { name: string, url: string }[], folder?: string, onFinish?: () => void) => {
export const saveFiles = async (files: { name: string, url: string }[], folder?: string) => {
const zip = new JSZip()
const dir = folder ? zip.folder(folder)! : zip
files.forEach(({ name, url }) => {
dir.file(name, fetch(url).then(r => r.blob()))
})
dir.generateAsync({ type: 'blob' }).then(b => {
const el = document.createElement('a')
el.style.display = 'none'
document.body.appendChild(el)
const bUrl = window.URL.createObjectURL(b)
el.href = bUrl
el.download = folder ? folder + '.zip' : 'download.zip'
el.click()
window.URL.revokeObjectURL(bUrl)
el.remove()
if (onFinish) {
onFinish()
}
})
const b = await dir.generateAsync({ type: 'blob' })
const el = document.createElement('a')
el.style.display = 'none'
document.body.appendChild(el)
const bUrl = window.URL.createObjectURL(b)
el.href = bUrl
el.download = folder ? folder + '.zip' : 'download.zip'
el.click()
window.URL.revokeObjectURL(bUrl)
el.remove()
}