0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 When local.json is corrupted, clear the file to avoid being unable to enter the main interface Fix https://github.com/siyuan-note/siyuan/issues/7911

Browse source
This commit is contained in:
Liang Ding 2023-04-07 09:35:10 +08:00
parent 95ac0e828b
commit ae4717710d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/api/storage.go
View file

@ -177,11 +177,6 @@ func getLocalStorage(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
data, err := model.GetLocalStorage()
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
data := model.GetLocalStorage()
ret.Data = data
}

17
kernel/model/storage.go
View file

@ -293,11 +293,7 @@ func RemoveLocalStorageVals(keys []string) (err error) {
localStorageLock.Lock()
defer localStorageLock.Unlock()
localStorage, err := getLocalStorage()
if nil != err {
return
}
localStorage := getLocalStorage()
for _, key := range keys {
delete(localStorage, key)
}
@ -308,11 +304,7 @@ func SetLocalStorageVal(key string, val interface{}) (err error) {
localStorageLock.Lock()
defer localStorageLock.Unlock()
localStorage, err := getLocalStorage()
if nil != err {
return
}
localStorage := getLocalStorage()
localStorage[key] = val
return setLocalStorage(localStorage)
}
@ -323,7 +315,7 @@ func SetLocalStorage(val interface{}) (err error) {
return setLocalStorage(val)
}
func GetLocalStorage() (ret map[string]interface{}, err error) {
func GetLocalStorage() (ret map[string]interface{}) {
localStorageLock.Lock()
defer localStorageLock.Unlock()
return getLocalStorage()
@ -355,7 +347,8 @@ func setLocalStorage(val interface{}) (err error) {
return
}
func getLocalStorage() (ret map[string]interface{}, err error) {
func getLocalStorage() (ret map[string]interface{}) {
// When local.json is corrupted, clear the file to avoid being unable to enter the main interface https://github.com/siyuan-note/siyuan/issues/7911
ret = map[string]interface{}{}
lsPath := filepath.Join(util.DataDir, "storage/local.json")
if !gulu.File.IsExist(lsPath) {