Feedback

Author: akshita31

src/observers/CsharpChannelObserver.ts

@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BaseChannelObserver } from "./BaseChannelObserver";
-import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, PackageInstallStart, CorruptedDownloadError } from "../omnisharp/loggingEvents";
+import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, PackageInstallStart, IntegrityCheckFailure } from "../omnisharp/loggingEvents";
 
 export class CsharpChannelObserver extends BaseChannelObserver {
     public post = (event: BaseEvent) => {
         switch (event.constructor.name) {
             case PackageInstallStart.name:
-            case CorruptedDownloadError.name:
+            case IntegrityCheckFailure.name:
                 this.showChannel(true);
                 break;
             case InstallationFailure.name:

src/observers/CsharpLoggerObserver.ts

@@ -58,21 +58,19 @@ export class CsharpLoggerObserver extends BaseLoggerObserver {
             case Event.LatestBuildDownloadStart.name:
                 this.logger.appendLine("Getting latest OmniSharp version information");
                 break;
-            case Event.DownloadRetry.name:
-                this.handleDownloadRetry(<Event.DownloadRetry>event);
-                break;
-            case Event.CorruptedDownloadError.name:
-                this.handleCorruptedDownloadError(<Event.CorruptedDownloadError>event);
+            case Event.IntegrityCheckFailure.name:
+                this.handleIntegrityCheckFailure(<Event.IntegrityCheckFailure>event);
                 break;
         }
     }
 
-    private handleCorruptedDownloadError(event: Event.CorruptedDownloadError){
-        this.logger.appendLine(`There was a problem downloading ${event.packageDescription}. Some functionalities may not work as expected. Please restart vscode to retrigger the download or download the package manually from ${event.url}`); 
-    }
-
-    private handleDownloadRetry(event: Event.DownloadRetry) {
-        this.logger.appendLine(`Corrupt download obtained for package ${event.packageDescription}. Retrying..`);
+    private handleIntegrityCheckFailure(event: Event.IntegrityCheckFailure) {
+        if (event.retry) {
+            this.logger.appendLine(`Package ${event.packageDescription} failed integrity check. Retrying..`);
+        }
+        else {
+            this.logger.appendLine(`Package ${event.packageDescription} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download or download the package manually from ${event.url}`); 
+        }
     }
 
     private handleDownloadSizeObtained(event: Event.DownloadSizeObtained) {

src/observers/ErrorMessageObserver.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BaseEvent, ZipError, DotNetTestRunFailure, DotNetTestDebugStartFailure, CorruptedDownloadError } from "../omnisharp/loggingEvents";
+import { BaseEvent, ZipError, DotNetTestRunFailure, DotNetTestDebugStartFailure, IntegrityCheckFailure } from "../omnisharp/loggingEvents";
 import { vscode } from "../vscodeAdapter";
 import showErrorMessage from "./utils/ShowErrorMessage";
 
@@ -22,13 +22,15 @@ export class ErrorMessageObserver {
             case DotNetTestDebugStartFailure.name:
                 this.handleDotNetTestDebugStartFailure(<DotNetTestDebugStartFailure>event);
                 break;
-            case CorruptedDownloadError.name:
-                this.handleCorruptedDownloadError(<CorruptedDownloadError> event);
+            case IntegrityCheckFailure.name:
+                this.handleIntegrityCheckFailure(<IntegrityCheckFailure> event);
         }
     }
 
-    handleCorruptedDownloadError(event: CorruptedDownloadError): any {
-        showErrorMessage(this.vscode, `There was a problem downloading ${event.packageDescription}. Some functionalities may not work as expected. Please restart vscode to retrigger the download or download the package manually from ${event.url}`);
+    handleIntegrityCheckFailure(event: IntegrityCheckFailure) {
+        if (!event.retry) {
+            showErrorMessage(this.vscode, `Package ${event.packageDescription} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download or download the package manually from ${event.url}`);
+        }
     }
 
     private handleZipError(event: ZipError) {

src/omnisharp/loggingEvents.ts

@@ -162,12 +162,8 @@ export class OpenURL {
     constructor(public url: string) { }
 }
 
-export class DownloadRetry {
-    constructor(public packageDescription: string){ }
-}
-
-export class CorruptedDownloadError {
-    constructor(public packageDescription: string, public url: string){ }
+export class IntegrityCheckFailure {
+    constructor(public packageDescription: string, public url: string, public retry: boolean){ }
 }
 
 export class RazorPluginPathSpecified implements BaseEvent {

src/packageManager/downloadAndInstallPackages.ts

@@ -11,7 +11,7 @@ import { EventStream } from '../EventStream';
 import { NetworkSettingsProvider } from "../NetworkSettings";
 import { AbsolutePathPackage } from "./AbsolutePathPackage";
 import { touchInstallFile, InstallFileType, deleteInstallFile, installFileExists } from "../common";
-import { InstallationFailure, DownloadRetry, CorruptedDownloadError } from "../omnisharp/loggingEvents";
+import { InstallationFailure, IntegrityCheckFailure } from "../omnisharp/loggingEvents";
 import { mkdirpSync } from "fs-extra";
 import { PackageInstallStart } from "../omnisharp/loggingEvents";
 import { isValidDownload } from './isValidInstallation';
@@ -36,10 +36,10 @@ export async function downloadAndInstallPackages(packages: AbsolutePathPackage[]
                     }
                     else {
                         if (count == 1) {
-                            eventStream.post(new DownloadRetry(pkg.description));
+                            eventStream.post(new IntegrityCheckFailure(pkg.description, pkg.url, true));
                         }
                         else {
-                            eventStream.post(new CorruptedDownloadError(pkg.description, pkg.url));
+                            eventStream.post(new IntegrityCheckFailure(pkg.description, pkg.url, false));
                             break;
                         }
                     }