github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-08 17:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Vanessa 2024-03-14 12:41:19 +08:00
commit 77541b7dda
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/model/assets.go
View File

@ -148,7 +148,12 @@ func NetImg2LocalAssets(rootID, originalURL string) (err error) {
return ast.WalkSkipChildren return ast.WalkSkipChildren
} }
if bytes.HasPrefix(bytes.ToLower(dest), []byte("https://")) || bytes.HasPrefix(bytes.ToLower(dest), []byte("http://")) { if bytes.HasPrefix(bytes.ToLower(dest), []byte("https://")) || bytes.HasPrefix(bytes.ToLower(dest), []byte("http://")) || bytes.HasPrefix(dest, []byte("//")) {
if bytes.HasPrefix(dest, []byte("//")) {
// `Convert network images to local` supports `//` https://github.com/siyuan-note/siyuan/issues/10598
dest = append([]byte("https:"), dest...)
}
u := string(dest) u := string(dest)
if strings.Contains(u, "qpic.cn") { if strings.Contains(u, "qpic.cn") {
// 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/5052 // 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/5052
@ -320,7 +325,12 @@ func NetAssets2LocalAssets(rootID string) (err error) {
return ast.WalkContinue return ast.WalkContinue
} }
if bytes.HasPrefix(bytes.ToLower(dest), []byte("https://")) || bytes.HasPrefix(bytes.ToLower(dest), []byte("http://")) { if bytes.HasPrefix(bytes.ToLower(dest), []byte("https://")) || bytes.HasPrefix(bytes.ToLower(dest), []byte("http://")) || bytes.HasPrefix(dest, []byte("//")) {
if bytes.HasPrefix(dest, []byte("//")) {
// `Convert network images to local` supports `//` https://github.com/siyuan-note/siyuan/issues/10598
dest = append([]byte("https:"), dest...)
}
u := string(dest) u := string(dest)
if strings.Contains(u, "qpic.cn") { if strings.Contains(u, "qpic.cn") {
// 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/5052 // 改进 `网络图片转换为本地图片` 微信图片拉取 https://github.com/siyuan-note/siyuan/issues/5052