♻️ Refactor keybinding service

internal/services/backup_service.go

@@ -868,8 +868,8 @@ func (s *BackupService) createExtension(ctx context.Context, client *ent.Client,
 	if v, ok := record[extension.FieldUUID].(string); ok {
 		builder.SetUUID(v)
 	}
-	if v, ok := record[extension.FieldKey].(string); ok {
-		builder.SetKey(v)
+	if v, ok := record[extension.FieldName].(string); ok {
+		builder.SetName(v)
 	}
 	if v, ok := record[extension.FieldEnabled].(bool); ok {
 		builder.SetEnabled(v)
@@ -891,8 +891,8 @@ func (s *BackupService) createExtension(ctx context.Context, client *ent.Client,
 
 func (s *BackupService) updateExtension(ctx context.Context, client *ent.Client, id int, record map[string]interface{}) error {
 	builder := client.Extension.UpdateOneID(id)
-	if v, ok := record[extension.FieldKey].(string); ok {
-		builder.SetKey(v)
+	if v, ok := record[extension.FieldName].(string); ok {
+		builder.SetName(v)
 	}
 	if v, ok := record[extension.FieldEnabled].(bool); ok {
 		builder.SetEnabled(v)
@@ -954,11 +954,20 @@ func (s *BackupService) createKeyBinding(ctx context.Context, client *ent.Client
 	if v, ok := record[keybinding.FieldUUID].(string); ok {
 		builder.SetUUID(v)
 	}
+	if v, ok := record[keybinding.FieldName].(string); ok {
+		builder.SetName(v)
+	}
 	if v, ok := record[keybinding.FieldKey].(string); ok {
 		builder.SetKey(v)
 	}
-	if v, ok := record[keybinding.FieldCommand].(string); ok {
-		builder.SetCommand(v)
+	if v, ok := record[keybinding.FieldMacos].(string); ok {
+		builder.SetMacos(v)
+	}
+	if v, ok := record[keybinding.FieldWindows].(string); ok {
+		builder.SetWindows(v)
+	}
+	if v, ok := record[keybinding.FieldLinux].(string); ok {
+		builder.SetLinux(v)
 	}
 	if v, ok := record[keybinding.FieldExtension].(string); ok {
 		builder.SetExtension(v)
@@ -966,6 +975,12 @@ func (s *BackupService) createKeyBinding(ctx context.Context, client *ent.Client
 	if v, ok := record[keybinding.FieldEnabled].(bool); ok {
 		builder.SetEnabled(v)
 	}
+	if v, ok := record[keybinding.FieldPreventDefault].(bool); ok {
+		builder.SetPreventDefault(v)
+	}
+	if v, ok := record[keybinding.FieldScope].(string); ok {
+		builder.SetScope(v)
+	}
 	if v, ok := record[keybinding.FieldCreatedAt].(string); ok {
 		builder.SetCreatedAt(v)
 	}
@@ -980,11 +995,20 @@ func (s *BackupService) createKeyBinding(ctx context.Context, client *ent.Client
 
 func (s *BackupService) updateKeyBinding(ctx context.Context, client *ent.Client, id int, record map[string]interface{}) error {
 	builder := client.KeyBinding.UpdateOneID(id)
+	if v, ok := record[keybinding.FieldName].(string); ok {
+		builder.SetName(v)
+	}
 	if v, ok := record[keybinding.FieldKey].(string); ok {
 		builder.SetKey(v)
 	}
-	if v, ok := record[keybinding.FieldCommand].(string); ok {
-		builder.SetCommand(v)
+	if v, ok := record[keybinding.FieldMacos].(string); ok {
+		builder.SetMacos(v)
+	}
+	if v, ok := record[keybinding.FieldWindows].(string); ok {
+		builder.SetWindows(v)
+	}
+	if v, ok := record[keybinding.FieldLinux].(string); ok {
+		builder.SetLinux(v)
 	}
 	if v, ok := record[keybinding.FieldExtension].(string); ok {
 		builder.SetExtension(v)
@@ -992,6 +1016,12 @@ func (s *BackupService) updateKeyBinding(ctx context.Context, client *ent.Client
 	if v, ok := record[keybinding.FieldEnabled].(bool); ok {
 		builder.SetEnabled(v)
 	}
+	if v, ok := record[keybinding.FieldPreventDefault].(bool); ok {
+		builder.SetPreventDefault(v)
+	}
+	if v, ok := record[keybinding.FieldScope].(string); ok {
+		builder.SetScope(v)
+	}
 	if v, ok := record[keybinding.FieldUpdatedAt].(string); ok {
 		builder.SetUpdatedAt(v)
 	}
@@ -1046,8 +1076,8 @@ func (s *BackupService) createTheme(ctx context.Context, client *ent.Client, rec
 	if v, ok := record[theme.FieldUUID].(string); ok {
 		builder.SetUUID(v)
 	}
-	if v, ok := record[theme.FieldKey].(string); ok {
-		builder.SetKey(v)
+	if v, ok := record[theme.FieldName].(string); ok {
+		builder.SetName(v)
 	}
 	if v, ok := record[theme.FieldType].(string); ok {
 		builder.SetType(theme.Type(v))
@@ -1069,8 +1099,8 @@ func (s *BackupService) createTheme(ctx context.Context, client *ent.Client, rec
 
 func (s *BackupService) updateTheme(ctx context.Context, client *ent.Client, id int, record map[string]interface{}) error {
 	builder := client.Theme.UpdateOneID(id)
-	if v, ok := record[theme.FieldKey].(string); ok {
-		builder.SetKey(v)
+	if v, ok := record[theme.FieldName].(string); ok {
+		builder.SetName(v)
 	}
 	if v, ok := record[theme.FieldType].(string); ok {
 		builder.SetType(theme.Type(v))

internal/services/extension_service.go

@@ -36,9 +36,9 @@ func (s *ExtensionService) ServiceStartup(ctx context.Context, options applicati
 // SyncExtensions 同步扩展配置
 func (s *ExtensionService) SyncExtensions(ctx context.Context) error {
 	defaults := models.NewDefaultExtensions()
-	definedKeys := make(map[models.ExtensionKey]models.Extension)
+	definedKeys := make(map[models.ExtensionName]models.Extension)
 	for _, ext := range defaults {
-		definedKeys[ext.Key] = ext
+		definedKeys[ext.Name] = ext
 	}
 
 	// 获取数据库中已有的扩展
@@ -49,7 +49,7 @@ func (s *ExtensionService) SyncExtensions(ctx context.Context) error {
 
 	existingKeys := make(map[string]bool)
 	for _, ext := range existing {
-		existingKeys[ext.Key] = true
+		existingKeys[ext.Name] = true
 	}
 
 	// 批量添加缺失的扩展
@@ -57,7 +57,7 @@ func (s *ExtensionService) SyncExtensions(ctx context.Context) error {
 	for key, ext := range definedKeys {
 		if !existingKeys[string(key)] {
 			builders = append(builders, s.db.Client.Extension.Create().
-				SetKey(string(ext.Key)).
+				SetName(string(ext.Name)).
 				SetEnabled(ext.Enabled).
 				SetConfig(ext.Config))
 		}
@@ -71,7 +71,7 @@ func (s *ExtensionService) SyncExtensions(ctx context.Context) error {
 	// 批量删除废弃的扩展
 	var deleteIDs []int
 	for _, ext := range existing {
-		if _, ok := definedKeys[models.ExtensionKey(ext.Key)]; !ok {
+		if _, ok := definedKeys[models.ExtensionName(ext.Name)]; !ok {
 			deleteIDs = append(deleteIDs, ext.ID)
 		}
 	}
@@ -86,15 +86,15 @@ func (s *ExtensionService) SyncExtensions(ctx context.Context) error {
 	return nil
 }
 
-// GetAllExtensions 获取所有扩展
-func (s *ExtensionService) GetAllExtensions(ctx context.Context) ([]*ent.Extension, error) {
+// GetExtensions 获取所有扩展
+func (s *ExtensionService) GetExtensions(ctx context.Context) ([]*ent.Extension, error) {
 	return s.db.Client.Extension.Query().All(ctx)
 }
 
-// GetExtensionByKey 根据Key获取扩展
-func (s *ExtensionService) GetExtensionByKey(ctx context.Context, key string) (*ent.Extension, error) {
+// GetExtensionByID 根据ID获取扩展
+func (s *ExtensionService) GetExtensionByID(ctx context.Context, id int) (*ent.Extension, error) {
 	ext, err := s.db.Client.Extension.Query().
-		Where(extension.Key(key)).
+		Where(extension.ID(id)).
 		Only(ctx)
 	if err != nil {
 		if ent.IsNotFound(err) {
@@ -106,13 +106,13 @@ func (s *ExtensionService) GetExtensionByKey(ctx context.Context, key string) (*
 }
 
 // UpdateExtensionEnabled 更新扩展启用状态
-func (s *ExtensionService) UpdateExtensionEnabled(ctx context.Context, key string, enabled bool) error {
-	ext, err := s.GetExtensionByKey(ctx, key)
+func (s *ExtensionService) UpdateExtensionEnabled(ctx context.Context, id int, enabled bool) error {
+	ext, err := s.GetExtensionByID(ctx, id)
 	if err != nil {
 		return err
 	}
 	if ext == nil {
-		return fmt.Errorf("extension not found: %s", key)
+		return fmt.Errorf("extension not found: %d", id)
 	}
 
 	// 更新扩展状态
@@ -124,23 +124,23 @@ func (s *ExtensionService) UpdateExtensionEnabled(ctx context.Context, key strin
 
 	// 同步更新该扩展关联的快捷键启用状态
 	if _, err := s.db.Client.KeyBinding.Update().
-		Where(keybinding.Extension(key)).
+		Where(keybinding.Extension(ext.Name)).
 		SetEnabled(enabled).
 		Save(ctx); err != nil {
-		return fmt.Errorf("update keybindings for extension %s error: %w", key, err)
+		return fmt.Errorf("update keybindings for extension %s error: %w", ext.Name, err)
 	}
 
 	return nil
 }
 
 // UpdateExtensionConfig 更新扩展配置
-func (s *ExtensionService) UpdateExtensionConfig(ctx context.Context, key string, config map[string]interface{}) error {
-	ext, err := s.GetExtensionByKey(ctx, key)
+func (s *ExtensionService) UpdateExtensionConfig(ctx context.Context, id int, config map[string]interface{}) error {
+	ext, err := s.GetExtensionByID(ctx, id)
 	if err != nil {
 		return err
 	}
 	if ext == nil {
-		return fmt.Errorf("extension not found: %s", key)
+		return fmt.Errorf("extension not found: %d", id)
 	}
 	return s.db.Client.Extension.UpdateOneID(ext.ID).
 		SetConfig(config).
@@ -148,25 +148,25 @@ func (s *ExtensionService) UpdateExtensionConfig(ctx context.Context, key string
 }
 
 // ResetExtensionConfig 重置单个扩展到默认状态
-func (s *ExtensionService) ResetExtensionConfig(ctx context.Context, key string) error {
-	defaults := models.NewDefaultExtensions()
-	var defaultExt *models.Extension
-	for _, ext := range defaults {
-		if string(ext.Key) == key {
-			defaultExt = &ext
-			break
-		}
-	}
-	if defaultExt == nil {
-		return fmt.Errorf("default extension not found: %s", key)
-	}
-
-	ext, err := s.GetExtensionByKey(ctx, key)
+func (s *ExtensionService) ResetExtensionConfig(ctx context.Context, id int) error {
+	ext, err := s.GetExtensionByID(ctx, id)
 	if err != nil {
 		return err
 	}
 	if ext == nil {
-		return fmt.Errorf("extension not found: %s", key)
+		return fmt.Errorf("extension not found: %d", id)
+	}
+
+	defaults := models.NewDefaultExtensions()
+	var defaultExt *models.Extension
+	for _, defExt := range defaults {
+		if string(defExt.Name) == ext.Name {
+			defaultExt = &defExt
+			break
+		}
+	}
+	if defaultExt == nil {
+		return fmt.Errorf("default extension not found: %s", ext.Name)
 	}
 
 	return s.db.Client.Extension.UpdateOneID(ext.ID).
@@ -175,6 +175,21 @@ func (s *ExtensionService) ResetExtensionConfig(ctx context.Context, key string)
 		Exec(ctx)
 }
 
+// GetExtensionConfig 获取扩展配置
+func (s *ExtensionService) GetExtensionConfig(ctx context.Context, id int) (map[string]interface{}, error) {
+	ext, err := s.GetExtensionByID(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	if ext == nil {
+		return nil, fmt.Errorf("extension not found: %d", id)
+	}
+	if ext.Config == nil {
+		return make(map[string]interface{}), nil
+	}
+	return ext.Config, nil
+}
+
 // GetDefaultExtensions 获取默认扩展配置（用于前端绑定生成）
 func (s *ExtensionService) GetDefaultExtensions() []models.Extension {
 	return models.NewDefaultExtensions()

internal/services/keybinding_service.go

@@ -35,9 +35,11 @@ func (s *KeyBindingService) ServiceStartup(ctx context.Context, options applicat
 // SyncKeyBindings 同步快捷键配置
 func (s *KeyBindingService) SyncKeyBindings(ctx context.Context) error {
 	defaults := models.NewDefaultKeyBindings()
-	definedKeys := make(map[models.KeyBindingKey]models.KeyBinding)
+	// 使用 type + name 作为唯一键
+	definedKeys := make(map[string]models.KeyBinding)
 	for _, kb := range defaults {
-		definedKeys[kb.Key] = kb
+		key := string(kb.Type) + ":" + string(kb.Name)
+		definedKeys[key] = kb
 	}
 
 	// 获取数据库中已有的快捷键
@@ -48,20 +50,38 @@ func (s *KeyBindingService) SyncKeyBindings(ctx context.Context) error {
 
 	existingKeys := make(map[string]bool)
 	for _, kb := range existing {
-		existingKeys[kb.Key] = true
+		key := kb.Type + ":" + kb.Name
+		existingKeys[key] = true
 	}
 
 	// 批量添加缺失的快捷键
 	var builders []*ent.KeyBindingCreate
 	for key, kb := range definedKeys {
-		if !existingKeys[string(key)] {
+		if !existingKeys[key] {
 			create := s.db.Client.KeyBinding.Create().
-				SetKey(string(kb.Key)).
-				SetCommand(kb.Command).
-				SetEnabled(kb.Enabled)
-			if kb.Extension != "" {
-				create.SetExtension(string(kb.Extension))
+				SetName(string(kb.Name)).
+				SetType(string(kb.Type)).
+				SetExtension(string(kb.Extension)).
+				SetEnabled(kb.Enabled).
+				SetPreventDefault(kb.PreventDefault)
+
+			// 设置快捷键字段
+			if kb.Key != "" {
+				create.SetKey(kb.Key)
 			}
+			if kb.Macos != "" {
+				create.SetMacos(kb.Macos)
+			}
+			if kb.Windows != "" {
+				create.SetWindows(kb.Windows)
+			}
+			if kb.Linux != "" {
+				create.SetLinux(kb.Linux)
+			}
+			if kb.Scope != "" {
+				create.SetScope(kb.Scope)
+			}
+
 			builders = append(builders, create)
 		}
 	}
@@ -74,7 +94,8 @@ func (s *KeyBindingService) SyncKeyBindings(ctx context.Context) error {
 	// 批量删除废弃的快捷键（硬删除）
 	var deleteIDs []int
 	for _, kb := range existing {
-		if _, ok := definedKeys[models.KeyBindingKey(kb.Key)]; !ok {
+		key := kb.Type + ":" + kb.Name
+		if _, ok := definedKeys[key]; !ok {
 			deleteIDs = append(deleteIDs, kb.ID)
 		}
 	}
@@ -89,16 +110,50 @@ func (s *KeyBindingService) SyncKeyBindings(ctx context.Context) error {
 	return nil
 }
 
-// GetAllKeyBindings 获取所有快捷键
-func (s *KeyBindingService) GetAllKeyBindings(ctx context.Context) ([]*ent.KeyBinding, error) {
-	return s.db.Client.KeyBinding.Query().All(ctx)
+// GetKeyBindings 根据类型获取快捷键
+func (s *KeyBindingService) GetKeyBindings(ctx context.Context, kbType models.KeyBindingType) ([]*ent.KeyBinding, error) {
+	if kbType == models.Standard {
+		// Standard 模式：只返回 type=standard 且 enabled=true
+		return s.db.Client.KeyBinding.Query().
+			Where(
+				keybinding.Type(string(kbType)),
+				keybinding.Enabled(true),
+			).
+			All(ctx)
+	}
+
+	// Emacs 模式：获取所有 enabled=true 的快捷键
+	allEnabled, err := s.db.Client.KeyBinding.Query().
+		Where(keybinding.Enabled(true)).
+		All(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("query enabled key bindings error: %w", err)
+	}
+
+	// 构建 emacs 快捷键的 name 集合
+	emacsNames := make(map[string]bool)
+	for _, kb := range allEnabled {
+		if kb.Type == string(models.Emacs) {
+			emacsNames[kb.Name] = true
+		}
+	}
+
+	// 过滤：去掉与 emacs 冲突的 standard 快捷键
+	var result []*ent.KeyBinding
+	for _, kb := range allEnabled {
+		// 如果是 standard 类型，且与 emacs 有 name 冲突，则跳过
+		if kb.Type == string(models.Standard) && emacsNames[kb.Name] {
+			continue
+		}
+		result = append(result, kb)
+	}
+
+	return result, nil
 }
 
-// GetKeyBindingByKey 根据Key获取快捷键
-func (s *KeyBindingService) GetKeyBindingByKey(ctx context.Context, key string) (*ent.KeyBinding, error) {
-	kb, err := s.db.Client.KeyBinding.Query().
-		Where(keybinding.Key(key)).
-		Only(ctx)
+// GetKeyBindingByID 根据ID获取快捷键
+func (s *KeyBindingService) GetKeyBindingByID(ctx context.Context, id int) (*ent.KeyBinding, error) {
+	kb, err := s.db.Client.KeyBinding.Get(ctx, id)
 	if err != nil {
 		if ent.IsNotFound(err) {
 			return nil, nil
@@ -108,28 +163,41 @@ func (s *KeyBindingService) GetKeyBindingByKey(ctx context.Context, key string)
 	return kb, nil
 }
 
-// UpdateKeyBindingCommand 更新快捷键命令
-func (s *KeyBindingService) UpdateKeyBindingCommand(ctx context.Context, key string, command string) error {
-	kb, err := s.GetKeyBindingByKey(ctx, key)
+// UpdateKeyBindingKeys 更新快捷键绑定（根据操作系统自动判断更新哪个字段）
+func (s *KeyBindingService) UpdateKeyBindingKeys(ctx context.Context, id int, key string) error {
+	kb, err := s.GetKeyBindingByID(ctx, id)
 	if err != nil {
 		return err
 	}
 	if kb == nil {
-		return fmt.Errorf("key binding not found: %s", key)
+		return fmt.Errorf("key binding not found: id=%d", id)
 	}
-	return s.db.Client.KeyBinding.UpdateOneID(kb.ID).
-		SetCommand(command).
-		Exec(ctx)
+
+	update := s.db.Client.KeyBinding.UpdateOneID(kb.ID)
+
+	os := application.Get().Env.Info().OS
+	switch os {
+	case "darwin":
+		update.SetMacos(key)
+	case "windows":
+		update.SetWindows(key)
+	case "linux":
+		update.SetLinux(key)
+	default:
+		s.logger.Error("unknown os: %s", os)
+	}
+
+	return update.SetKey(key).Exec(ctx)
 }
 
 // UpdateKeyBindingEnabled 更新快捷键启用状态
-func (s *KeyBindingService) UpdateKeyBindingEnabled(ctx context.Context, key string, enabled bool) error {
-	kb, err := s.GetKeyBindingByKey(ctx, key)
+func (s *KeyBindingService) UpdateKeyBindingEnabled(ctx context.Context, id int, enabled bool) error {
+	kb, err := s.GetKeyBindingByID(ctx, id)
 	if err != nil {
 		return err
 	}
 	if kb == nil {
-		return fmt.Errorf("key binding not found: %s", key)
+		return fmt.Errorf("key binding not found: id=%d", id)
 	}
 	return s.db.Client.KeyBinding.UpdateOneID(kb.ID).
 		SetEnabled(enabled).
@@ -140,3 +208,48 @@ func (s *KeyBindingService) UpdateKeyBindingEnabled(ctx context.Context, key str
 func (s *KeyBindingService) GetDefaultKeyBindings() []models.KeyBinding {
 	return models.NewDefaultKeyBindings()
 }
+
+// ResetKeyBindings 重置所有快捷键到默认值
+func (s *KeyBindingService) ResetKeyBindings(ctx context.Context) error {
+	// 获取默认快捷键
+	defaults := models.NewDefaultKeyBindings()
+
+	// 构建默认快捷键映射 (type:name -> KeyBinding)
+	defaultsMap := make(map[string]models.KeyBinding)
+	for _, kb := range defaults {
+		key := string(kb.Type) + ":" + string(kb.Name)
+		defaultsMap[key] = kb
+	}
+
+	// 获取数据库中所有快捷键
+	existing, err := s.db.Client.KeyBinding.Query().All(ctx)
+	if err != nil {
+		return fmt.Errorf("query key bindings error: %w", err)
+	}
+
+	// 更新所有快捷键到默认值
+	for _, existingKb := range existing {
+		key := existingKb.Type + ":" + existingKb.Name
+		defaultKb, ok := defaultsMap[key]
+		if !ok {
+			// 如果默认配置中没有这个快捷键，跳过
+			continue
+		}
+
+		// 无条件更新所有字段到默认值
+		update := s.db.Client.KeyBinding.UpdateOneID(existingKb.ID).
+			SetKey(defaultKb.Key).
+			SetMacos(defaultKb.Macos).
+			SetWindows(defaultKb.Windows).
+			SetLinux(defaultKb.Linux).
+			SetScope(defaultKb.Scope).
+			SetEnabled(defaultKb.Enabled).
+			SetPreventDefault(defaultKb.PreventDefault)
+
+		if err := update.Exec(ctx); err != nil {
+			return fmt.Errorf("update key binding error: %w", err)
+		}
+	}
+
+	return nil
+}

internal/services/theme_service.go

@@ -32,15 +32,15 @@ func (s *ThemeService) ServiceStartup(ctx context.Context, options application.S
 	return nil
 }
 
-// GetThemeByKey 根据Key获取主题
-func (s *ThemeService) GetThemeByKey(ctx context.Context, key string) (*ent.Theme, error) {
-	trimmed := strings.TrimSpace(key)
+// GetThemeByName 根据Key获取主题
+func (s *ThemeService) GetThemeByName(ctx context.Context, name string) (*ent.Theme, error) {
+	trimmed := strings.TrimSpace(name)
 	if trimmed == "" {
 		return nil, fmt.Errorf("theme key cannot be empty")
 	}
 
 	t, err := s.db.Client.Theme.Query().
-		Where(theme.Key(trimmed)).
+		Where(theme.Name(trimmed)).
 		Only(ctx)
 	if err != nil {
 		if ent.IsNotFound(err) {
@@ -68,7 +68,7 @@ func (s *ThemeService) UpdateTheme(ctx context.Context, key string, colors map[s
 		themeType = theme.TypeLight
 	}
 
-	existing, err := s.GetThemeByKey(ctx, trimmed)
+	existing, err := s.GetThemeByName(ctx, trimmed)
 	if err != nil {
 		return err
 	}
@@ -76,7 +76,7 @@ func (s *ThemeService) UpdateTheme(ctx context.Context, key string, colors map[s
 	if existing == nil {
 		// 插入新主题
 		_, err = s.db.Client.Theme.Create().
-			SetKey(trimmed).
+			SetName(trimmed).
 			SetType(themeType).
 			SetColors(colors).
 			Save(ctx)
@@ -98,7 +98,7 @@ func (s *ThemeService) ResetTheme(ctx context.Context, key string) error {
 	}
 
 	_, err := s.db.Client.Theme.Delete().
-		Where(theme.Key(trimmed)).
+		Where(theme.Name(trimmed)).
 		Exec(mixin.SkipSoftDelete(ctx))
 	return err
 }