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

♻️ 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

6
kernel/api/account.go
View file

@ -30,7 +30,7 @@ func startFreeTrial(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
err := model.StartFreeTrial()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -48,7 +48,7 @@ func useActivationcode(c *gin.Context) {
code := arg["data"].(string)
err := model.UseActivationcode(code)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -73,7 +73,7 @@ func deactivateUser(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
err := model.DeactivateUser()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

16
kernel/api/archive.go
View file

@ -36,7 +36,7 @@ func zip(c *gin.Context) {
entryPath := arg["path"].(string)
entryAbsPath, err := util.GetAbsPathInWorkspace(entryPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -44,14 +44,14 @@ func zip(c *gin.Context) {
zipFilePath := arg["zipPath"].(string)
zipAbsFilePath, err := util.GetAbsPathInWorkspace(zipFilePath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
zipFile, err := gulu.Zip.Create(zipAbsFilePath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -63,13 +63,13 @@ func zip(c *gin.Context) {
} else {
err = zipFile.AddEntry(base, entryAbsPath)
}
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = zipFile.Close(); nil != err {
if err = zipFile.Close(); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -87,7 +87,7 @@ func unzip(c *gin.Context) {
zipFilePath := arg["zipPath"].(string)
zipAbsFilePath, err := util.GetAbsPathInWorkspace(zipFilePath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -95,13 +95,13 @@ func unzip(c *gin.Context) {
entryPath := arg["path"].(string)
entryAbsPath, err := util.GetAbsPathInWorkspace(entryPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := gulu.Zip.Unzip(zipAbsFilePath, entryAbsPath); nil != err {
if err := gulu.Zip.Unzip(zipAbsFilePath, entryAbsPath); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

26
kernel/api/asset.go
View file

@ -46,7 +46,7 @@ func statAsset(c *gin.Context) {
if strings.HasPrefix(path, "assets/") {
var err error
p, err = model.GetAssetAbsPath(path)
if nil != err {
if err != nil {
ret.Code = 1
return
}
@ -62,13 +62,13 @@ func statAsset(c *gin.Context) {
}
info, err := os.Stat(p)
if nil != err {
if err != nil {
ret.Code = 1
return
}
t, err := times.Stat(p)
if nil != err {
if err != nil {
ret.Code = 1
return
}
@ -160,7 +160,7 @@ func renameAsset(c *gin.Context) {
oldPath := arg["oldPath"].(string)
newName := arg["newName"].(string)
newPath, err := model.RenameAsset(oldPath, newName)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -182,7 +182,7 @@ func getDocImageAssets(c *gin.Context) {
id := arg["id"].(string)
assets, err := model.DocImageAssets(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -203,12 +203,12 @@ func setFileAnnotation(c *gin.Context) {
p = strings.ReplaceAll(p, "%23", "#")
data := arg["data"].(string)
writePath, err := resolveFileAnnotationAbsPath(p)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := filelock.WriteFile(writePath, []byte(data)); nil != err {
if err := filelock.WriteFile(writePath, []byte(data)); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -228,7 +228,7 @@ func getFileAnnotation(c *gin.Context) {
p := arg["path"].(string)
p = strings.ReplaceAll(p, "%23", "#")
readPath, err := resolveFileAnnotationAbsPath(p)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -240,7 +240,7 @@ func getFileAnnotation(c *gin.Context) {
}
data, err := filelock.ReadFile(readPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -253,7 +253,7 @@ func getFileAnnotation(c *gin.Context) {
func resolveFileAnnotationAbsPath(assetRelPath string) (ret string, err error) {
filePath := strings.TrimSuffix(assetRelPath, ".sya")
absPath, err := model.GetAssetAbsPath(filePath)
if nil != err {
if err != nil {
return
}
dir := filepath.Dir(absPath)
@ -319,7 +319,7 @@ func resolveAssetPath(c *gin.Context) {
path := arg["path"].(string)
p, err := model.GetAssetAbsPath(path)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 3000}
@ -340,7 +340,7 @@ func uploadCloud(c *gin.Context) {
rootID := arg["id"].(string)
count, err := model.UploadAssets2Cloud(rootID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 3000}
@ -371,7 +371,7 @@ func insertLocalAssets(c *gin.Context) {
}
id := arg["id"].(string)
succMap, err := model.InsertLocalAssets(id, assetPaths, isUpload)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

6
kernel/api/attr.go
View file

@ -99,7 +99,7 @@ func setBlockAttrs(c *gin.Context) {
}
}
err := model.SetBlockAttrs(id, nameValues)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -141,7 +141,7 @@ func batchSetBlockAttrs(c *gin.Context) {
}
err := model.BatchSetBlockAttrs(blockAttrs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -164,7 +164,7 @@ func resetBlockAttrs(c *gin.Context) {
nameValues[name] = value.(string)
}
err := model.ResetBlockAttrs(id, nameValues)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

26
kernel/api/av.go
View file

@ -38,7 +38,7 @@ func duplicateAttributeViewBlock(c *gin.Context) {
avID := arg["avID"].(string)
newAvID, newBlockID, err := model.DuplicateDatabaseBlock(avID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -88,7 +88,7 @@ func setDatabaseBlockView(c *gin.Context) {
viewID := arg["viewID"].(string)
err := model.SetDatabaseBlockView(blockID, viewID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -122,7 +122,7 @@ func getAttributeViewPrimaryKeyValues(c *gin.Context) {
keyword = keywordArg.(string)
}
attributeViewName, databaseBlockIDs, rows, err := model.GetAttributeViewPrimaryKeyValues(id, keyword, page, pageSize)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -170,7 +170,7 @@ func appendAttributeViewDetachedBlocksWithValues(c *gin.Context) {
}
err := model.AppendAttributeViewDetachedBlocksWithValues(avID, values)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -206,7 +206,7 @@ func addAttributeViewBlocks(c *gin.Context) {
srcs = append(srcs, src)
}
err := model.AddAttributeViewBlock(nil, srcs, avID, blockID, previousID, ignoreFillFilter)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -231,7 +231,7 @@ func removeAttributeViewBlocks(c *gin.Context) {
}
err := model.RemoveAttributeViewBlock(srcIDs, avID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -257,7 +257,7 @@ func addAttributeViewKey(c *gin.Context) {
previousKeyID := arg["previousKeyID"].(string)
err := model.AddAttributeViewKey(avID, keyID, keyName, keyType, keyIcon, previousKeyID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -279,7 +279,7 @@ func removeAttributeViewKey(c *gin.Context) {
keyID := arg["keyID"].(string)
err := model.RemoveAttributeViewKey(avID, keyID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -306,7 +306,7 @@ func sortAttributeViewViewKey(c *gin.Context) {
previousKeyID := arg["previousKeyID"].(string)
err := model.SortAttributeViewViewKey(avID, viewID, keyID, previousKeyID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -329,7 +329,7 @@ func sortAttributeViewKey(c *gin.Context) {
previousKeyID := arg["previousKeyID"].(string)
err := model.SortAttributeViewKey(avID, keyID, previousKeyID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -442,7 +442,7 @@ func renderSnapshotAttributeView(c *gin.Context) {
index := arg["snapshot"].(string)
id := arg["id"].(string)
view, attrView, err := model.RenderRepoSnapshotAttributeView(index, id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -484,7 +484,7 @@ func renderHistoryAttributeView(c *gin.Context) {
id := arg["id"].(string)
created := arg["created"].(string)
view, attrView, err := model.RenderHistoryAttributeView(id, created)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -548,7 +548,7 @@ func renderAttributeView(c *gin.Context) {
}
view, attrView, err := model.RenderAttributeView(id, viewID, query, page, pageSize)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

20
kernel/api/bazaar.go
View file

@ -128,7 +128,7 @@ func installBazaarPlugin(c *gin.Context) {
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
err := model.InstallBazaarPlugin(repoURL, repoHash, packageName)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -154,7 +154,7 @@ func uninstallBazaarPlugin(c *gin.Context) {
frontend := arg["frontend"].(string)
packageName := arg["packageName"].(string)
err := model.UninstallBazaarPlugin(packageName, frontend)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -216,7 +216,7 @@ func installBazaarWidget(c *gin.Context) {
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
err := model.InstallBazaarWidget(repoURL, repoHash, packageName)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -239,7 +239,7 @@ func uninstallBazaarWidget(c *gin.Context) {
packageName := arg["packageName"].(string)
err := model.UninstallBazaarWidget(packageName)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -301,7 +301,7 @@ func installBazaarIcon(c *gin.Context) {
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
err := model.InstallBazaarIcon(repoURL, repoHash, packageName)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -325,7 +325,7 @@ func uninstallBazaarIcon(c *gin.Context) {
packageName := arg["packageName"].(string)
err := model.UninstallBazaarIcon(packageName)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -388,7 +388,7 @@ func installBazaarTemplate(c *gin.Context) {
repoHash := arg["repoHash"].(string)
packageName := arg["packageName"].(string)
err := model.InstallBazaarTemplate(repoURL, repoHash, packageName)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -412,7 +412,7 @@ func uninstallBazaarTemplate(c *gin.Context) {
packageName := arg["packageName"].(string)
err := model.UninstallBazaarTemplate(packageName)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -479,7 +479,7 @@ func installBazaarTheme(c *gin.Context) {
update = arg["update"].(bool)
}
err := model.InstallBazaarTheme(repoURL, repoHash, packageName, int(mode), update)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -507,7 +507,7 @@ func uninstallBazaarTheme(c *gin.Context) {
packageName := arg["packageName"].(string)
err := model.UninstallBazaarTheme(packageName)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

12
kernel/api/block.go
View file

@ -97,7 +97,7 @@ func transferBlockRef(c *gin.Context) {
}
err := model.TransferBlockRef(fromID, toID, refIDs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -122,7 +122,7 @@ func swapBlockRef(c *gin.Context) {
defID := arg["defID"].(string)
includeChildren := arg["includeChildren"].(bool)
err := model.SwapBlockRef(refID, defID, includeChildren)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -170,7 +170,7 @@ func getHeadingDeleteTransaction(c *gin.Context) {
id := arg["id"].(string)
transaction, err := model.GetHeadingDeleteTransaction(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -193,7 +193,7 @@ func getHeadingLevelTransaction(c *gin.Context) {
level := int(arg["level"].(float64))
transaction, err := model.GetHeadingLevelTransaction(id, level)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -215,7 +215,7 @@ func setBlockReminder(c *gin.Context) {
id := arg["id"].(string)
timed := arg["timed"].(string) // yyyyMMddHHmmss
err := model.SetBlockReminder(id, timed)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -449,7 +449,7 @@ func getBlockBreadcrumb(c *gin.Context) {
}
blockPath, err := model.BuildBlockBreadcrumb(id, excludeTypes)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

20
kernel/api/block_op.go
View file

@ -99,7 +99,7 @@ func appendDailyNoteBlock(c *gin.Context) {
luteEngine := util.NewLute()
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -107,7 +107,7 @@ func appendDailyNoteBlock(c *gin.Context) {
}
p, _, err := model.CreateDailyNote(boxID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "create daily note failed: " + err.Error()
return
@ -152,7 +152,7 @@ func prependDailyNoteBlock(c *gin.Context) {
luteEngine := util.NewLute()
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -160,7 +160,7 @@ func prependDailyNoteBlock(c *gin.Context) {
}
p, _, err := model.CreateDailyNote(boxID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "create daily note failed: " + err.Error()
return
@ -380,7 +380,7 @@ func appendBlock(c *gin.Context) {
luteEngine := util.NewLute()
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -425,7 +425,7 @@ func prependBlock(c *gin.Context) {
luteEngine := util.NewLute()
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -486,7 +486,7 @@ func insertBlock(c *gin.Context) {
luteEngine := util.NewLute()
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -534,7 +534,7 @@ func updateBlock(c *gin.Context) {
if "markdown" == dataType {
var err error
data, err = dataBlockDOM(data, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "data block DOM failed: " + err.Error()
return
@ -548,7 +548,7 @@ func updateBlock(c *gin.Context) {
}
block, err := model.GetBlock(id, nil)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "get block failed: " + err.Error()
return
@ -557,7 +557,7 @@ func updateBlock(c *gin.Context) {
var transactions []*model.Transaction
if "NodeDocument" == block.Type {
oldTree, err := filesys.LoadTree(block.Box, block.Path, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "load tree failed: " + err.Error()
return

4
kernel/api/bookmark.go
View file

@ -42,7 +42,7 @@ func removeBookmark(c *gin.Context) {
}
bookmark := arg["bookmark"].(string)
if err := model.RemoveBookmark(bookmark); nil != err {
if err := model.RemoveBookmark(bookmark); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -61,7 +61,7 @@ func renameBookmark(c *gin.Context) {
oldBookmark := arg["oldBookmark"].(string)
newBookmark := arg["newBookmark"].(string)
if err := model.RenameBookmark(oldBookmark, newBookmark); nil != err {
if err := model.RenameBookmark(oldBookmark, newBookmark); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}

4
kernel/api/broadcast.go
View file

@ -130,7 +130,7 @@ func subscribe(c *gin.Context, broadcastChannel *melody.Melody, channel string)
map[string]interface{}{
"channel": channel,
},
); nil != err {
); err != nil {
logging.LogErrorf("create broadcast channel failed: %s", err)
return
}
@ -175,7 +175,7 @@ func postMessage(c *gin.Context) {
channel.Count = 0
} else {
var broadcastChannel = _broadcastChannel.(*melody.Melody)
if err := broadcastChannel.Broadcast([]byte(message)); nil != err {
if err := broadcastChannel.Broadcast([]byte(message)); err != nil {
logging.LogErrorf("broadcast message failed: %s", err)
ret.Code = -2

28
kernel/api/export.go
View file

@ -45,7 +45,7 @@ func exportAttributeView(c *gin.Context) {
avID := arg["id"].(string)
blockID := arg["blockID"].(string)
zipPath, err := model.ExportAv2CSV(avID, blockID)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -221,7 +221,7 @@ func export2Liandi(c *gin.Context) {
id := arg["id"].(string)
err := model.Export2Liandi(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -239,7 +239,7 @@ func exportDataInFolder(c *gin.Context) {
exportFolder := arg["folder"].(string)
name, err := model.ExportDataInFolder(exportFolder)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -255,7 +255,7 @@ func exportData(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
zipPath, err := model.ExportData()
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -296,7 +296,7 @@ func exportResources(c *gin.Context) {
}
zipFilePath, err := model.ExportResources(resourcePaths, name)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -414,7 +414,7 @@ func exportDocx(c *gin.Context) {
}
fullPath, err := model.ExportDocx(id, savePath, removeAssets, merge)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -455,14 +455,14 @@ func exportTempContent(c *gin.Context) {
content := arg["content"].(string)
tmpExport := filepath.Join(util.TempDir, "export", "temp")
if err := os.MkdirAll(tmpExport, 0755); nil != err {
if err := os.MkdirAll(tmpExport, 0755); err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
return
}
p := filepath.Join(tmpExport, gulu.Rand.String(7))
if err := os.WriteFile(p, []byte(content), 0644); nil != err {
if err := os.WriteFile(p, []byte(content), 0644); err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -563,7 +563,7 @@ func processPDF(c *gin.Context) {
removeAssets := arg["removeAssets"].(bool)
watermark := arg["watermark"].(bool)
err := model.ProcessPDF(id, path, merge, removeAssets, watermark)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -592,7 +592,7 @@ func exportAsFile(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
form, err := c.MultipartForm()
if nil != err {
if err != nil {
logging.LogErrorf("export as file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -601,7 +601,7 @@ func exportAsFile(c *gin.Context) {
file := form.File["file"][0]
reader, err := file.Open()
if nil != err {
if err != nil {
logging.LogErrorf("export as file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -610,7 +610,7 @@ func exportAsFile(c *gin.Context) {
defer reader.Close()
data, err := io.ReadAll(reader)
if nil != err {
if err != nil {
logging.LogErrorf("export as file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -620,7 +620,7 @@ func exportAsFile(c *gin.Context) {
name := "file-" + file.Filename
name = util.FilterFileName(name)
tmpDir := filepath.Join(util.TempDir, "export")
if err = os.MkdirAll(tmpDir, 0755); nil != err {
if err = os.MkdirAll(tmpDir, 0755); err != nil {
logging.LogErrorf("export as file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -629,7 +629,7 @@ func exportAsFile(c *gin.Context) {
tmp := filepath.Join(tmpDir, name)
err = os.WriteFile(tmp, data, 0644)
if nil != err {
if err != nil {
logging.LogErrorf("export as file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()

16
kernel/api/extension.go
View file

@ -53,7 +53,7 @@ func extensionCopy(c *gin.Context) {
}
}
if err := os.MkdirAll(assets, 0755); nil != err {
if err := os.MkdirAll(assets, 0755); err != nil {
logging.LogErrorf("create assets folder [%s] failed: %s", assets, err)
ret.Msg = err.Error()
return
@ -62,15 +62,15 @@ func extensionCopy(c *gin.Context) {
uploaded := map[string]string{}
for originalName, file := range form.File {
oName, err := url.PathUnescape(originalName)
if nil != err {
if err != nil {
if strings.Contains(originalName, "%u") {
originalName = strings.ReplaceAll(originalName, "%u", "\\u")
originalName, err = strconv.Unquote("\"" + originalName + "\"")
if nil != err {
if err != nil {
continue
}
oName, err = url.PathUnescape(originalName)
if nil != err {
if err != nil {
continue
}
} else {
@ -84,14 +84,14 @@ func extensionCopy(c *gin.Context) {
fName := path.Base(u.Path)
f, err := file[0].Open()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
break
}
data, err := io.ReadAll(f)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
break
@ -113,7 +113,7 @@ func extensionCopy(c *gin.Context) {
fName = util.FilterUploadFileName(fName)
fName = fName + "-" + ast.NewNodeID() + ext
writePath := filepath.Join(assets, fName)
if err = filelock.WriteFile(writePath, data); nil != err {
if err = filelock.WriteFile(writePath, data); err != nil {
ret.Code = -1
ret.Msg = err.Error()
break
@ -132,7 +132,7 @@ func extensionCopy(c *gin.Context) {
href = strings.ReplaceAll(href, "https://ld246.com/article/", "https://ld246.com/article/raw/")
href = strings.ReplaceAll(href, "https://liuyun.io/article/", "https://liuyun.io/article/raw/")
resp, err := httpclient.NewCloudRequest30s().Get(href)
if nil != err {
if err != nil {
logging.LogWarnf("get [%s] failed: %s", href, err)
} else {
bodyData, readErr := io.ReadAll(resp.Body)

50
kernel/api/file.go
View file

@ -80,7 +80,7 @@ func globalCopyFiles(c *gin.Context) {
destDir = filepath.Join(util.WorkspaceDir, destDir)
for _, src := range srcs {
dest := filepath.Join(destDir, filepath.Base(src))
if err := filelock.Copy(src, dest); nil != err {
if err := filelock.Copy(src, dest); err != nil {
logging.LogErrorf("copy file [%s] to [%s] failed: %s", src, dest, err)
ret.Code = -1
ret.Msg = err.Error()
@ -100,7 +100,7 @@ func copyFile(c *gin.Context) {
src := arg["src"].(string)
src, err := model.GetAssetAbsPath(src)
if nil != err {
if err != nil {
logging.LogErrorf("get asset [%s] abs path failed: %s", src, err)
ret.Code = -1
ret.Msg = err.Error()
@ -109,7 +109,7 @@ func copyFile(c *gin.Context) {
}
info, err := os.Stat(src)
if nil != err {
if err != nil {
logging.LogErrorf("stat [%s] failed: %s", src, err)
ret.Code = -1
ret.Msg = err.Error()
@ -125,7 +125,7 @@ func copyFile(c *gin.Context) {
}
dest := arg["dest"].(string)
if err = filelock.Copy(src, dest); nil != err {
if err = filelock.Copy(src, dest); err != nil {
logging.LogErrorf("copy file [%s] to [%s] failed: %s", src, dest, err)
ret.Code = -1
ret.Msg = err.Error()
@ -145,7 +145,7 @@ func getFile(c *gin.Context) {
filePath := arg["path"].(string)
fileAbsPath, err := util.GetAbsPathInWorkspace(filePath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
c.JSON(http.StatusAccepted, ret)
@ -158,7 +158,7 @@ func getFile(c *gin.Context) {
c.JSON(http.StatusAccepted, ret)
return
}
if nil != err {
if err != nil {
logging.LogErrorf("stat [%s] failed: %s", fileAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -192,7 +192,7 @@ func getFile(c *gin.Context) {
}
data, err := filelock.ReadFile(fileAbsPath)
if nil != err {
if err != nil {
logging.LogErrorf("read file [%s] failed: %s", fileAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -224,7 +224,7 @@ func readDir(c *gin.Context) {
dirPath := arg["path"].(string)
dirAbsPath, err := util.GetAbsPathInWorkspace(dirPath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
return
@ -235,7 +235,7 @@ func readDir(c *gin.Context) {
ret.Msg = err.Error()
return
}
if nil != err {
if err != nil {
logging.LogErrorf("stat [%s] failed: %s", dirAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -249,7 +249,7 @@ func readDir(c *gin.Context) {
}
entries, err := os.ReadDir(dirAbsPath)
if nil != err {
if err != nil {
logging.LogErrorf("read dir [%s] failed: %s", dirAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -260,7 +260,7 @@ func readDir(c *gin.Context) {
for _, entry := range entries {
path := filepath.Join(dirAbsPath, entry.Name())
info, err = os.Stat(path)
if nil != err {
if err != nil {
logging.LogErrorf("stat [%s] failed: %s", path, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -289,7 +289,7 @@ func renameFile(c *gin.Context) {
srcPath := arg["path"].(string)
srcAbsPath, err := util.GetAbsPathInWorkspace(srcPath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
return
@ -302,7 +302,7 @@ func renameFile(c *gin.Context) {
destPath := arg["newPath"].(string)
destAbsPath, err := util.GetAbsPathInWorkspace(destPath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
c.JSON(http.StatusAccepted, ret)
@ -314,7 +314,7 @@ func renameFile(c *gin.Context) {
return
}
if err := filelock.Rename(srcAbsPath, destAbsPath); nil != err {
if err := filelock.Rename(srcAbsPath, destAbsPath); err != nil {
logging.LogErrorf("rename file [%s] to [%s] failed: %s", srcAbsPath, destAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -334,7 +334,7 @@ func removeFile(c *gin.Context) {
filePath := arg["path"].(string)
fileAbsPath, err := util.GetAbsPathInWorkspace(filePath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
return
@ -344,14 +344,14 @@ func removeFile(c *gin.Context) {
ret.Code = http.StatusNotFound
return
}
if nil != err {
if err != nil {
logging.LogErrorf("stat [%s] failed: %s", fileAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
return
}
if err = filelock.Remove(fileAbsPath); nil != err {
if err = filelock.Remove(fileAbsPath); err != nil {
logging.LogErrorf("remove [%s] failed: %s", fileAbsPath, err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()
@ -366,7 +366,7 @@ func putFile(c *gin.Context) {
var err error
filePath := c.PostForm("path")
fileAbsPath, err := util.GetAbsPathInWorkspace(filePath)
if nil != err {
if err != nil {
ret.Code = http.StatusForbidden
ret.Msg = err.Error()
return
@ -377,7 +377,7 @@ func putFile(c *gin.Context) {
if isDir {
err = os.MkdirAll(fileAbsPath, 0755)
if nil != err {
if err != nil {
logging.LogErrorf("make dir [%s] failed: %s", fileAbsPath, err)
}
} else {
@ -391,34 +391,34 @@ func putFile(c *gin.Context) {
for {
dir := filepath.Dir(fileAbsPath)
if err = os.MkdirAll(dir, 0755); nil != err {
if err = os.MkdirAll(dir, 0755); err != nil {
logging.LogErrorf("put file [%s] make dir [%s] failed: %s", fileAbsPath, dir, err)
break
}
var f multipart.File
f, err = fileHeader.Open()
if nil != err {
if err != nil {
logging.LogErrorf("open file failed: %s", err)
break
}
var data []byte
data, err = io.ReadAll(f)
if nil != err {
if err != nil {
logging.LogErrorf("read file failed: %s", err)
break
}
err = filelock.WriteFile(fileAbsPath, data)
if nil != err {
if err != nil {
logging.LogErrorf("write file [%s] failed: %s", fileAbsPath, err)
break
}
break
}
}
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -436,7 +436,7 @@ func putFile(c *gin.Context) {
}
modTime = millisecond2Time(modTimeInt)
}
if err = os.Chtimes(fileAbsPath, modTime, modTime); nil != err {
if err = os.Chtimes(fileAbsPath, modTime, modTime); err != nil {
logging.LogErrorf("change time failed: %s", err)
ret.Code = http.StatusInternalServerError
ret.Msg = err.Error()

52
kernel/api/filetree.go
View file

@ -55,7 +55,7 @@ func listDocTree(c *gin.Context) {
var doctree []*DocFile
root := filepath.Join(util.WorkspaceDir, "data", notebook, p)
dir, err := os.ReadDir(root)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -77,7 +77,7 @@ func listDocTree(c *gin.Context) {
doctree = append(doctree, parent)
subPath := filepath.Join(root, entry.Name())
if err = walkDocTree(subPath, parent, &ids); nil != err {
if err = walkDocTree(subPath, parent, &ids); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -103,7 +103,7 @@ type DocFile struct {
func walkDocTree(p string, docFile *DocFile, ids *map[string]bool) (err error) {
dir, err := os.ReadDir(p)
if nil != err {
if err != nil {
return
}
@ -122,7 +122,7 @@ func walkDocTree(p string, docFile *DocFile, ids *map[string]bool) (err error) {
docFile.Children = append(docFile.Children, parent)
subPath := filepath.Join(p, entry.Name())
if err = walkDocTree(subPath, parent, ids); nil != err {
if err = walkDocTree(subPath, parent, ids); err != nil {
return
}
} else {
@ -190,7 +190,7 @@ func doc2Heading(c *gin.Context) {
targetID := arg["targetID"].(string)
after := arg["after"].(bool)
srcTreeBox, srcTreePath, err := model.Doc2Heading(srcID, targetID, after)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -216,7 +216,7 @@ func heading2Doc(c *gin.Context) {
targetNotebook := arg["targetNoteBook"].(string)
targetPath := arg["targetPath"].(string)
srcRootBlockID, targetPath, err := model.Heading2Doc(srcHeadingID, targetNotebook, targetPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -226,7 +226,7 @@ func heading2Doc(c *gin.Context) {
model.WaitForWritingFiles()
luteEngine := util.NewLute()
tree, err := filesys.LoadTree(targetNotebook, targetPath, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -261,7 +261,7 @@ func li2Doc(c *gin.Context) {
targetNotebook := arg["targetNoteBook"].(string)
targetPath := arg["targetPath"].(string)
srcRootBlockID, targetPath, err := model.ListItem2Doc(srcListItemID, targetNotebook, targetPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -271,7 +271,7 @@ func li2Doc(c *gin.Context) {
model.WaitForWritingFiles()
luteEngine := util.NewLute()
tree, err := filesys.LoadTree(targetNotebook, targetPath, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -310,7 +310,7 @@ func getHPathByPath(c *gin.Context) {
p := arg["path"].(string)
hPath, err := model.GetHPathByPath(notebook, p)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -333,7 +333,7 @@ func getHPathsByPaths(c *gin.Context) {
paths = append(paths, p.(string))
}
hPath, err := model.GetHPathsByPaths(paths)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -356,7 +356,7 @@ func getHPathByID(c *gin.Context) {
}
hPath, err := model.GetHPathByID(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -379,7 +379,7 @@ func getPathByID(c *gin.Context) {
}
_path, err := model.GetPathByID(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -401,7 +401,7 @@ func getFullHPathByID(c *gin.Context) {
id := arg["id"].(string)
hPath, err := model.GetFullHPathByID(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -431,7 +431,7 @@ func getIDsByHPath(c *gin.Context) {
p := arg["path"].(string)
ids, err := model.GetIDsByHPath(p, notebook)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -462,7 +462,7 @@ func moveDocs(c *gin.Context) {
callback := arg["callback"]
err := model.MoveDocs(fromPaths, toNotebook, toPath, callback)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -523,7 +523,7 @@ func renameDoc(c *gin.Context) {
title := arg["title"].(string)
err := model.RenameDoc(notebook, p, title)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -542,7 +542,7 @@ func duplicateDoc(c *gin.Context) {
id := arg["id"].(string)
tree, err := model.LoadTreeByBlockID(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -584,7 +584,7 @@ func createDoc(c *gin.Context) {
}
tree, err := model.CreateDocByMd(notebook, p, title, md, sorts)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 7000}
@ -611,7 +611,7 @@ func createDailyNote(c *gin.Context) {
notebook := arg["notebook"].(string)
p, existed, err := model.CreateDailyNote(notebook)
if nil != err {
if err != nil {
if model.ErrBoxNotFound == err {
ret.Code = 1
} else {
@ -625,7 +625,7 @@ func createDailyNote(c *gin.Context) {
box := model.Conf.Box(notebook)
luteEngine := util.NewLute()
tree, err := filesys.LoadTree(box.ID, p, luteEngine)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -707,7 +707,7 @@ func createDocWithMd(c *gin.Context) {
}
id, err := model.CreateWithMarkdown(notebook, hPath, markdown, parentID, id, withMath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -764,7 +764,7 @@ func getDocCreateSavePath(c *gin.Context) {
}
docCreateSavePath, err := model.RenderGoTemplate(docCreateSavePathTpl)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -818,7 +818,7 @@ func getRefCreateSavePath(c *gin.Context) {
}
refCreateSavePath, err := model.RenderGoTemplate(refCreateSavePathTpl)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -899,7 +899,7 @@ func listDocsByPath(c *gin.Context) {
}
files, totals, err := model.ListDocTree(notebook, p, sortMode, flashcard, showHidden, maxListCount)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -983,7 +983,7 @@ func getDoc(c *gin.Context) {
return
}
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return

6
kernel/api/format.go
View file

@ -36,7 +36,7 @@ func netAssets2LocalAssets(c *gin.Context) {
id := arg["id"].(string)
err := model.NetAssets2LocalAssets(id, false, "")
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -59,7 +59,7 @@ func netImg2LocalAssets(c *gin.Context) {
url = urlArg.(string)
}
err := model.NetAssets2LocalAssets(id, true, url)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -78,7 +78,7 @@ func autoSpace(c *gin.Context) {
id := arg["id"].(string)
err := model.AutoSpace(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}

8
kernel/api/graph.go
View file

@ -64,14 +64,14 @@ func getGraph(c *gin.Context) {
query := arg["k"].(string)
graphConf, err := gulu.JSON.MarshalJSON(arg["conf"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
global := conf.NewGlobalGraph()
if err = gulu.JSON.UnmarshalJSON(graphConf, global); nil != err {
if err = gulu.JSON.UnmarshalJSON(graphConf, global); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -110,14 +110,14 @@ func getLocalGraph(c *gin.Context) {
id := arg["id"].(string)
graphConf, err := gulu.JSON.MarshalJSON(arg["conf"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
local := conf.NewLocalGraph()
if err = gulu.JSON.UnmarshalJSON(graphConf, local); nil != err {
if err = gulu.JSON.UnmarshalJSON(graphConf, local); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

12
kernel/api/history.go
View file

@ -104,7 +104,7 @@ func getNotebookHistory(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
histories, err := model.GetNotebookHistory()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -122,7 +122,7 @@ func clearWorkspaceHistory(c *gin.Context) {
msgId := util.PushMsg(model.Conf.Language(100), 1000*60*15)
time.Sleep(3 * time.Second)
err := model.ClearWorkspaceHistory()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -148,7 +148,7 @@ func getDocHistoryContent(c *gin.Context) {
keyword = k.(string)
}
id, rootID, content, isLargeDoc, err := model.GetDocHistoryContent(historyPath, keyword)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -174,7 +174,7 @@ func rollbackDocHistory(c *gin.Context) {
notebook := arg["notebook"].(string)
historyPath := arg["historyPath"].(string)
err := model.RollbackDocHistory(notebook, historyPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -196,7 +196,7 @@ func rollbackAssetsHistory(c *gin.Context) {
historyPath := arg["historyPath"].(string)
err := model.RollbackAssetsHistory(historyPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -214,7 +214,7 @@ func rollbackNotebookHistory(c *gin.Context) {
historyPath := arg["historyPath"].(string)
err := model.RollbackNotebookHistory(historyPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

28
kernel/api/import.go
View file

@ -37,7 +37,7 @@ func importSY(c *gin.Context) {
defer util.ClearPushProgress(100)
form, err := c.MultipartForm()
if nil != err {
if err != nil {
logging.LogErrorf("parse import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -53,7 +53,7 @@ func importSY(c *gin.Context) {
}
file := files[0]
reader, err := file.Open()
if nil != err {
if err != nil {
logging.LogErrorf("read import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -61,7 +61,7 @@ func importSY(c *gin.Context) {
}
importDir := filepath.Join(util.TempDir, "import")
if err = os.MkdirAll(importDir, 0755); nil != err {
if err = os.MkdirAll(importDir, 0755); err != nil {
logging.LogErrorf("make import dir [%s] failed: %s", importDir, err)
ret.Code = -1
ret.Msg = err.Error()
@ -70,13 +70,13 @@ func importSY(c *gin.Context) {
writePath := filepath.Join(util.TempDir, "import", file.Filename)
defer os.RemoveAll(writePath)
writer, err := os.OpenFile(writePath, os.O_RDWR|os.O_CREATE, 0644)
if nil != err {
if err != nil {
logging.LogErrorf("open import .sy.zip [%s] failed: %s", writePath, err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if _, err = io.Copy(writer, reader); nil != err {
if _, err = io.Copy(writer, reader); err != nil {
logging.LogErrorf("write import .sy.zip failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -89,7 +89,7 @@ func importSY(c *gin.Context) {
toPath := form.Value["toPath"][0]
err = model.ImportSY(writePath, notebook, toPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -104,7 +104,7 @@ func importData(c *gin.Context) {
defer util.ClearPushProgress(100)
form, err := c.MultipartForm()
if nil != err {
if err != nil {
logging.LogErrorf("import data failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -120,7 +120,7 @@ func importData(c *gin.Context) {
tmpImport := filepath.Join(util.TempDir, "import")
err = os.MkdirAll(tmpImport, 0755)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "create temp import dir failed"
return
@ -128,7 +128,7 @@ func importData(c *gin.Context) {
dataZipPath := filepath.Join(tmpImport, util.CurrentTimeSecondsStr()+".zip")
defer os.RemoveAll(dataZipPath)
dataZipFile, err := os.Create(dataZipPath)
if nil != err {
if err != nil {
logging.LogErrorf("create temp file failed: %s", err)
ret.Code = -1
ret.Msg = "create temp file failed"
@ -136,20 +136,20 @@ func importData(c *gin.Context) {
}
file := form.File["file"][0]
fileReader, err := file.Open()
if nil != err {
if err != nil {
logging.LogErrorf("open upload file failed: %s", err)
ret.Code = -1
ret.Msg = "open file failed"
return
}
_, err = io.Copy(dataZipFile, fileReader)
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = "read file failed"
return
}
if err = dataZipFile.Close(); nil != err {
if err = dataZipFile.Close(); err != nil {
logging.LogErrorf("close file failed: %s", err)
ret.Code = -1
ret.Msg = "close file failed"
@ -158,7 +158,7 @@ func importData(c *gin.Context) {
fileReader.Close()
err = model.ImportData(dataZipPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -178,7 +178,7 @@ func importStdMd(c *gin.Context) {
localPath := arg["localPath"].(string)
toPath := arg["toPath"].(string)
err := model.ImportFromLocalPath(notebook, localPath, toPath)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

6
kernel/api/inbox.go
View file

@ -41,7 +41,7 @@ func removeShorthands(c *gin.Context) {
}
err := model.RemoveCloudShorthands(ids)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -59,7 +59,7 @@ func getShorthand(c *gin.Context) {
id := arg["id"].(string)
data, err := model.GetCloudShorthand(id)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return
@ -78,7 +78,7 @@ func getShorthands(c *gin.Context) {
page := int(arg["page"].(float64))
data, err := model.GetCloudShorthands(page)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return

4
kernel/api/lute.go
View file

@ -58,7 +58,7 @@ func html2BlockDOM(c *gin.Context) {
dom := arg["dom"].(string)
markdown, withMath, err := model.HTML2Markdown(dom)
if nil != err {
if err != nil {
ret.Data = "Failed to convert"
return
}
@ -155,7 +155,7 @@ func html2BlockDOM(c *gin.Context) {
name = name[0 : len(name)-len(ext)]
name = name + "-" + ast.NewNodeID() + ext
targetPath := filepath.Join(util.DataDir, "assets", name)
if err = filelock.Copy(localPath, targetPath); nil != err {
if err = filelock.Copy(localPath, targetPath); err != nil {
logging.LogErrorf("copy asset from [%s] to [%s] failed: %s", localPath, targetPath, err)
return ast.WalkStop
}

22
kernel/api/network.go
View file

@ -61,7 +61,7 @@ func echo(c *gin.Context) {
password, passwordSet = c.Request.URL.User.Password()
if form, err := c.MultipartForm(); nil != err || nil == form {
if form, err := c.MultipartForm(); err != nil || nil == form {
multipartForm = nil
} else {
multipartForm = &MultipartForm{
@ -75,11 +75,11 @@ func echo(c *gin.Context) {
files[i].Filename = handler.Filename
files[i].Header = handler.Header
files[i].Size = handler.Size
if file, err := handler.Open(); nil != err {
if file, err := handler.Open(); err != nil {
logging.LogWarnf("echo open form [%s] file [%s] error: %s", k, handler.Filename, err.Error())
} else {
content := make([]byte, handler.Size)
if _, err := file.Read(content); nil != err {
if _, err := file.Read(content); err != nil {
logging.LogWarnf("echo read form [%s] file [%s] error: %s", k, handler.Filename, err.Error())
} else {
files[i].Content = base64.StdEncoding.EncodeToString(content)
@ -89,7 +89,7 @@ func echo(c *gin.Context) {
}
}
if data, err := c.GetRawData(); nil == err {
if data, err := c.GetRawData(); err == nil {
rawData = base64.StdEncoding.EncodeToString(data)
} else {
logging.LogWarnf("echo get raw data error: %s", err.Error())
@ -203,7 +203,7 @@ func forwardProxy(c *gin.Context) {
case "base64":
fallthrough
case "base64-std":
if payload, err := base64.StdEncoding.DecodeString(arg["payload"].(string)); nil != err {
if payload, err := base64.StdEncoding.DecodeString(arg["payload"].(string)); err != nil {
ret.Code = -2
ret.Msg = "decode base64-std payload failed: " + err.Error()
return
@ -211,7 +211,7 @@ func forwardProxy(c *gin.Context) {
request.SetBody(payload)
}
case "base64-url":
if payload, err := base64.URLEncoding.DecodeString(arg["payload"].(string)); nil != err {
if payload, err := base64.URLEncoding.DecodeString(arg["payload"].(string)); err != nil {
ret.Code = -2
ret.Msg = "decode base64-url payload failed: " + err.Error()
return
@ -221,7 +221,7 @@ func forwardProxy(c *gin.Context) {
case "base32":
fallthrough
case "base32-std":
if payload, err := base32.StdEncoding.DecodeString(arg["payload"].(string)); nil != err {
if payload, err := base32.StdEncoding.DecodeString(arg["payload"].(string)); err != nil {
ret.Code = -2
ret.Msg = "decode base32-std payload failed: " + err.Error()
return
@ -229,7 +229,7 @@ func forwardProxy(c *gin.Context) {
request.SetBody(payload)
}
case "base32-hex":
if payload, err := base32.HexEncoding.DecodeString(arg["payload"].(string)); nil != err {
if payload, err := base32.HexEncoding.DecodeString(arg["payload"].(string)); err != nil {
ret.Code = -2
ret.Msg = "decode base32-hex payload failed: " + err.Error()
return
@ -237,7 +237,7 @@ func forwardProxy(c *gin.Context) {
request.SetBody(payload)
}
case "hex":
if payload, err := hex.DecodeString(arg["payload"].(string)); nil != err {
if payload, err := hex.DecodeString(arg["payload"].(string)); err != nil {
ret.Code = -2
ret.Msg = "decode hex payload failed: " + err.Error()
return
@ -251,14 +251,14 @@ func forwardProxy(c *gin.Context) {
started := time.Now()
resp, err := request.Send(method, destURL)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "forward request failed: " + err.Error()
return
}
bodyData, err := io.ReadAll(resp.Body)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "read response body failed: " + err.Error()
return

18
kernel/api/notebook.go
View file

@ -75,7 +75,7 @@ func renameNotebook(c *gin.Context) {
name := arg["name"].(string)
err := model.RenameBox(notebook, name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -112,7 +112,7 @@ func removeNotebook(c *gin.Context) {
}
err := model.RemoveBox(notebook)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -137,14 +137,14 @@ func createNotebook(c *gin.Context) {
name := arg["name"].(string)
id, err := model.CreateBox(name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
existed, err := model.Mount(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -204,7 +204,7 @@ func openNotebook(c *gin.Context) {
msgId := util.PushMsg(model.Conf.Language(45), 1000*60*15)
defer util.PushClearMsg(msgId)
existed, err := model.Mount(notebook)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -321,14 +321,14 @@ func setNotebookConf(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg["conf"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
boxConf := box.GetConf()
if err = gulu.JSON.UnmarshalJSON(param, boxConf); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, boxConf); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -377,7 +377,7 @@ func lsNotebooks(c *gin.Context) {
// 兼容旧版接口，不能直接使用 util.JsonArg()
arg := map[string]interface{}{}
if err := c.ShouldBindJSON(&arg); nil == err {
if err := c.ShouldBindJSON(&arg); err == nil {
if arg["flashcard"] != nil {
flashcard = arg["flashcard"].(bool)
}
@ -389,7 +389,7 @@ func lsNotebooks(c *gin.Context) {
} else {
var err error
notebooks, err = model.ListNotebooks()
if nil != err {
if err != nil {
return
}
}

2
kernel/api/outline.go
View file

@ -40,7 +40,7 @@ func getDocOutline(c *gin.Context) {
rootID := arg["id"].(string)
headings, err := model.Outline(rootID)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return

2
kernel/api/pandoc.go
View file

@ -46,7 +46,7 @@ func pandoc(c *gin.Context) {
}
path, err := util.ConvertPandoc(dir, args...)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

2
kernel/api/petal.go
View file

@ -53,7 +53,7 @@ func setPetalEnabled(c *gin.Context) {
enabled := arg["enabled"].(bool)
frontend := arg["frontend"].(string)
data, err := model.SetPetalEnabled(packageName, enabled, frontend)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

40
kernel/api/repo.go
View file

@ -42,7 +42,7 @@ func getRepoFile(c *gin.Context) {
id := arg["id"].(string)
data, p, err := model.GetRepoFile(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -71,7 +71,7 @@ func openRepoSnapshotDoc(c *gin.Context) {
id := arg["id"].(string)
content, isProtyleDoc, updated, err := model.OpenRepoSnapshotDoc(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -96,7 +96,7 @@ func diffRepoSnapshots(c *gin.Context) {
left := arg["left"].(string)
right := arg["right"].(string)
diff, err := model.DiffRepoSnapshots(left, right)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -117,7 +117,7 @@ func getCloudSpace(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
sync, backup, hSize, hAssetSize, hTotalSize, exchangeSize, hTrafficUploadSize, hTrafficDownloadSize, htrafficAPIGet, hTrafficAPIPut, err := model.GetCloudSpace()
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
util.PushErrMsg(err.Error(), 3000)
@ -162,7 +162,7 @@ func downloadCloudSnapshot(c *gin.Context) {
id := arg["id"].(string)
tag := arg["tag"].(string)
if err := model.DownloadCloudSnapshot(tag, id); nil != err {
if err := model.DownloadCloudSnapshot(tag, id); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -180,7 +180,7 @@ func uploadCloudSnapshot(c *gin.Context) {
id := arg["id"].(string)
tag := arg["tag"].(string)
if err := model.UploadCloudSnapshot(tag, id); nil != err {
if err := model.UploadCloudSnapshot(tag, id); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -198,7 +198,7 @@ func getRepoSnapshots(c *gin.Context) {
page := arg["page"].(float64)
snapshots, pageCount, totalCount, err := model.GetRepoSnapshots(int(page))
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -222,7 +222,7 @@ func getCloudRepoSnapshots(c *gin.Context) {
page := int(arg["page"].(float64))
snapshots, pageCount, totalCount, err := model.GetCloudRepoSnapshots(page)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -240,7 +240,7 @@ func getCloudRepoTagSnapshots(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
snapshots, err := model.GetCloudRepoTagSnapshots()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -262,7 +262,7 @@ func removeCloudRepoTagSnapshot(c *gin.Context) {
tag := arg["tag"].(string)
err := model.RemoveCloudRepoTag(tag)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -274,7 +274,7 @@ func getRepoTagSnapshots(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
snapshots, err := model.GetTagSnapshots()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -296,7 +296,7 @@ func removeRepoTagSnapshot(c *gin.Context) {
tag := arg["tag"].(string)
err := model.RemoveTagSnapshot(tag)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -313,7 +313,7 @@ func createSnapshot(c *gin.Context) {
}
memo := arg["memo"].(string)
if err := model.IndexRepo(memo); nil != err {
if err := model.IndexRepo(memo); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(140), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -332,7 +332,7 @@ func tagSnapshot(c *gin.Context) {
id := arg["id"].(string)
name := arg["name"].(string)
if err := model.TagSnapshot(id, name); nil != err {
if err := model.TagSnapshot(id, name); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(140), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -351,7 +351,7 @@ func importRepoKey(c *gin.Context) {
base64Key := arg["key"].(string)
retKey, err := model.ImportRepoKey(base64Key)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -373,7 +373,7 @@ func initRepoKeyFromPassphrase(c *gin.Context) {
}
pass := arg["pass"].(string)
if err := model.InitRepoKeyFromPassphrase(pass); nil != err {
if err := model.InitRepoKeyFromPassphrase(pass); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -389,7 +389,7 @@ func initRepoKey(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
if err := model.InitRepoKey(); nil != err {
if err := model.InitRepoKey(); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -405,7 +405,7 @@ func resetRepo(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
if err := model.ResetRepo(); nil != err {
if err := model.ResetRepo(); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(146), err.Error())
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -417,7 +417,7 @@ func purgeRepo(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
if err := model.PurgeRepo(); nil != err {
if err := model.PurgeRepo(); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(201), err.Error())
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -429,7 +429,7 @@ func purgeCloudRepo(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
if err := model.PurgeCloud(); nil != err {
if err := model.PurgeCloud(); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(201), err.Error())
ret.Data = map[string]interface{}{"closeTimeout": 5000}

18
kernel/api/riff.go
View file

@ -66,7 +66,7 @@ func batchSetRiffCardsDueTime(c *gin.Context) {
}
err := model.SetFlashcardsDueTime(cardDues)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
}
@ -178,7 +178,7 @@ func reviewRiffCard(c *gin.Context) {
rating := int(arg["rating"].(float64))
reviewedCardIDs := getReviewedCards(arg)
err := model.ReviewFlashcard(deckID, cardID, riff.Rating(rating), reviewedCardIDs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -197,7 +197,7 @@ func skipReviewRiffCard(c *gin.Context) {
deckID := arg["deckID"].(string)
cardID := arg["cardID"].(string)
err := model.SkipReviewFlashcard(deckID, cardID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -216,7 +216,7 @@ func getNotebookRiffDueCards(c *gin.Context) {
notebookID := arg["notebook"].(string)
reviewedCardIDs := getReviewedCards(arg)
cards, unreviewedCount, unreviewedNewCardCount, unreviewedOldCardCount, err := model.GetNotebookDueFlashcards(notebookID, reviewedCardIDs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -242,7 +242,7 @@ func getTreeRiffDueCards(c *gin.Context) {
rootID := arg["rootID"].(string)
reviewedCardIDs := getReviewedCards(arg)
cards, unreviewedCount, unreviewedNewCardCount, unreviewedOldCardCount, err := model.GetTreeDueFlashcards(rootID, reviewedCardIDs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -268,7 +268,7 @@ func getRiffDueCards(c *gin.Context) {
deckID := arg["deckID"].(string)
reviewedCardIDs := getReviewedCards(arg)
cards, unreviewedCount, unreviewedNewCardCount, unreviewedOldCardCount, err := model.GetDueFlashcards(deckID, reviewedCardIDs)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -381,7 +381,7 @@ func renameRiffDeck(c *gin.Context) {
deckID := arg["deckID"].(string)
name := arg["name"].(string)
err := model.RenameDeck(deckID, name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -399,7 +399,7 @@ func removeRiffDeck(c *gin.Context) {
deckID := arg["deckID"].(string)
err := model.RemoveDeck(deckID)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -417,7 +417,7 @@ func createRiffDeck(c *gin.Context) {
name := arg["name"].(string)
deck, err := model.CreateDeck(name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

6
kernel/api/search.go
View file

@ -132,7 +132,7 @@ func findReplace(c *gin.Context) {
}
err := model.FindReplace(k, r, replaceTypes, ids, paths, boxes, types, method, orderBy, groupBy)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -211,7 +211,7 @@ func removeTemplate(c *gin.Context) {
path := arg["path"].(string)
err := model.RemoveTemplate(path)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -281,7 +281,7 @@ func updateEmbedBlock(c *gin.Context) {
content := arg["content"].(string)
err := model.UpdateEmbedBlock(id, content)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

50
kernel/api/setting.go
View file

@ -61,14 +61,14 @@ func setConfSnippet(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
snippet := &conf.Snpt{}
if err = gulu.JSON.UnmarshalJSON(param, snippet); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, snippet); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -142,14 +142,14 @@ func setBazaar(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
bazaar := &conf.Bazaar{}
if err = gulu.JSON.UnmarshalJSON(param, bazaar); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, bazaar); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -171,14 +171,14 @@ func setAI(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
ai := &conf.AI{}
if err = gulu.JSON.UnmarshalJSON(param, ai); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, ai); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -219,14 +219,14 @@ func setFlashcard(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
flashcard := &conf.Flashcard{}
if err = gulu.JSON.UnmarshalJSON(param, flashcard); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, flashcard); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -256,14 +256,14 @@ func setAccount(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
account := &conf.Account{}
if err = gulu.JSON.UnmarshalJSON(param, account); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, account); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -285,7 +285,7 @@ func setEditor(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -294,7 +294,7 @@ func setEditor(c *gin.Context) {
oldGenerateHistoryInterval := model.Conf.Editor.GenerateHistoryInterval
editor := conf.NewEditor()
if err = gulu.JSON.UnmarshalJSON(param, editor); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, editor); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -346,14 +346,14 @@ func setExport(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
export := &conf.Export{}
if err = gulu.JSON.UnmarshalJSON(param, export); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, export); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -385,14 +385,14 @@ func setFiletree(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
fileTree := conf.NewFileTree()
if err = gulu.JSON.UnmarshalJSON(param, fileTree); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, fileTree); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -431,14 +431,14 @@ func setSearch(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
s := &conf.Search{}
if err = gulu.JSON.UnmarshalJSON(param, s); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, s); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -485,14 +485,14 @@ func setKeymap(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg["data"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
keymap := &conf.Keymap{}
if err = gulu.JSON.UnmarshalJSON(param, keymap); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, keymap); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -512,14 +512,14 @@ func setAppearance(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
appearance := &conf.Appearance{}
if err = gulu.JSON.UnmarshalJSON(param, appearance); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, appearance); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -544,14 +544,14 @@ func setPublish(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
publish := &conf.Publish{}
if err = gulu.JSON.UnmarshalJSON(param, publish); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, publish); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -627,7 +627,7 @@ func login2faCloudUser(c *gin.Context) {
token := arg["token"].(string)
code := arg["code"].(string)
data, err := model.Login2fa(token, code)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

6
kernel/api/snippet.go
View file

@ -49,7 +49,7 @@ func getSnippet(c *gin.Context) {
}
confSnippets, err := model.LoadSnippets()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "load snippets failed: " + err.Error()
return
@ -108,7 +108,7 @@ func setSnippet(c *gin.Context) {
}
err := model.SetSnippet(snippets)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "set snippet failed: " + err.Error()
return
@ -126,7 +126,7 @@ func removeSnippet(c *gin.Context) {
id := arg["id"].(string)
snippet, err := model.RemoveSnippet(id)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "remove snippet failed: " + err.Error()
return

2
kernel/api/sql.go
View file

@ -45,7 +45,7 @@ func SQL(c *gin.Context) {
stmt := arg["stmt"].(string)
result, err := sql.Query(stmt, model.Conf.Search.Limit)
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
return

16
kernel/api/storage.go
View file

@ -30,7 +30,7 @@ func getRecentDocs(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
data, err := model.GetRecentDocs()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -49,7 +49,7 @@ func removeCriterion(c *gin.Context) {
name := arg["name"].(string)
err := model.RemoveCriterion(name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -66,21 +66,21 @@ func setCriterion(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg["criterion"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
criterion := &model.Criterion{}
if err = gulu.JSON.UnmarshalJSON(param, criterion); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, criterion); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
err = model.SetCriterion(criterion)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -111,7 +111,7 @@ func removeLocalStorageVals(c *gin.Context) {
}
err := model.RemoveLocalStorageVals(keys)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -136,7 +136,7 @@ func setLocalStorageVal(c *gin.Context) {
key := arg["key"].(string)
val := arg["val"].(interface{})
err := model.SetLocalStorageVal(key, val)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -160,7 +160,7 @@ func setLocalStorage(c *gin.Context) {
val := arg["val"].(interface{})
err := model.SetLocalStorage(val)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

82
kernel/api/sync.go
View file

@ -38,7 +38,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
defer c.JSON(200, ret)
form, err := c.MultipartForm()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -54,7 +54,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
f := files[0]
fh, err := f.Open()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -63,7 +63,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
data, err := io.ReadAll(fh)
fh.Close()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -71,7 +71,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
}
tmpDir := filepath.Join(util.TempDir, "import")
if err = os.MkdirAll(tmpDir, 0755); nil != err {
if err = os.MkdirAll(tmpDir, 0755); err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -79,14 +79,14 @@ func importSyncProviderWebDAV(c *gin.Context) {
}
tmp := filepath.Join(tmpDir, f.Filename)
if err = os.WriteFile(tmp, data, 0644); nil != err {
if err = os.WriteFile(tmp, data, 0644); err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = gulu.Zip.Unzip(tmp, tmpDir); nil != err {
if err = gulu.Zip.Unzip(tmp, tmpDir); err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -95,7 +95,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
tmp = filepath.Join(tmpDir, f.Filename[:len(f.Filename)-4])
data, err = os.ReadFile(tmp)
if nil != err {
if err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -105,7 +105,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
data = util.AESDecrypt(string(data))
data, _ = hex.DecodeString(string(data))
webdav := &conf.WebDAV{}
if err = gulu.JSON.UnmarshalJSON(data, webdav); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, webdav); err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -113,7 +113,7 @@ func importSyncProviderWebDAV(c *gin.Context) {
}
err = model.SetSyncProviderWebDAV(webdav)
if nil != err {
if err != nil {
logging.LogErrorf("import WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -131,7 +131,7 @@ func exportSyncProviderWebDAV(c *gin.Context) {
name := "siyuan-webdav-" + time.Now().Format("20060102150405") + ".json"
tmpDir := filepath.Join(util.TempDir, "export")
if err := os.MkdirAll(tmpDir, 0755); nil != err {
if err := os.MkdirAll(tmpDir, 0755); err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -144,7 +144,7 @@ func exportSyncProviderWebDAV(c *gin.Context) {
}
data, err := gulu.JSON.MarshalJSON(model.Conf.Sync.WebDAV)
if nil != err {
if err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -153,7 +153,7 @@ func exportSyncProviderWebDAV(c *gin.Context) {
dataStr := util.AESEncrypt(string(data))
tmp := filepath.Join(tmpDir, name)
if err = os.WriteFile(tmp, []byte(dataStr), 0644); nil != err {
if err = os.WriteFile(tmp, []byte(dataStr), 0644); err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -161,21 +161,21 @@ func exportSyncProviderWebDAV(c *gin.Context) {
}
zipFile, err := gulu.Zip.Create(tmp + ".zip")
if nil != err {
if err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = zipFile.AddEntry(name, tmp); nil != err {
if err = zipFile.AddEntry(name, tmp); err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = zipFile.Close(); nil != err {
if err = zipFile.Close(); err != nil {
logging.LogErrorf("export WebDAV provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -194,7 +194,7 @@ func importSyncProviderS3(c *gin.Context) {
defer c.JSON(200, ret)
form, err := c.MultipartForm()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -210,7 +210,7 @@ func importSyncProviderS3(c *gin.Context) {
f := files[0]
fh, err := f.Open()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -219,7 +219,7 @@ func importSyncProviderS3(c *gin.Context) {
data, err := io.ReadAll(fh)
fh.Close()
if nil != err {
if err != nil {
logging.LogErrorf("read upload file failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -227,7 +227,7 @@ func importSyncProviderS3(c *gin.Context) {
}
importDir := filepath.Join(util.TempDir, "import")
if err = os.MkdirAll(importDir, 0755); nil != err {
if err = os.MkdirAll(importDir, 0755); err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -235,7 +235,7 @@ func importSyncProviderS3(c *gin.Context) {
}
tmp := filepath.Join(importDir, f.Filename)
if err = os.WriteFile(tmp, data, 0644); nil != err {
if err = os.WriteFile(tmp, data, 0644); err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -243,7 +243,7 @@ func importSyncProviderS3(c *gin.Context) {
}
tmpDir := filepath.Join(importDir, "s3")
if err = gulu.Zip.Unzip(tmp, tmpDir); nil != err {
if err = gulu.Zip.Unzip(tmp, tmpDir); err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -251,7 +251,7 @@ func importSyncProviderS3(c *gin.Context) {
}
entries, err := os.ReadDir(tmpDir)
if nil != err {
if err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -267,7 +267,7 @@ func importSyncProviderS3(c *gin.Context) {
tmp = filepath.Join(tmpDir, entries[0].Name())
data, err = os.ReadFile(tmp)
if nil != err {
if err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -277,7 +277,7 @@ func importSyncProviderS3(c *gin.Context) {
data = util.AESDecrypt(string(data))
data, _ = hex.DecodeString(string(data))
s3 := &conf.S3{}
if err = gulu.JSON.UnmarshalJSON(data, s3); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, s3); err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -285,7 +285,7 @@ func importSyncProviderS3(c *gin.Context) {
}
err = model.SetSyncProviderS3(s3)
if nil != err {
if err != nil {
logging.LogErrorf("import S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -303,7 +303,7 @@ func exportSyncProviderS3(c *gin.Context) {
name := "siyuan-s3-" + time.Now().Format("20060102150405") + ".json"
tmpDir := filepath.Join(util.TempDir, "export")
if err := os.MkdirAll(tmpDir, 0755); nil != err {
if err := os.MkdirAll(tmpDir, 0755); err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -316,7 +316,7 @@ func exportSyncProviderS3(c *gin.Context) {
}
data, err := gulu.JSON.MarshalJSON(model.Conf.Sync.S3)
if nil != err {
if err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -325,7 +325,7 @@ func exportSyncProviderS3(c *gin.Context) {
dataStr := util.AESEncrypt(string(data))
tmp := filepath.Join(tmpDir, name)
if err = os.WriteFile(tmp, []byte(dataStr), 0644); nil != err {
if err = os.WriteFile(tmp, []byte(dataStr), 0644); err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -333,21 +333,21 @@ func exportSyncProviderS3(c *gin.Context) {
}
zipFile, err := gulu.Zip.Create(tmp + ".zip")
if nil != err {
if err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = zipFile.AddEntry(name, tmp); nil != err {
if err = zipFile.AddEntry(name, tmp); err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
return
}
if err = zipFile.Close(); nil != err {
if err = zipFile.Close(); err != nil {
logging.LogErrorf("export S3 provider failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -445,7 +445,7 @@ func listCloudSyncDir(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
syncDirs, hSize, err := model.ListCloudSyncDir()
if nil != err {
if err != nil {
ret.Code = 1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -470,7 +470,7 @@ func removeCloudSyncDir(c *gin.Context) {
name := arg["name"].(string)
err := model.RemoveCloudSyncDir(name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -491,7 +491,7 @@ func createCloudSyncDir(c *gin.Context) {
name := arg["name"].(string)
err := model.CreateCloudSyncDir(name)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -562,7 +562,7 @@ func setSyncProvider(c *gin.Context) {
provider := int(arg["provider"].(float64))
err := model.SetSyncProvider(provider)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -581,7 +581,7 @@ func setSyncProviderS3(c *gin.Context) {
s3Arg := arg["s3"].(interface{})
data, err := gulu.JSON.MarshalJSON(s3Arg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -589,7 +589,7 @@ func setSyncProviderS3(c *gin.Context) {
}
s3 := &conf.S3{}
if err = gulu.JSON.UnmarshalJSON(data, s3); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, s3); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -597,7 +597,7 @@ func setSyncProviderS3(c *gin.Context) {
}
err = model.SetSyncProviderS3(s3)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -616,7 +616,7 @@ func setSyncProviderWebDAV(c *gin.Context) {
webdavArg := arg["webdav"].(interface{})
data, err := gulu.JSON.MarshalJSON(webdavArg)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -624,7 +624,7 @@ func setSyncProviderWebDAV(c *gin.Context) {
}
webdav := &conf.WebDAV{}
if err = gulu.JSON.UnmarshalJSON(data, webdav); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, webdav); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -632,7 +632,7 @@ func setSyncProviderWebDAV(c *gin.Context) {
}
err = model.SetSyncProviderWebDAV(webdav)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}

18
kernel/api/system.go
View file

@ -39,7 +39,7 @@ func getNetwork(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
maskedConf, err := model.GetMaskedConf()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "get conf failed: " + err.Error()
return
@ -76,7 +76,7 @@ func getChangelog(c *gin.Context) {
}
contentData, err := os.ReadFile(changelogPath)
if nil != err {
if err != nil {
logging.LogErrorf("read changelog failed: %s", err)
return
}
@ -97,7 +97,7 @@ func getEmojiConf(c *gin.Context) {
builtConfPath := filepath.Join(util.AppearancePath, "emojis", "conf.json")
data, err := os.ReadFile(builtConfPath)
if nil != err {
if err != nil {
logging.LogErrorf("read emojis conf.json failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -105,7 +105,7 @@ func getEmojiConf(c *gin.Context) {
}
var conf []map[string]interface{}
if err = gulu.JSON.UnmarshalJSON(data, &conf); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &conf); err != nil {
logging.LogErrorf("unmarshal emojis conf.json failed: %s", err)
ret.Code = -1
ret.Msg = err.Error()
@ -124,7 +124,7 @@ func getEmojiConf(c *gin.Context) {
if gulu.File.IsDir(customConfDir) {
model.CustomEmojis = sync.Map{}
customEmojis, err := os.ReadDir(customConfDir)
if nil != err {
if err != nil {
logging.LogErrorf("read custom emojis failed: %s", err)
} else {
for _, customEmoji := range customEmojis {
@ -136,7 +136,7 @@ func getEmojiConf(c *gin.Context) {
if customEmoji.IsDir() {
// 子级
subCustomEmojis, err := os.ReadDir(filepath.Join(customConfDir, name))
if nil != err {
if err != nil {
logging.LogErrorf("read custom emojis failed: %s", err)
continue
}
@ -211,7 +211,7 @@ func getConf(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
maskedConf, err := model.GetMaskedConf()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "get conf failed: " + err.Error()
return
@ -252,14 +252,14 @@ func setUILayout(c *gin.Context) {
}
param, err := gulu.JSON.MarshalJSON(arg["layout"])
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
uiLayout := &conf.UILayout{}
if err = gulu.JSON.UnmarshalJSON(param, uiLayout); nil != err {
if err = gulu.JSON.UnmarshalJSON(param, uiLayout); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return

4
kernel/api/tag.go
View file

@ -57,7 +57,7 @@ func renameTag(c *gin.Context) {
oldLabel := arg["oldLabel"].(string)
newLabel := arg["newLabel"].(string)
if err := model.RenameTag(oldLabel, newLabel); nil != err {
if err := model.RenameTag(oldLabel, newLabel); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}
@ -75,7 +75,7 @@ func removeTag(c *gin.Context) {
}
label := arg["label"].(string)
if err := model.RemoveTag(label); nil != err {
if err := model.RemoveTag(label); err != nil {
ret.Code = -1
ret.Msg = err.Error()
ret.Data = map[string]interface{}{"closeTimeout": 5000}

6
kernel/api/template.go
View file

@ -36,7 +36,7 @@ func renderSprig(c *gin.Context) {
template := arg["template"].(string)
content, err := model.RenderGoTemplate(template)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = util.EscapeHTML(err.Error())
return
@ -57,7 +57,7 @@ func docSaveAsTemplate(c *gin.Context) {
name := arg["name"].(string)
overwrite := arg["overwrite"].(bool)
code, err := model.DocSaveAsTemplate(id, name, overwrite)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = util.EscapeHTML(err.Error())
return
@ -86,7 +86,7 @@ func renderTemplate(c *gin.Context) {
}
_, content, err := model.RenderTemplate(p, id, preview)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = util.EscapeHTML(err.Error())
return

4
kernel/api/transaction.go
View file

@ -40,7 +40,7 @@ func performTransactions(c *gin.Context) {
trans := arg["transactions"]
data, err := gulu.JSON.MarshalJSON(trans)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = "parses request failed"
return
@ -55,7 +55,7 @@ func performTransactions(c *gin.Context) {
timestamp := int64(arg["reqId"].(float64))
var transactions []*model.Transaction
if err = gulu.JSON.UnmarshalJSON(data, &transactions); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &transactions); err != nil {
ret.Code = -1
ret.Msg = "parses request failed"
return

22
kernel/api/workspace.go
View file

@ -57,7 +57,7 @@ func checkWorkspaceDir(c *gin.Context) {
}
entries, err := os.ReadDir(path)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf("read workspace dir [%s] failed: %s", path, err)
}
@ -104,7 +104,7 @@ func createWorkspaceDir(c *gin.Context) {
}
if !gulu.File.IsExist(absPath) {
if err := os.MkdirAll(absPath, 0755); nil != err {
if err := os.MkdirAll(absPath, 0755); err != nil {
ret.Code = -1
ret.Msg = fmt.Sprintf("create workspace dir [%s] failed: %s", absPath, err)
return
@ -112,7 +112,7 @@ func createWorkspaceDir(c *gin.Context) {
}
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -120,7 +120,7 @@ func createWorkspaceDir(c *gin.Context) {
workspacePaths = append(workspacePaths, absPath)
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -147,7 +147,7 @@ func removeWorkspaceDir(c *gin.Context) {
}
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -155,7 +155,7 @@ func removeWorkspaceDir(c *gin.Context) {
workspacePaths = gulu.Str.RemoveElem(workspacePaths, path)
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -174,7 +174,7 @@ func removeWorkspaceDirPhysically(c *gin.Context) {
path := arg["path"].(string)
if gulu.File.IsDir(path) {
err := os.RemoveAll(path)
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -202,7 +202,7 @@ func getMobileWorkspaces(c *gin.Context) {
root := filepath.Dir(util.WorkspaceDir)
dirs, err := os.ReadDir(root)
if nil != err {
if err != nil {
logging.LogErrorf("read dir [%s] failed: %s", root, err)
ret.Code = -1
ret.Msg = err.Error()
@ -229,7 +229,7 @@ func getWorkspaces(c *gin.Context) {
defer c.JSON(http.StatusOK, ret)
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -299,7 +299,7 @@ func setWorkspaceDir(c *gin.Context) {
}
workspacePaths, err := util.ReadWorkspacePaths()
if nil != err {
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
@ -310,7 +310,7 @@ func setWorkspaceDir(c *gin.Context) {
workspacePaths = gulu.Str.RemoveElem(workspacePaths, path)
workspacePaths = append(workspacePaths, path) // 切换的工作空间固定放在最后一个
if err = util.WriteWorkspacePaths(workspacePaths); nil != err {
if err = util.WriteWorkspacePaths(workspacePaths); err != nil {
ret.Code = -1
ret.Msg = err.Error()
return