✨ Optimize localstore block and generator

nonebot · Sep 30, 2024 · 24df0de · 24df0de
1 parent 309b978
commit 24df0de
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 18 deletions.
diff --git a/packages/app/src/blocks/nonebot_store.ts b/packages/app/src/blocks/nonebot_store.ts
@@ -31,7 +31,7 @@ export const definitions: BlockDefinition[] = [
     type: "store_load_json",
     tooltip: "",
     helpUrl: "",
-    message0: "读取文件 %1 %2 到字典 %3",
+    message0: "读取文件 %1 %2 的字典",
     args0: [
       {
         type: "field_input",
@@ -42,14 +42,55 @@ export const definitions: BlockDefinition[] = [
         type: "input_dummy",
         name: "PARAMS",
       },
+    ],
+    output: "DICT",
+    colour: 150,
+    inputsInline: true,
+  },
+  {
+    type: "store_save_text",
+    tooltip: "",
+    helpUrl: "",
+    message0: "保存文本 %1 到文件 %2 %3",
+    args0: [
       {
         type: "input_value",
-        name: "DICT",
+        name: "TEXT",
+        check: "String",
+      },
+      {
+        type: "field_input",
+        name: "FILE",
+        text: "save.txt",
+      },
+      {
+        type: "input_dummy",
+        name: "PARAMS",
       },
     ],
     previousStatement: null,
     nextStatement: null,
-    colour: 150,
+    colour: 180,
+    inputsInline: true,
+  },
+  {
+    type: "store_load_text",
+    tooltip: "",
+    helpUrl: "",
+    message0: "读取文件 %1 %2 的文本",
+    args0: [
+      {
+        type: "field_input",
+        name: "FILE",
+        text: "save.txt",
+      },
+      {
+        type: "input_dummy",
+        name: "PARAMS",
+      },
+    ],
+    output: "String",
+    colour: 180,
     inputsInline: true,
   },
 ];
diff --git a/packages/app/src/default.ts b/packages/app/src/default.ts
@@ -11,15 +11,15 @@ export const startBlocks = {
         inputs: {
           HANDLE: {
             block: {
-              type: "store_load_json",
-              id: "d.$llW7Lq)~KG{Z|h1+B",
-              fields: { FILE: "save.json" },
+              type: "variables_set",
+              id: "9_AQ_@)mWU$=2GkYbT-d",
+              fields: { VAR: { id: "VSvr3AeHEP),5NB5v$+;" } },
               inputs: {
-                DICT: {
+                VALUE: {
                   block: {
-                    type: "variables_get",
-                    id: "E,j@$a(@v[(]u_R${B+Z",
-                    fields: { VAR: { id: "VSvr3AeHEP),5NB5v$+;" } },
+                    type: "store_load_json",
+                    id: "3~H`IY?A(%(Bb+8/wL3c",
+                    fields: { FILE: "save.json" },
                   },
                 },
               },
@@ -39,9 +39,7 @@ export const startBlocks = {
                             block: {
                               type: "variables_get",
                               id: "[Ws*B$JWgLY]BeT`^_=]",
-                              fields: {
-                                VAR: { id: "VSvr3AeHEP),5NB5v$+;" },
-                              },
+                              fields: { VAR: { id: "VSvr3AeHEP),5NB5v$+;" } },
                             },
                           },
                         },
@@ -90,9 +88,7 @@ export const startBlocks = {
                               block: {
                                 type: "variables_get",
                                 id: "7iF8)`YtA.s.-@v_dYNo",
-                                fields: {
-                                  VAR: { id: "VSvr3AeHEP),5NB5v$+;" },
-                                },
+                                fields: { VAR: { id: "VSvr3AeHEP),5NB5v$+;" } },
                               },
                             },
                             VALUE: {

diff --git a/packages/app/src/generators/nonebot_store.ts b/packages/app/src/generators/nonebot_store.ts
@@ -20,11 +20,34 @@ forBlock["store_load_json"] = function (
   block: Blockly.Block,
   generator: PythonGenerator,
 ) {
-  const dict = generator.valueToCode(block, "DICT", Order.ATOMIC);
   const file = block.getFieldValue("FILE");
   generator["definitions_"]["import json"] = "import json";
   generator["definitions_"]["import nonebot_plugin_localstore as store"] =
     "import nonebot_plugin_localstore as store";
-  const code = `${dict} = json.loads(store.get_plugin_data_file("${file}").read_text() if store.get_plugin_data_file("${file}").exists() else "{}")\n`;
+  const code = `json.loads(store.get_plugin_data_file("${file}").read_text() if store.get_plugin_data_file("${file}").exists() else "{}")`;
+  return [code, Order.ATOMIC];
+};
+
+forBlock["store_save_text"] = function (
+  block: Blockly.Block,
+  generator: PythonGenerator,
+) {
+  const text = generator.valueToCode(block, "TEXT", Order.ATOMIC);
+  const file = block.getFieldValue("FILE");
+  generator["definitions_"]["import nonebot_plugin_localstore as store"] =
+    "import nonebot_plugin_localstore as store";
+  const code = `store.get_plugin_data_file("${file}").write_text(${text})\n`;
   return code;
 };
+
+forBlock["store_load_text"] = function (
+  block: Blockly.Block,
+  generator: PythonGenerator,
+) {
+  const file = block.getFieldValue("FILE");
+  generator["definitions_"]["import json"] = "import json";
+  generator["definitions_"]["import nonebot_plugin_localstore as store"] =
+    "import nonebot_plugin_localstore as store";
+  const code = `store.get_plugin_data_file("${file}").read_text() if store.get_plugin_data_file("${file}").exists() else ""`;
+  return [code, Order.ATOMIC];
+};
diff --git a/packages/app/src/toolbox.ts b/packages/app/src/toolbox.ts
@@ -363,6 +363,10 @@ export const toolbox = {
           kind: "BLOCK",
           type: "dicts_get",
         },
+        {
+          kind: "BLOCK",
+          type: "dicts_get_multi",
+        },
         {
           kind: "BLOCK",
           type: "dicts_set",
@@ -440,6 +444,10 @@ export const toolbox = {
           kind: "BLOCK",
           type: "alconna_arg_get",
         },
+        {
+          kind: "BLOCK",
+          type: "nonebot_send",
+        },
       ],
       name: "跨平台命令处理",
       colour: "90",
@@ -455,6 +463,14 @@ export const toolbox = {
           kind: "BLOCK",
           type: "store_load_json",
         },
+        {
+          kind: "BLOCK",
+          type: "store_save_text",
+        },
+        {
+          kind: "BLOCK",
+          type: "store_load_text",
+        },
       ],
       name: "文件存储",
       colour: "150",