Merge pull request #5 from 0xGG/fix/windows-path

fix: Windows path issue

Author: shd101wyy

.vscodeignore

@@ -12,6 +12,7 @@ webpack.config.js
 **/*.ts
 **/*.tsx
 *.vsix
+*.zip
 
 # Manually include the node modules that we used
 node_modules

package.json

@@ -121,6 +121,7 @@
     "react-dom": "^16.13.1",
     "react-i18next": "^11.3.4",
     "react-lazyload": "^2.6.7",
+    "slash": "^3.0.0",
     "styled-components": "^5.1.0",
     "subscriptions-transport-ws": "^0.9.16",
     "super-react-gist": "^1.0.4",
@@ -130,7 +131,7 @@
     "typeface-roboto": "^0.0.75",
     "typescript": "^3.8.3",
     "unstated-next": "^1.1.0",
-    "vickymd": "^0.1.15",
+    "vickymd": "^0.1.16",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {

src/extension/TreeView.ts

@@ -33,7 +33,7 @@ export class CrossnoteTreeViewProvider
           this.crossnote.refreshNotesPanelWebview();
           const treeItems: CrossnoteTreeItem[] = [
             new CrossnoteTreeItem(
-              "🗓 " + "Today",
+              "📅 " + "Today",
               vscode.TreeItemCollapsibleState.None,
               notebook,
               CrossnoteSectionType.Today,

src/lib/crossnote.ts

@@ -211,6 +211,7 @@ export class Crossnote {
     }
     let needsToRefreshTagNode = false;
     let needsToRefreshTreeView = false;
+    let needsToRefreshNotesPanelImmediately = false;
     let oldNote = notebook.notes.find((n) => n.filePath === newNote.filePath);
     if (!oldNote) {
       notebook.notes = [newNote, ...notebook.notes];
@@ -225,6 +226,15 @@ export class Crossnote {
       needsToRefreshTreeView = true;
     }
 
+    const oldNoteHasEncription = !!oldNote.config.encryption;
+    const newNoteHasEncryption = !!newNote.config.encryption;
+    if (
+      oldNote.config.pinned !== newNote.config.pinned ||
+      oldNoteHasEncription !== newNoteHasEncryption
+    ) {
+      needsToRefreshNotesPanelImmediately = true;
+    }
+
     oldNote.config = newNote.config;
     oldNote.markdown = newNote.markdown;
     this.needsToRefreshNotesPanel = true;
@@ -242,6 +252,10 @@ export class Crossnote {
     if (needsToRefreshTreeView) {
       this.refreshTreeView();
     }
+
+    if (needsToRefreshNotesPanelImmediately) {
+      this.sendNotesToNotesPanelWebview();
+    }
   }
 
   private startNotesPanelRefreshTimer() {

src/lib/notebook.ts

@@ -4,6 +4,7 @@ import YAML from "yamljs";
 import { Note, NoteConfig, getHeaderFromMarkdown } from "./note";
 import AES from "crypto-js/aes";
 import mkdirp from "mkdirp";
+import slash from "slash";
 import { SelectedSection, CrossnoteSectionType } from "./section";
 import { randomID } from "../util/util";
 
@@ -138,7 +139,7 @@ ${markdown}`;
       // Create note
       const note: Note = {
         notebookPath: this.dir,
-        filePath: path.relative(this.dir, absFilePath),
+        filePath: slash(path.relative(this.dir, absFilePath)),
         markdown: notFullMarkdown ? markdown.slice(0, 1000) : markdown,
         config: noteConfig,
       };

src/views/components/ChangeFilePathDialog.tsx

@@ -11,6 +11,7 @@ import { useTranslation } from "react-i18next";
 import { Note } from "../../lib/note";
 import { vscode } from "../util/util";
 import { MessageAction } from "../../lib/message";
+import slash from "slash";
 
 interface Props {
   open: boolean;
@@ -36,6 +37,7 @@ export default function ChangeFilePathDialog(props: Props) {
         if (!newFilePath.endsWith(".md")) {
           newFilePath = newFilePath + ".md";
         }
+        newFilePath = slash(newFilePath);
         if (note.filePath !== newFilePath) {
           vscode.postMessage({
             action: MessageAction.ChangeNoteFilePath,

src/views/components/EditorPanel.tsx

@@ -620,19 +620,19 @@ export default function EditorPanel(props: Props) {
     };
     editor.on("imageClicked", imageClickedHandler);
 
-    const imageRendered = (args: any) => {
+    const loadImage = (args: any) => {
       const element = args.element;
       const imageSrc = element.getAttribute("data-src");
       element.setAttribute("src", resolveNoteImageSrc(note, imageSrc));
     };
-    editor.on("imageRendered", imageRendered);
+    editor.on("imageReadyToLoad", loadImage);
 
     return () => {
       editor.off("changes", changesHandler);
       editor.off("keyup", keyupHandler);
       editor.off("linkIconClicked", linkIconClickedHandler);
       editor.off("imageClicked", imageClickedHandler);
-      editor.off("imageRendered", imageRendered);
+      editor.off("imageReadyToLoad", loadImage);
     };
   }, [editor, note, decryptionPassword, isDecrypted, openURL]);
 

src/views/util/util.ts

@@ -1,6 +1,7 @@
 import { Message } from "../../lib/message";
 import { Note } from "../../lib/note";
 import * as path from "path";
+import slash from "slash";
 
 interface VSCodeWebviewAPI {
   postMessage: (message: Message) => void;
@@ -18,14 +19,12 @@ export function resolveNoteImageSrc(note: Note, imageSrc: string) {
   } else if (imageSrc.startsWith("http://")) {
     return "";
   } else if (imageSrc.startsWith("/")) {
-    return `vscode-resource://file//${path.resolve(
-      note.notebookPath,
-      "." + imageSrc
+    return `vscode-resource://file//${slash(
+      path.resolve(note.notebookPath, "." + imageSrc)
     )}`;
   } else {
-    return `vscode-resource://file//${path.resolve(
-      note.notebookPath,
-      imageSrc
+    return `vscode-resource://file//${slash(
+      path.resolve(note.notebookPath, imageSrc)
     )}`;
   }
 }

yarn.lock

@@ -6820,6 +6820,11 @@ simple-get@^3.0.2:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npm.taobao.org/slash/download/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ=
+
 slugify@^1.3.1:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/slugify/download/slugify-1.4.0.tgz#c9557c653c54b0c7f7a8e786ef3431add676d2cb"
@@ -8108,10 +8113,10 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vickymd@^0.1.15:
-  version "0.1.15"
-  resolved "https://registry.npm.taobao.org/vickymd/download/vickymd-0.1.15.tgz#09bde76fc414e72be3b096cfbb8fc419c5776cbf"
-  integrity sha1-Cb3nb8QU5yvjsJbPu4/EGcV3bL8=
+vickymd@^0.1.16:
+  version "0.1.16"
+  resolved "https://registry.npm.taobao.org/vickymd/download/vickymd-0.1.16.tgz#6116b9523a893949a9afd3bf07c505de269add8d"
+  integrity sha1-YRa5UjqJOUmpr9O/B8UF3iaa3Y0=
   optionalDependencies:
     echarts "^4.7.0"
     emojione "^4.5.0"