From 4b46e2c3d6c8d8f1d4a60306eaca05b108536c30 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 2 Nov 2022 08:27:41 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9C=AA=E7=99=BB=E5=BD=95=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E5=A4=B1=E8=B4=A5=20Fix=20https://github.com/siyuan-n?= =?UTF-8?q?ote/siyuan/issues/6448?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/conf/user.go | 4 ++++ kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/repository.go | 13 +++++++------ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/kernel/conf/user.go b/kernel/conf/user.go index 8a6eb6ed0..96ec4332c 100644 --- a/kernel/conf/user.go +++ b/kernel/conf/user.go @@ -44,3 +44,7 @@ type UserTitle struct { Desc string `json:"desc"` Icon string `json:"icon"` } + +func (user *User) GetCloudRepoAvailableSize() int64 { + return int64(user.UserSiYuanRepoSize - user.UserSiYuanAssetSize) +} diff --git a/kernel/go.mod b/kernel/go.mod index 6730fbc0e..d42365771 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -36,7 +36,7 @@ require ( github.com/panjf2000/ants/v2 v2.6.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/radovskyb/watcher v1.0.7 - github.com/siyuan-note/dejavu v0.0.0-20221101103342-02ed165940e8 + github.com/siyuan-note/dejavu v0.0.0-20221102002421-8e07eac1b233 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 github.com/siyuan-note/eventbus v0.0.0-20220916025349-3ac6e75522da github.com/siyuan-note/filelock v0.0.0-20221007163134-7e64809023ef diff --git a/kernel/go.sum b/kernel/go.sum index 59446e85d..fcb5dd584 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -353,8 +353,8 @@ github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1l github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4= github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw= -github.com/siyuan-note/dejavu v0.0.0-20221101103342-02ed165940e8 h1:c8JeXge8e2CtNMq3s96Ix6Ppj0qYNZ4t42o8UaWoNo8= -github.com/siyuan-note/dejavu v0.0.0-20221101103342-02ed165940e8/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= +github.com/siyuan-note/dejavu v0.0.0-20221102002421-8e07eac1b233 h1:SNKbf8fHsXkbIcERHYKeORSVBvMSXgirxXC8f0mN0mU= +github.com/siyuan-note/dejavu v0.0.0-20221102002421-8e07eac1b233/go.mod h1:+U86jfsvpacZBThE3Ouf/ZQ4EsB4jGPJsMO2iuRv0LQ= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE= github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20220916025349-3ac6e75522da h1:/jNhl7LC+9BhkWvNxuJDdsNfA/2wvfuj9mqWx4CbV90= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index f2555ffd9..a17517703 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1007,18 +1007,19 @@ func buildCloudConf() (ret *cloud.Conf, err error) { Conf.Save() } - userId, token := "0", "" + userId, token, availableSize := "0", "", int64(1024*1024*1024*1024*2) if nil != Conf.User { userId = Conf.User.UserId token = Conf.User.UserToken + availableSize = Conf.User.GetCloudRepoAvailableSize() } ret = &cloud.Conf{ - Dir: Conf.Sync.CloudName, - UserID: userId, - Token: token, - LimitSize: int64(Conf.User.UserSiYuanRepoSize - Conf.User.UserSiYuanAssetSize), - Server: util.AliyunServer, + Dir: Conf.Sync.CloudName, + UserID: userId, + Token: token, + AvailableSize: availableSize, + Server: util.AliyunServer, } return }