Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-24 02:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Data snapshot save device ID, name and OS https://github.com/siyuan-note/siyuan/issues/8094

Browse source
This commit is contained in:
Liang Ding 2023-04-24 12:07:39 +08:00
parent 9f9afdcfd0
commit 051ddf74ae
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
7 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/conf.go
View file

@ -235,8 +235,12 @@ func InitConf() {
if "" == Conf.System.ID {
Conf.System.ID = util.GetDeviceID()
}
if "" == Conf.System.Name {
Conf.System.Name = util.GetDeviceName()
}
if util.ContainerStd == util.Container {
Conf.System.ID = util.GetDeviceID()
Conf.System.Name = util.GetDeviceName()
}
Conf.System.AppDir = util.WorkingDir

2
kernel/model/repository.go
View file

@ -1401,7 +1401,7 @@ func newRepository() (ret *dejavu.Repo, err error) {
ignoreLines := getIgnoreLines()
ignoreLines = append(ignoreLines, "/.siyuan/conf.json") // 忽略旧版同步配置
ret, err = dejavu.NewRepo(util.DataDir, util.RepoDir, util.HistoryDir, util.TempDir, Conf.System.ID, Conf.Repo.Key, ignoreLines, cloudRepo)
ret, err = dejavu.NewRepo(util.DataDir, util.RepoDir, util.HistoryDir, util.TempDir, Conf.System.ID, Conf.System.Name, Conf.System.OS, Conf.Repo.Key, ignoreLines, cloudRepo)
if nil != err {
logging.LogErrorf("init data repo failed: %s", err)
return