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

♻️ Rename func

Browse source
This commit is contained in:
Daniel 2024-01-06 20:14:39 +08:00
parent b5b05cef49
commit 5a1a632912
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -1560,7 +1560,7 @@ func newRepository() (ret *dejavu.Repo, err error) {
return return
} }
ignoreLines := getIgnoreLines() ignoreLines := getSyncIgnoreLines()
ignoreLines = append(ignoreLines, "/.siyuan/conf.json") // 忽略旧版同步配置 ignoreLines = append(ignoreLines, "/.siyuan/conf.json") // 忽略旧版同步配置
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) 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 { if nil != err {

2
kernel/model/sync.go
View file

@ -577,7 +577,7 @@ func formatRepoErrorMsg(err error) string {
return msg return msg
} }
func getIgnoreLines() (ret []string) { func getSyncIgnoreLines() (ret []string) {
ignore := filepath.Join(util.DataDir, ".siyuan", "syncignore") ignore := filepath.Join(util.DataDir, ".siyuan", "syncignore")
err := os.MkdirAll(filepath.Dir(ignore), 0755) err := os.MkdirAll(filepath.Dir(ignore), 0755)
if nil != err { if nil != err {