新的mvc

Author: ccagml

src/BABA.ts

@@ -0,0 +1,64 @@
+/*
+ * Filename: /home/cc/leetcode-extension/src/BABA.ts
+ * Path: /home/cc/leetcode-extension
+ * Created Date: Saturday, September 23rd 2023, 8:17:16 pm
+ * Author: ccagml
+ *
+ * Copyright (c) 2023 ccagml . All rights reserved
+ */
+
+import { BaseCC } from "./utils/BaseCC";
+export * as BaseCC from "./utils/BaseCC";
+export enum BabaStr {
+  every_second = "every_second",
+  StatusBarTimeMediator = "StatusBarTimeMediator",
+  StatusBarTimeProxy = "StatusBarTimeProxy",
+  submit = "submit",
+  showProblemFinish = "showProblemFinish",
+  VSCODE_DISPOST = "VSCODE_DISPOST",
+  statusBarTime_start = "statusBarTime_start",
+  statusBarTime_stop = "statusBarTime_stop",
+  statusBarTime_reset = "statusBarTime_reset",
+  StatusBarProxy = "StatusBarProxy",
+  StatusBarMediator = "StatusBarMediator",
+  statusBar_update_status = "statusBar_update_status",
+  statusBar_update = "statusBar_update",
+  statusBar_update_UserContestInfo = "statusBar_update_UserContestInfo",
+}
+
+export class BABA {
+  public static fa;
+  public static init() {
+    this.fa = BaseCC.Facade.getInstance("lcpr");
+  }
+  public static regClazz(clazz_list) {
+    let len = clazz_list.length;
+    for (let j = 0; j < len; j++) {
+      this[clazz_list[j].NAME] = new clazz_list[j]();
+    }
+  }
+
+  public static dispose(): any {
+    this.sendNotification(BabaStr.VSCODE_DISPOST);
+  }
+  public static sendNotification(name: string, body?: any, type?: string) {
+    this.fa.sendNotification(name, body, type);
+  }
+
+  public static getProxy(name: string) {
+    return this.fa.retrieveProxy(name);
+  }
+}
+
+export class BABAProxy extends BaseCC.Proxy {
+  constructor(name: string) {
+    super(name);
+    BABA.fa.registerProxy(this);
+  }
+}
+export class BABAMediator extends BaseCC.Mediator {
+  constructor(name: string) {
+    super(name);
+    BABA.fa.registerMediator(this);
+  }
+}

src/controller/EventController.ts

@@ -8,7 +8,6 @@
  */
 
 import { eventService } from "../service/EventService";
-import { statusBarTimeService } from "../service/StatusBarTimeService";
 // 事件的控制器
 /* The EventController class has a method called addEvent that calls the addEvent method on the
 eventService class */
@@ -23,10 +22,6 @@ class EventContorller {
   public addEvent() {
     eventService.addEvent();
   }
-
-  public every_second() {
-    statusBarTimeService.updateSecond();
-  }
 }
 
 export const eventController: EventContorller = new EventContorller();

src/controller/LoginController.ts

@@ -15,10 +15,10 @@ import { createEnvOption } from "../utils/CliUtils";
 import { logOutput, promptForOpenOutputChannel } from "../utils/OutputUtils";
 import { eventService } from "../service/EventService";
 import { window, QuickPickOptions, ProgressLocation, Progress } from "vscode";
-import { statusBarService } from "../service/StatusBarService";
 import { treeDataService } from "../service/TreeDataService";
 import { getLeetCodeEndpoint } from "../utils/ConfigUtils";
 import { bricksDataService } from "../service/BricksDataService";
