add: redeploy event;

Author: MapoMagpie

core/core.go

@@ -45,7 +45,7 @@ func Start(opts *Options) {
 	listManager.SetFiles(fileNames)
 
 	// 添加菜单
-	menuNameAdd := tui.Menu{Name: "Add", Cb: func(m *tui.Model) (cmd tea.Cmd) {
+	menuNameAdd := tui.Menu{Name: "A添加", Cb: func(m *tui.Model) (cmd tea.Cmd) {
 		if len(m.Inputs) == 0 {
 			return tui.ExitMenuCmd
 		}
@@ -84,7 +84,7 @@ func Start(opts *Options) {
 	}}
 
 	// 删除菜单
-	menuNameDelete := tui.Menu{Name: "Delete", Cb: func(m *tui.Model) (cmd tea.Cmd) {
+	menuNameDelete := tui.Menu{Name: "D删除", Cb: func(m *tui.Model) (cmd tea.Cmd) {
 		item, err := m.CurrItem()
 		if err != nil {
 			m.Inputs = []string{}
@@ -103,7 +103,7 @@ func Start(opts *Options) {
 
 	// 修改菜单
 	var modifyingItem tui.ItemRender
-	menuNameModify := tui.Menu{Name: "Modify", Cb: func(m *tui.Model) (cmd tea.Cmd) {
+	menuNameModify := tui.Menu{Name: "M修改", Cb: func(m *tui.Model) (cmd tea.Cmd) {
 		item, err := m.CurrItem()
 		if err != nil {
 			m.Inputs = []string{}
@@ -119,7 +119,7 @@ func Start(opts *Options) {
 	}}
 
 	// 确认修改菜单
-	menuNameConfirm := tui.Menu{Name: "Confirm", Cb: func(m *tui.Model) tea.Cmd {
+	menuNameConfirm := tui.Menu{Name: "确认", Cb: func(m *tui.Model) tea.Cmd {
 		m.Modifying = false
 		raw := strings.Join(m.Inputs, "")
 		switch item := modifyingItem.(type) {
@@ -212,11 +212,11 @@ func Start(opts *Options) {
 					}
 				}
 				if key == "ctrl+up" && next != nil {
-					currEntryData.Weight = int(math.Max(1, float64(next.Data().Weight+1)))
+					currEntryData.Weight = int(math.Max(1, float64(next.Data().Weight-1)))
 					changed = true
 				}
 				if key == "ctrl+down" && prev != nil {
-					currEntryData.Weight = int(math.Max(1, float64(prev.Data().Weight-1)))
+					currEntryData.Weight = int(math.Max(1, float64(prev.Data().Weight+1)))
 					changed = true
 				}
 			}
@@ -240,6 +240,7 @@ func Start(opts *Options) {
 					}
 				}
 				// 延迟同步到文件
+				// log.Println("modify weight sync: ", currEntry.Raw())
 				modifyWeightDebouncer.Do(func() {
 					FlushAndSync(opts, dc, opts.SyncOnChange)
 				})
@@ -256,6 +257,14 @@ func Start(opts *Options) {
 			return m, func() tea.Msg { return 0 } // trigger bubbletea update
 		},
 	}
+	// 重新部署，强制保存变更到文件，并执行rime部署指令。
+	redeployEvent := &tui.Event{
+		Keys: []string{"ctrl+s"},
+		Cb: func(_ string, m *tui.Model) (tea.Model, tea.Cmd) {
+			FlushAndSync(opts, dc, true)
+			return m, nil
+		},
+	}
 
 	// new model
 	events := []*tui.Event{
@@ -264,6 +273,7 @@ func Start(opts *Options) {
 		tui.ClearInputEvent,
 		exitEvent,
 		exportDictEvent,
+		redeployEvent,
 		modifyWeightEvent,
 		showHelpEvent,
 	}
@@ -336,7 +346,7 @@ var lock *mutil.FLock = mutil.NewFLock()
 // 同步变更到文件中，如果启用了自动部署Rime的功能则调用部署指令
 func FlushAndSync(opts *Options, dc *dict.Dictionary, sync bool) {
 	// 此操作的阻塞的，但可能被异步调用，因此加上防止重复调用机制
-	if lock.Should() {
+	if !lock.Should() {
 		return
 	}
 	defer lock.Done()

dict/loader.go

@@ -23,6 +23,10 @@ type FileEntries struct {
 	ID       uint8
 }
 
+func (fe *FileEntries) Id() int {
+	return int(fe.ID)
+}
+
 func (fe *FileEntries) String() string {
 	return fe.FilePath
 }

dict/matcher.go

@@ -11,6 +11,10 @@ type MatchResult struct {
 	score int
 }
 
+func (m *MatchResult) Id() int {
+	return int(m.Entry.FID)
+}
+
 func (m *MatchResult) String() string {
 	return string(m.Entry.raw)
 }

main.go

@@ -4,9 +4,8 @@ import (
 	"log"
 	"path/filepath"
 
-	core "github.com/MapoMagpie/rimedm/core"
-	tea "github.com/charmbracelet/bubbletea"
-
+	"github.com/MapoMagpie/rimedm/core"
+	"github.com/charmbracelet/bubbletea"
 	// "net/http"
 	// _ "net/http/pprof"
 )

tui/event.go

@@ -34,7 +34,7 @@ var MoveEvent = &Event{
 	Cb: func(key string, m *Model) (tea.Model, tea.Cmd) {
 		list := m.lm.List()
 		currIndex := &m.lm.currIndex
-		if m.ShowMenu && m.CurrMenu().Name == "Add" {
+		if m.ShowMenu && m.CurrMenu().Name == "A添加" {
 			list = m.lm.files
 			currIndex = &m.lm.fileIndex
 		}

tui/tui.go

@@ -4,7 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
+	"slices"
 	"sort"
+	"strconv"
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -24,12 +27,17 @@ func FreshListCmd() tea.Msg {
 }
 
 type ItemRender interface {
+	Id() int
 	String() string
 	Cmp(other any) bool
 }
 
 type StringRender string
 
+func (h StringRender) Id() int {
+	return 0
+}
+
 func (h StringRender) String() string {
 	return string(h)
 }
@@ -82,15 +90,21 @@ func (l *ListManager) Files() []ItemRender {
 
 func (l *ListManager) Helps() []ItemRender {
 	list := []ItemRender{
-		StringRender("菜单项: [Modify] 修改选择的项(高亮)，回车后，输入框中的内容会被设置，修改后，再次回车确认修改"),
-		StringRender("菜单项: [Delete] 将选择的项(高亮)从码表中删除，通过上下键选择"),
-		StringRender("菜单项: [Add]    将输入的内容添加到码表中，上下方向键要添加到的文件"),
-		StringRender("Enter:  显示菜单"),
+		StringRender("Ctrl+S:     手动同步，如果没有启用自动同步，"),
+		StringRender("            可通过此按键手动将变更同步至文件，并部署Rime"),
 		StringRender("Ctrl+Right: 修改权重，将当前项的权重加一"),
 		StringRender("Ctrl+Left:  修改权重，将当前项的权重减一"),
 		StringRender("Ctrl+Down:  修改权重，将当前项的权重增加到下一项之前"),
 		StringRender("Ctrl+Up:    修改权重，将当前项的权重降低到上一项之后"),
+		StringRender("Enter:      显示菜单"),
+		StringRender("菜单项: [A添加] 将输入的内容添加到码表中，"),
+		StringRender("                上下方向键选择要添加到的文件"),
+		StringRender("菜单项: [M修改] 修改选择的项(高亮)，"),
+		StringRender("                回车后，输入框中的内容会被设置，"),
+		StringRender("                修改后，再次回车确认修改"),
+		StringRender("菜单项: [D删除] 将选择的项(高亮)从码表中删除，通过上下键选择"),
 	}
+	slices.Reverse(list)
 	return list
 }
 
@@ -166,6 +180,19 @@ func (m *Model) CurrFile() (ItemRender, error) {
 	return files[m.lm.fileIndex], nil
 }
 
+func (m *Model) CurrItemFile() string {
+	currItem, err := m.CurrItem()
+	if err != nil {
+		return ""
+	}
+	for _, file := range m.lm.Files() {
+		if file.Id() == currItem.Id() {
+			return filepath.Base(file.String())
+		}
+	}
+	return ""
+}
+
 func (m *Model) CurrMenu() *Menu {
 	menus := m.menuFetcher(m.Modifying)
 	if m.MenuIndex < len(menus) {
@@ -229,10 +256,20 @@ func (m *Model) menuCtl(key string) {
 		}
 	default:
 		if len(key) == 1 && len(menus) > 0 {
-			for i, menu := range menus {
-				if strings.ToLower(menu.Name[:1]) == key {
-					m.MenuIndex = i
-					break
+			num, err := strconv.Atoi(key)
+			// select menu by numpad
+			if err == nil && num > 0 && num < 10 {
+				index := num - 1
+				if index < len(menus) {
+					m.MenuIndex = index
+				}
+			} else {
+				// select menu by letter
+				for i, menu := range menus {
+					if strings.ToLower(menu.Name[:1]) == key {
+						m.MenuIndex = i
+						break
+					}
 				}
 			}
 		}
@@ -256,7 +293,7 @@ func (m *Model) View() string {
 	if m.lm.ShowingHelp {
 		list = m.lm.Helps()
 		currIndex = 0
-	} else if m.ShowMenu && m.CurrMenu().Name == "Add" {
+	} else if m.ShowMenu && m.CurrMenu().Name == "A添加" {
 		list = m.lm.Files()
 		currIndex = m.lm.fileIndex
 	}
@@ -282,8 +319,8 @@ func (m *Model) View() string {
 		}
 	}
 	// footer
-	sb.WriteString(fmt.Sprintf("Total: %d\n", le))
-	sb.WriteString("Press[Enter:Menu][Ctrl+X:Clear Input][Ctrl+C|ESC:Quit][Ctrl+H:Show Help]\n")
+	sb.WriteString(fmt.Sprintf("Total: %d; %s\n", le, m.CurrItemFile()))
+	sb.WriteString("Press[Enter:操作][Ctrl+X:清空输入][Ctrl+S:同步][ESC:退出][Ctrl+H:帮助]\n")
 	if m.Modifying {
 		line = strings.Replace(line, "---------", "Modifying", 1)
 	}