reOrganize some codesfix:can't open dosbox in linux

Author: xsro

i18n/chs/out/DOSBox.i18n.json

@@ -1,5 +1,9 @@
 {
 	"openemu.msg": "\nMASM/TASM>>打开DOSBox:{0}",
 	"run.msg": "\n{0}({1})>>运行:{2}",
-	"debug.msg": "\n{0}({1})>>调试:{2}"
+	"debug.msg": "\n{0}({1})>>调试:{2}",
+	"runcode.error": "{0}汇编出错,无法运行/调试",
+	"runcode.warn": "成功汇编链接生成EXE，但是汇编时产生了警告信息({0}warning)，可能无法运行/调试,是否继续操作",
+	"runcode.continue": "继续",
+	"runcode.stop": "否"
 }

i18n/chs/out/runcode.i18n.json

@@ -3,7 +3,7 @@
   "displayName": "MASM/TASM",
   "publisher": "xsro",
   "description": "DOS汇编语言开发环境和语法支持，win下安装即用,自带DOSBox.exe和TASM/MASM工具",
-  "version": "0.5.0",
+  "version": "0.5.1-beta.1",
   "keywords": [
     "dosbox",
     "16位",

i18n/chs/out/viaplayer.i18n.json

@@ -1,47 +1,33 @@
 import { Uri, workspace, window, TextDocument, FileType } from 'vscode';
 import { Config } from './configration';
 import { exec, ExecOptions } from 'child_process';
-import { AssemblerDiag } from './language/diagnose';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
 /**
- * A function used when using boxasm.bat
+ * A function used when using boxasm.bat to run or debug ASM codes in DOSBox
  * @param conf The config information
  * @param runOrDebug true for run ASM code,false for debug
- * @param doc the source ASM file
- * @param diag using its `diag.ErrMsgProcess` to process the assembler's output
  */
-export function runDosbox2(conf: Config, runOrDebug: boolean, doc: TextDocument, diag: AssemblerDiag) {
+export async function runDosbox2(conf: Config, runOrDebug: boolean): Promise<string> {
     let fs = workspace.fs;
     let src: Uri = Uri.joinPath(conf.extScriptsUri, "./boxasm.bat");
     let target: Uri = Uri.joinPath(conf.toolsUri, "./boxasm.bat");
-    fs.copy(src, target, { overwrite: conf.toolsBuiltin }).then(
-        () => {
-            runDosbox(conf, conf.boxasmCommand(runOrDebug), doc).then(
-                (stdout) => { BOXdiag(conf, diag, doc); }
-            );
-        },
-        (reason) => {
-            console.log(reason);
-            runDosbox(conf, conf.boxasmCommand(runOrDebug), doc).then(
-                (stdout) => { BOXdiag(conf, diag, doc); }
-            );
-        }
-    );
+    if (!conf.customToolInfo?.hasBoxasm) { await fs.copy(src, target, { overwrite: true }); }
+    await runDosbox(conf, conf.boxasmCommand(runOrDebug));
+    let stdout: Uint8Array = await fs.readFile(conf.workloguri)
+    return stdout.toString();
 }
 /**open dosbox and do things about it
  * @param conf The config information
  * @param more The commands needed to exec in dosbox
- * @param doc If defined, copy this file to workspace as T.xxx(xxx is the files extension)
+ * @param doc If defined, copy this file to workspace as T.xxx(xxx is the files extension) using terminal commands
  */
 export function runDosbox(conf: Config, more?: string, doc?: TextDocument): Promise<string> {
-    let filename = doc?.fileName;
-    let fileext = filename?.substring(filename.lastIndexOf("."), filename.length);
     let preCommand: string = "";
     let boxcmd: string = '@echo off\n';
-    boxcmd += `mount c \\\"${conf.path}\\\"\nmount d \\\"${conf.workpath}\\\"\n`;//mount the necessary path
+    boxcmd += `mount c \\\"${conf.path}\\\"\nmount d \\\"${conf.workUri.fsPath}\\\"\n`;//mount the necessary path
     boxcmd += "d:\nset PATH=%%PATH%%;c:\\tasm;c:\\masm\n";//switch to the working space and add path\
     if (doc) {
+        let filename = doc?.fileName;
+        let fileext = filename?.substring(filename.lastIndexOf("."), filename.length);
         boxcmd += `echo Your file has been copied as D:\\T${fileext}\n`;
         if (process.platform === 'win32') {
             preCommand = `del/Q T*.* & copy "${filename}" "T${fileext}" & `;
@@ -53,31 +39,58 @@ export function runDosbox(conf: Config, more?: string, doc?: TextDocument): Prom
     boxcmd += "@echo on";
     if (more) { boxcmd += "\n" + more; }//add extra commands
     let opt: OPTS = {
-        cwd: conf.workpath,
+        cwd: conf.workUri.fsPath,
         preOpen: preCommand,
         core: conf.OpenDosbox,
         boxcmd: boxcmd,
         parameter: ' -conf "' + conf.dosboxconfuri.fsPath + '" '
     };
     return openDosbox(opt);
 }
+/**
+ * opendosbox at the Editor's file's folder
+ * @param conf config
+ * @param doc the doc
+ */
 export function BoxOpenCurrentFolder(conf: Config, doc: TextDocument) {
     let folderpath: string = Uri.joinPath(doc.uri, '../').fsPath;
     let opt: OPTS = {
-        cwd: conf.workpath,
+        cwd: conf.workUri.fsPath,
         core: conf.OpenDosbox,
         boxcmd: `mount e \\\"${folderpath}\\\"\nmount c \\\"${conf.path}\\\"\nset PATH=%%PATH%%;c:\\masm;c:\\tasm\ne:`,
         parameter: ' -conf "' + conf.dosboxconfuri.fsPath + '" '
     };
     openDosbox(opt);
 }
+/**
+ * options for open dosbox
+ */
 interface OPTS {
+    /**
+     * the cwd of child_process
+     */
     cwd: string,
+    /**
+     * the core command,usually the command for open dosbox
+     */
     core: string
+    /**
+     * the command exec before the core command
+     */
     preOpen?: string,
+    /**
+     * the parameter for dosbox command
+     */
     parameter?: string,
+    /**
+     * the command need to exec inside dosbox
+     */
     boxcmd?: string
 }
+/**
+ * open DOSBox through child_process
+ * @param opt options
+ */
 function openDosbox(opt: OPTS): Promise<string> {
     let str = opt.core + opt.parameter;
     if (opt.preOpen) {
@@ -97,34 +110,28 @@ function openDosbox(opt: OPTS): Promise<string> {
     }
     return new Promise(
         (resolve, reject) => {
-            exec(str, execOption, (error: any, stdout: string, stderr: string) => {
+            let child = exec(str, execOption, (error: any, stdout: string, stderr: string) => {
                 if (error) {
                     reject(error);
                 }
                 else {
                     resolve(stdout);
                 }
             });
+            child.on('exit', (code) => {
+                if (code !== 0) {
+                    let msg = `Open dosbox Failed\t exitcode${code}\n`;
+                    if (process.platform !== "win32") {
+                        msg += 'PLEASE make sure DOSBox can be opened by terminal command "dosbox"';
+                    }
+                    window.showErrorMessage(msg);
+                }
+
+            })
         }
     );
 }
-function BOXdiag(conf: Config, diag: AssemblerDiag, doc: TextDocument): string {
-    let info: string = ' ', content: string;
-    if (doc) {
-        content = doc.getText();
-        workspace.fs.readFile(conf.workloguri).then(
-            (text) => {
-                info = text.toString();
-                if (diag.ErrMsgProcess(content, info, doc.uri, conf.MASMorTASM) === 0) {
-                    let Errmsgwindow = localize("dosbox.errmsg", '{0} Failed to compile. See the output for more information', conf.MASMorTASM);
-                    window.showErrorMessage(Errmsgwindow);
-                }
-            },
-            () => { console.error('read dosbox mode T.txt FAILED'); }
-        );
-    }
-    return info;
-}
+
 
 
 

package.json

@@ -9,7 +9,7 @@ interface ToolInfo {
     hasMasm: boolean,
     hasTasm: boolean,
 }
-const inArrays = (data: [string, FileType][], arr: [string, FileType]) => {
+export const inArrays = (data: [string, FileType][], arr: [string, FileType]) => {
     let ignoreCase = process.platform === "win32";
     if (ignoreCase) {
         return data.some(e => e[0].toLowerCase() === arr[0] && e[1] === arr[1]);
@@ -32,9 +32,6 @@ async function customToolCheck(path: string): Promise<ToolInfo> {
     };
     let dir1 = await fs.readDirectory(uri);
     console.log(inArrays(dir1, ["boxasm.bat", FileType.File]));
-    if (inArrays(dir1, ["boxasm.bat", FileType.File])) {
-        info.hasBoxasm = true;
-    }
     if (inArrays(dir1, ["dosbox", FileType.Directory]) && process.platform === "win32") {
         let dir2 = await fs.readDirectory(Uri.joinPath(uri, './dosbox'));
         if (inArrays(dir2, ["dosbox.exe", FileType.File])) {
@@ -47,6 +44,7 @@ async function customToolCheck(path: string): Promise<ToolInfo> {
             info.hasPlayerasm = true;
         }
     }
+    info.hasBoxasm = inArrays(dir1, ["boxasm.bat", FileType.File]);
     info.hasMasm = inArrays(dir1, ["masm", FileType.Directory]);
     info.hasTasm = inArrays(dir1, ["tasm", FileType.Directory]);
     console.log(dir1, info);
@@ -65,19 +63,19 @@ export class Config {
     private _BOXrun: string | undefined;
     private emulator: string | undefined;
     public toolsUri: Uri;
-    private customToolInfo: ToolInfo | undefined = undefined;
-    public readonly toolsBuiltin: boolean = false;
+    public customToolInfo: ToolInfo | undefined = undefined;
     public readonly resolution: string | undefined;
     public readonly savefirst: boolean | undefined;
     public readonly MASMorTASM: string | undefined;
-    public OpenDosbox: string;
+    public readonly _console: string | undefined;
     constructor(content: ExtensionContext) {
         let configuration = workspace.getConfiguration('masmtasm');
         this.MASMorTASM = configuration.get('ASM.MASMorTASM');
         this.emulator = configuration.get('ASM.emulator');
         this.savefirst = configuration.get('ASM.savefirst');
         this.resolution = configuration.get('dosbox.CustomResolution');
         this._BOXrun = configuration.get('dosbox.run');
+        this._console = configuration.get("dosbox.console");
         this._exturi = content.extensionUri;
         //the tools' Uri
         let toolpath: string | undefined = configuration.get('ASM.toolspath');
@@ -88,19 +86,25 @@ export class Config {
                 (reason) => { console.log(reason); this.customToolInfo = undefined; }
             );
         };
+
+        //写dosbox配置信息
+        this.writeBoxconfig(this);
+    }
+    public get OpenDosbox() {
         //command for open
         let boxUri = Uri.joinPath(this._exturi, './tools/dosbox/dosbox.exe');
         if (this.customToolInfo?.hasDosbox) { boxUri = Uri.joinPath(this.customToolInfo.uri, './dosbox/dosbox.exe'); }
-        let command: string, path = '"' + boxUri.fsPath + '"';
-        switch (configuration.get("dosbox.console")) {
-            case "min": command = 'start/min/wait "" ' + path; break;
-            case "noconsole": command = path + ' -noconsole'; break;
-            case "normal":
-            default: command = path;
+        let command: string = "dosbox";
+        if (process.platform === "win32") {
+            let path = '"' + boxUri.fsPath + '"';
+            switch (this._console) {
+                case "min": command = 'start/min/wait "" ' + path; break;
+                case "noconsole": command = path + ' -noconsole'; break;
+                case "normal":
+                default: command = path;
+            }
         }
-        this.OpenDosbox = command;
-        //写dosbox配置信息
-        this.writeBoxconfig(this);
+        return command;
     }
     /**
      * file path of scripts packaged inside
@@ -120,9 +124,8 @@ export class Config {
      * file path of the separated space for DOSBox to use
      * which will be mounted as `D:` in dosbox
      */
-    public get workpath(): string {
-        let path = Uri.joinPath(this._exturi, './scripts/work/').fsPath;
-        return path;
+    public get workUri(): Uri {
+        return Uri.joinPath(this._exturi, './scripts/work/');
     }
     /**
      * file path of the compiler information in the dosbox mode