Skip to content

Commit

Permalink
feat: 解析图片链接
Browse files Browse the repository at this point in the history
  • Loading branch information
terwer committed Aug 11, 2023
1 parent 63950dd commit fbdbaad
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
7 changes: 5 additions & 2 deletions src/service/picgoPostApi.ts
Expand Up @@ -32,7 +32,7 @@ import { ParsedImage } from "~/src/models/parsedImage.ts"
import { PicgoPostResult } from "~/src/models/picgoPostResult.ts"
import { appConstants } from "~/src/appConstants.ts"
import { JsonUtil, StrUtil } from "zhi-common"
import { SiyuanDevice } from "zhi-device"
import { BrowserUtil, SiyuanDevice } from "zhi-device"
import { PicgoApi } from "~/src/service/picgoApi.js"

/**
Expand Down Expand Up @@ -80,7 +80,10 @@ export class PicgoPostApi {
// 处理思源本地图片预览
// 这个是从思源查出来解析的是否是本地
if (retImg.isLocal) {
const baseUrl = ""
let baseUrl = ""
if (BrowserUtil.isInBrowser) {
baseUrl = window.location.origin
}
imgUrl = StrUtil.pathJoin(baseUrl, "/" + imgUrl)
}

Expand Down
21 changes: 17 additions & 4 deletions src/utils/parser/imageParse.spec.ts
Expand Up @@ -25,9 +25,16 @@

import { describe, it } from "vitest"
import { ImageParser } from "~/src/utils/parser/imageParser"
import { ParsedImage, PicgoPostApi } from "~/src"
import { siyuanKernelApi } from "~/src/utils/utils.ts"

describe("test imageParser", () => {
it("test parseImagesToArray", () => {
it("test parseImagesToArray", async () => {
const imageParser = new ImageParser()
const picgoPostApi = new PicgoPostApi()
const siyuanApi = siyuanKernelApi()

const pageId = "20230810225224-zpeipef"
const md = `
​![image](assets/image-20230810225235-fdkcky0.png)
Expand All @@ -42,8 +49,14 @@ describe("test imageParser", () => {
​![image](assets/image-20230811154614-oh2revw.png)​`
const imageParser = new ImageParser()
const images = imageParser.parseImagesToArray(md)
console.log(images)
const attrs = await siyuanApi.getBlockAttrs(pageId)

let retImgs: ParsedImage[] = []
const parsedImages = imageParser.parseImagesToArray(md)
retImgs = [...new Set([...retImgs, ...parsedImages])]
console.log("retImgs=>", retImgs)

const imageItemArray = await picgoPostApi.doConvertImagesToImagesItemArray(attrs, retImgs)
console.log("imageItemArray=>", imageItemArray)
})
})

0 comments on commit fbdbaad

Please sign in to comment.