Skip to content

Commit ea53fac

Browse files
committed
fix: 修复配置文件和数据库文件的存在性检查逻辑
1 parent a7a6a7b commit ea53fac

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

internal/conf/init.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ import (
1212
func init() {
1313
Conf = &Config{}
1414
event.On(eventType.ProcessStart, event.ListenerFunc(func(e event.Event) error {
15+
if _, err := os.Stat(flags.ConfigFile); os.IsNotExist(err) {
16+
if err := Override(Default()); err != nil {
17+
return err
18+
}
19+
}
1520
b, err := os.ReadFile(flags.ConfigFile)
1621
if err != nil {
1722
return err

internal/patch/v1.1.4.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"log/slog"
66
"os"
77

8-
"github.com/komari-monitor/komari/cmd/flags"
98
"github.com/komari-monitor/komari/internal/conf"
109
_ "github.com/mattn/go-sqlite3"
1110
"gorm.io/gorm"
@@ -14,13 +13,18 @@ import (
1413
// v1_1_4_PreMigration 在数据库和配置加载前执行,直接操作 SQLite 数据库文件
1514
func v1_1_4_PreMigration() {
1615
// 检查数据库文件是否存在
17-
if _, err := os.Stat(flags.DatabaseFile); os.IsNotExist(err) {
16+
if _, err := os.Stat("./data/komari.db"); os.IsNotExist(err) {
1817
// 数据库文件不存在,无需迁移
1918
return
2019
}
2120

21+
if _, err := os.Stat("./data/komari.json"); err == nil {
22+
// 配置文件已存在,无需迁移
23+
return
24+
}
25+
2226
// 打开 SQLite 数据库
23-
db, err := sql.Open("sqlite3", flags.DatabaseFile)
27+
db, err := sql.Open("sqlite3", "./data/komari.db")
2428
if err != nil {
2529
slog.Error("[>1.1.4] Failed to open database file for migration.", slog.Any("error", err))
2630
return

0 commit comments

Comments
 (0)