From 04ba3ed0118d31ac6d7f45b8c55058abf5608bf5 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 May 2024 16:38:49 +0800 Subject: [PATCH 1/5] :art: Support convert Base64 image when clipping HTML https://github.com/siyuan-note/siyuan/issues/11210 --- kernel/api/extension.go | 2 +- kernel/model/import.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/api/extension.go b/kernel/api/extension.go index 8dd8aea49..d8aa3e63f 100644 --- a/kernel/api/extension.go +++ b/kernel/api/extension.go @@ -122,7 +122,7 @@ func extensionCopy(c *gin.Context) { } luteEngine := util.NewStdLute() - md := luteEngine.HTML2Md(dom) + md, _ := model.HTML2Markdown(dom) md = strings.TrimSpace(md) var unlinks []*ast.Node diff --git a/kernel/model/import.go b/kernel/model/import.go index ffa6e9008..150912a9b 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -33,6 +33,7 @@ import ( "os" "path" "path/filepath" + "regexp" "runtime/debug" "sort" "strconv" @@ -927,8 +928,11 @@ func processBase64Img(n *ast.Node, dest string, assetDirPath string, err error) os.MkdirAll(base64TmpDir, 0755) sep := strings.Index(dest, ";base64,") + str := strings.TrimSpace(dest[sep+8:]) + re := regexp.MustCompile(`(?i)%0A`) + str = re.ReplaceAllString(str, "\n") var decodeErr error - unbased, decodeErr := base64.StdEncoding.DecodeString(dest[sep+8:]) + unbased, decodeErr := base64.StdEncoding.DecodeString(str) if nil != decodeErr { logging.LogErrorf("decode base64 image failed: %s", decodeErr) return From 73b254e9e49359420255dfa826ebbc9ee06a6635 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 1 May 2024 17:03:33 +0800 Subject: [PATCH 2/5] :art: Support convert Base64 image when clipping HTML https://github.com/siyuan-note/siyuan/issues/11210 --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 1c98e30c3..d99d460ce 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -8,7 +8,7 @@ require ( github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7 github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30 - github.com/88250/lute v1.7.7-0.20240426152525-692d31b09cd2 + github.com/88250/lute v1.7.7-0.20240501085643-eb6f97b5b990 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4 diff --git a/kernel/go.sum b/kernel/go.sum index 1fb9c4bc7..83c0fe576 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -12,8 +12,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30 h1:IeE4DVRWnVpcbMj7gGZoSMiBWs3h/ihiyOmualS1Mas= github.com/88250/gulu v1.2.3-0.20240324024901-3c1bb82cba30/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8= -github.com/88250/lute v1.7.7-0.20240426152525-692d31b09cd2 h1:ij6zgH3jCeBzRQ1hRgJzuEFwyHBO8coK5Jn1fCFAamo= -github.com/88250/lute v1.7.7-0.20240426152525-692d31b09cd2/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk= +github.com/88250/lute v1.7.7-0.20240501085643-eb6f97b5b990 h1:aDwkV9eHMm0v14+yCKSjBupfuh9lMZmWGWmMinJpfGc= +github.com/88250/lute v1.7.7-0.20240501085643-eb6f97b5b990/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0= github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY= From 65ab8a8d0a600337e5ee44c76d0a29d41f243e51 Mon Sep 17 00:00:00 2001 From: Jeffrey Chen <78434827+TCOTC@users.noreply.github.com> Date: Wed, 1 May 2024 17:43:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?jp=5FJP=20=E2=86=92=20ja=5FJP=20(#11219)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/electron/init.html | 4 ++-- app/src/constants.ts | 2 +- app/src/types/config.d.ts | 2 +- kernel/util/working.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/electron/init.html b/app/electron/init.html index 863f7a69d..bc3272d9a 100644 --- a/app/electron/init.html +++ b/app/electron/init.html @@ -210,7 +210,7 @@ - +