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

🎨 Improve data repo key importing https://github.com/siyuan-note/siyuan/issues/12183

Browse source
This commit is contained in:
Daniel 2024-08-03 22:36:14 +08:00
parent efb3c5dd36
commit 6215e37418
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/model/repository.go
View file

@ -424,23 +424,23 @@ func statTypesByPath(files []*entity.File) (ret []*TypeCount) {
return
}
func ImportRepoKey(base64Key string) (err error) {
func ImportRepoKey(base64Key string) (retKey string, err error) {
util.PushMsg(Conf.Language(136), 3000)
base64Key = strings.TrimSpace(base64Key)
base64Key = gulu.Str.RemoveInvisible(base64Key)
if 1 > len(base64Key) {
retKey = strings.TrimSpace(base64Key)
retKey = gulu.Str.RemoveInvisible(retKey)
if 1 > len(retKey) {
err = errors.New(Conf.Language(142))
return
}
key, err := base64.StdEncoding.DecodeString(base64Key)
key, err := base64.StdEncoding.DecodeString(retKey)
if nil != err {
logging.LogErrorf("import data repo key failed: %s", err)
return errors.New(Conf.Language(157))
return "", errors.New(Conf.Language(157))
}
if 32 != len(key) {
return errors.New(Conf.Language(157))
return "", errors.New(Conf.Language(157))
}
Conf.Repo.Key = key