feat: finish the view create & check

Author: wh131462

Readme.md

@@ -81,8 +81,6 @@ yarn leet-check
 ```
 
 此指令会根据今天的题目信息去执行对应的题目文件，输出结果。
-> NOTE:缓存的实现是在`commom/resouces/store.json`,如果只想让内容在本地存在,不上传到个人项目中的话,执行`git update-index --aussume-unchanged common/resources/store.json`来忽略本地的文件变更即可。
->
 
 ```shell
 yarn leet-check 
@@ -193,7 +191,6 @@ yarn leet-create -r
  D:\GitHub\leetcode-practice> yarn leet-create -r     
 yarn run v1.22.19
 $ node common/scripts/create.js -r
-[store]数据存储成功[random-question-info]:[[object Object]]
 [fulfillQuestion]题目[43][字符串相乘]已完成填充.
 Done in 1.78s.
 ```

common/utils/file/getFileListBySameName.js

@@ -0,0 +1,5 @@
+import {readdirSync} from "fs";
+
+export function getFileListBySameName(dir, name) {
+    return readdirSync(dir).filter((filename) => filename.includes(name));
+}

common/utils/question-handler/checkQuestion.js

@@ -0,0 +1,26 @@
+import fs from "fs";
+import vm from "vm";
+import {showLogs} from "#common/utils/question-handler/showLogs.js";
+
+/**
+ * 执行脚本 - 可传入上下文
+ * @param filePath
+ * @param context
+ * @returns {any}
+ */
+export function executeScript(filePath, context) {
+    const fileContent = fs.readFileSync(filePath, 'utf-8');
+    const script = new vm.Script(fileContent);
+    return script.runInContext(context);
+}
+
+/**
+ * 执行问题检测进程
+ * @param path
+ */
+export const checkQuestion = async (path)=>{
+    return await executeScript(path, vm.createContext({
+        showLogs
+    }))
+}
+

common/utils/question-handler/createQuestion.js

@@ -1,21 +1,30 @@
 import fs from "fs";
 import path from "path";
 import {fulfillQuestion} from "#common/utils/question-handler/fulfillQuestion.js";
+
 export const sourceFilePath = path.normalize('resources/template/template.js');
-export const createQuestion = (question,questionDir) => {
-  return new Promise(resolve=>{
-    let filePath = path.normalize(path.join(questionDir, 'index.js'));
-    if(fs.existsSync(filePath)){
-      resolve(false);
-    }else{
-      // 创建目录
-      fs.mkdir(questionDir, { recursive: true }, () => {
-        // 复制文件
-        fs.copyFile(sourceFilePath, filePath, 0, () => {
-          fulfillQuestion(filePath,question)
-          resolve(filePath);
-        });
-      });
-    }
-  })
+export const createQuestion = (question, questionDir) => {
+    return new Promise(resolve => {
+        let filePath = path.normalize(path.join(questionDir, 'index.js'));
+        if (fs.existsSync(filePath)) {
+            resolve(false);
+        } else {
+            createQuestionFile(questionDir, filePath, question).then(path => resolve(path)).catch(e => resolve(false));
+        }
+    })
+}
+export const createQuestionFile = (questionDir, questionFilePath, question) => {
+    return new Promise((resolve, reject) => {
+        try {
+            fs.mkdir(questionDir, {recursive: true}, () => {
+                // 复制文件
+                fs.copyFile(sourceFilePath, questionFilePath, 0, () => {
+                    fulfillQuestion(questionFilePath, question)
+                    resolve(questionFilePath)
+                });
+            });
+        } catch (e) {
+            reject(e);
+        }
+    })
 }

common/utils/question-handler/createQuestionCopy.js

@@ -1,4 +1,20 @@
 //todo 创建问题副本
-export const createQuestionCopy = (question)=>{
+import {getCountBySameName} from "#common/utils/file/getCountBySameName.js";
+import {createQuestionFile} from "#common/utils/question-handler/createQuestion.js";
+import path from "path";
 
+/**
+ * 创建副本
+ * @param question
+ * @param questionDir
+ * @returns {Promise<unknown>}
+ */
+export const createQuestionCopy = (question, questionDir)=>{
+    if(!question||!question.id)return Promise.reject("question is empty");
+    const dir = path.dirname(questionDir);
+    const name = `${question.id}.${question.slug}`;
+    const affix = ` [${getCountBySameName(dir,name)}]`;
+    const copyFileDir = path.join(dir,`${name}${affix}`);
+    const copyFilePath = path.join(copyFileDir,`index.js`);
+    return createQuestionFile(copyFileDir,copyFilePath,question);
 }

common/utils/store/store-realm.js

@@ -20,8 +20,8 @@ const open = async ()=>{
  */
 const exeOnce = async (callback)=>{
     const realm = await open();
-    const res = callback(realm);
-    realm.close()
+    const res = await callback(realm);
+    realm.close();
     return res;
 }
 
@@ -47,7 +47,7 @@ export const setQuestion = (mode,question)=>exeOnce((realm)=>{
         realm.delete(realm.objects("Question").filtered("mode=$0",mode));
         newQuestion = realm.create("Question", Object.assign(question,{mode}));
     });
-    return newQuestion;
+    return newQuestion.toJSON();
 });
 /**
  * 删除某一个模式

common/view/check.view.js

@@ -0,0 +1,89 @@
+import inquirer from "inquirer";
+import path from "path";
+import {getQuestionFileName} from "#common/utils/question-handler/getQuestionFileName.js";
+import {getQuestionById} from "#common/utils/question-getter/getQuestionById.js";
+import {getQuestionToday} from "#common/utils/question-getter/getQuestionToday.js";
+import {getQuestionRandom} from "#common/utils/question-getter/getQuestionRandom.js";
+import {createQuestion} from "#common/utils/question-handler/createQuestion.js";
+import {createQuestionCopy} from "#common/utils/question-handler/createQuestionCopy.js";
+import {getQuestionByMode} from "#common/utils/store/store-realm.js";
+import {checkQuestion} from "#common/utils/question-handler/checkQuestion.js";
+import {getCountBySameName} from "#common/utils/file/getCountBySameName.js";
+import {getFileListBySameName} from "#common/utils/file/getFileListBySameName.js";
+const modeQuestion = [{
+    type: 'list',
+    name: 'mode',
+    message: '请选择检查问题的模式:',
+    choices: ['today', 'identity', 'random'],
+}];
+// 第一个问题 选择的模式
+const {mode} = await inquirer.prompt(modeQuestion,null);
+const identityQuestion = [{
+    type: 'input',
+    name: 'identity',
+    message: '请输入题目编号:',
+}];
+let question;
+switch (mode){
+    case "identity":
+        const {identity} = await inquirer.prompt(identityQuestion,null);
+        question = !identity?
+            await getQuestionByMode(mode):
+            await getQuestionById(identity);
+        break;
+    case "random":
+        question = await getQuestionByMode(mode);
+        break;
+    case "today":
+    default:
+        question = await getQuestionByMode(mode);
+        break;
+}
+// 检查题目
+const questionFileName = getQuestionFileName(question);
+const currentDir = process.cwd();
+let questionDir = path.join(currentDir,questionFileName);
+// 创建路径确认
+const pathRightQuestion = [{
+    type: 'confirm',
+    name: 'dirRight',
+    message: `是否检测当前目录[ ${currentDir} ]下的题目[ ${questionFileName} ]?`,
+}];
+const {dirRight} = await inquirer.prompt(pathRightQuestion,null);
+if(!dirRight){
+    const newPathRightQuestion = [{
+        type: 'confirm',
+        name: 'newDirRight',
+        message: `请选择要检测的目录?`,
+    }];
+    const {newDirRight} = await inquirer.prompt(newPathRightQuestion,null);
+    if(!newDirRight){
+        console.log("用户取消检测操作")
+    }else{
+        const newDirQuestion = [{
+            type: 'input',
+            name: 'newDir',
+            message: `请选择新目录(基础地址为${currentDir}):`,
+        }];
+        const {newDir} = await inquirer.prompt(newDirQuestion,null);
+        questionDir = path.join(path.join(process.cwd(),newDir),`${questionFileName}`)
+    }
+}
+const questionParentDir = path.dirname(questionDir);
+// 先检测有几个副本
+if(getCountBySameName(questionParentDir,questionFileName)>0){
+    const selectQuestionQuestion = [{
+        type: 'list',
+        name: 'selectQuestion',
+        message: `题目[ ${questionFileName} ]有多个副本,请选择一个进行检测:`,
+        choices:getFileListBySameName(questionParentDir,questionFileName)
+    }]
+    // 选择其中一个副本进行检查
+    const {selectQuestion} = await inquirer.prompt(selectQuestionQuestion,null);
+    questionDir = path.join(questionParentDir,selectQuestion);
+    console.log(`用户选择题目[ ${questionFileName}]的副本[ ${selectQuestion}]进行检测`)
+}
+const filePath = path.join(questionDir,"index.js");
+await checkQuestion(filePath);
+console.log(`题目[${questionFileName}]检查完成！\n文件地址为: ${filePath}`)
+process.exit(0)

common/view/create.view.js

@@ -6,6 +6,7 @@ import {getQuestionToday} from "#common/utils/question-getter/getQuestionToday.j
 import {getQuestionRandom} from "#common/utils/question-getter/getQuestionRandom.js";
 import {createQuestion} from "#common/utils/question-handler/createQuestion.js";
 import {createQuestionCopy} from "#common/utils/question-handler/createQuestionCopy.js";
+import {setQuestion} from "#common/utils/store/store-realm.js";
 const modeQuestion = [{
     type: 'list',
     name: 'mode',
@@ -34,6 +35,9 @@ switch (mode){
         question = await getQuestionToday()
         break;
 }
+const store = await setQuestion(mode,question);
+if(!store) console.warn(`[create][${mode}]问题[${question.title}]未成功缓存`)
+console.log(`[create][${mode}]问题[${question.title}]已缓存`,store)
 // 创建题目
 const questionFileName = getQuestionFileName(question);
 const currentDir = process.cwd();
@@ -64,8 +68,9 @@ if(!dirRight){
         questionDir = path.join(path.join(process.cwd(),newDir),`${questionFileName}`)
     }
 }
-let filePath = await createQuestion(question,questionDir)
+let filePath = await createQuestion(question,questionDir);
 if(!filePath){
-    filePath = createQuestionCopy(question)
+    filePath = await createQuestionCopy(question,questionDir);
 }
-console.log(`题目[${questionFileName}]创建完成！`)
+console.log(`题目[${questionFileName}]创建完成！\n文件地址为: ${filePath}`)
+process.exit(0)

package.json

@@ -17,6 +17,8 @@
     "leet-create": "node scripts/create.js",
     "leet-create:i": "node scripts/create.js -i",
     "leet-check": "node scripts/check.js",
+    "easy-create": "node common/view/create.view.js",
+    "easy-check": "node common/view/check.view.js",
     "commit": "cz",
     "test": "vitest --run",
     "coverage": "vitest run --coverage",

scripts/check.js

@@ -1,8 +1,6 @@
 /**
  * 执行脚本
  */
-import {temExe} from "#common/utils/temExe.js";
-import {readStore} from "#common/utils/store.js";
 import {showLogs} from "#common/utils/showLogs.js";
 import fs from 'fs';
 import vm from 'vm'
@@ -39,20 +37,18 @@ switch (args[0]) {
         break;
 }
 
-function executeScript(filePath, content) {
-const fileContent = fs.readFileSync(filePath, 'utf-8');
-
-const script = new vm.Script(fileContent);
-return script.runInContext(content);
+/**
+ * 执行脚本
+ * @param filePath
+ * @param context
+ * @returns {any}
+ */
 
-}
 async function main() {
     const src = parseFilePath(`${process.cwd()}/src/${name}/index.js`);
 
     try {
-      await  executeScript(src, vm.createContext({
-            showLogs
-        }))
+
    } catch (error) {
        console.log('执行失败', error)
    }

scripts/create.js

@@ -1,7 +1,6 @@
 import {createQuestion} from "#common/utils/question-handler/createQuestion.js";
 import {getQuestionToday} from "#common/utils/question-getter/getQuestionToday.js";
 import {fulfillQuestion} from "#common/utils/question-handler/fulfillQuestion.js";
-import {writeStore} from "#common/utils/store/store.js";
 import {getQuestionById} from "#common/utils/question-getter/getQuestionById.js";
 import {getRandomId} from "#common/utils/question-handler/getRandomId.js";
 import {setQuestion} from "#common/utils/store/store-realm.js";