Merge pull request #392 from DustinCampbell/improve-omnisharp-logging

Fix OmniSharp download and improve logging
dotnet · May 31, 2016 · e38e1a6 · e38e1a6
2 parents 56abbd6 + 5ffff21
commit e38e1a6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/src/omnisharpDownload.ts b/src/omnisharpDownload.ts
@@ -13,8 +13,9 @@ import * as tmp from 'tmp';
 import {parse} from 'url';
 import {SupportedPlatform, getSupportedPlatform} from './utils';
 import {getProxyAgent} from './proxy';
+import {OutputChannel} from 'vscode';
 
-const Decompress = require('decompress');
+const decompress = require('decompress');
 
 const BaseDownloadUrl = 'https://vscodeoscon.blob.core.windows.net/ext';
 const DefaultInstallLocation = path.join(__dirname, '../.omnisharp');
@@ -73,14 +74,14 @@ function download(urlString: string): Promise<stream.Readable> {
     });
 }
 
-export function downloadOmnisharp(): Promise<boolean> {
+export function downloadOmnisharp(output: OutputChannel): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
-        console.log(`[OmniSharp]: Installing to ${DefaultInstallLocation}`);
+        output.appendLine(`[INFO] Installing to ${DefaultInstallLocation}`);
 
         const assetName = getOmnisharpAssetName();
         const urlString = `${BaseDownloadUrl}/${assetName}`;
 
-        console.log(`[OmniSharp] Attempting to download ${assetName}...`);
+        output.appendLine(`[INFO] Attempting to download ${assetName}...`);
 
         return download(urlString)
             .then(inStream => {
@@ -89,7 +90,7 @@ export function downloadOmnisharp(): Promise<boolean> {
                         return reject(err);
                     }
 
-                    console.log(`[OmniSharp] Downloading to ${tmpPath}...`);
+                    output.appendLine(`[INFO] Downloading to ${tmpPath}...`);
 
                     const outStream = fs.createWriteStream(null, { fd: fd });
 
@@ -99,30 +100,18 @@ export function downloadOmnisharp(): Promise<boolean> {
                     outStream.once('finish', () => {
                         // At this point, the asset has finished downloading.
 
-                        console.log(`[OmniSharp] Download complete!`);
+                        output.appendLine(`[INFO] Download complete!`);
+                        output.appendLine(`[INFO] Decompressing...`);
 
-                        let decompress = new Decompress()
-                            .src(tmpPath)
-                            .dest(DefaultInstallLocation);
-
-                        if (path.extname(assetName).toLowerCase() === '.zip') {
-                            decompress = decompress.use(Decompress.zip());
-                            console.log(`[OmniSharp] Unzipping...`);
-                        }
-                        else {
-                            decompress = decompress.use(Decompress.targz());
-                            console.log(`[OmniSharp] Untaring...`);
-                        }
-
-                        decompress.run((err, files) => {
-                            if (err) {
+                        return decompress(tmpPath, DefaultInstallLocation)
+                            .then(files => {
+                                output.appendLine(`[INFO] Done! ${files.length} files unpacked.`)
+                                return resolve(true);
+                            })
+                            .error(err => {
+                                output.appendLine(`[ERROR] ${err}`);
                                 return reject(err);
-                            }
-
-                            console.log(`[OmniSharp] Done! ${files.length} files unpacked.`)
-
-                            return resolve(true);
-                        });
+                            });
                     });
 
                     inStream.pipe(outStream);

diff --git a/src/omnisharpServerLauncher.ts b/src/omnisharpServerLauncher.ts
@@ -37,7 +37,7 @@ export function installOmnisharpIfNeeded(output: OutputChannel): Promise<string>
             throw err;
         }
 
-        return downloadOmnisharp().then(_ => {
+        return downloadOmnisharp(output).then(_ => {
             return getOmnisharpLaunchFilePath();
         })
     });