mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-03 06:41:44 +08:00
🎨 Improve sync message push https://ld246.com/article/1732931024696
This commit is contained in:
parent
91a768e4e7
commit
e643d7106f
@ -135,6 +135,7 @@ func importData(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
file := form.File["file"][0]
|
file := form.File["file"][0]
|
||||||
|
logging.LogInfof("import data [name=%s, size=%d]", file.Filename, file.Size)
|
||||||
fileReader, err := file.Open()
|
fileReader, err := file.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logging.LogErrorf("open upload file failed: %s", err)
|
logging.LogErrorf("open upload file failed: %s", err)
|
||||||
|
@ -1556,7 +1556,6 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
|
|||||||
}
|
}
|
||||||
planSyncAfter(delay)
|
planSyncAfter(delay)
|
||||||
}
|
}
|
||||||
util.PushClearProgress()
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user