Added command: Restore/upgrade system templates

Author: devdotnetorg

package.json

@@ -116,7 +116,7 @@
 					},
 					"fastiot.template.loadonstart": {
 						"type": "boolean",
-						"default": false,
+						"default": true,
 						"description": "Load templates on extension start (false, speeds up the start of the extension)."
 					},
 					"conf.resource.insertEmptyLastLine": {
@@ -304,6 +304,10 @@
 			{
 				"command": "viewTemplates.OpenTemplateFolder",
 				"title": "Open template folder"
+			},
+			{
+				"command": "viewTemplates.RestoreSystemTemplates",
+				"title": "Restore/upgrade system templates (offline)"
 			}
 		],
 		"viewsContainers": {
@@ -374,6 +378,10 @@
 				{
 					"command": "viewTemplates.OpenTemplateFolder",
 					"when": "view == viewTemplates"
+				},
+				{
+					"command": "viewTemplates.RestoreSystemTemplates",
+					"when": "view == viewTemplates"
 				}
 			],
 			"view/item/context": [

src/Configuration/IotConfiguration.ts

@@ -188,27 +188,6 @@ export class IotConfiguration {
       });
     });
 
-    //old variant
-    /*
-    const loadTemplates = async () => {
-      let url:string="";
-      if(this._context.extensionMode==vscode.ExtensionMode.Production)
-      {
-        url="https://raw.githubusercontent.com/devdotnetorg/vscode-extension-dotnet-fastiot/master/templates/system/templatelist.fastiot.yaml";
-      }else{
-        //for test
-        url="https://raw.githubusercontent.com/devdotnetorg/vscode-extension-dotnet-fastiot/dev/templates/system/templatelist.fastiot.yaml";
-      }
-      this._logCallback("-------- Loading templates -------");
-      this.Templates.Clear();
-      await this.Templates.LoadTemplatesSystem();
-      await this.Templates.UpdateSystemTemplate(url,this.Folder.Temp);
-      await this.Templates.LoadTemplatesUser();
-      this._logCallback(`${this.Templates.Count} template(s) available.`);
-      this._logCallback("----------------------------------");
-      };
-	  loadTemplates();
-    */
   }
 }
 

src/Templates/IotTemplateCollection.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import * as fs from 'fs';
+import * as fs from 'fs-extra';
 import * as path from 'path';
 import {EntityType} from '../Entity/EntityType';
 import {EntityCollection,ContainsType} from '../Entity/EntityCollection';
@@ -51,22 +51,22 @@ export class IotTemplateCollection extends EntityCollection<IotTemplateAttribute
     this.ContextUI.Output(`${result.Status}. ${result.Message}. ${result.SystemMessage}`);
   }
 
-  protected async LoadFromFolder(path:string, type:EntityType,recoverySourcePath:string|undefined):Promise<IotResult>
+  protected async LoadFromFolder(pathFolder:string, type:EntityType,recoverySourcePath:string|undefined):Promise<IotResult>
   {
     let result= new IotResult(StatusResult.Ok, undefined,undefined);
     //Recovery
     let recovery = new IotTemplateRecovery(type); 
     if(type==EntityType.system&&recoverySourcePath)
     {
-      result=recovery.RestoryDirStructure(recoverySourcePath,path);
+      result=recovery.RestoryDirStructure(recoverySourcePath,pathFolder);
       if(result.Status==StatusResult.Error) return Promise.resolve(result);
     } 
     //
-    const listFolders=IoTHelper.GetListDir(path);
+    const listFolders=IoTHelper.GetListDir(pathFolder);
     //ckeck
     if (listFolders.length==0)
     {
-      result=new IotResult(StatusResult.Ok,`${path} folder is empty. There are no templates to load.`);
+      result=new IotResult(StatusResult.Ok,`${pathFolder} folder is empty. There are no templates to load.`);
       return Promise.resolve(result);
     }
     //checking all folders
@@ -78,7 +78,7 @@ export class IotTemplateCollection extends EntityCollection<IotTemplateAttribute
       if(!template.IsValid&&type==EntityType.system)
       {
         //Recovery
-        this.ContextUI.Output(`Template recovery: ${filePath}`);
+        this.ContextUI.Output(`Template recovery: ${path.dirname(filePath)}`);
         result= template.Recovery();
         if(result.Status==StatusResult.Ok)
           {
@@ -127,9 +127,9 @@ export class IotTemplateCollection extends EntityCollection<IotTemplateAttribute
     });
     //result
     if(this.Count>0){
-      result= new IotResult(StatusResult.Ok,`Loading templates from ${path} folder successfully completed`,undefined);
+      result= new IotResult(StatusResult.Ok,`Loading templates from ${pathFolder} folder successfully completed`,undefined);
     }else{
-      result= new IotResult(StatusResult.Error,` No template was loaded from the ${path} folder`,undefined);
+      result= new IotResult(StatusResult.Error,` No template was loaded from the ${pathFolder} folder`,undefined);
     }
     return Promise.resolve(result);
   }
@@ -233,4 +233,13 @@ export class IotTemplateCollection extends EntityCollection<IotTemplateAttribute
     return Promise.resolve(result);
   }
 
+  public RestoreSystemTemplates()
+  {
+    const path=`${this.BasePath}\\${EntityType.system}`;
+    if (fs.existsSync(path)) {
+      //clear
+      fs.emptyDirSync(path);
+    }
+  }
+
 }

src/extension.ts

@@ -279,19 +279,26 @@ export async function activate(context: vscode.ExtensionContext) {
 	});
 	//Open template folder
 	let commandOpenTemplateFolder = vscode.commands.registerCommand('viewTemplates.OpenTemplateFolder', () => {	
-			openTemplateFolder(config.Folder.Templates);	
+			openTemplateFolder(config.Folder.Templates);
+	});
+	//Restore/upgrade system templates
+	let commandRestoreSystemTemplates = vscode.commands.registerCommand('viewTemplates.RestoreSystemTemplates', async () => {
+		config.Templates.RestoreSystemTemplates();
+		if(config.Templates.Count>0) await config.LoadTemplatesAsync();
+		vscode.window.showInformationMessage("Restore/upgrade system templates completed successfully");
 	});
 	//Events
 	//Extension configuration change event 
 	let eventChangeConfiguration=vscode.workspace.onDidChangeConfiguration((e) => {
 		if(e.affectsConfiguration('fastiot'))
 		{
+			// TODO reload settings while the extension is running
 			/*
 			treeDataDevicesProvider.Config=config;
 			treeDataConfigurationsProvider.Config=config;
 			treeDataProjectsProvider.Config=config;
 			*/
-			vscode.window.showInformationMessage('Changed extension settings: .NET FastIoT');
+			//vscode.window.showInformationMessage('Changed extension settings: .NET FastIoT');
 			//vscode.window.showInformationMessage('You must restart the .NET FastIoT extension or VSCode to apply the new settings');	
 		}
     }, undefined, context.subscriptions);	
@@ -339,8 +346,9 @@ export async function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(commandCreateProject);
 	context.subscriptions.push(commandReloadTemplates);
 	context.subscriptions.push(commandOpenTemplateFolder);
+	context.subscriptions.push(commandOpenTemplateFolder);
 	//events
-	context.subscriptions.push(eventChangeConfiguration);
+	context.subscriptions.push(commandRestoreSystemTemplates);
 }
 
 // this method is called when your extension is deactivated