feat: support book info output

aidenlx · Apr 29, 2021 · f81e4eb · f81e4eb
1 parent fab7f02
commit f81e4eb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "author": "AidenLx",
   "license": "MIT",
   "devDependencies": {
-    "@alx-plugins/marginnote": "^0.5.4",
+    "@alx-plugins/marginnote": "^0.5.7",
     "@release-it/bumper": "^2.0.0",
     "@release-it/conventional-changelog": "^2.0.1",
     "@rollup/plugin-commonjs": "^18.0.0",

diff --git a/src/eventHandlers.ts b/src/eventHandlers.ts
@@ -16,9 +16,19 @@ export function onPopupMenuOnNote(sender: NotifySender) {
   if (self.recorder.isDuplicate(Date.now()))
     return;
 
-  const src = sender.userInfo.note;
+  const srcNote = sender.userInfo.note;
+  let currentBook;
+
+  if (!srcNote) {
+    showHUD("no note in sender");
+    return;
+  }
+
+  if (srcNote.docMd5)   
+    currentBook= Database.sharedInstance().getDocumentById(srcNote.docMd5);
+
   try {
-    copy(stringify(src, self.recorder));
+    copy(stringify(srcNote,self.recorder,currentBook));
   } catch (error) {
     showHUD(error.toString());
   }
@@ -36,10 +46,12 @@ export function onPopupMenuOnSelection(sender: NotifySender) {
     self.recorder = new PopupRecorder();
   }
 
-  const selection = sender.userInfo.documentController.selectionText;
+  const { selectionText: selection, document: currentBook } = sender.userInfo
+    .documentController as DocumentController;
+
   try {
     if (selection && selection.length) {
-      copy(stringify({ sel: selection }, self.recorder));
+      copy(stringify({ sel: selection }, self.recorder, currentBook));
     }
   } catch (error) {
     showHUD(error.toString());

diff --git a/src/modules/parser.ts b/src/modules/parser.ts
@@ -3,21 +3,22 @@ import { node, ReturnBody } from "./return";
 import { scanObject } from "./tools";
 
 
-function process(node: node, rec: PopupRecorder): ReturnBody {
+function process(node: node, rec: PopupRecorder, currentBook?: MbBook): ReturnBody {
   let data = isSel(node) ? node : scanObject(node, 2);
   const last = rec.last;
   rec.push(data);
   const sendTime = rec.last.addTime as number;
   return {
     type: isSel(node) ? "sel" : "note",
     sendTime,
+    currentBook: currentBook ? scanObject(currentBook) : undefined,
     data,
     last,
   };
 }
 
-export function stringify<T extends node>(node: T, rec: PopupRecorder): string {
-  return "<!--MN-->\n" + JSON.stringify(process(node, rec));
+export function stringify<T extends node>(node: T, rec: PopupRecorder, currentBook?: MbBook): string {
+  return "<!--MN-->\n" + JSON.stringify(process(node, rec, currentBook));
 }
 
 function isSel(node: node): node is selection {

diff --git a/src/modules/return.d.ts b/src/modules/return.d.ts
@@ -5,8 +5,9 @@ export type node = selection | MbBookNote;
 type ReturnBody_Basic = {
   type: "sel" | "note";
   sendTime: ReturnType<typeof Date.now>;
-  last: item;
+  currentBook?: MbBook;
   data: node;
+  last: item;
 };
 
 export type ReturnBody = ReturnBody_Note | ReturnBody_Sel;