clean up

Author: davegarthsimpson

arduino-ide-extension/src/browser/boards/boards-service-provider.ts

@@ -65,7 +65,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
   protected _availablePorts: Port[] = [];
   protected _availableBoards: AvailableBoard[] = [];
 
-  private uploadInProgress = false;
+  private uploadAttemptInProgress = false;
 
   private lastItemRemovedForUpload: { board: Board; port: Port } | undefined;
   // "lastPersistingUploadPort", is a port created during an upload, that persisted after
@@ -87,8 +87,8 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
   private readonly _reconciled = new Deferred<void>();
 
   onStart(): void {
-    this.notificationCenter.onUploadInProgress(
-      this.onUploadNotificationReceived.bind(this)
+    this.notificationCenter.onUploadAttemptInProgress(
+      this.onUploadAttemptEventReceived.bind(this)
     );
     this.notificationCenter.onAttachedBoardsDidChange(
       this.notifyAttachedBoardsChanged.bind(this)
@@ -121,8 +121,8 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
     return this._reconciled.promise;
   }
 
-  private onUploadNotificationReceived(uploadInProgress: boolean): void {
-    this.uploadInProgress = uploadInProgress;
+  private onUploadAttemptEventReceived(uploadAttemptInProgress: boolean): void {
+    this.uploadAttemptInProgress = uploadAttemptInProgress;
   }
 
   private checkForItemRemoved(event: AttachedBoardsChangeEvent): void {
@@ -192,7 +192,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
       this.logger.info('------------------------------------------');
     }
 
-    if (this.uploadInProgress) {
+    if (this.uploadAttemptInProgress) {
       this.checkForItemRemoved(event);
     } else {
       this.checkForPersistingPort(event);
@@ -202,7 +202,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
     this._availablePorts = event.newState.ports;
     this.onAvailablePortsChangedEmitter.fire(this._availablePorts);
     this.reconcileAvailableBoards().then(() => {
-      if (!this.uploadInProgress) {
+      if (!this.uploadAttemptInProgress) {
         this.tryReconnect();
       }
     });

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -195,8 +195,10 @@ export class UploadSketch extends CoreServiceContribution {
       // uploadInProgress will be set to false whether the upload fails or not
       this.uploadInProgress = true;
       this.onDidChangeEmitter.fire();
-      this.notificationCenter.notifyUploadInProgress(this.uploadInProgress);
       this.clearVisibleNotification();
+      this.notificationCenter.notifyUploadAttemptInProgress(
+        this.uploadInProgress
+      );
 
       const verifyOptions =
         await this.commandService.executeCommand<CoreService.Options.Compile>(
@@ -249,7 +251,9 @@ export class UploadSketch extends CoreServiceContribution {
     } finally {
       this.uploadInProgress = false;
       this.onDidChangeEmitter.fire();
-      this.notificationCenter.notifyUploadInProgress(this.uploadInProgress);
+      this.notificationCenter.notifyUploadAttemptInProgress(
+        this.uploadInProgress
+      );
     }
   }
 

arduino-ide-extension/src/browser/notification-center.ts

@@ -66,7 +66,7 @@ export class NotificationCenter
   }>();
   private readonly onAppStateDidChangeEmitter =
     new Emitter<FrontendApplicationState>();
-  private readonly onUploadInProgressEmitter = new Emitter<boolean>();
+  private readonly onUploadAttemptInProgressEmitter = new Emitter<boolean>();
 
   protected readonly toDispose = new DisposableCollection(
     this.indexWillUpdateEmitter,
@@ -81,7 +81,7 @@ export class NotificationCenter
     this.libraryDidInstallEmitter,
     this.libraryDidUninstallEmitter,
     this.attachedBoardsDidChangeEmitter,
-    this.onUploadInProgressEmitter
+    this.onUploadAttemptInProgressEmitter
   );
 
   readonly onIndexDidUpdate = this.indexDidUpdateEmitter.event;
@@ -99,7 +99,8 @@ export class NotificationCenter
     this.attachedBoardsDidChangeEmitter.event;
   readonly onRecentSketchesDidChange = this.recentSketchesChangedEmitter.event;
   readonly onAppStateDidChange = this.onAppStateDidChangeEmitter.event;
-  readonly onUploadInProgress = this.onUploadInProgressEmitter.event;
+  readonly onUploadAttemptInProgress =
+    this.onUploadAttemptInProgressEmitter.event;
 
   @postConstruct()
   protected init(): void {
@@ -173,7 +174,7 @@ export class NotificationCenter
     this.recentSketchesChangedEmitter.fire(event);
   }
 
-  notifyUploadInProgress(event: boolean): void {
-    this.onUploadInProgressEmitter.fire(event);
+  notifyUploadAttemptInProgress(event: boolean): void {
+    this.onUploadAttemptInProgressEmitter.fire(event);
   }
 }

arduino-ide-extension/src/common/protocol/notification-service.ts

@@ -28,7 +28,7 @@ export interface NotificationServiceClient {
   notifyLibraryDidUninstall(event: { item: LibraryPackage }): void;
   notifyAttachedBoardsDidChange(event: AttachedBoardsChangeEvent): void;
   notifyRecentSketchesDidChange(event: { sketches: Sketch[] }): void;
-  notifyUploadInProgress(event: boolean): void;
+  notifyUploadAttemptInProgress(event: boolean): void;
 }
 
 export const NotificationServicePath = '/services/notification-service';

arduino-ide-extension/src/node/notification-service-server.ts

@@ -82,8 +82,10 @@ export class NotificationServiceServerImpl
     );
   }
 
-  notifyUploadInProgress(event: boolean): void {
-    this.clients.forEach((client) => client.notifyUploadInProgress(event));
+  notifyUploadAttemptInProgress(event: boolean): void {
+    this.clients.forEach((client) =>
+      client.notifyUploadAttemptInProgress(event)
+    );
   }
 
   setClient(client: NotificationServiceClient): void {