feat: 支持图片导入

terwer · May 17, 2023 · 6387db2 · 6387db2
1 parent dbd4346
commit 6387db2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/src/Constants.ts b/src/Constants.ts
@@ -23,6 +23,8 @@
  * questions.
  */
 
+export const dataDir = `${(window as any).siyuan.config.system.dataDir}`
+export const mediaDir = `${dataDir}/assets/import`
 export const isDev = process.env.DEV_MODE === "true"
 export const siyuanApiUrl = ""
 export const siyuanApiToken = ""
diff --git a/src/api/kernel-api.ts b/src/api/kernel-api.ts
@@ -24,7 +24,7 @@
  */
 
 import { BaseApi, SiyuanData } from "./base-api"
-import { siyuanApiToken, siyuanApiUrl } from "../Constants"
+import {mediaDir, siyuanApiToken, siyuanApiUrl} from "../Constants"
 import { fetchPost } from "siyuan"
 
 /**
@@ -88,7 +88,7 @@ class KernelApi extends BaseApi {
    */
   public async convertPandoc(type: string, from: string, to: string): Promise<SiyuanData> {
     const args = {
-      args: ["--to", type, from, "-o", to],
+      args: ["--to", type, from, "-o", to, "--extract-media", mediaDir],
     }
     return await this.siyuanRequest("/api/convert/pandoc", args)
   }

diff --git a/src/index.ts b/src/index.ts
@@ -26,7 +26,7 @@
 import { App, IObject, Plugin } from "siyuan"
 import { createLogger } from "./utils/simple-logger"
 import KernelApi from "./api/kernel-api"
-import { isDev } from "./Constants"
+import {isDev, mediaDir} from "./Constants"
 import "./index.styl"
 import { removeImporterConfig } from "./store/config"
 import { initTopbar } from "./topbar"
@@ -56,6 +56,7 @@ export default class ImporterPlugin extends Plugin {
 
     // 初始化顶栏按钮
     await initTopbar(this)
+    this.logger.info("mediaDir=>", mediaDir)
     this.logger.info(this.i18n.importerLoaded)
   }
 

diff --git a/src/lib/ImportForm.svelte b/src/lib/ImportForm.svelte
@@ -26,7 +26,7 @@
 <script lang="ts">
   import { showMessage } from "siyuan"
   import ImporterPlugin from "../index"
-  import { removeEmptyLines } from "../utils/utils"
+  import { removeEmptyLines, replaceImagePath } from "../utils/utils"
   import { onMount } from "svelte"
   import { loadImporterConfig, saveImporterConfig } from "../store/config"
   import { isDev } from "../Constants"
@@ -94,7 +94,10 @@
     }
 
     // 文本处理
+    // 去除空行
     mdText = removeEmptyLines(mdText)
+    // 资源路径
+    mdText = replaceImagePath(mdText)
 
     // 创建 MD 文档
     const mdResult = await pluginInstance.kernelApi.createDocWithMd(toNotebookId, `/${filename}`, mdText)

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -24,6 +24,7 @@
  */
 
 import KernelApi from "../api/kernel-api"
+import { dataDir } from "../Constants"
 
 /**
  * 文件是否存在
@@ -62,4 +63,23 @@ export const isFileExists = async (kernelApi: KernelApi, p: string, type: "text"
  *
  * @param str - 字符串
  */
-export const removeEmptyLines = (str: string): string => str.replace(/^#+\s*\n|!\[.*?\]\(.*?\)\n+|\n\u00A0+/gm, "\n")
+// 删除图片
+// export const removeEmptyLines = (str: string): string => str.replace(/^#+\s*\n|!\[.*?\]\(.*?\)\n+|\n\u00A0+/gm, "\n")
+// 保留图片
+export const removeEmptyLines = (str: string): string => str.replace(/^#+\s*\n|\n\u00A0+/gm, "\n")
+
+/**
+ * 修复图片路径
+ *
+ * @param mdText - markdown 文本
+ */
+export const replaceImagePath = (mdText: string): string => {
+  const basePath = dataDir
+  const regex = /!\[(.*?)\]\((\/.*?)\)/g
+  return mdText.replace(regex, (match, p1, p2) => {
+    if (p2.includes(basePath)) {
+      return `![${p1}](${p2.replace(basePath, "")})`
+    }
+    return match
+  })
+}