edit props

王一帆 · 王一帆 · commit cd90d8d08efe · 2023-09-01T22:54:56.000+08:00
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This plugin for Obsidian deals multi notes from search results、current file、
 - Add Dataview Task to target Canvas---**New in v1.7.7**
 - Move/Copy Multi-File to target folder
 - Rename Multi-File
-- Add or Change Multi-File's Props（need to install **MetaEdit** plugin）
+- Add/Edit/Remove（propValue:-） Multi-File's Props（no need to install **MetaEdit** plugin from 1.8.0）
 - Delete Multi-File
 - Merge Multi-File to target file
 - Create files from unresolved links
diff --git a/README_zh.md b/README_zh.md
@@ -11,7 +11,7 @@
 - 添加文本到指定Canvas---**v1.7.6新增**
 - 添加Dataview Task到指定Canvas---**v1.7.7新增**
 - 批量移动/拷贝目标文档到指定目录
-- 批量编辑目标文档属性（新增or修改，需要安装MetaEdit插件）
+- 批量编辑目标文档属性（新增、修改、删除（属性值为-），1.8.0无需再安装MetaEdit插件）
 - 批量删除目标文档
 - 批量重命名目标文档
 - 批量基于链接创建文档
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-file-cooker",
 	"name": "File Cooker",
-	"version": "1.7.8",
+	"version": "1.8.0",
 	"minAppVersion": "1.2.0",
 	"description": "Deal multi notes from Search results、current file、Dataview query string...",
 	"author": "iuian",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-file-cooker",