+import { BABA, BabaStr } from "../BABA";
 
 // 登录控制器
 class LoginContorller {
@@ -203,7 +203,7 @@ class LoginContorller {
    * @returns The login status of the user.
    */
   public async getLoginStatus() {
-    return await statusBarService.getLoginStatus();
+    return await BABA.getProxy(BabaStr.StatusBarProxy).getLoginStatus();
   }
 
   // 删除所有缓存

src/controller/TreeViewController.ts

@@ -55,7 +55,6 @@ import {
 } from "../utils/ConfigUtils";
 import { NodeModel } from "../model/NodeModel";
 import { ISearchSet } from "../model/Model";
-import { statusBarService } from "../service/StatusBarService";
 import { previewService } from "../service/PreviewService";
 import { executeService } from "../service/ExecuteService";
 import { getNodeIdFromFile } from "../utils/SystemUtils";
@@ -80,6 +79,7 @@ import { submissionService } from "../service/SubmissionService";
 import { bricksDataService } from "../service/BricksDataService";
 import { groupDao } from "../dao/groupDao";
 import { fileMeta, ProblemMeta } from "../utils/problemUtils";
+import { BABA, BabaStr } from "../BABA";
 
 // 视图控制器
 class TreeViewController implements Disposable {
@@ -111,7 +111,8 @@ class TreeViewController implements Disposable {
    * @returns A promise that resolves to a string.
    */
   public async submitSolution(uri?: vscode.Uri): Promise<void> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       promptForSignIn();
       return;
     }
@@ -144,7 +145,8 @@ class TreeViewController implements Disposable {
    */
   public async testSolution(uri?: vscode.Uri): Promise<void> {
     try {
-      if (statusBarService.getStatus() === UserStatus.SignedOut) {
+      let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+      if (sbp.getStatus() === UserStatus.SignedOut) {
         return;
       }
 
@@ -254,7 +256,8 @@ class TreeViewController implements Disposable {
    */
   public async testCaseDef(uri?: vscode.Uri, allCase?: boolean): Promise<void> {
     try {
-      if (statusBarService.getStatus() === UserStatus.SignedOut) {
+      let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+      if (sbp.getStatus() === UserStatus.SignedOut) {
         return;
       }
 
@@ -289,7 +292,8 @@ class TreeViewController implements Disposable {
    */
   public async reTestSolution(uri?: vscode.Uri): Promise<void> {
     try {
-      if (statusBarService.getStatus() === UserStatus.SignedOut) {
+      let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+      if (sbp.getStatus() === UserStatus.SignedOut) {
         return;
       }
 
@@ -337,7 +341,8 @@ class TreeViewController implements Disposable {
    */
   public async tesCaseArea(uri?: vscode.Uri, testcase?: string): Promise<void> {
     try {
-      if (statusBarService.getStatus() === UserStatus.SignedOut) {
+      let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+      if (sbp.getStatus() === UserStatus.SignedOut) {
         return;
       }
 
@@ -505,7 +510,8 @@ class TreeViewController implements Disposable {
    */
   public async getAllProblems(): Promise<IProblem[]> {
     try {
-      if (statusBarService.getStatus() === UserStatus.SignedOut) {
+      let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+      if (sbp.getStatus() === UserStatus.SignedOut) {
         return [];
       }
 
@@ -603,7 +609,7 @@ class TreeViewController implements Disposable {
       return;
     }
 
-    if (!statusBarService.getUser() && choice.value != "testapi") {
+    if (!BABA.getProxy(BabaStr.StatusBarProxy).getUser() && choice.value != "testapi") {
       promptForSignIn();
       return;
     }
@@ -701,7 +707,8 @@ class TreeViewController implements Disposable {
   }
 
   public async searchProblemByID(): Promise<void> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       promptForSignIn();
       return;
     }
@@ -769,7 +776,8 @@ class TreeViewController implements Disposable {
     const problems: IProblem[] = await this.getAllProblems();
     let randomProblem: IProblem;
 
-    const user_score = statusBarService.getUserContestScore();
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    const user_score = sbp.getUserContestScore();
     if (user_score > 0) {
       let min_score: number = getPickOneByRankRangeMin();
       let max_score: number = getPickOneByRankRangeMax();
@@ -956,13 +964,14 @@ class TreeViewController implements Disposable {
   }
 
   public async searchUserContest(): Promise<void> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       promptForSignIn();
       return;
     }
     try {
       const needTranslation: boolean = isUseEndpointTranslation();
-      const solution: string = await executeService.getUserContest(needTranslation, statusBarService.getUser() || "");
+      const solution: string = await executeService.getUserContest(needTranslation, sbp.getUser() || "");
       const query_result = JSON.parse(solution);
       const tt: userContestRanKingBase = Object.assign({}, userContestRankingObj, query_result.userContestRanking);
       eventService.emit("searchUserContest", tt);
@@ -972,7 +981,8 @@ class TreeViewController implements Disposable {
     }
   }
   public async searchToday(): Promise<void> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       promptForSignIn();
       return;
     }
@@ -1137,7 +1147,8 @@ class TreeViewController implements Disposable {
   }
 
   public async refreshCheck(): Promise<void> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       return;
     }
     const day_start = systemUtils.getDayStart(); //获取当天零点的时间
@@ -1156,7 +1167,8 @@ class TreeViewController implements Disposable {
       this.waitTodayQuestion = true;
       await this.searchToday();
     }
-    let user_score = statusBarService.getUserContestScore();
+
+    let user_score = sbp.getUserContestScore();
     if (!user_score && !this.waitUserContest) {
       this.waitUserContest = true;
       await this.searchUserContest();
@@ -1168,7 +1180,10 @@ class TreeViewController implements Disposable {
     const temp_waitTodayQuestion: boolean = this.waitTodayQuestion;
     const temp_waitUserContest: boolean = this.waitUserContest;
     this.clearCache();
-    let user_score = statusBarService.getUserContestScore();
+
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+
+    let user_score = sbp.getUserContestScore();
     for (const problem of await this.getAllProblems()) {
       this.explorerNodeMap.set(problem.id, new NodeModel(problem, true, user_score));
       this.fidToQid.set(problem.id, problem.qid.toString());
@@ -1188,7 +1203,8 @@ class TreeViewController implements Disposable {
   }
 
   public getRootNodes(): NodeModel[] {
-    let user_score = statusBarService.getUserContestScore();
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    let user_score = sbp.getUserContestScore();
     const baseNode: NodeModel[] = [
       new NodeModel(
         Object.assign({}, defaultProblem, {

src/extension.ts

@@ -16,7 +16,6 @@ import { treeItemDecorationService } from "./service/TreeItemDecorationService";
 import { logOutput, promptForOpenOutputChannel } from "./utils/OutputUtils";
 import { executeService } from "./service/ExecuteService";
 import { eventController } from "./controller/EventController";
-import { statusBarService } from "./service/StatusBarService";
 import { previewService } from "./service/PreviewService";
 import { solutionService } from "./service/SolutionService";
 import { submissionService } from "./service/SubmissionService";
@@ -27,9 +26,13 @@ import { getLeetCodeEndpoint } from "./utils/ConfigUtils";
 import { BricksType, OutPutType, RemarkComment } from "./model/Model";
 import { bricksDataService } from "./service/BricksDataService";
 import { bricksViewController } from "./controller/BricksViewController";
-import { statusBarTimeService } from "./service/StatusBarTimeService";
 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";
+
+//==================================BABA========================================
 
 // 激活插件
 /**
@@ -40,6 +43,9 @@ import { debugContorller } from "./controller/DebugController";
 let lcpr_timer;
 export async function activate(context: ExtensionContext): Promise<void> {
   try {
+    BABA.init();
+    BABA.regClazz([StatusBarTimeMediator, StatusBarTimeProxy, StatusBarProxy, StatusBarMediator]);
+
     // 初始化控制器
     mainContorller.initialize(context);
     // 检查node环境
@@ -50,14 +56,13 @@ export async function activate(context: ExtensionContext): Promise<void> {
 
     // 资源管理
     context.subscriptions.push(
-      statusBarService,
       logOutput,
       previewService,
       submissionService,
       solutionService,
       executeService,
       markdownService,
-      statusBarTimeService,
+      BABA,
       fileButtonController,
       treeViewController,
       window.registerFileDecorationProvider(treeItemDecorationService),
@@ -84,9 +89,15 @@ export async function activate(context: ExtensionContext): Promise<void> {
       commands.registerCommand("lcpr.addFavorite", (node: NodeModel) => treeViewController.addFavorite(node)),
       commands.registerCommand("lcpr.removeFavorite", (node: NodeModel) => treeViewController.removeFavorite(node)),
       commands.registerCommand("lcpr.problems.sort", () => treeViewController.switchSortingStrategy()),
-      commands.registerCommand("lcpr.statusBarTime.start", () => statusBarTimeService.start()),
-      commands.registerCommand("lcpr.statusBarTime.stop", () => statusBarTimeService.stop()),
-      commands.registerCommand("lcpr.statusBarTime.reset", () => statusBarTimeService.reset()),
+      commands.registerCommand("lcpr.statusBarTime.start", () => {
+        BABA.sendNotification(BabaStr.statusBarTime_start);
+      }),
+      commands.registerCommand("lcpr.statusBarTime.stop", () => {
+        BABA.sendNotification(BabaStr.statusBarTime_stop);
+      }),
+      commands.registerCommand("lcpr.statusBarTime.reset", () => {
+        BABA.sendNotification(BabaStr.statusBarTime_reset);
+      }),
       commands.registerCommand("lcpr.setBricksType0", (node: NodeModel) =>
         bricksViewController.setBricksType(node, BricksType.TYPE_0)
       ),
@@ -163,10 +174,14 @@ export async function activate(context: ExtensionContext): Promise<void> {
       OutPutType.error
     );
   } finally {
-    lcpr_timer = setInterval(eventController.every_second, 1000);
+    lcpr_timer = setInterval(lcpr_timer_callback, 1000);
   }
 }
 
+function lcpr_timer_callback() {
+  BABA.sendNotification(BabaStr.every_second);
+}
+
 export function deactivate(): void {
   // Do nothing.
   if (0) {

src/service/BricksDataService.ts

@@ -11,9 +11,9 @@ import { TreeDataProvider, EventEmitter, Event, TreeItem, TreeItemCollapsibleSta
 import { BricksNormalId, defaultProblem, ISubmitEvent } from "../model/Model";
 import { bricksViewController } from "../controller/BricksViewController";
 import { BricksNode } from "../model/NodeModel";
-import { statusBarService } from "./StatusBarService";
 import { bricksDao } from "../dao/bricksDao";
 import { groupDao } from "../dao/groupDao";
+import { BABA, BabaStr } from "../BABA";
 
 export class BricksDataService implements TreeDataProvider<BricksNode> {
   private onDidChangeTreeDataEvent: EventEmitter<BricksNode | undefined | null> = new EventEmitter<
@@ -66,7 +66,8 @@ export class BricksDataService implements TreeDataProvider<BricksNode> {
 
   // 获取子节点信息
   public async getChildren(element?: BricksNode | undefined): Promise<BricksNode[] | null | undefined> {
-    if (!statusBarService.getUser()) {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
       return [
         new BricksNode(
           Object.assign({}, defaultProblem, {