feat(database): add gearTxt field to parsed results and update related functions

2026-02-17 22:42:59 +08:00
parent 5dba3d9930
commit 8c4c4e77d7
13 changed files with 658 additions and 226 deletions
--- a/internal/model/database.go
+++ b/internal/model/database.go
@@ -6,59 +6,60 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"

 	_ "modernc.org/sqlite"
 )

-// Database 数据库管理器
+// Database manages the app database.
 type Database struct {
 	db *sql.DB
 }

-// NewDatabase 创建新的数据库连接
+// NewDatabase creates a new database connection.
 func NewDatabase() (*Database, error) {
 	dbPath := getDatabasePath()
 	log.Printf("[db] init: path=%s", dbPath)

-	// 确保目录存在
+	// Ensure directory exists.
 	dir := filepath.Dir(dbPath)
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		log.Printf("[db] mkdir failed: dir=%s err=%v", dir, err)
-		return nil, fmt.Errorf("创建数据库目录失败: %w", err)
+		return nil, fmt.Errorf("create database dir failed: %w", err)
 	}

-	// 连接数据库
+	// Connect database.
 	db, err := sql.Open("sqlite", dbPath)
 	if err != nil {
 		log.Printf("[db] open failed: path=%s err=%v", dbPath, err)
-		return nil, fmt.Errorf("连接数据库失败: %w", err)
+		return nil, fmt.Errorf("open database failed: %w", err)
 	}

-	// 测试连接
+	// Test connection.
 	if err := db.Ping(); err != nil {
 		log.Printf("[db] ping failed: err=%v", err)
-		return nil, fmt.Errorf("数据库连接测试失败: %w", err)
+		return nil, fmt.Errorf("database ping failed: %w", err)
 	}

 	database := &Database{db: db}

-	// 初始化表结构
+	// Init tables.
 	if err := database.initTables(); err != nil {
 		log.Printf("[db] init tables failed: err=%v", err)
-		return nil, fmt.Errorf("初始化数据库表失败: %w", err)
+		return nil, fmt.Errorf("init tables failed: %w", err)
 	}

 	log.Printf("[db] init ok")
 	return database, nil
 }

-// Close 关闭数据库连接
+// Close closes the database connection.
 func (d *Database) Close() error {
 	return d.db.Close()
 }

