Merge pull request #29 from terwer/dev

feat: #20 导入epub后，里面的图片会出现在未引用资源里面，容易被误清除

Author: terwer

README.md

@@ -19,6 +19,11 @@ Import epub, docx, html, etc. into Siyuan notes. Currently supported formats: .e
 
 ## Changelog
 
+**v1.4.1 major update**
+
+- Optimize link removal rules
+- Block some notebooks
+
 **v1.4.0 major update**
 
 In short, this version is strongly recommended for all users to upgrade, to prevent resource files from being unable to cross-platform due to previous path problems, and to have a better user experience in other aspects.

README_zh_CN.md

@@ -21,6 +21,11 @@
 
 ## 更新历史
 
+**v1.4.1 主要更新**
+
+- 优化去除链接规则
+- 屏蔽掉一部分 notebook
+
 **v1.4.0 主要更新**
 
 总之，这个版本强烈建议所有用户升级，防止之前的路径问题导致资源文件无法跨平台，同时在其他方面也有更好的用户体验。

package.json

@@ -35,8 +35,5 @@
     "vite": "^4.3.7",
     "vite-plugin-static-copy": "^0.15.0",
     "vitest": "^0.31.1"
-  },
-  "dependencies": {
-    "shorthash2": "^1.0.3"
   }
 }

pnpm-lock.yaml

@@ -23,8 +23,9 @@
  * questions.
  */
 
+export const workspaceDir = `${(window as any).siyuan.config.system.workspaceDir}`
 export const dataDir = `${(window as any).siyuan.config.system.dataDir}`
-export const mediaDir = `${dataDir}/assets/import`
+export const mediaDir = `./assets`
 export const isDev = process.env.DEV_MODE === "true"
 export const siyuanApiUrl = ""
 export const siyuanApiToken = ""

src/Constants.ts

@@ -24,9 +24,8 @@
  */
 
 import { BaseApi, SiyuanData } from "./base-api"
-import {mediaDir, siyuanApiToken, siyuanApiUrl} from "../Constants"
+import { mediaDir, siyuanApiToken, siyuanApiUrl } from "../Constants"
 import { fetchPost } from "siyuan"
-import shortHash from "shorthash2";
 
 /**
  * 思源笔记服务端API v2.8.8
@@ -80,6 +79,20 @@ class KernelApi extends BaseApi {
     })
   }
 
+  public async saveTextData(fileName: string, data: any) {
+    return new Promise((resolve) => {
+      const pathString = `/temp/convert/pandoc/${fileName}`
+      const file = new File([new Blob([data])], pathString.split("/").pop())
+      const formData = new FormData()
+      formData.append("path", pathString)
+      formData.append("file", file)
+      formData.append("isDir", "false")
+      fetchPost("/api/file/putFile", formData, (response) => {
+        resolve(response)
+      })
+    })
+  }
+
   /**
    * 转换服务
    *
@@ -88,9 +101,8 @@ class KernelApi extends BaseApi {
    * @param to - 转换后的文件名，不包括路径，路径相对于 /temp/convert/pandoc
    */
   public async convertPandoc(type: string, from: string, to: string): Promise<SiyuanData> {
-    const toMediaDir = [mediaDir, shortHash(to).toLowerCase()].join("/")
     const args = {
-      args: ["--to", type, from, "-o", to, "--extract-media", toMediaDir],
+      args: ["--to", type, from, "-o", to, "--extract-media", mediaDir],
     }
     return await this.siyuanRequest("/api/convert/pandoc", args)
   }
@@ -123,7 +135,7 @@ class KernelApi extends BaseApi {
   }
 
   /**
-   * 通过Markdown创建文档
+   * 删除文件
    *
    * @param path - 路径
    */
@@ -135,7 +147,7 @@ class KernelApi extends BaseApi {
   }
 
   /**
-   * 通过Markdown创建文档
+   * 通过 Markdown 创建文档
    *
    * @param notebook - 笔记本
    * @param path - 路径
@@ -149,6 +161,23 @@ class KernelApi extends BaseApi {
     }
     return await this.siyuanRequest("/api/filetree/createDocWithMd", params)
   }
+
+  /**
+   * 导入 Markdown 文件
+   *
+   * @param localPath - 本地 MD 文档绝对路径
+   * @param notebook - 笔记本
+   * @param path - 路径
+   */
+  public async importStdMd(localPath, notebook: string, path: string): Promise<SiyuanData> {
+    const params = {
+      // Users/terwer/Documents/mydocs/SiYuanWorkspace/public/temp/convert/pandoc/西蒙学习法：如何在短时间内快速学会新知识-友荣方略.md
+      localPath: localPath,
+      notebook: notebook,
+      toPath: path,
+    }
+    return await this.siyuanRequest("/api/import/importStdMd", params)
+  }
 }
 
 export default KernelApi

