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

♻️ Refactor Go to err != nil, err == nil (#12385)

Browse source
This commit is contained in:
Oleksandr Redko 2024-09-04 04:40:50 +03:00 • committed by GitHub
parent 473a159ef2
commit b100721fee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
147 changed files with 1661 additions and 1659 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/model/sync.go
View file

@ -65,7 +65,7 @@ func SyncDataDownload() {
err := syncRepoDownload()
code := 1
if nil != err {
if err != nil {
code = 2
}
util.BroadcastByType("main", "syncing", code, Conf.Sync.Stat, nil)
@ -92,7 +92,7 @@ func SyncDataUpload() {
err := syncRepoUpload()
code := 1
if nil != err {
if err != nil {
code = 2
}
util.BroadcastByType("main", "syncing", code, Conf.Sync.Stat, nil)
@ -151,7 +151,7 @@ func BootSyncData() {
util.BroadcastByType("main", "syncing", 0, Conf.Language(81), nil)
err := bootSyncRepo()
code := 1
if nil != err {
if err != nil {
code = 2
}
util.BroadcastByType("main", "syncing", code, Conf.Sync.Stat, nil)
@ -202,7 +202,7 @@ func syncData(exit, byHand bool) {
dataChanged, err := syncRepo(exit, byHand)
code := 1
if nil != err {
if err != nil {
code = 2
}
util.BroadcastByType("main", "syncing", code, Conf.Sync.Stat, nil)
@ -474,12 +474,12 @@ func CreateCloudSyncDir(name string) (err error) {
}
repo, err := newRepository()
if nil != err {
if err != nil {
return
}
err = repo.CreateCloudRepo(name)
if nil != err {
if err != nil {
err = errors.New(formatRepoErrorMsg(err))
return
}
@ -499,12 +499,12 @@ func RemoveCloudSyncDir(name string) (err error) {
}
repo, err := newRepository()
if nil != err {
if err != nil {
return
}
err = repo.RemoveCloudRepo(name)
if nil != err {
if err != nil {
err = errors.New(formatRepoErrorMsg(err))
return
}
@ -525,12 +525,12 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) {
var size int64
repo, err := newRepository()
if nil != err {
if err != nil {
return
}
dirs, size, err = repo.GetCloudRepos()
if nil != err {
if err != nil {
err = errors.New(formatRepoErrorMsg(err))
return
}
@ -606,17 +606,17 @@ func formatRepoErrorMsg(err error) string {
func getSyncIgnoreLines() (ret []string) {
ignore := filepath.Join(util.DataDir, ".siyuan", "syncignore")
err := os.MkdirAll(filepath.Dir(ignore), 0755)
if nil != err {
if err != nil {
return
}
if !gulu.File.IsExist(ignore) {
if err = gulu.File.WriteFileSafer(ignore, nil, 0644); nil != err {
if err = gulu.File.WriteFileSafer(ignore, nil, 0644); err != nil {
logging.LogErrorf("create syncignore [%s] failed: %s", ignore, err)
return
}
}
data, err := os.ReadFile(ignore)
if nil != err {
if err != nil {
logging.LogErrorf("read syncignore [%s] failed: %s", ignore, err)
return
}
@ -831,7 +831,7 @@ func dialSyncWebSocket() (c *websocket.Conn, err error) {
"x-siyuan-repo": []string{Conf.Sync.CloudName},
}
c, _, err = websocket.DefaultDialer.Dial(endpoint, header)
if nil == err {
if err == nil {
closedSyncWebSocket.Store(false)
}
return