Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

vscode: move throtting of download progress to call site

Browse source
This commit is contained in:
Veetaha 2020-02-09 14:18:05 +02:00
parent a63659badb
commit f3240e22c6
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editors/code/src/installation/download_file.ts
View file

@ -1,20 +1,18 @@
import fetch from "node-fetch";
import { throttle } from "throttle-debounce";
import * as fs from "fs";
import { strict as assert } from "assert";
/**
* Downloads file from `url` and stores it at `destFilePath`.
* `onProgress` callback is periodically called to track the progress of downloading,
* it gets the already read and total amount of bytes to read as its parameters.
* `onProgress` callback is called on recieveing each chunk of bytes
* to track the progress of downloading, it gets the already read and total
* amount of bytes to read as its parameters.
*/
export async function downloadFile(
url: string,
destFilePath: fs.PathLike,
onProgress: (readBytes: number, totalBytes: number) => void
): Promise<void> {
onProgress = throttle(200, /* noTrailing: */ true, onProgress);
const response = await fetch(url);
const totalBytes = Number(response.headers.get('content-length'));

25
editors/code/src/installation/language_server.ts
View file

@ -1,8 +1,9 @@
import { spawnSync } from "child_process";
import * as vscode from "vscode";
import * as path from "path";
import { strict as assert } from "assert";
import { promises as fs } from "fs";
import { spawnSync } from "child_process";
import { throttle } from "throttle-debounce";
import { BinarySource } from "./interfaces";
import { fetchLatestArtifactMetadata } from "./fetch_latest_artifact_metadata";
@ -28,19 +29,23 @@ export async function downloadLatestLanguageServer(
{
location: vscode.ProgressLocation.Notification,
cancellable: false, // FIXME: add support for canceling download?
title: `Downloading language server ${releaseName}`
title: `Downloading language server (${releaseName})`
},
async (progress, _cancellationToken) => {
let lastPrecentage = 0;
await downloadFile(downloadUrl, installationPath, (readBytes, totalBytes) => {
const newPercentage = (readBytes / totalBytes) * 100;
progress.report({
message: newPercentage.toFixed(0) + "%",
increment: newPercentage - lastPrecentage
});
await downloadFile(downloadUrl, installationPath, throttle(
200,
/* noTrailing: */ true,
(readBytes, totalBytes) => {
const newPercentage = (readBytes / totalBytes) * 100;
progress.report({
message: newPercentage.toFixed(0) + "%",
increment: newPercentage - lastPrecentage
});
lastPrecentage = newPercentage;
});
lastPrecentage = newPercentage;
})
);
}
);