diff --git a/src/routes/cloud/+page.svelte b/src/routes/cloud/+page.svelte index 7f5b089..d51ea20 100644 --- a/src/routes/cloud/+page.svelte +++ b/src/routes/cloud/+page.svelte @@ -37,18 +37,17 @@ function xhrDownloadFileId(fileId: string) { return new Promise((resolve, reject) => { const { access_token } = gapi.auth.getToken(); - const xhr = new XMLHttpRequest(); + completed = 0; + totalSize = 0; + xhr.open('GET', `https://www.googleapis.com/drive/v3/files/${fileId}?alt=media`); xhr.setRequestHeader('Authorization', `Bearer ${access_token}`); xhr.responseType = 'blob'; - xhr.onloadstart = () => { - completed = 0; - }; - xhr.onprogress = ({ loaded, total }) => { + loadingMessage = ''; completed = loaded; totalSize = total; }; @@ -292,9 +291,9 @@
- {#if loadingMessage} + {#if loadingMessage || completed > 0} - {#if completed > 0 && completed !== totalSize} + {#if completed > 0}

{formatBytes(completed)} / {formatBytes(totalSize)}

{:else}