mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move unlink on download into download function

Browse Source 
Since this is required by all callsites its easier to have it in the
function itself.
This commit is contained in:
Matthias Einwag 2020-09-23 08:37:02 -07:00
parent df4d59512e
commit c7f4647749
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/code/src/main.ts
View File

@ -200,15 +200,11 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
const dest = path.join(config.globalStoragePath, "rust-analyzer.vsix");
await downloadWithRetryDialog(state, async () => {
// Unlinking the exe file before moving new one on its place should prevent ETXTBSY error.
await fs.unlink(dest).catch(err => {
if (err.code !== "ENOENT") throw err;
});
await download({
url: artifact.browser_download_url,
dest,
progressTitle: "Downloading rust-analyzer extension",
overwrite: true,
});
});
@ -330,17 +326,13 @@ async function getServer(config: Config, state: PersistentState): Promise<string
assert(!!artifact, `Bad release: ${JSON.stringify(release)}`);
await downloadWithRetryDialog(state, async () => {
// Unlinking the exe file before moving new one on its place should prevent ETXTBSY error.
await fs.unlink(dest).catch(err => {
if (err.code !== "ENOENT") throw err;
});
await download({
url: artifact.browser_download_url,
dest,
progressTitle: "Downloading rust-analyzer server",
gunzip: true,
mode: 0o755
mode: 0o755,
overwrite: true,
});
});

8
editors/code/src/net.ts
View File

@ -76,6 +76,7 @@ interface DownloadOpts {
dest: string;
mode?: number;
gunzip?: boolean;
overwrite?: boolean,
}
export async function download(opts: DownloadOpts) {
@ -85,6 +86,13 @@ export async function download(opts: DownloadOpts) {
const randomHex = crypto.randomBytes(5).toString("hex");
const tempFile = path.join(dest.dir, `${dest.name}${randomHex}`);
if (opts.overwrite) {
// Unlinking the exe file before moving new one on its place should prevent ETXTBSY error.
await fs.promises.unlink(opts.dest).catch(err => {
if (err.code !== "ENOENT") throw err;
});
}
await vscode.window.withProgress(
{
location: vscode.ProgressLocation.Notification,