Merge pull request #333 from NullorNone/feature-current-contest-display

添加了近期竞赛列表

Author: ccagml

README.md

@@ -31,6 +31,7 @@
 - 增加 cpp、js、py3 一些题目的 debug(参考 wangtao0101 项目,有问题提 issues)
 - [有些题目原插件无法调试,请尝试配置区域调试参数](#区域调试参数的一些说明)
 - [国际站修改登录方式 cRUL 方式登录](#cRUL 登录)
+- [增加近期竞赛回顾](#近期竞赛回顾)
 
 # 关于本项目
 
@@ -52,6 +53,13 @@
 
 ![search](https://www.ccagml.com/wp-content/uploads/2022/10/search.gif)
 
+## 近期竞赛回顾
+
+![search](./resources/leetcode-extension-recentcontests.gif)
+
+  - 近期比赛数据和比赛的题目通过中文官网在线获取
+  - 国际站并无对应api，因此即使在国际站点下也是通过中文站点获取的数据，同时由于没有登录参数，可能存在无法获取数据的情况。
+
 ## 区块测试用例
 
 ### 例子(cpp 文件为例)
@@ -141,7 +149,11 @@
 - 获取提交历史(直接找官方的提交数据)
 - 提交答案与期望答案不同的地方?
 - (完成)做题目计时
-- 还没出分前周赛题目显示 未评分(需要官网获取最新几期的题目编号) -->
+- (完成)还没出分前周赛题目显示 未评分(需要官网获取最新几期的题目编号)
+- (完成)在线获取周赛编号下的题目
+- 将搜索功能中的竞赛修改为在线获取题目，将周赛与双周赛分开，同时可以检索未出分前的竞赛题目
+- 将近期竞赛的显示数量修改为可配置选项
+- -->
 
 ## 搬砖功能的说明
 

resources/leetcode-extension-recentcontests.gif

@@ -88,6 +88,8 @@ export enum BabaStr {
   TreeData_rebuildTreeData = "TreeData_rebuildTreeData",
   QuestionData_ReBuildQuestionDataFinish = "QuestionData_ReBuildQuestionDataFinish",
   TreeData_searchTodayFinish = "TreeData_searchTodayFinish",
+  TreeData_searchRecentContestFinish = "TreeData_searchRecentContestFinish",
+  TreeData_searchContestQuestionFinish = "TreeData_searchContestQuestionFinish",
   TreeData_searchUserContest = "TreeData_searchUserContest",
   TreeData_searchUserContestFinish = "TreeData_searchUserContestFinish",
   TreeData_searchScoreRangeFinish = "TreeData_searchScoreRangeFinish",
@@ -134,6 +136,10 @@ export enum BabaStr {
   BricksData_removeQidFromGroupFinish = "BricksData_removeQidFromGroupFinish",
   TodayDataProxy = "TodayDataProxy",
   TodayDataMediator = "TodayDataMediator",
+  RecentContestProxy = "RecentContestProxy",
+  RecentContestMediator = "RecentContestMediator",
+  ContestQuestionProxy = "ContestQuestionProxy",
+  ContestQuestionMediator = "ContestQuestionMediator",
 }
 
 export class BABA {

src/BABA.ts

@@ -291,6 +291,23 @@ class ExecuteService implements Disposable {
     return solution;
   }
 
+  public async getRecentContest(needTranslation: boolean): Promise<string> {
+    // solution don't support translation
+    const cmd: string[] = [await this.getLeetCodeBinaryPath(), "query", "-i"];
+    if (!needTranslation) {
+      cmd.push("-T");
+    }
+    const solution: string = await this.callWithMsg("正在获取近期竞赛~", this.nodeExecutable, cmd);
+    return solution;
+  }
+
+  public async getContestQuestion(contestName: string): Promise<string> {
+    // solution don't support translation
+    const cmd: string[] = [await this.getLeetCodeBinaryPath(), "query", "-j", contestName];
+    const solution: string = await this.callWithMsg("正在获取近期竞赛的题目~", this.nodeExecutable, cmd);
+    return solution;
+  }
+
   public async getDescription(problemNodeId: string, needTranslation: boolean): Promise<string> {
     const cmd: string[] = [await this.getLeetCodeBinaryPath(), "show", problemNodeId, "-x"];
     if (!needTranslation) {

src/childCall/childCallModule.ts

@@ -46,7 +46,7 @@ import {
   getBelongingWorkspaceFolderUri,
   selectWorkspaceFolder,
 } from "../utils/ConfigUtils";
-import { CreateTreeNodeModel, ITodayDataResponse, TreeNodeModel, TreeNodeType } from "../model/TreeNodeModel";
+import { CreateTreeNodeModel, ITodayDataResponse, TreeNodeModel, TreeNodeType, ITreeDataNormal } from "../model/TreeNodeModel";
 import { ISearchSet } from "../model/ConstDefind";
 
 import { ShowMessage, promptForSignIn, promptHintMessage } from "../utils/OutputUtils";
@@ -1032,6 +1032,14 @@ class TreeViewController implements Disposable {
         },
         TreeNodeType.Tree_contest
       ),
+      CreateTreeNodeModel(
+        {
+          id: Category.RecentContestList,
+          name: Category.RecentContestList,
+          rootNodeSortId: RootNodeSort.RecentContestList,
+        },
+        TreeNodeType.Tree_recentContestList
+      ),
     ];
 
     // 获取每日一题的数据
@@ -1148,6 +1156,30 @@ class TreeViewController implements Disposable {
     return sortNodeList(sorceNode);
   }
 
+  public getRecentContestList(): TreeNodeModel[] {
+      const sorceNode: TreeNodeModel[] = [];
+      let recentContestNodeList: ITreeDataNormal[] | undefined = BABA.getProxy(BabaStr.RecentContestProxy).getAllContestTreeNode();
+
+      if (recentContestNodeList != undefined) {
+        for (let i = 0; i < recentContestNodeList.length; i++) {
+          sorceNode.push(CreateTreeNodeModel(recentContestNodeList[i], TreeNodeType.Tree_recentContestList_contest));
+        }
+      }
+      return sortNodeList(sorceNode);
+    }
+
+  public getContestQuestionNodes(element: TreeNodeModel): TreeNodeModel[] {
+    const sorceNode: TreeNodeModel[] = [];
+    let questionList = BABA.getProxy(BabaStr.ContestQuestionProxy).getContestQuestionData(element.id);
+    for (let question of questionList) {
+      let DayQuestionNode: TreeNodeModel | undefined = BABA.getProxy(BabaStr.QuestionDataProxy).getNodeByQid(question);
+      if (DayQuestionNode != undefined) {
+        sorceNode.push(CreateTreeNodeModel(DayQuestionNode.get_data(), TreeNodeType.Tree_recentContestList_contest_leaf));
+      }
+    }
+    return sortNodeList(sorceNode);
+  }
+
   public getAllNodes(): TreeNodeModel[] {
     const res: TreeNodeModel[] = [];
 

src/controller/TreeViewController.ts

@@ -52,7 +52,7 @@ export class DebugPy3 {
     if (!moduleExportsReg.test(fileContent.toString())) {
       await fse.writeFile(
         filePath,
-        `# @lcpr-before-debug-begin\nfrom python3problem${temp_meta_id.toString()} import *\nfrom typing import *\n# @lcpr-before-debug-end\n\n` +
+        `# @lcpr-before-debug-begin\nfrom python3problem${temp_meta_id.toString()} import * # type: ignore \nfrom typing import *\n# @lcpr-before-debug-end\n\n` +
           fileContent.toString()
       );
     }

src/debug/DoPy3.ts

@@ -29,6 +29,8 @@ import { PreviewMediator, PreviewProxy } from "./preView/PreviewModule";
 import { DebugMediator, DebugProxy } from "./debug/DebugModule";
 import { RankScoreDataMediator, RankScoreDataProxy } from "./rankScore/RankScoreDataModule";
 import { TodayDataMediator, TodayDataProxy } from "./todayData/TodayDataModule";
+import { RecentContestMediator, RecentContestProxy } from "./recentContestData/RecentContestDataModule";
+import { ContestQuestionMediator, ContestQuestionProxy } from "./recentContestData/ContestQuestionDataModule";
 
 //==================================BABA========================================
 
@@ -73,6 +75,10 @@ export async function activate(context: ExtensionContext): Promise<void> {
       RankScoreDataMediator,
       TodayDataProxy,
       TodayDataMediator,
+      RecentContestProxy,
+      RecentContestMediator,
+      ContestQuestionProxy,
+      ContestQuestionMediator,
     ]);
 
     // 资源管理

src/extension.ts

@@ -136,6 +136,7 @@ export enum RootNodeSort {
   Score = 8,
   ScoreRange = 9,
   Contest = 9,
+  RecentContestList = 10,
   DIFEASY = 1,
   DIFMID = 2,
   DIFHARD = 3,
@@ -196,6 +197,7 @@ export enum Category {
   Score = "Score",
   Choice = "Choice",
   Contest = "Contest",
+  RecentContestList = "RecentContestList",
 }
 
 export enum DescriptionConfiguration {

src/model/ConstDefind.ts

@@ -71,6 +71,15 @@ export interface ITodayDataResponse {
   time: number;
 }
 
+// 竞赛的数据
+export interface IContestData {
+  index: number;
+  title: string;
+  titleSlug: string;
+  startTime: number;
+  duration: number;
+}
+
 export enum TreeNodeType {
 
   // 功能节点
@@ -127,6 +136,9 @@ export enum TreeNodeType {
   Tree_search_score_leaf = 10911, // 分数范围的叶子
   Tree_search_contest_leaf = 10921, // 分数范围的叶子
 
+  Tree_recentContestList = 11000,  // 题目列表 最近比赛列表
+  Tree_recentContestList_contest = 11010,  // 题目列表 最近比赛列表/比赛
+  Tree_recentContestList_contest_leaf = 11011,  // 题目列表 最近比赛列表/比赛/题目
 
   // 工地=================
 
@@ -167,7 +179,8 @@ export function is_problem_by_nodeType(nt) {
     nodeType == TreeNodeType.Tree_contest_Q4_leaf ||
     nodeType == TreeNodeType.Bricks_NeedReview_Day_leaf ||
     nodeType == TreeNodeType.Bricks_TodaySubmit_leaf ||
-    nodeType == TreeNodeType.Bricks_Diy_leaf
+    nodeType == TreeNodeType.Bricks_Diy_leaf ||
+    nodeType == TreeNodeType.Tree_recentContestList_contest_leaf
   );
 
 }

src/model/TreeNodeModel.ts

@@ -0,0 +1,79 @@
+import { BABAMediator, BABAProxy, BabaStr, BaseCC, BABA } from "../BABA";
+import { OutPutType } from "../model/ConstDefind";
+import { promptForSignIn, ShowMessage } from "../utils/OutputUtils";
+
+class ContestQuestionData {
+  fidInfo: Map<string, number[]> = new Map<string, number[]>();
+
+  setFidInfo(fid, data) {
+    this.fidInfo.set(fid, data);
+  }
+
+  getFidInfo(fid) {
+    return this.fidInfo.get(fid);
+  }
+}
+
+const contestQuestionData: ContestQuestionData = new ContestQuestionData();
+
+export class ContestQuestionProxy extends BABAProxy {
+  static NAME = BabaStr.ContestQuestionProxy;
+  constructor() {
+    super(ContestQuestionProxy.NAME);
+  }
+
+  public getAllRecentContestQuestionData() {
+    return contestQuestionData.fidInfo;
+  }
+
+  public getContestQuestionData(contestName) {
+    return contestQuestionData.getFidInfo(contestName);
+  }
+
+  public async searchContestQuestionData(contestName): Promise<void> {
+    let sbp = BABA.getProxy(BabaStr.StatusBarProxy);
+    if (!sbp.getUser()) {
+      promptForSignIn();
+      return;
+    }
+    try {
+      const solution: string = await BABA.getProxy(BabaStr.ChildCallProxy)
+        .get_instance()
+        .getContestQuestion(contestName);
+      const query_result = JSON.parse(solution);
+
+      for (let i = 0; i < query_result.length; i++) {
+        let data = query_result[i].questions.map((item) => item.question_id);
+        contestQuestionData.setFidInfo(query_result[i].contest, data);
+      }
+      BABA.sendNotification(BabaStr.TreeData_searchContestQuestionFinish);
+    } catch (error) {
+      BABA.getProxy(BabaStr.LogOutputProxy).get_log().appendLine(error.toString());
+      await ShowMessage("Failed to fetch question of" + contestName + ". 请查看控制台信息~", OutPutType.error);
+    }
+  }
+}
+
+export class ContestQuestionMediator extends BABAMediator {
+  static NAME = BabaStr.ContestQuestionMediator;
+  constructor() {
+    super(ContestQuestionMediator.NAME);
+  }
+
+  listNotificationInterests(): string[] {
+    return [
+      BabaStr.TreeData_searchRecentContestFinish,
+    ];
+  }
+  async handleNotification(_notification: BaseCC.BaseCC.INotification) {
+    switch (_notification.getName()) {
+      case BabaStr.TreeData_searchRecentContestFinish:
+        let ContestList = BABA.getProxy(BabaStr.RecentContestProxy).getAllRecentContestData();
+        let contestName = Array.from(ContestList.keys()).join(",");
+        await BABA.getProxy(BabaStr.ContestQuestionProxy).searchContestQuestionData(contestName);
+        break;
+      default:
+        break;
+    }
+  }
+}