[optimize] auto convert encoding for cmsis config wizard

Author: github0null

src/CodeConverter.ts

@@ -58,7 +58,7 @@ export class CodeConverter {
         return str;
     }
 
-    private getCodeType(bomHead: Buffer): CodeType {
+    private static getCodeType(bomHead: Buffer): CodeType {
 
         let codeType: CodeType;
 
@@ -111,27 +111,27 @@ export class CodeConverter {
         return codeType;
     }
 
-    GetCodeType(file: File): Promise<CodeType> {
+    static getFileCodeType(file: File): Promise<CodeType> {
         return new Promise((resolve) => {
             const stream = fs.createReadStream(file.path);
             stream.on('readable', () => {
                 let bomHead: Buffer = stream.read(4);
                 stream.close();
-                resolve(this.getCodeType(bomHead));
+                resolve(CodeConverter.getCodeType(bomHead));
             });
         });
     }
 
-    getCodeTypeSync(file: File): CodeType {
+    static getCodeTypeSync(file: File): CodeType {
         const buf = fs.readFileSync(file.path);
-        return this.getCodeType(buf);
+        return CodeConverter.getCodeType(buf);
     }
 
-    ExistCode(encoding: string): boolean {
+    static existCode(encoding: string): boolean {
         return iconv.encodingExists(encoding);
     }
 
-    ConvertToUTF8(file: File, originalEncoding: string, outPath: string) {
+    static convertFileToUTF8(file: File, originalEncoding: string, outPath: string) {
         fs.createReadStream(file.path)
             .pipe(iconv.decodeStream(originalEncoding))
             .pipe(iconv.encodeStream('utf8'))
@@ -140,7 +140,11 @@ export class CodeConverter {
             }));
     }
 
-    toTargetCode(str: string, encoding: string): Buffer {
+    static toTargetCode(str: string, encoding: string): Buffer {
         return iconv.encode(iconv.decode(Buffer.from(str), 'utf8'), encoding);
     }
+
+    static toUtf8Code(buff: Buffer, encoding: string): Buffer {
+        return iconv.encode(iconv.decode(buff, encoding), 'utf8');
+    }
 }

src/HexUploader.ts

@@ -312,12 +312,11 @@ class JLinkUploader extends HexUploader<any> {
         jlinkCommandtemplate = this.project.resolveEnvVar(jlinkCommandtemplate);
         jlinkCommandtemplate = jlinkCommandtemplate + os.EOL + 'exit'; // append 'exit' command
 
-        const codeConverter = new CodeConverter();
         const codePage = ResManager.getLocalCodePage();
 
         // write commands file
-        if (codePage && codeConverter.ExistCode(codePage)) {
-            fs.writeFileSync(jlinkCommandsFile.path, codeConverter.toTargetCode(jlinkCommandtemplate, codePage));
+        if (codePage && CodeConverter.existCode(codePage)) {
+            fs.writeFileSync(jlinkCommandsFile.path, CodeConverter.toTargetCode(jlinkCommandtemplate, codePage));
         } else {
             jlinkCommandsFile.Write(jlinkCommandtemplate);
         }

src/WebPanelManager.ts

@@ -33,6 +33,8 @@ import * as NodePath from 'path';
 import * as CmsisConfigParser from './CmsisConfigParser'
 import * as os from 'os'
 import * as platform from './Platform';
+import * as fs from 'fs';
+import { CodeConverter } from "./CodeConverter";
 
 let _instance: WebPanelManager;
 
@@ -242,8 +244,17 @@ export class WebPanelManager {
 
     showCmsisConfigWizard(uri: vscode.Uri): void {
 
-        const srcFile = new File(uri.fsPath);
-        const lines = srcFile.Read().split(/\r\n|\n/);
+        // get current encoding for this file
+        const fencoding = vscode.workspace.getConfiguration(undefined, uri).get<string>('files.encoding') || 'utf8';
+        const inputFile = new File(uri.fsPath);
+
+        let fileContUtf8Buf = fs.readFileSync(inputFile.path);
+
+        if (fencoding != 'utf8') {
+            fileContUtf8Buf = CodeConverter.toUtf8Code(fileContUtf8Buf, fencoding);
+        }
+
+        const lines = fileContUtf8Buf.toString().split(/\r\n|\n/);
 
         let cmsisConfig: CmsisConfigParser.CmsisConfiguration | undefined;
 
@@ -268,7 +279,7 @@ export class WebPanelManager {
 
         const panel = vscode.window.createWebviewPanel(
             'cmsis_wizard_view',
-            srcFile.name,
+            inputFile.name,
             vscode.ViewColumn.One,
             panelOptions
         );
@@ -326,8 +337,18 @@ export class WebPanelManager {
                 };
 
                 try {
-                    if (!Array.isArray(data)) throw Error(`Error response type: \'${typeof (data)}\'`);
-                    srcFile.Write(data.join(os.EOL));
+                    if (!Array.isArray(data)) {
+                        throw Error(`Error response type: \'${typeof (data)}\'`);
+                    }
+
+                    const fileContent = data.join(os.EOL);
+
+                    if (fencoding != 'utf8') {
+                        fs.writeFileSync(inputFile.path, CodeConverter.toTargetCode(fileContent, fencoding));
+                    } else {
+                        inputFile.Write(fileContent);
+                    }
+
                     status.success = true;
                     status.msg = 'Save Done !';
                 } catch (error) {