From ea53facb982d61c3ac29f63d69a03da2ac4db768 Mon Sep 17 00:00:00 2001 From: Akizon77 Date: Sat, 6 Dec 2025 17:24:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=AD=98=E5=9C=A8=E6=80=A7=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/conf/init.go | 5 +++++ internal/patch/v1.1.4.go | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/conf/init.go b/internal/conf/init.go index bb75cda..0f831e6 100644 --- a/internal/conf/init.go +++ b/internal/conf/init.go @@ -12,6 +12,11 @@ import ( func init() { Conf = &Config{} event.On(eventType.ProcessStart, event.ListenerFunc(func(e event.Event) error { + if _, err := os.Stat(flags.ConfigFile); os.IsNotExist(err) { + if err := Override(Default()); err != nil { + return err + } + } b, err := os.ReadFile(flags.ConfigFile) if err != nil { return err diff --git a/internal/patch/v1.1.4.go b/internal/patch/v1.1.4.go index 75df00a..108c184 100644 --- a/internal/patch/v1.1.4.go +++ b/internal/patch/v1.1.4.go @@ -5,7 +5,6 @@ import ( "log/slog" "os" - "github.com/komari-monitor/komari/cmd/flags" "github.com/komari-monitor/komari/internal/conf" _ "github.com/mattn/go-sqlite3" "gorm.io/gorm" @@ -14,13 +13,18 @@ import ( // v1_1_4_PreMigration 在数据库和配置加载前执行,直接操作 SQLite 数据库文件 func v1_1_4_PreMigration() { // 检查数据库文件是否存在 - if _, err := os.Stat(flags.DatabaseFile); os.IsNotExist(err) { + if _, err := os.Stat("./data/komari.db"); os.IsNotExist(err) { // 数据库文件不存在,无需迁移 return } + if _, err := os.Stat("./data/komari.json"); err == nil { + // 配置文件已存在,无需迁移 + return + } + // 打开 SQLite 数据库 - db, err := sql.Open("sqlite3", flags.DatabaseFile) + db, err := sql.Open("sqlite3", "./data/komari.db") if err != nil { slog.Error("[>1.1.4] Failed to open database file for migration.", slog.Any("error", err)) return