-	"version": "1.7.8",
+	"version": "1.8.0",
 	"description": "Deal batch notes from Search results、current file、Dataview query string...",
 	"main": "main.js",
 	"scripts": {
@@ -18,7 +18,7 @@
 		"@typescript-eslint/parser": "^5.2.0",
 		"builtin-modules": "^3.2.0",
 		"esbuild": "0.13.12",
-		"obsidian": "^1.3.5",
+		"obsidian": "^1.4.4",
 		"obsidian-dataview": "^0.5.38",
 		"tslib": "2.3.1",
 		"typescript": "4.4.4"
diff --git a/src/action/edit-properties-action.ts b/src/action/edit-properties-action.ts
@@ -1,8 +1,8 @@
 import { App, Notice, TAbstractFile } from "obsidian";
-import { EditFrontMatterModal } from "src/modal/edit-front-matter-modal";
+import { EditPropertiesModal } from "src/modal/edit-properties-modal";
 import { Action, ActionModel } from "./action";
 
-export class EditFrontMatterAction implements Action {
+export class EditPropertiesAction implements Action {
 
     app: App;
 
@@ -13,7 +13,7 @@ export class EditFrontMatterAction implements Action {
     act(actionModels: ActionModel[]) {
         if (actionModels.length > 0) {
             let files = actionModels.map(model => model.file);
-            new EditFrontMatterModal(this.app, files).open();
+            new EditPropertiesModal(this.app, files).open();
         } else {
             new Notice("No Files Found!");
         }
diff --git a/src/command/clipboard-command.ts b/src/command/clipboard-command.ts
@@ -2,7 +2,7 @@ import FileCookerPlugin from 'main';
 import { Action } from 'src/action/action';
 import { AddToCanvasAction } from 'src/action/add-to-canvas-action';
 import { DeleteAction } from 'src/action/delete-action';
-import { EditFrontMatterAction } from 'src/action/edit-front-matter-action';
+import { EditPropertiesAction } from 'src/action/edit-properties-action';
 import { MoveAction } from 'src/action/move-action';
 import { RenameAction } from 'src/action/rename-action';
 import { SyncFlomoAction } from 'src/action/sync-flomo-action';
@@ -44,20 +44,15 @@ export class ClipboardCommand implements Command {
     }
 
     /**
-     * Edit Front Matter 
+     * Edit Properties 
      * https://github.com/lijyze/obsidian-state-switcher/blob/d0a80081b0fcc1b899eed2e3d7e834c2d5703875/src/util.ts#L42
      */
     private registEditProp() {
-        let metaedit = this.plugin.app.plugins.plugins["metaedit"];
-
         this.plugin.addCommand({
             id: 'edit-front-matter-in-clipboard-files',
-            name: 'Edit Front Matter in clipboard files ...',
-            checkCallback: (checking: boolean) => {
-                if (!checking) {
-                    new ClipboardReader(this.plugin).read(new EditFrontMatterAction(this.plugin.app));
-                }
-                return metaedit != null;
+            name: 'Edit Properties in clipboard files ...',
+            callback: () => {
+                new ClipboardReader(this.plugin).read(new EditPropertiesAction(this.plugin.app));
             }
         });
     }
diff --git a/src/command/current-file-command.ts b/src/command/current-file-command.ts
@@ -3,7 +3,7 @@ import { Editor, MarkdownView } from 'obsidian';
 import { Action } from 'src/action/action';
 import { CreateAction } from 'src/action/create-action';
 import { DeleteAction } from 'src/action/delete-action';
-import { EditFrontMatterAction } from 'src/action/edit-front-matter-action';
+import { EditPropertiesAction } from 'src/action/edit-properties-action';
 import { MoveAction } from 'src/action/move-action';
 import { RenameAction } from 'src/action/rename-action';
 import { SyncFlomoAction } from 'src/action/sync-flomo-action';
@@ -48,20 +48,15 @@ export class CurrentFileCommand implements Command {
     }
 
     /**
-     * Edit Front Matter 
+     * Edit Properties
      * https://github.com/lijyze/obsidian-state-switcher/blob/d0a80081b0fcc1b899eed2e3d7e834c2d5703875/src/util.ts#L42
      */
     private registEditProp() {
-        let metaedit = this.plugin.app.plugins.plugins["metaedit"];
-
         this.plugin.addCommand({
             id: "edit-front-matter-in-current-file-links",
-            name: "Edit Front Matter in current file links ...",
-            checkCallback: (checking: boolean) => {
-                if (!checking) {
-                    new CurrentFileReader(this.plugin).read(new EditFrontMatterAction(this.plugin.app));
-                }
-                return metaedit != null;
+            name: "Edit Properties in current file links ...",
+            callback: () => {
+                new CurrentFileReader(this.plugin).read(new EditPropertiesAction(this.plugin.app));
             }
         });
     }
diff --git a/src/command/dataview-command.ts b/src/command/dataview-command.ts
@@ -4,7 +4,7 @@ import { DataviewApi, getAPI } from 'obsidian-dataview';
 import { Action } from 'src/action/action';
 import { CopyAction } from 'src/action/copy-action';
 import { DeleteAction } from 'src/action/delete-action';
-import { EditFrontMatterAction } from 'src/action/edit-front-matter-action';
+import { EditPropertiesAction } from 'src/action/edit-properties-action';
 import { MoveAction } from 'src/action/move-action';
 import { RenameAction } from 'src/action/rename-action';
 import { SyncFlomoAction } from 'src/action/sync-flomo-action';
@@ -53,21 +53,19 @@ export class DataviewCommand implements Command {
     }
 
     /**
-     * Edit Front Matter 
+     * Edit Properties 
      * https://github.com/lijyze/obsidian-state-switcher/blob/d0a80081b0fcc1b899eed2e3d7e834c2d5703875/src/util.ts#L42
      * @param dataviewApi        
      */
     private registEditProp(dataviewApi: DataviewApi) {
-        let metaedit = this.plugin.app.plugins.plugins["metaedit"];
-
         this.plugin.addCommand({
             id: "edit-front-matter-in-dataview-results",
-            name: "Edit Front Matter in dataview results ...",
+            name: "Edit Properties in dataview results ...",
             editorCheckCallback: (checking: boolean, editor: Editor, view: MarkdownView) => {
                 if (!checking) {
-                    new DataviewReader(this.plugin, editor.getSelection()).read(new EditFrontMatterAction(this.plugin.app));
+                    new DataviewReader(this.plugin, editor.getSelection()).read(new EditPropertiesAction(this.plugin.app));
                 }
-                return dataviewApi != null && metaedit != null;
+                return dataviewApi != null;
             }
         });
     }
diff --git a/src/command/search-command.ts b/src/command/search-command.ts
@@ -2,7 +2,7 @@ import FileCookerPlugin from 'main';
 import { Action } from 'src/action/action';
 import { AddToCanvasAction } from 'src/action/add-to-canvas-action';
 import { DeleteAction } from 'src/action/delete-action';
-import { EditFrontMatterAction } from 'src/action/edit-front-matter-action';
+import { EditPropertiesAction } from 'src/action/edit-properties-action';
 import { MoveAction } from 'src/action/move-action';
 import { RenameAction } from 'src/action/rename-action';
 import { SyncFlomoAction } from 'src/action/sync-flomo-action';
@@ -42,20 +42,15 @@ export class SearchCommand implements Command {
     }
 
     /**
-     * Edit Front Matter 
+     * Edit Properties 
      * https://github.com/lijyze/obsidian-state-switcher/blob/d0a80081b0fcc1b899eed2e3d7e834c2d5703875/src/util.ts#L42
      */
     private registEditProp() {
-        let metaedit = this.plugin.app.plugins.plugins["metaedit"];
-
         this.plugin.addCommand({
             id: 'edit-front-matter-in-searchresults-files',
-            name: 'Edit Front Matter in searchresults files ...',
-            checkCallback: (checking: boolean) => {
-                if (!checking) {
-                    new SearchResultsReader(this.plugin).read(new EditFrontMatterAction(this.plugin.app));
-                }
-                return metaedit != null;
+            name: 'Edit Properties in searchresults files ...',
+            callback: () => {
+                new SearchResultsReader(this.plugin).read(new EditPropertiesAction(this.plugin.app));
             }
         });
     }
diff --git a/src/modal/edit-properties-modal.ts b/src/modal/edit-properties-modal.ts
@@ -1,9 +1,9 @@
-import { App, Modal, Notice, Setting, TAbstractFile } from 'obsidian';
+import { App, Modal, Notice, Setting, TAbstractFile, TFile } from 'obsidian';
 
 /**
- *  弹窗编辑Front Matter属性
+ *  弹窗编辑Properties属性
  */
-export class EditFrontMatterModal extends Modal {
+export class EditPropertiesModal extends Modal {
     resultArr: TAbstractFile[];
     key: String;
     val: String;
@@ -21,7 +21,7 @@ export class EditFrontMatterModal extends Modal {
     onOpen() {
         const { contentEl } = this;
 
-        contentEl.createEl("h1", { text: "Edit Front Matter" });
+        contentEl.createEl("h1", { text: "Edit Properties" });
 
         if (this.resultArr.length == 0) {
             contentEl.createEl("div", { text: "No files found!" });
@@ -41,12 +41,12 @@ export class EditFrontMatterModal extends Modal {
 
             new Setting(contentEl)
                 .addText((txt) =>
-                    txt.setPlaceholder("Front Matter Key")
+                    txt.setPlaceholder("Properties Key")
                         .onChange((val) => {
                             this.key = val;
                         })
                 ).addText((txt) =>
-                    txt.setPlaceholder("Front Matter Value")
+                    txt.setPlaceholder("Properties Value")
                         .onChange((val) => {
                             this.val = val;
                         })
@@ -74,23 +74,21 @@ export class EditFrontMatterModal extends Modal {
                                 return;
                             }
                             this.close();
-                            let api = this.app.plugins.plugins["metaedit"].api;
-                            let c_num = 0;
-                            let u_num = 0;
                             for (let i = 0; i < this.resultArr.length; i++) {
-                                let info = this.resultArr[i];
-                                let val = await api.getPropertyValue(this.key, info);
-                                if (val == null) {
-                                    api.createYamlProperty(this.key, this.val, info);
-                                    c_num += 1;
-                                } else if (this.overrideFlag || val.trim() == "") {
-                                    api.update(this.key, this.val, info);
-                                    u_num += 1;
-                                }
+                                let info = this.resultArr[i] as TFile;
+                                let _this = this;
+                                this.app.fileManager.processFrontMatter(info, (props) => {
+                                    if (_this.val === '-') {
+                                        // 删除属性
+                                        delete props[_this.key];
+                                    } else {
+                                        if (_this.overrideFlag || !props[_this.key]) {
+                                            props[_this.key] = _this.val;
+                                        }
+                                    }
+                                });
                             }
-                            new Notice("Edit Success!");
-                            new Notice("Add " + c_num + " !");
-                            new Notice("Update " + u_num + " !");
+                            new Notice("Edit Property Success!");
                         }))
                 .addButton((btn) =>
                     btn
diff --git a/versions.json b/versions.json
@@ -7,5 +7,6 @@
 	"1.5.0": "0.12.0",
 	"1.6.0": "0.15.0",
 	"1.7.0": "1.1.9",
-	"1.7.6": "1.2.0"
+	"1.7.6": "1.2.0",
+	"1.8.0": "1.4.4"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "obsidian-file-cooker",`
`3`	`3`	`"name": "File Cooker",`
`4`		`- "version": "1.7.8",`
	`4`	`+ "version": "1.8.0",`
`5`	`5`	`"minAppVersion": "1.2.0",`
`6`	`6`	`"description": "Deal multi notes from Search results、current file、Dataview query string...",`
`7`	`7`	`"author": "iuian",`