src/api/kernel-api.ts

@@ -26,10 +26,10 @@
 <script lang="ts">
   import { showMessage } from "siyuan"
   import ImporterPlugin from "../index"
-  import {removeEmptyLines, removeFootnotes, removeLinks, replaceImagePath} from "../utils/utils"
+  import { removeEmptyLines, removeFootnotes, removeLinks, replaceImagePath } from "../utils/utils"
   import { onMount } from "svelte"
   import { loadImporterConfig, saveImporterConfig } from "../store/config"
-  import { isDev } from "../Constants"
+  import { isDev, workspaceDir } from "../Constants"
 
   export let pluginInstance: ImporterPlugin
   export let dialog
@@ -39,7 +39,7 @@
   let toNotebookId
   let toNotebookName
   //用户指南不应该作为可以写入的笔记本
-  const hiddenNotebook: Set<string> = new Set(["思源笔记用户指南", "SiYuan User Guide"]);
+  const hiddenNotebook: Set<string> = new Set(["思源笔记用户指南", "SiYuan User Guide"])
 
   const startImport = async (
     event: InputEvent & {
@@ -104,9 +104,13 @@
     mdText = replaceImagePath(mdText)
     // 去除脚注
     mdText = removeFootnotes(mdText)
+    await pluginInstance.kernelApi.saveTextData(`${toFilename}`, mdText)
 
     // 创建 MD 文档
-    const mdResult = await pluginInstance.kernelApi.createDocWithMd(toNotebookId, `/${filename}`, mdText)
+    // const mdResult = await pluginInstance.kernelApi.createDocWithMd(toNotebookId, `/${filename}`, mdText)
+    // 导入 MD 文档
+    const localPath = `${workspaceDir}/temp/convert/pandoc/${toFilename}`
+    const mdResult = await pluginInstance.kernelApi.importStdMd(localPath, toNotebookId, `/`)
     if (mdResult.code !== 0) {
       showMessage(`${pluginInstance.i18n.msgDocCreateFailed}=>${toFilePath}`, 7000, "error")
     }
@@ -155,10 +159,8 @@
     const res = await pluginInstance.kernelApi.lsNotebooks()
     const data = res.data as any
     notebooks = data.notebooks ?? []
-    //没有必要把所有笔记本都列出来
-    notebooks = notebooks.filter(
-        notebook => !notebook.closed && !hiddenNotebook.has(notebook.name)
-    );
+    // 没有必要把所有笔记本都列出来
+    notebooks = notebooks.filter((notebook) => !notebook.closed && !hiddenNotebook.has(notebook.name))
     // 选中，若是没保存，获取第一个
     toNotebookId = importerConfig?.notebook ?? notebooks[0].id
     const currentNotebook = notebooks.find((n) => n.id === toNotebookId)

src/lib/ImportForm.svelte

@@ -68,16 +68,15 @@ export const isFileExists = async (kernelApi: KernelApi, p: string, type: "text"
 // 保留图片
 export const removeEmptyLines = (str: string): string => str.replace(/^#+\s*\n|\n\u00A0+/gm, "\n")
 
+function convertPathToUnixStyle(path) {
+  // 使用 replace() 函数将所有反斜杠替换为斜杠
+  return path.replace(/\\/g, "/")
+}
 /**
  * 修复图片路径
  *
  * @param mdText - markdown 文本
  */
-function convertPathToUnixStyle(path) {
-  // 使用 replace() 函数将所有反斜杠替换为斜杠
-  return path.replace(/\\/g, "/")
-}
-
 export function replaceImagePath(mdText) {
   const regex = /!\[(.*?)\]\(([^\s]*?)\)/g
   return mdText.replace(regex, (match, p1, p2) => {
@@ -103,8 +102,6 @@ export function removeFootnotes(text) {
 export function removeLinks(text) {
   const regex = /\[([^\]]+)]\(([^)]+)\)/g
   return text.replace(regex, (match, p1, p2) => {
-    console.log(p2)
-    console.log(typeof p2)
     if (p2.includes("./Text") || p2.includes("#") || p2.includes("kindle:")) {
       return p1
     } else {