Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 改进网络图片转换本地图片消息提示 https://github.com/siyuan-note/siyuan/issues/5131

Browse source
This commit is contained in:
Liang Ding 2022-06-09 19:17:15 +08:00
parent bb669e47f6
commit 101a8e7350
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/assets.go
View file

@ -69,7 +69,7 @@ func NetImg2LocalAssets(rootID string) (err error) {
}
var files int
util.PushMsg(Conf.Language(119), 7000)
msgId := gulu.Rand.String(7)
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
@ -90,6 +90,7 @@ func NetImg2LocalAssets(rootID string) (err error) {
u = strings.Replace(u, "/0?", "/640?", 1)
}
}
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(119), u), 15000)
request := util.NewBrowserRequest(Conf.System.NetworkProxy.String())
resp, reqErr := request.Get(u)
if nil != reqErr {
@ -147,14 +148,14 @@ func NetImg2LocalAssets(rootID string) (err error) {
return ast.WalkContinue
})
if 0 < files {
util.PushMsg(Conf.Language(113), 7000)
util.PushUpdateMsg(msgId, Conf.Language(113), 7000)
if err = writeJSONQueue(tree); nil != err {
return
}
sql.WaitForWritingDatabase()
util.PushMsg(fmt.Sprintf(Conf.Language(120), files), 5000)
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(120), files), 5000)
} else {
util.PushMsg(Conf.Language(121), 3000)
util.PushUpdateMsg(msgId, Conf.Language(121), 3000)
}
return
}