Refactor state control into controller

Author: mikecentola

src/control.ts

@@ -12,11 +12,11 @@ import { StatusBarControl } from './util/statusBar';
 import { NavTreeView } from './views/navTreeView';
 import { GCodeUnitsController } from './gcodeUnits';
 import { StatsView } from './views/statsView';
-import { constants, Contexts, GlobalState, PIcon, VSBuiltInCommands } from './util/constants';
+import { constants, Contexts, PIcon, VSBuiltInCommands } from './util/constants';
 import { Commands } from './util/commands';
-import { LocalStorageService } from './util/localStorageService';
-import { IVersion, Version } from './util/version';
+import { Version } from './util/version';
 import { Messages } from './util/messages';
+import { StateControl } from './util/stateControl';
 
 export class Control {
     private static _config: Config | undefined;
@@ -26,7 +26,7 @@ export class Control {
     // Controllers
     private static _statusBarControl: StatusBarControl;
     private static _unitsController: GCodeUnitsController | undefined;
-    private static _storageManager: LocalStorageService;
+    private static _stateController: StateControl;
 
     // Views
     private static _statsView: StatsView | undefined;
@@ -36,8 +36,8 @@ export class Control {
         this._context = context;
         this._config = config;
 
-        // Load GlobalState Storage Manager
-        this._storageManager = new LocalStorageService(context);
+        // Load State Controller
+        this._stateController = new StateControl(context);
 
         // Load StatusBars
         context.subscriptions.push((this._statusBarControl = new StatusBarControl(this._context)));
@@ -121,23 +121,19 @@ export class Control {
     private static async checkVersion() {
         const gcodeVersion = new Version(constants.extension.version);
 
-        const prevVer = new Version(
-            this._storageManager.getValue<IVersion>(GlobalState.PreviousVersion, 'global') ?? '0.0.0',
-        );
+        const prevVer = this._stateController.getVersion();
 
         const newVer = gcodeVersion.compareWith(prevVer.getVersion()) === 1 ? true : false;
 
         if (newVer) {
             // Extension has been updated
-            Logger.log(`G-Code upgraded from ${prevVer.getVersionAsString()} to ${gcodeVersion.getVersionAsString()}`);
-            await this.showWhatsNew(gcodeVersion);
 
             // Update globalState version
-            void this._storageManager.setValue<IVersion>(
-                GlobalState.PreviousVersion,
-                gcodeVersion.getVersion(),
-                'global',
-            );
+            Logger.log('Updating...');
+            void this._stateController.updateVer(gcodeVersion);
+
+            Logger.log(`G-Code upgraded from ${prevVer.getVersionAsString()} to ${gcodeVersion.getVersionAsString()}`);
+            await this.showWhatsNew(gcodeVersion);
         } else {
             return;
         }
@@ -183,4 +179,8 @@ export class Control {
     static get gcodeUnitsController() {
         return this._unitsController;
     }
+
+    static get stateController() {
+        return this._stateController;
+    }
 }

src/util/constants.ts

@@ -31,6 +31,7 @@ interface IConstants {
     readonly urls: {
         readonly changeLog: string;
         readonly readme: string;
+        readonly vsmpReviews: string;
     };
 }
 
@@ -50,6 +51,9 @@ export const constants: IConstants = {
     urls: {
         changeLog: 'https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/CHANGELOG.md',
         readme: 'https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/README.md',
+        vsmpReviews:
+            'https://marketplace.visualstudio.com/items?' +
+            'itemName=appliedengdesign.vscode-gcode-syntax&ssr=false#review-details',
     },
 };
 
@@ -67,8 +71,3 @@ export const enum VSBuiltInCommands {
 export const enum Contexts {
     NavTreeViewEnabled = 'gcode:navTree:enabled',
 }
-
-export const enum GlobalState {
-    PreviousVersion = 'gcode:previousVersion',
-    Version = 'gcode:version',
-}

src/util/version.ts

@@ -32,7 +32,7 @@ export class Version {
         };
     }
 
-    public getVersion(): IVersion {
+    getVersion(): IVersion {
         return this._version;
     }