Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 未登录情况下创建数据快照失败 Fix https://github.com/siyuan-note/siyuan/issues/6448

Browse source
This commit is contained in:
Liang Ding 2022-11-02 08:27:41 +08:00
parent 64ccd06dd4
commit 4b46e2c3d6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/conf/user.go
View file

@ -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)
}

2
kernel/go.mod
View file

@ -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

4
kernel/go.sum
View file

@ -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=

13
kernel/model/repository.go
View file

@ -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
}