调试时, TreeNode 参数类型的数据,测试用例数据是整数时的调试参数解析问题

ccagml · ccagml · commit 21cceb5a722f · 2023-11-06T23:49:07.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # version 3.1.6
 
 - 每日一题完成后延迟 5 秒请求数据(因为马上请求,获得的状态还是未完成)
+- 调试时, TreeNode 参数类型的数据,测试用例数据是整数时的调试参数解析问题
 
 # version 3.1.5
 
diff --git a/resources/debug/entry/cpp/problems/common.cpp b/resources/debug/entry/cpp/problems/common.cpp
@@ -1,5 +1,5 @@
-#include <vector>
 #include <queue>
+#include <vector>
 using namespace std;
 
 #include "cJSON.h"
@@ -240,6 +240,13 @@ TreeNode *parseTreeNode(const cJSON *node)
     queue<TreeNode *> q;
     int i = 0;
 
+    // LCP 194题的参数 是整数
+    if (node->type == cJSON_Number)
+    {
+        TreeNode *child = new TreeNode(node->valueint);
+        return child;
+    }
+
     if (node->type != cJSON_Array)
     {
         throw "Parse parameter error, expect NumberArray";
diff --git a/resources/debug/entry/javascript/entry.js b/resources/debug/entry/javascript/entry.js
@@ -11,7 +11,7 @@ const sock = net.connect(
         port: debugServerPort,
         host: "127.0.0.1",
     },
-    function() {
+    function () {
         start();
     },
 );
@@ -47,7 +47,7 @@ function onSuccess() {
     onClose();
 }
 
-process.on("uncaughtException", function(err) {
+process.on("uncaughtException", function (err) {
     onError(err.message + "\n" + err.stack);
     throw err;
 });
@@ -209,7 +209,7 @@ function NestedInteger(ni) {
      * Return true if this NestedInteger holds a single integer, rather than a nested list.
      * @return { boolean }
      */
-    this.isInteger = function() {
+    this.isInteger = function () {
         if (Array.isArray(ni)) {
             return false;
         }
@@ -221,7 +221,7 @@ function NestedInteger(ni) {
      * Return null if this NestedInteger holds a nested list
      * @return { integer }
      */
-    this.getInteger = function() {
+    this.getInteger = function () {
         if (Array.isArray(ni)) {
             return null;
         }
@@ -233,7 +233,7 @@ function NestedInteger(ni) {
      * Return null if this NestedInteger holds a single integer
      * @return { NestedInteger[] }
      */
-    this.getList = function() {
+    this.getList = function () {
         if (Array.isArray(ni)) {
             return nested;
         }
@@ -256,14 +256,14 @@ function parseMountainArray(param) {
          * @param {integer} index
          * @return {integer}
          */
-        this.get = function(index) {
+        this.get = function (index) {
             return param[index];
         };
 
         /**
          * @return {integer}
          */
-        this.length = function() {
+        this.length = function () {
             return param.length;
         };
     }
@@ -276,6 +276,12 @@ function TreeNode(val) {
 }
 
 function parseTreeNode(param) {
+    // LCP 194题的参数 是整数
+    if (isNumber(param)) {
+        return new TreeNode(param);
+    }
+
+
     if (!Array.isArray(param)) {
         onParameterError();
     }
diff --git a/resources/debug/entry/python3/entry.py b/resources/debug/entry/python3/entry.py
@@ -218,6 +218,9 @@ def parseMountainArray(param):
 
 
 def parseTreeNode(param):
+    # LCP 194题的参数 是整数
+    if (isNumber(param)):
+        return TreeNode(param)
     if (not isList(param)):
         onParameterError()
 
diff --git a/src/BABA.ts b/src/BABA.ts
@@ -13,6 +13,7 @@ import { BaseCC } from "./utils/BaseCC";
 export * as BaseCC from "./utils/BaseCC";
 export enum BabaStr {
   every_second = "every_second",
+  every_minute = "every_minute",
   StatusBarTimeMediator = "StatusBarTimeMediator",
   StatusBarTimeProxy = "StatusBarTimeProxy",
   RemarkMediator = "RemarkMediator",
diff --git a/src/debug/DoPy3.ts b/src/debug/DoPy3.ts
@@ -42,14 +42,17 @@ export class DebugPy3 {
       return;
     }
 
-    debugConfig.program = await getEntryFile(meta.lang, meta.id);
+    const numericStr = meta.id.replace(/\D/g, ""); // 去除非数字字符
+    const temp_meta_id = parseInt(numericStr, 10);
+
+    debugConfig.program = await getEntryFile(meta.lang, temp_meta_id.toString());
 
     // check whether module.exports is exist or not
     const moduleExportsReg: RegExp = /# @lcpr-before-debug-begin/;
     if (!moduleExportsReg.test(fileContent.toString())) {
       await fse.writeFile(
         filePath,
-        `# @lcpr-before-debug-begin\nfrom python3problem${meta.id} import *\nfrom typing import *\n# @lcpr-before-debug-end\n\n` +
+        `# @lcpr-before-debug-begin\nfrom python3problem${temp_meta_id.toString()} import *\nfrom typing import *\n# @lcpr-before-debug-end\n\n` +
           fileContent.toString()
       );
     }
@@ -60,7 +63,7 @@ export class DebugPy3 {
       problemType.funName,
       problemType.paramTypes.join(","),
       problemType.returnType || "returnType",
-      meta.id,
+      temp_meta_id.toString(),
       port.toString(),
     ];
     vscode.debug.startDebugging(
diff --git a/src/extension.ts b/src/extension.ts
@@ -38,7 +38,8 @@ import { TodayDataMediator, TodayDataProxy } from "./todayData/TodayDataModule";
  * @param {ExtensionContext} context - ExtensionContext
  */
 
-let lcpr_timer;
+let lcpr_timer_sec;
+let lcpr_timer_min;
 export async function activate(context: ExtensionContext): Promise<void> {
   try {
     BABA.init([
@@ -225,22 +226,29 @@ export async function activate(context: ExtensionContext): Promise<void> {
     BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
     ShowMessage("Extension initialization failed. Please open output channel for details.", OutPutType.error);
   } finally {
-    lcpr_timer = setInterval(lcpr_timer_callback, 1000);
+    lcpr_timer_sec = setInterval(() => {
+      new Promise(async (resolve, _) => {
+        await BABA.sendNotificationAsync(BabaStr.every_second);
+        resolve(1);
+      });
+    }, 1000);
+    lcpr_timer_min = setInterval(() => {
+      new Promise(async (resolve, _) => {
+        await BABA.sendNotificationAsync(BabaStr.every_minute);
+        resolve(1);
+      });
+    }, 60000);
   }
 }
 
-function lcpr_timer_callback() {
-  BABA.sendNotification(BabaStr.every_second);
-}
-
 export function deactivate(): void {
   // Do nothing.
-  if (0) {
-    let a = 0;
-    console.log(a);
+  if (lcpr_timer_sec != undefined) {
+    clearInterval(lcpr_timer_sec);
+    lcpr_timer_sec = undefined;
   }
-  if (lcpr_timer != undefined) {
-    clearInterval(lcpr_timer);
-    lcpr_timer = undefined;
+  if (lcpr_timer_min != undefined) {
+    clearInterval(lcpr_timer_min);
+    lcpr_timer_min = undefined;
   }
 }
diff --git a/src/todayData/TodayDataModule.ts b/src/todayData/TodayDataModule.ts
@@ -12,7 +12,7 @@ import { ISubmitEvent, OutPutType } from "../model/ConstDefind";
 import { ITodayDataResponse } from "../model/TreeNodeModel";
 import { isUseEndpointTranslation } from "../utils/ConfigUtils";
 import { promptForSignIn, ShowMessage } from "../utils/OutputUtils";
-import { getDayEnd, getDayStart } from "../utils/SystemUtils";
+import { getDayEnd, getDayNow, getDayStart } from "../utils/SystemUtils";
 
 class TodayData {
   fidInfo: Map<string, ITodayDataResponse> = new Map<string, ITodayDataResponse>();
@@ -25,18 +25,23 @@ class TodayData {
     return this.fidInfo.get(fid);
   }
 
-  checkNeedReadNew() {
+  async checkNeedReadNew() {
     const day_start = getDayStart(); //获取当天零点的时间
     const day_end = getDayEnd(); //获取当天23:59:59的时间
     let need_get_today: boolean = true;
 
+    let cur_time = getDayNow();
+    if (cur_time > day_start + 600 || cur_time < day_start + 300) {
+      return;
+    }
+
     this.fidInfo.forEach((value) => {
       if (day_start <= value.time && value.time <= day_end) {
         need_get_today = false;
       }
     });
     if (need_get_today) {
-      BABA.getProxy(BabaStr.TodayDataProxy).searchToday();
+      await BABA.getProxy(BabaStr.TodayDataProxy).searchToday();
     }
   }
   public async checkSubmit(e: ISubmitEvent) {
@@ -111,7 +116,13 @@ export class TodayDataMediator extends BABAMediator {
   }
 
   listNotificationInterests(): string[] {
-    return [BabaStr.VSCODE_DISPOST, BabaStr.StartReadData, BabaStr.CommitResult_showFinish, BabaStr.BABACMD_refresh];
+    return [
+      BabaStr.VSCODE_DISPOST,
+      BabaStr.StartReadData,
+      BabaStr.CommitResult_showFinish,
+      BabaStr.BABACMD_refresh,
+      BabaStr.every_minute,
+    ];
   }
   async handleNotification(_notification: BaseCC.BaseCC.INotification) {
     switch (_notification.getName()) {
@@ -126,6 +137,9 @@ export class TodayDataMediator extends BABAMediator {
       case BabaStr.BABACMD_refresh:
         BABA.getProxy(BabaStr.TodayDataProxy).searchToday();
         break;
+      case BabaStr.every_minute:
+        await todayData.checkNeedReadNew();
+        break;
       default:
         break;
     }