-// getDatabasePath 获取数据库文件路径
+// getDatabasePath returns the database file path.
 func getDatabasePath() string {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
@@ -67,19 +68,18 @@ func getDatabasePath() string {
 	return filepath.Join(homeDir, ".equipment-analyzer", "equipment_analyzer.db")
 }

-// initTables 初始化数据库表结构
+// initTables creates tables if not exist.
 func (d *Database) initTables() error {
-	// 解析数据表 - 存储抓包解析后的装备和角色数据
 	parsedDataTable := `
 	CREATE TABLE IF NOT EXISTS parsed_data (
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
 		session_name TEXT NOT NULL,
 		items_json TEXT NOT NULL,
 		heroes_json TEXT NOT NULL,
+		geartxt TEXT NOT NULL DEFAULT '',
 		created_at INTEGER NOT NULL
 	);`

-	// 应用设置表
 	settingsTable := `
 	CREATE TABLE IF NOT EXISTS app_settings (
 		key TEXT PRIMARY KEY,
@@ -94,44 +94,59 @@ func (d *Database) initTables() error {

 	for _, table := range tables {
 		if _, err := d.db.Exec(table); err != nil {
-			return fmt.Errorf("创建表失败: %w", err)
+			return fmt.Errorf("create table failed: %w", err)
 		}
 	}

+	if err := d.ensureParsedDataColumns(); err != nil {
+		return err
+	}
+
 	return nil
 }

-// SaveParsedData 保存解析后的数据
-func (d *Database) SaveParsedData(sessionName string, itemsJSON, heroesJSON string) error {
-	stmt := `
-	INSERT INTO parsed_data (session_name, items_json, heroes_json, created_at)
-	VALUES (?, ?, ?, ?)`
+func (d *Database) ensureParsedDataColumns() error {
+	_, err := d.db.Exec("ALTER TABLE parsed_data ADD COLUMN geartxt TEXT NOT NULL DEFAULT ''")
+	if err != nil {
+		if strings.Contains(err.Error(), "duplicate column name") {
+			return nil
+		}
+		return fmt.Errorf("add geartxt column failed: %w", err)
+	}
+	return nil
+}

-	_, err := d.db.Exec(stmt, sessionName, itemsJSON, heroesJSON, time.Now().Unix())
+// SaveParsedData saves parsed items/heroes with raw gear txt.
+func (d *Database) SaveParsedData(sessionName string, itemsJSON, heroesJSON, gearTxt string) error {
+	stmt := `
+	INSERT INTO parsed_data (session_name, items_json, heroes_json, geartxt, created_at)
+	VALUES (?, ?, ?, ?, ?)`
+
+	_, err := d.db.Exec(stmt, sessionName, itemsJSON, heroesJSON, gearTxt, time.Now().Unix())
 	return err
 }

-// GetLatestParsedData 获取最新的解析数据
-func (d *Database) GetLatestParsedData() (string, string, error) {
+// GetLatestParsedData returns latest parsed data.
+func (d *Database) GetLatestParsedData() (string, string, string, error) {
 	stmt := `
-	SELECT items_json, heroes_json 
-	FROM parsed_data 
-	ORDER BY created_at DESC 
+	SELECT items_json, heroes_json, geartxt
+	FROM parsed_data
+	ORDER BY created_at DESC
 	LIMIT 1`

-	var itemsJSON, heroesJSON string
-	err := d.db.QueryRow(stmt).Scan(&itemsJSON, &heroesJSON)
+	var itemsJSON, heroesJSON, gearTxt string
+	err := d.db.QueryRow(stmt).Scan(&itemsJSON, &heroesJSON, &gearTxt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return "", "", nil
+			return "", "", "", nil
 		}
-		return "", "", err
+		return "", "", "", err
 	}

-	return itemsJSON, heroesJSON, nil
+	return itemsJSON, heroesJSON, gearTxt, nil
 }

-// GetParsedSessions 获取所有解析会话
+// GetParsedSessions returns all parsed sessions.
 func (d *Database) GetParsedSessions() ([]ParsedSession, error) {
 	stmt := `
 	SELECT id, session_name, created_at
@@ -155,26 +170,26 @@ func (d *Database) GetParsedSessions() ([]ParsedSession, error) {
 	return sessions, nil
 }

-// GetParsedDataByID 获取指定会话的数据
-func (d *Database) GetParsedDataByID(id int64) (string, string, error) {
+// GetParsedDataByID returns parsed data for a session.
+func (d *Database) GetParsedDataByID(id int64) (string, string, string, error) {
 	stmt := `
-	SELECT items_json, heroes_json
+	SELECT items_json, heroes_json, geartxt
 	FROM parsed_data
 	WHERE id = ?
 	LIMIT 1`

-	var itemsJSON, heroesJSON string
-	err := d.db.QueryRow(stmt, id).Scan(&itemsJSON, &heroesJSON)
+	var itemsJSON, heroesJSON, gearTxt string
+	err := d.db.QueryRow(stmt, id).Scan(&itemsJSON, &heroesJSON, &gearTxt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return "", "", nil
+			return "", "", "", nil
 		}
-		return "", "", err
+		return "", "", "", err
 	}
-	return itemsJSON, heroesJSON, nil
+	return itemsJSON, heroesJSON, gearTxt, nil
 }

-// UpdateParsedSessionName 更新解析会话名称
+// UpdateParsedSessionName updates session name.
 func (d *Database) UpdateParsedSessionName(id int64, name string) error {
 	stmt := `
 	UPDATE parsed_data
@@ -184,7 +199,7 @@ func (d *Database) UpdateParsedSessionName(id int64, name string) error {
 	return err
 }

-// DeleteParsedSession 删除解析会话
+// DeleteParsedSession deletes a parsed session.
 func (d *Database) DeleteParsedSession(id int64) error {
 	stmt := `
 	DELETE FROM parsed_data
@@ -193,14 +208,14 @@ func (d *Database) DeleteParsedSession(id int64) error {
 	return err
 }

-// SaveSetting 保存应用设置
+// SaveSetting saves app setting.
 func (d *Database) SaveSetting(key, value string) error {
 	stmt := "INSERT OR REPLACE INTO app_settings (key, value, updated_at) VALUES (?, ?, ?)"
 	_, err := d.db.Exec(stmt, key, value, time.Now().Unix())
 	return err
 }

-// GetSetting 获取应用设置
+// GetSetting returns app setting.
 func (d *Database) GetSetting(key string) (string, error) {
 	stmt := "SELECT value FROM app_settings WHERE key = ?"
 	var value string
@@ -211,7 +226,7 @@ func (d *Database) GetSetting(key string) (string, error) {
 	return value, nil
 }

-// GetAllSettings 获取所有设置
+// GetAllSettings returns all settings.
 func (d *Database) GetAllSettings() (map[string]string, error) {
 	stmt := "SELECT key, value FROM app_settings"
 	rows, err := d.db.Query(stmt)
--- a/internal/model/packet.go
+++ b/internal/model/packet.go
@@ -32,8 +32,9 @@ type CaptureStatus struct {

 // ParsedResult 解析结果
 type ParsedResult struct {
-	Items  []interface{} `json:"items"`
-	Heroes []interface{} `json:"heroes"`
+	Items   []interface{} `json:"items"`
+	Heroes  []interface{} `json:"heroes"`
+	GearTxt string        `json:"geartxt"`
 }

 // ParsedSession 解析数据会话信息