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

🎨 Cloud sync storage size check

Browse source
This commit is contained in:
Liang Ding 2022-07-03 09:36:18 +08:00
parent d013fd1229
commit e17aa59597
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/repository.go
View file

@ -311,7 +311,7 @@ func syncRepo(byHand bool) {
Dir: Conf.Sync.CloudName,
UserID: Conf.User.UserId,
Token: Conf.User.UserToken,
LimitSize: int64(Conf.User.UserSiYuanRepoSize),
LimitSize: int64(Conf.User.UserSiYuanRepoSize - Conf.User.UserSiYuanAssetSize),
ProxyURL: Conf.System.NetworkProxy.String(),
Server: util.AliyunServer,
}
@ -322,6 +322,9 @@ func syncRepo(byHand bool) {
if nil != err {
util.LogErrorf("sync data repo failed: %s", err)
msg := "Sync data repo failed: " + err.Error()
if errors.Is(err, dejavu.ErrSyncCloudStorageSizeExceeded) {
msg = fmt.Sprintf(Conf.Language(43), byteCountSI(int64(Conf.User.UserSiYuanRepoSize)))
}
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
return

4
kernel/model/sync.go
View file

@ -135,8 +135,8 @@ func SyncData(boot, exit, byHand bool) {
indexRepoBeforeCloudSync()
//同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5142
//syncRepo(byHand)
//return // TODO: 测试
syncRepo(byHand)
return // TODO: 测试
WaitForWritingFiles()
writingDataLock.Lock()