From 8c6b747da831b4420663566129436f1883dadb61 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 30 Aug 2023 17:09:14 +0800 Subject: [PATCH 1/3] :art: Improve EPUB asset file content parsing https://github.com/siyuan-note/siyuan/issues/9072 --- kernel/go.mod | 3 ++- kernel/go.sum | 4 ++-- kernel/model/asset_content.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 04401292b..ef764cc7a 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -6,6 +6,7 @@ require ( code.sajari.com/docconv v1.3.5 github.com/88250/clipboard v0.1.5 github.com/88250/css v0.1.2 + github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 github.com/88250/gulu v1.2.3-0.20230615033005-b519d6875346 github.com/88250/lute v1.7.6-0.20230828091650-fcb96f789c8f github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c @@ -57,7 +58,6 @@ require ( github.com/steambap/captcha v1.4.1 github.com/studio-b12/gowebdav v0.9.0 github.com/vmihailenco/msgpack/v5 v5.3.5 - github.com/wmentor/epub v1.0.1 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 github.com/xuri/excelize/v2 v2.8.0 golang.org/x/image v0.11.0 @@ -177,3 +177,4 @@ replace github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20 //replace github.com/88250/pdfcpu => D:\88250\pdfcpu //replace github.com/88250/gulu => D:\88250\gulu //replace github.com/mattn/go-sqlite3 => D:\88250\go-sqlite3 +//replace github.com/88250/epub => D:\88250\epub diff --git a/kernel/go.sum b/kernel/go.sum index 04955542a..c0f474c42 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -55,6 +55,8 @@ github.com/88250/clipboard v0.1.5 h1:V/mCiSrjwmIiJwvchGTs+W2ozdINxk7y7KgHNTSzlCI github.com/88250/clipboard v0.1.5/go.mod h1:bNLJx4L8cF6fEgiXMPVrK1Iidnaff8BTkktTNtefcks= github.com/88250/css v0.1.2 h1:+AADhEwWoGZFbUjqIsBcdnq2xfj8fDFDAGRXhBUhUY8= github.com/88250/css v0.1.2/go.mod h1:XfcZHQ0YuUb9VncVBurQfVyw1ZQicsB5Gc9N7BK3/ig= +github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 h1:qiE88Pw/9GG8hvMfpfB4aUhnIikZTwG+Z/Xbn0a9R14= +github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48/go.mod h1:UgVSq5iO9pOvqs3hIGNVk6WXDiAB0v3Dlg4nssQJ7W4= github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXSiEXYAo8Zbi/r2Ld6Dd4MmGHgir3EaSuHQ= github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20230615033005-b519d6875346 h1:U0wZN6zuf+vUhzdHC6DbZE/bY5FUt3FuCwn/KgObV44= @@ -577,8 +579,6 @@ github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/wmentor/epub v1.0.1 h1:88Jod0B9g+7NxdbAHhmE/qHnK+i4Ns/NJjeyQ/V8YwI= -github.com/wmentor/epub v1.0.1/go.mod h1:PydFqUA+hmJ9g1lI/3XRYAK2TPC5WVFEZh7lkV9ETtM= github.com/wmentor/html v1.0.1 h1:iIuDyH7pohHMMzdD5WQhvya5UyIecFDWTYzdM873Ook= github.com/wmentor/html v1.0.1/go.mod h1:nwnrzqG0xD0Q1mO+a4iNfgh40K8/tFuq6smFlHOBu10= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= diff --git a/kernel/model/asset_content.go b/kernel/model/asset_content.go index 3a92bac84..402e981b4 100644 --- a/kernel/model/asset_content.go +++ b/kernel/model/asset_content.go @@ -29,6 +29,7 @@ import ( "unicode/utf8" "code.sajari.com/docconv" + "github.com/88250/epub" "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/dustin/go-humanize" @@ -42,7 +43,6 @@ import ( "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/util" - "github.com/wmentor/epub" "github.com/xuri/excelize/v2" ) From eb8da00236acef8a3f9f0341df47c9e6f60cd612 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 30 Aug 2023 17:10:43 +0800 Subject: [PATCH 2/3] :art: Improve asset file content search preview escaping https://github.com/siyuan-note/siyuan/issues/9073 --- kernel/util/misc.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/util/misc.go b/kernel/util/misc.go index 389dfc5e7..b76277f3d 100644 --- a/kernel/util/misc.go +++ b/kernel/util/misc.go @@ -42,13 +42,12 @@ func RemoveElem[T any](s []T, index int) []T { } func EscapeHTML(s string) string { - if strings.Contains(s, "&") || strings.Contains(s, """) || strings.Contains(s, "<") || strings.Contains(s, ">") || strings.Contains(s, "'") || strings.Contains(s, "'") { - return s - } - if strings.ContainsAny(s, "<>\"'") { return html.EscapeString(s) } + if strings.Contains(s, "&") || strings.Contains(s, """) || strings.Contains(s, "<") || strings.Contains(s, ">") || strings.Contains(s, "'") || strings.Contains(s, "'") { + return s + } return s } From ecc0c9d8189601c8e7ca90d611caa14389659995 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 30 Aug 2023 17:11:15 +0800 Subject: [PATCH 3/3] :art: Improve asset file content search preview escaping https://github.com/siyuan-note/siyuan/issues/9073 --- kernel/util/misc.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/util/misc.go b/kernel/util/misc.go index b76277f3d..9eea724d7 100644 --- a/kernel/util/misc.go +++ b/kernel/util/misc.go @@ -45,9 +45,6 @@ func EscapeHTML(s string) string { if strings.ContainsAny(s, "<>\"'") { return html.EscapeString(s) } - if strings.Contains(s, "&") || strings.Contains(s, """) || strings.Contains(s, "<") || strings.Contains(s, ">") || strings.Contains(s, "'") || strings.Contains(s, "'") { - return s - } return s }