重构 log 输出 和 remark 代码, 减少代码耦合

CHANGELOG.md

@@ -1,3 +1,7 @@
+# version 3.1.1
+
+- 重构 log 输出 和 remark 代码, 减少代码耦合
+
 # version 2.19.19
 
 - win10 上 python3 调试 sys.argv 会忽略空字符串参数

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-leetcode-problem-rating",
     "displayName": "LeetCode",
     "description": "%main.description%",
-    "version": "2.19.19",
+    "version": "3.1.1",
     "author": "ccagml",
     "publisher": "ccagml",
     "license": "MIT",

src/BABA.ts

@@ -28,6 +28,18 @@ export enum BabaStr {
   statusBar_update_status = "statusBar_update_status",
   statusBar_update = "statusBar_update",
   statusBar_update_UserContestInfo = "statusBar_update_UserContestInfo",
+  InitAll = "InitAll",
+  LogOutputProxy = "LogOutputProxy",
+  LogOutputMediator = "LogOutputMediator",
+  Remark_remarkCreateNote = "Remark_remarkCreateNote",
+  Remark_remarkClose = "Remark_remarkClose",
+  Remark_remarkReplyNote = "Remark_remarkReplyNote",
+  Remark_remarkDeleteNoteComment = "Remark_remarkDeleteNoteComment",
+  Remark_remarkCancelsaveNote = "Remark_remarkCancelsaveNote",
+  Remark_remarkSaveNote = "Remark_remarkSaveNote",
+  Remark_remarkEditNote = "Remark_remarkEditNote",
+  Remark_startRemark = "Remark_startRemark",
+  Remark_includeTemplates = "Remark_includeTemplates",
 }
 
 export class BABA {

src/controller/LoginController.ts

@@ -12,7 +12,7 @@ import * as systemUtils from "../utils/SystemUtils";
 import { executeService } from "../service/ExecuteService";
 import { OutPutType, Endpoint, IQuickItemEx, loginArgsMapping, UserStatus } from "../model/Model";
 import { createEnvOption } from "../utils/CliUtils";
-import { logOutput, promptForOpenOutputChannel } from "../utils/OutputUtils";
+import { promptForOpenOutputChannel } from "../utils/OutputUtils";
 import { eventService } from "../service/EventService";
 import { window, QuickPickOptions, ProgressLocation, Progress } from "vscode";
 import { treeDataService } from "../service/TreeDataService";
@@ -59,7 +59,8 @@ class LoginContorller {
           childProc.stdout?.on("data", async (data: string | Buffer) => {
             data = data.toString();
             // vscode.window.showInformationMessage(`cc login msg ${data}.`);
-            logOutput.append(data);
+            BABA.getProxy(BabaStr.LogOutputProxy).get_log().append(data);
+
             if (data.includes("twoFactorCode")) {
               const twoFactor: string | undefined = await window.showInputBox({
                 prompt: "Enter two-factor code.",
@@ -90,7 +91,9 @@ class LoginContorller {
             }
           });
 
-          childProc.stderr?.on("data", (data: string | Buffer) => logOutput.append(data.toString()));
+          childProc.stderr?.on("data", (data: string | Buffer) => {
+            BABA.getProxy(BabaStr.LogOutputProxy).get_log().append(data.toString());
+          });
           childProc.on("error", reject);
 
           const name: string | undefined = await window.showInputBox({

src/controller/MainController.ts

@@ -11,11 +11,10 @@ import * as systemUtils from "../utils/SystemUtils";
 import { executeService } from "../service/ExecuteService";
 import { ExtensionContext } from "vscode";
 import { treeDataService } from "../service/TreeDataService";
-import { logOutput } from "../utils/OutputUtils";
 import { extensionState } from "../utils/problemUtils";
-import { nlsUtils } from "../utils/NlsUtils";
 
 import * as fse from "fs-extra";
+import { BABA, BabaStr } from "../BABA";
 // 做杂活
 class MainContorller {
   constructor() {}
@@ -58,7 +57,7 @@ class MainContorller {
       cur_version_num *= 100;
       cur_version_num += Number(e);
     });
-    logOutput.setLCPTCTX("version", cur_version_num);
+    BABA.getProxy(BabaStr.LogOutputProxy).get_log().setLCPTCTX("version", cur_version_num);
   }
 
   // 初始化上下文
@@ -68,7 +67,6 @@ class MainContorller {
    * @param {ExtensionContext} context - ExtensionContext
    */
   public initialize(context: ExtensionContext) {
-    nlsUtils.init();
     this.setGlobal(context);
     treeDataService.initialize(context);
     extensionState.context = context;

src/controller/TreeViewController.ts

@@ -58,7 +58,7 @@ import { ISearchSet } from "../model/Model";
 import { previewService } from "../service/PreviewService";
 import { executeService } from "../service/ExecuteService";
 import { getNodeIdFromFile } from "../utils/SystemUtils";
-import { logOutput, promptForOpenOutputChannel, promptForSignIn, promptHintMessage } from "../utils/OutputUtils";
+import { promptForOpenOutputChannel, promptForSignIn, promptHintMessage } from "../utils/OutputUtils";
 import { treeDataService } from "../service/TreeDataService";
 import {
   genFileExt,
@@ -689,7 +689,7 @@ class TreeViewController implements Disposable {
       );
       solutionService.show(solution);
     } catch (error) {
-      logOutput.appendLine(error.toString());
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
       await promptForOpenOutputChannel("Failed to fetch the top voted solution. 请查看控制台信息~", OutPutType.error);
     }
   }
@@ -701,7 +701,7 @@ class TreeViewController implements Disposable {
       // solutionService.show(solution);
       // debugContorller.try_get_diy_param();
     } catch (error) {
-      logOutput.appendLine(error.toString());
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
       await promptForOpenOutputChannel("Failed to fetch today question. 请查看控制台信息~", OutPutType.error);
     }
   }
@@ -840,7 +840,7 @@ class TreeViewController implements Disposable {
       if (finalPath) {
         finalPath = await this.resolveRelativePath(finalPath, node, language);
         if (!finalPath) {
-          logOutput.appendLine("Showing problem canceled by user.");
+          BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine("Showing problem canceled by user.");
           return;
         }
       }
@@ -985,7 +985,7 @@ class TreeViewController implements Disposable {
       const tt: userContestRanKingBase = Object.assign({}, userContestRankingObj, query_result.userContestRanking);
       eventService.emit("searchUserContest", tt);
     } catch (error) {
-      logOutput.appendLine(error.toString());
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
       await promptForOpenOutputChannel("Failed to fetch today question. 请查看控制台信息~", OutPutType.error);
     }
   }
@@ -1014,7 +1014,7 @@ class TreeViewController implements Disposable {
         await bricksDataService.refresh();
       }
     } catch (error) {
-      logOutput.appendLine(error.toString());
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
       await promptForOpenOutputChannel("Failed to fetch today question. 请查看控制台信息~", OutPutType.error);
     }
   }
@@ -1097,7 +1097,7 @@ class TreeViewController implements Disposable {
           return getDayNowStr();
         default:
           errorMsg = `The config '${placeholder}' is not supported.`;
-          logOutput.appendLine(errorMsg);
+          BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(errorMsg);
           throw new Error(errorMsg);
       }
     });

src/debugex/debugCpp.ts

@@ -1,7 +1,6 @@
 import * as fse from "fs-extra";
 import * as path from "path";
 import * as vscode from "vscode";
-import { logOutput } from "../utils/OutputUtils";
 
 import { executeCommand } from "../utils/CliUtils";
 import {
@@ -18,6 +17,7 @@ import { isWindows } from "../utils/SystemUtils";
 
 import { DebugBase } from "../debugex/debugBase";
 import { debugArgDao } from "../dao/debugArgDao";
+import { BABA, BabaStr } from "../BABA";
 
 function getGdbDefaultConfig(): IDebugConfig {
   return {
@@ -396,8 +396,8 @@ class DebugCpp extends DebugBase {
       );
     } catch (e) {
       vscode.window.showErrorMessage(e);
-      logOutput.append(e.stack);
-      logOutput.show();
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().append(e.stack);
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().show();
       return;
     }
 
@@ -450,8 +450,8 @@ class DebugCpp extends DebugBase {
       );
     } catch (e) {
       vscode.window.showErrorMessage(e);
-      logOutput.append(e.stack);
-      logOutput.show();
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().append(e.stack);
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().show();
       return;
     }
 

src/extension.ts

@@ -13,7 +13,7 @@ import { treeViewController } from "./controller/TreeViewController";
 import { NodeModel } from "./model/NodeModel";
 import { treeDataService } from "./service/TreeDataService";
 import { treeItemDecorationService } from "./service/TreeItemDecorationService";
-import { logOutput, promptForOpenOutputChannel } from "./utils/OutputUtils";
+import { promptForOpenOutputChannel } from "./utils/OutputUtils";
 import { executeService } from "./service/ExecuteService";
 import { eventController } from "./controller/EventController";
 import { previewService } from "./service/PreviewService";
@@ -26,12 +26,12 @@ import { getLeetCodeEndpoint } from "./utils/ConfigUtils";
 import { BricksType, OutPutType, RemarkComment } from "./model/Model";
 import { bricksDataService } from "./service/BricksDataService";
 import { bricksViewController } from "./controller/BricksViewController";
-import { remarkController } from "./controller/RemarkController";
 import { debugContorller } from "./controller/DebugController";
 import { BABA, BabaStr } from "./BABA";
 import { StatusBarTimeMediator, StatusBarTimeProxy } from "./statusBarTime/StatusBarTimeModule";
 import { StatusBarMediator, StatusBarProxy } from "./statusBar/StatusBarModule";
-import { RemarkProxy, RemarkMediator } from "./service/RemarkService";
+import { LogOutputMediator, LogOutputProxy } from "./logOutput/logOutputModule";
+import { RemarkMediator, RemarkProxy } from "./remark/RemarkServiceModule";
 
 //==================================BABA========================================
 
@@ -52,8 +52,12 @@ export async function activate(context: ExtensionContext): Promise<void> {
       StatusBarMediator,
       RemarkProxy,
       RemarkMediator,
+      LogOutputProxy,
+      LogOutputMediator,
     ]);
 
+    BABA.sendNotification(BabaStr.InitAll, context);
+
     // 初始化控制器
     mainContorller.initialize(context);
     // 检查node环境
@@ -64,7 +68,6 @@ export async function activate(context: ExtensionContext): Promise<void> {
 
     // 资源管理
     context.subscriptions.push(
-      logOutput,
       previewService,
       submissionService,
       solutionService,
@@ -133,31 +136,31 @@ export async function activate(context: ExtensionContext): Promise<void> {
       commands.registerCommand("lcpr.removeQidFromGroup", (node) => bricksViewController.removeQidFromGroup(node)),
 
       commands.registerCommand("lcpr.remarkCreateNote", (reply: CommentReply) => {
-        remarkController.remarkCreateNote(reply);
+        BABA.sendNotification(BabaStr.Remark_remarkCreateNote, reply);
       }),
       commands.registerCommand("lcpr.remarkClose", (a) => {
-        remarkController.remarkClose(a);
+        BABA.sendNotification(BabaStr.Remark_remarkClose, a);
       }),
       commands.registerCommand("lcpr.remarkReplyNote", (reply: CommentReply) => {
-        remarkController.remarkReplyNote(reply);
+        BABA.sendNotification(BabaStr.Remark_remarkReplyNote, reply);
       }),
       commands.registerCommand("lcpr.remarkDeleteNoteComment", (comment: RemarkComment) => {
-        remarkController.remarkDeleteNoteComment(comment);
+        BABA.sendNotification(BabaStr.Remark_remarkDeleteNoteComment, comment);
       }),
       commands.registerCommand("lcpr.remarkCancelsaveNote", (comment: RemarkComment) => {
-        remarkController.remarkCancelsaveNote(comment);
+        BABA.sendNotification(BabaStr.Remark_remarkCancelsaveNote, comment);
       }),
       commands.registerCommand("lcpr.remarkSaveNote", (comment: RemarkComment) => {
-        remarkController.remarkSaveNote(comment);
+        BABA.sendNotification(BabaStr.Remark_remarkSaveNote, comment);
       }),
       commands.registerCommand("lcpr.remarkEditNote", (comment: RemarkComment) => {
-        remarkController.remarkEditNote(comment);
+        BABA.sendNotification(BabaStr.Remark_remarkEditNote, comment);
       }),
       commands.registerCommand("lcpr.startRemark", (document: TextDocument) => {
-        remarkController.startRemark(document);
+        BABA.sendNotification(BabaStr.Remark_startRemark, document);
       }),
       commands.registerCommand("lcpr.includeTemplates", (document: TextDocument) => {
-        remarkController.includeTemplates(document);
+        BABA.sendNotification(BabaStr.Remark_includeTemplates, document);
       }),
       commands.registerCommand("lcpr.simpleDebug", (document: TextDocument, testCase?) =>
         debugContorller.startDebug(document, testCase)
@@ -176,7 +179,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
     await loginContorller.getLoginStatus();
     await bricksViewController.initialize();
   } catch (error) {
-    logOutput.appendLine(error.toString());
+    BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
     promptForOpenOutputChannel(
       "Extension initialization failed. Please open output channel for details.",
       OutPutType.error