update

Author: ccagml

CHANGELOG.md

@@ -1,3 +1,7 @@
+## version 2.4.1
+
+- 简易 remark 功能, 用于回忆思考过程? 后续需要用这个数据生成文章
+
 ## version 2.3.2
 
 - WC320 数据

README.md

@@ -24,6 +24,7 @@
 - [新增区块测试用例](#区块测试用例)
 - [新增搬砖功能(重复练习?)](#搬砖功能的说明)
 - [状态栏增加简易计时器](#状态栏增加简易计时器)
+- [新增一个 remark 功能](#新增在工作目录存放数据)
 
 # 关于本项目
 
@@ -100,6 +101,10 @@
   > > .lcpr_data/ 存数据
   > >
   > > > bricks.json
+  > >
+  > > > remark 备注数据
+  > > >
+  > > > > qid 备注 remark 数据
 
 ### bricks.json 存放格式
 

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-leetcode-problem-rating",
     "displayName": "LeetCode",
     "description": "LeetCode 官方插件增强, 代码开源, 增加 LeetCode 题目难度分, 给个star吧, 球球了",
-    "version": "2.3.2",
+    "version": "2.4.1",
     "author": "ccagml",
     "publisher": "ccagml",
     "license": "MIT",
@@ -188,8 +188,8 @@
                 "title": "Create Note"
             },
             {
-                "command": "lcpr.remarkAdd",
-                "title": "测试新加线程?"
+                "command": "lcpr.remarkClose",
+                "title": "关闭?"
             },
             {
                 "command": "lcpr.remarkReplyNote",
@@ -249,20 +249,20 @@
             "commandPalette": [
                 {
                     "command": "lcpr.remarkCreateNote",
-                    "when": "false"
+                    "when": "true"
                 },
                 {
                     "command": "lcpr.remarkReplyNote",
-                    "when": "false"
+                    "when": "true"
                 },
                 {
                     "command": "lcpr.remarkDeleteNoteComment",
-                    "when": "false"
+                    "when": "true"
                 }
             ],
             "comments/commentThread/title": [
                 {
-                    "command": "lcpr.remarkAdd",
+                    "command": "lcpr.remarkClose",
                     "group": "inline",
                     "when": "commentController == comment-sample"
                 }
@@ -292,14 +292,9 @@
                 }
             ],
             "comments/comment/context": [
-                {
-                    "command": "lcpr.remarkCancelsaveNote",
-                    "group": "inline@1",
-                    "when": "commentController == comment-sample"
-                },
                 {
                     "command": "lcpr.remarkSaveNote",
-                    "group": "inline@2",
+                    "group": "inline@1",
                     "when": "commentController == comment-sample"
                 }
             ],

src/controller/RemarkController.ts

@@ -15,11 +15,8 @@ import { remarkService } from "../service/RemarkService";
 class RemarkController implements Disposable {
   public dispose(): void {}
 
-  public remarkAdd(a, b, c, d) {
-    console.log(a);
-    console.log(b);
-    console.log(c);
-    console.log(d);
+  public remarkClose(a) {
+    remarkService.remarkClose(a);
   }
 
   public remarkCreateNote(reply: CommentReply) {
@@ -33,8 +30,8 @@ class RemarkController implements Disposable {
   public remarkDeleteNoteComment(comment: RemarkComment) {
     remarkService.remarkDeleteNoteComment(comment);
   }
-  public startRemark(document: TextDocument) {
-    remarkService.startRemark(document);
+  public async startRemark(document: TextDocument) {
+    await remarkService.startRemark(document);
   }
 
   public remarkCancelsaveNote(comment: RemarkComment) {

src/dao/remarkDao.ts

@@ -0,0 +1,85 @@
+// > workspace/ 工作目录
+// >
+// > > .lcpr_data/ 存数据
+// > >
+// > > > remake/ 备注
+// > > >
+// > > > > 题目内部编号.json 根据 qid 备注的信息
+// > >
+
+import { fetchProblemLanguage, selectWorkspaceFolder } from "../utils/ConfigUtils";
+import { useWsl, toWinPath } from "../utils/SystemUtils";
+import * as path from "path";
+import * as fse from "fs-extra";
+
+class RemarkDao {
+  version = 1;
+  public async get_remark_dir_path() {
+    const language: string | undefined = await fetchProblemLanguage();
+    if (!language) {
+      return;
+    }
+    const workspaceFolder: string = await selectWorkspaceFolder(false);
+    if (!workspaceFolder) {
+      return;
+    }
+    let lcpr_data_path: string = path.join(workspaceFolder, ".lcpr_data");
+    await fse.ensureDir(lcpr_data_path);
+
+    let remark_dir: string = path.join(lcpr_data_path, "remark");
+    await fse.ensureDir(remark_dir);
+
+    remark_dir = useWsl() ? await toWinPath(remark_dir) : remark_dir;
+    return remark_dir;
+  }
+  public async init() {
+    let lcpr_data_path = await this.get_remark_dir_path();
+    if (!lcpr_data_path) {
+      return;
+    }
+  }
+
+  private async getQidPath(qid: string) {
+    let remark_dir = await this.get_remark_dir_path();
+    if (!remark_dir) {
+      return;
+    }
+    if (!qid) {
+      return;
+    }
+    let qid_path: string = path.join(remark_dir, qid);
+    qid_path = useWsl() ? await toWinPath(qid_path) : qid_path;
+    return qid_path;
+  }
+
+  private async _write_data(qid: string, data: object) {
+    let qid_data_path = await this.getQidPath(qid);
+    if (!qid_data_path) {
+      return;
+    }
+    return await fse.writeFile(qid_data_path, JSON.stringify(data));
+  }
+
+  private async _read_data(qid: string) {
+    let qid_data_path = await this.getQidPath(qid);
+    if (!qid_data_path) {
+      return;
+    }
+
+    if (!(await fse.pathExists(qid_data_path))) {
+      return {};
+    }
+    let temp_data = await fse.readFile(qid_data_path, "utf8");
+    return JSON.parse(temp_data) || {};
+  }
+
+  public async getInfoByQid(qid: string) {
+    let all_remark = await this._read_data(qid);
+    return all_remark || {};
+  }
+  public async setInfoByQid(qid: string, info) {
+    await this._write_data(qid, info);
+  }
+}
+
+export const remarkDao: RemarkDao = new RemarkDao();

src/extension.ts

@@ -109,8 +109,8 @@ export async function activate(context: ExtensionContext): Promise<void> {
       commands.registerCommand("lcpr.remarkCreateNote", (reply: CommentReply) => {
         remarkController.remarkCreateNote(reply);
       }),
-      commands.registerCommand("lcpr.remarkAdd", (a, b, c, d) => {
-        remarkController.remarkAdd(a, b, c, d);
+      commands.registerCommand("lcpr.remarkClose", (a) => {
+        remarkController.remarkClose(a);
       }),
       commands.registerCommand("lcpr.remarkReplyNote", (reply: CommentReply) => {
         remarkController.remarkReplyNote(reply);

src/model/Model.ts

@@ -17,7 +17,7 @@ import {
   CommentAuthorInformation,
   CommentThread,
 } from "vscode";
-import { getDayNowM } from "../utils/SystemUtils";
+import { getDayNowM, getRemakeName } from "../utils/SystemUtils";
 
 export interface IQuickItemEx<T> extends QuickPickItem {
   value: T;
@@ -272,23 +272,32 @@ export interface ISubmitEvent {
 export class RemarkComment implements Comment {
   id: number;
   label: string | undefined;
-  constructor(
-    public body: string | MarkdownString,
-    public mode: CommentMode,
-    public author: CommentAuthorInformation,
-    public parent?: CommentThread,
-    public contextValue?: string
-  ) {
+  mode: CommentMode;
+  author: CommentAuthorInformation;
+  contextValue?: string;
+
+  constructor(public body: string | MarkdownString, public parent?: CommentThread) {
     this.id = getDayNowM();
     this.label = "";
+    this.contextValue = "canDelete";
+    this.mode = CommentMode.Preview;
+    this.author = { name: getRemakeName() };
   }
 
-  getDbString() {
+  getDbData() {
     let a = {
       name: this.author.name,
       id: this.id,
       body: this.body,
     };
+    return a;
+  }
+
+  static getObjByDbData(dbData, thread?): RemarkComment {
+    let obj = new RemarkComment(dbData.body, thread);
+    obj.id = dbData.id || getDayNowM();
+    obj.author = { name: dbData.name };
+    return obj;
   }
 }
 

src/service/RemarkService.ts

@@ -10,8 +10,8 @@ import {
   Disposable,
 } from "vscode";
 import { treeViewController } from "../controller/TreeViewController";
+import { remarkDao } from "../dao/remarkDao";
 import { RemarkComment } from "../model/Model";
-import { getRemakeName } from "../utils/SystemUtils";
 
 class RemarkService implements Disposable {
   private _remarkComment;
@@ -44,7 +44,7 @@ class RemarkService implements Disposable {
     };
   }
 
-  public startRemark(document: TextDocument) {
+  public async startRemark(document: TextDocument) {
     let docInfo = this.getQidByDocument(document);
     if (docInfo["qid"] == undefined) {
       return;
@@ -54,12 +54,17 @@ class RemarkService implements Disposable {
       this._qid_map_thread.get(docInfo["qid"])?.dispose();
       this._qid_map_thread.delete(docInfo["qid"]);
     }
+    let oldRemark = await this.getOldThreadRemarkByQid(docInfo["qid"]);
     for (let i: number = 0; i < document.lineCount; i++) {
       const lineContent: string = document.lineAt(i).text;
       if (lineContent.indexOf("@lc code=start") >= 0) {
-        let newRemark = this._remarkComment.createCommentThread(document.uri, new Range(i - 1, 0, i - 1, 0), []);
-        newRemark.contextValue = `qid:${docInfo["qid"]}`;
-        newRemark.label = `${docInfo["fid"]}题`;
+        let newRemark = this._remarkComment.createCommentThread(document.uri, new Range(i - 1, 0, i - 1, 0), oldRemark);
+        newRemark.comments.forEach((element) => {
+          element.parent = newRemark;
+        });
+
+        newRemark.contextValue = `qid=${docInfo["qid"]}`;
+        newRemark.label = `${docInfo["fid"]}`;
         newRemark.collapsibleState = CommentThreadCollapsibleState.Expanded;
         this._qid_map_thread.set(docInfo["qid"], newRemark);
         break;
@@ -76,16 +81,12 @@ class RemarkService implements Disposable {
   }
 
   public remarkDeleteNoteComment(comment: RemarkComment) {
-    let thread = comment.parent;
-    if (!thread) {
+    if (!comment.parent) {
       return;
     }
 
-    thread.comments = thread.comments.filter((cmt) => (cmt as RemarkComment).id !== comment.id);
-
-    // if (thread.comments.length === 0) {
-    //   thread.dispose();
-    // }
+    comment.parent.comments = comment.parent.comments.filter((cmt) => (cmt as RemarkComment).id !== comment.id);
+    this.saveThreadRemark(comment.parent);
   }
 
   public remarkCancelsaveNote(comment: RemarkComment) {
@@ -100,19 +101,10 @@ class RemarkService implements Disposable {
 
       return cmt;
     });
+    this.saveThreadRemark(comment.parent);
   }
   public remarkSaveNote(comment: RemarkComment) {
-    if (!comment.parent) {
-      return;
-    }
-
-    comment.parent.comments = comment.parent.comments.map((cmt) => {
-      if ((cmt as RemarkComment).id === comment.id) {
-        cmt.mode = CommentMode.Preview;
-      }
-
-      return cmt;
-    });
+    this.remarkCancelsaveNote(comment);
   }
   public remarkEditNote(comment: RemarkComment) {
     if (!comment.parent) {
@@ -126,12 +118,49 @@ class RemarkService implements Disposable {
 
       return cmt;
     });
+
+    this.saveThreadRemark(comment.parent);
   }
 
   public replyNote(reply: CommentReply) {
     let thread = reply.thread;
-    let newComment = new RemarkComment(reply.text, CommentMode.Preview, { name: getRemakeName() }, thread, "canDelete");
+    let newComment = new RemarkComment(reply.text, thread);
     thread.comments = [...thread.comments, newComment];
+    this.saveThreadRemark(thread);
+  }
+
+  public saveThreadRemark(thread) {
+    const params: URLSearchParams = new URLSearchParams(thread.contextValue);
+    let qid = params.get("qid");
+    if (!qid) {
+      return;
+    }
+    let data: Array<any> = [];
+    thread.comments.forEach((element) => {
+      data.push(element.getDbData());
+    });
+    let remarkData = {};
+    remarkData["data"] = data;
+    remarkDao.setInfoByQid(qid, remarkData);
+  }
+  public async getOldThreadRemarkByQid(qid: string, thread?) {
+    let remarkData = await remarkDao.getInfoByQid(qid);
+    let remarkDataBody = remarkData["data"] || [];
+    let OldRemark: Array<any> = [];
+    remarkDataBody.forEach((element) => {
+      OldRemark.push(RemarkComment.getObjByDbData(element, thread));
+    });
+    return OldRemark;
+  }
+
+  public remarkClose(thread) {
+    const params: URLSearchParams = new URLSearchParams(thread.contextValue);
+    let qid = params.get("qid");
+    if (!qid) {
+      return;
+    }
+
+    this._qid_map_thread.get(qid)?.dispose();
   }
 
   public dispose(): void {}