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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2026-01-06 18:46:19 +08:00
commit a38abdfd6e
3 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/av.go
View file

@ -921,7 +921,7 @@ func setAttributeViewBlockAttr(c *gin.Context) {
if _, ok := arg["itemID"]; ok {
itemID = arg["itemID"].(string)
} else if _, ok := arg["rowID"]; ok {
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
// TODO 计划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
itemID = arg["rowID"].(string)
}
value := arg["value"].(interface{})

2
kernel/model/attribute_view.go
View file

@ -4754,7 +4754,7 @@ func BatchUpdateAttributeViewCells(tx *Transaction, avID string, values []interf
if _, ok := v["itemID"]; ok {
itemID = v["itemID"].(string)
} else if _, ok := v["rowID"]; ok {
// TODO 划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
// TODO 计划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15708#issuecomment-3239694546
itemID = v["rowID"].(string)
}
valueData := v["value"]

36
kernel/model/conf.go
View file

@ -587,8 +587,13 @@ func InitConf() {
Conf.DataIndexState = 0
if "" == Conf.CookieKey {
Conf.CookieKey = gulu.Rand.String(16)
if cookieKey := readCookieKey(); "" != cookieKey {
Conf.CookieKey = cookieKey
} else {
if "" == Conf.CookieKey {
Conf.CookieKey = gulu.Rand.String(16)
}
writeCookieKey(Conf.CookieKey)
}
Conf.Save()
@ -600,6 +605,33 @@ func InitConf() {
go util.InitTesseract()
}
func readCookieKey() (cookieKey string) {
cookieKeyPath := filepath.Join(util.HomeDir, ".config", "siyuan", "cookie.key")
if !gulu.File.IsExist(cookieKeyPath) {
return
}
data, err := os.ReadFile(cookieKeyPath)
if err != nil {
logging.LogErrorf("read cookie key file [%s] failed: %s", cookieKeyPath, err)
return
}
cookieKey = string(bytes.TrimSpace(data))
return
}
func writeCookieKey(cookieKey string) {
cookieKeyPath := filepath.Join(util.HomeDir, ".config", "siyuan", "cookie.key")
if gulu.File.IsExist(cookieKeyPath) {
return
}
if err := os.WriteFile(cookieKeyPath, []byte(cookieKey), 0644); err != nil {
logging.LogErrorf("save cookie key file [%s] failed: %s", cookieKeyPath, err)
}
}
func initLang() {
p := filepath.Join(util.WorkingDir, "appearance", "langs")
dir, err := os.Open(p)