From ba292a057674ca6e1a9569d57bf33de1ba9831b5 Mon Sep 17 00:00:00 2001 From: Marcel Kloubert Date: Tue, 10 Apr 2018 23:12:09 +0200 Subject: [PATCH] bugfixes --- CHANGELOG.md | 3 ++- package-lock.json | 2 +- package.json | 2 +- src/tools/quickexecution.ts | 16 +++------------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32d5774..ec030c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,12 @@ [![Share via Facebook](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Facebook.png)](https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded"e=vscode-deploy-reloaded) [![Share via Twitter](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Twitter.png)](https://twitter.com/intent/tweet?source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&text=vscode-deploy-reloaded:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&via=mjkloubert) [![Share via Google+](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Google+.png)](https://plus.google.com/share?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Pinterest](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Pinterest.png)](https://pinterest.com/pin/create/button/?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&media=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif&description=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.) [![Share via Reddit](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Reddit.png)](https://www.reddit.com/submit?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded) [![Share via LinkedIn](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/LinkedIn.png)](https://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded&summary=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Wordpress](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Wordpress.png)](https://wordpress.com/press-this.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded"e=vscode-deploy-reloaded&s=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&i=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif) [![Share via Email](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Email.png)](mailto:?subject=vscode-deploy-reloaded&body=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20'vs-deploy'%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) -## 0.69.0 (April 10th, 2018; log files) +## 0.69.1 (April 10th, 2018; log files) * added `Deploy Reloaded: Log files ...` command, which can open an extension's log file now * can define [global buttons](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/buttons) now, s. [issue #52](https://github.com/mkloubert/vscode-deploy-reloaded/issues/52) * code cleanups and improvements +* bugfixes ## 0.68.1 (April 9th, 2018; improved output) diff --git a/package-lock.json b/package-lock.json index 5876165..6eadab3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-deploy-reloaded", - "version": "0.69.0", + "version": "0.69.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 83abce8..072bbe8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-deploy-reloaded", "displayName": "Deploy (Reloaded)", "description": "Deploys files of a workspace to a destination.", - "version": "0.69.0", + "version": "0.69.1", "publisher": "mkloubert", "engines": { "vscode": "^1.22.0" diff --git a/src/tools/quickexecution.ts b/src/tools/quickexecution.ts index 38c651c..684b012 100644 --- a/src/tools/quickexecution.ts +++ b/src/tools/quickexecution.ts @@ -530,10 +530,6 @@ export async function _1b87f2ee_b636_45b6_807c_0e2d25384b02_1409614337( }).filter(e => !$h.isEmptyString(e)); await $h.withProgress(async (progress) => { - progress.report({ - message: 'Detecting files ...', //TODO: translate - }); - const FILES = await $h.glob(patterns, { cwd: WORKSPACE.editorRootPath, root: WORKSPACE.editorRootPath, @@ -545,6 +541,8 @@ export async function _1b87f2ee_b636_45b6_807c_0e2d25384b02_1409614337( }); if (FILES.length > 0) { + progress.increment = 1 / FILES.length * 100.0; + let lineCount = 0; for (let i = 0; i < FILES.length; i++) { if (progress.cancellationToken.isCancellationRequested) { @@ -552,15 +550,7 @@ export async function _1b87f2ee_b636_45b6_807c_0e2d25384b02_1409614337( } const F = FILES[i]; - const PERCENTAGE = Math.floor( - (i + 1) / FILES.length * 100.0 - ); - - progress.report({ - // increment: PERCENTAGE, - message: `Scanning file '${F}' (${lineCount}) ...`, - percentage: PERCENTAGE, - }); + progress.message = `Scanning file '${F}' (${lineCount}) ...`; lineCount += (await $h.readFile(F)).toString('binary') .split("\n")