From f8b7e086babe477bf72671c84af3dfdfe73aadf9 Mon Sep 17 00:00:00 2001
From: HFO4 <912394456@qq.com>
Date: Fri, 22 Apr 2022 15:56:45 +0800
Subject: [PATCH] fix: `database is locked` when using sqlite

---
 assets                   | 2 +-
 models/init.go           | 9 ++++++---
 pkg/filesystem/manage.go | 6 ++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/assets b/assets
index f2e1195..032ce5b 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit f2e11958738434c5a14547f21b6e78d7f3aec6fe
+Subproject commit 032ce5ba95803fa5667538c0254f7812acd34449
diff --git a/models/init.go b/models/init.go
index 8cfa788..397317d 100644
--- a/models/init.go
+++ b/models/init.go
@@ -73,10 +73,13 @@ func Init() {
 	}
 
 	//设置连接池
-	//空闲
 	db.DB().SetMaxIdleConns(50)
-	//打开
-	db.DB().SetMaxOpenConns(100)
+	if conf.DatabaseConfig.Type == "sqlite" || conf.DatabaseConfig.Type == "sqlite3" || conf.DatabaseConfig.Type == "UNSET" {
+		db.DB().SetMaxOpenConns(1)
+	} else {
+		db.DB().SetMaxOpenConns(100)
+	}
+
 	//超时
 	db.DB().SetConnMaxLifetime(time.Second * 30)
 
diff --git a/pkg/filesystem/manage.go b/pkg/filesystem/manage.go
index 724b250..10e9986 100644
--- a/pkg/filesystem/manage.go
+++ b/pkg/filesystem/manage.go
@@ -424,11 +424,9 @@ func (fs *FileSystem) CreateDirectory(ctx context.Context, fullPath string) (*mo
 	_, err := newFolder.Create()
 
 	if err != nil {
-		if _, ok := ctx.Value(fsctx.IgnoreDirectoryConflictCtx).(bool); !ok {
-			return nil, fmt.Errorf("failed to create folder: %w", err)
-		}
-
+		return nil, fmt.Errorf("failed to create folder: %w", err)
 	}
+
 	return &newFolder, nil
 }