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

kernel/api/file.go

@@ -372,6 +372,7 @@ func renameFile(c *gin.Context) {
 	}
 
 	destPath := arg["newPath"].(string)
+	destPath = strings.TrimSpace(destPath)
 	destAbsPath, err := util.GetAbsPathInWorkspace(destPath)
 	if err != nil {
 		ret.Code = http.StatusForbidden
@@ -437,8 +438,12 @@ func putFile(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 
+	isDirStr := c.PostForm("isDir")
+	isDir, _ := strconv.ParseBool(isDirStr)
+
 	var err error
 	filePath := c.PostForm("path")
+	filePath = strings.TrimSpace(filePath)
 	fileAbsPath, err := util.GetAbsPathInWorkspace(filePath)
 	if err != nil {
 		ret.Code = http.StatusForbidden
@@ -453,11 +458,21 @@ func putFile(c *gin.Context) {
 			ret.Msg = "invalid file path, please check https://github.com/siyuan-note/siyuan/issues/14658 for more details"
 			return
 		}
+	} else {
+		info, statErr := os.Stat(fileAbsPath)
+		if statErr != nil {
+			logging.LogErrorf("stat file [%s] failed: %s", fileAbsPath, statErr)
+			ret.Code = http.StatusInternalServerError
+			ret.Msg = statErr.Error()
+			return
+		}
+		if info.IsDir() && !isDir {
+			ret.Code = http.StatusBadRequest
+			ret.Msg = "the path is a directory"
+			return
+		}
 	}
 
-	isDirStr := c.PostForm("isDir")
-	isDir, _ := strconv.ParseBool(isDirStr)
-
 	if isDir {
 		err = os.MkdirAll(fileAbsPath, 0755)
 		if err != nil {

kernel/sql/database.go

@@ -95,13 +95,11 @@ func InitDatabase(forceRebuild bool) (err error) {
 
 	// 不存在库或者版本不一致都会走到这里
 
-	if err = closeDatabase(); nil != err {
-		logging.LogFatalf(logging.ExitCodeUnavailableDatabase, "close database failed: %s", err)
-	}
-
+	closeDatabase()
 	if gulu.File.IsExist(util.DBPath) {
 		if err = removeDatabaseFile(); err != nil {
-			logging.LogFatalf(logging.ExitCodeUnavailableDatabase, "remove database file [%s] failed: %s", util.DBPath, err)
+			logging.LogErrorf("remove database file failed: %s", err)
+			err = nil
 		}
 	}
 
@@ -271,6 +269,8 @@ func InitHistoryDatabase(forceRebuild bool) {
 	}
 
 	historyDB.Close()
+	historyDB = nil
+	runtime.GC()
 	if err := os.RemoveAll(util.HistoryDBPath); err != nil {
 		logging.LogErrorf("remove history database file [%s] failed: %s", util.HistoryDBPath, err)
 		return
@@ -283,6 +283,8 @@ func InitHistoryDatabase(forceRebuild bool) {
 func initHistoryDBConnection() {
 	if nil != historyDB {
 		historyDB.Close()
+		historyDB = nil
+		runtime.GC()
 	}
 
 	util.LogDatabaseSize(util.HistoryDBPath)
@@ -327,6 +329,8 @@ func InitAssetContentDatabase(forceRebuild bool) {
 	}
 
 	assetContentDB.Close()
+	assetContentDB = nil
+	runtime.GC()
 	if err := os.RemoveAll(util.AssetContentDBPath); err != nil {
 		logging.LogErrorf("remove assets database file [%s] failed: %s", util.AssetContentDBPath, err)
 		return
@@ -339,6 +343,8 @@ func InitAssetContentDatabase(forceRebuild bool) {
 func initAssetContentDBConnection() {
 	if nil != assetContentDB {
 		assetContentDB.Close()
+		assetContentDB = nil
+		runtime.GC()
 	}
 
 	util.LogDatabaseSize(util.AssetContentDBPath)
@@ -1282,17 +1288,14 @@ func batchUpdateHPath(tx *sql.Tx, tree *parse.Tree, context map[string]interface
 }
 
 func CloseDatabase() {
-	if err := closeDatabase(); err != nil {
+	if err := db.Close(); err != nil {
 		logging.LogErrorf("close database failed: %s", err)
-		return
 	}
 	if err := historyDB.Close(); err != nil {
 		logging.LogErrorf("close history database failed: %s", err)
-		return
 	}
 	if err := assetContentDB.Close(); err != nil {
 		logging.LogErrorf("close asset content database failed: %s", err)
-		return
 	}
 	treenode.CloseDatabase()
 	logging.LogInfof("closed database")
@@ -1544,14 +1547,15 @@ func removeDatabaseFile() (err error) {
 	return
 }
 
-func closeDatabase() (err error) {
+func closeDatabase() {
 	if nil == db {
 		return
 	}
 
-	err = db.Close()
+	db.Close()
 	debug.FreeOSMemory()
-	runtime.GC() // 没有这句的话文件句柄不会释放，后面就无法删除文件
+	db = nil
+	runtime.GC()
 	return
 }
 

kernel/treenode/blocktree.go

@@ -136,7 +136,8 @@ func closeDatabase() {
 		logging.LogErrorf("close database failed: %s", err)
 	}
 	debug.FreeOSMemory()
-	runtime.GC() // 没有这句的话文件句柄不会释放，后面就无法删除文件
+	db = nil
+	runtime.GC()
 	return
 }