Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuzzy finder cleanup

Browse Source
This commit is contained in:
evan 2018-05-21 11:47:27 -05:00
parent 8c869b0fd7
commit b22ef132b7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/fuzzy-view.go
View File

@ -37,12 +37,12 @@ type FuzzyView struct {
func NewFuzzyView(view *MainView, width int, height int) *FuzzyView { func NewFuzzyView(view *MainView, width int, height int) *FuzzyView {
rooms := []*rooms.Room{} roomList := []*rooms.Room{}
roomtitles := []string{} roomTitles := []string{}
for _, tag := range view.roomList.tags { for _, tag := range view.roomList.tags {
for _, room := range view.roomList.items[tag].rooms { for _, room := range view.roomList.items[tag].rooms {
rooms = append(rooms, room.Room) roomList = append(roomList, room.Room)
roomtitles = append(roomtitles, room.GetTitle()) roomTitles = append(roomTitles, room.GetTitle())
} }
} }
// search box for fuzzy search // search box for fuzzy search
@ -78,7 +78,7 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView {
// callback to update search box // callback to update search box
fuzzySearch.SetChangedFunc(func(str string) { fuzzySearch.SetChangedFunc(func(str string) {
// get matches and display in fuzzyResults // get matches and display in fuzzyResults
fuzz.matches = fuzzy.RankFindFold(str, roomtitles) fuzz.matches = fuzzy.RankFindFold(str, roomTitles)
if len(str) > 0 && len(fuzz.matches) > 0 { if len(str) > 0 && len(fuzz.matches) > 0 {
sort.Sort(fuzz.matches) sort.Sort(fuzz.matches)
fuzzyResults.Clear() fuzzyResults.Clear()
@ -99,6 +99,7 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView {
highlights := fuzzyResults.GetHighlights() highlights := fuzzyResults.GetHighlights()
if event.Key() == tcell.KeyEsc { if event.Key() == tcell.KeyEsc {
view.parent.views.RemovePage("fuzzy") view.parent.views.RemovePage("fuzzy")
view.parent.app.SetFocus(view.parent.views)
return nil return nil
} else if event.Key() == tcell.KeyTab { } else if event.Key() == tcell.KeyTab {
// cycle highlighted area to next fuzzy match // cycle highlighted area to next fuzzy match
@ -111,8 +112,8 @@ func NewFuzzyView(view *MainView, width int, height int) *FuzzyView {
} else if event.Key() == tcell.KeyEnter { } else if event.Key() == tcell.KeyEnter {
// switch room to currently selected room // switch room to currently selected room
if len(highlights) > 0 { if len(highlights) > 0 {
debug.Print("Fuzzy Selected Room:", rooms[fuzz.matches[fuzz.selected].Index].GetTitle()) debug.Print("Fuzzy Selected Room:", roomList[fuzz.matches[fuzz.selected].Index].GetTitle())
view.SwitchRoom(rooms[fuzz.matches[fuzz.selected].Index].Tags()[0].Tag, rooms[fuzz.matches[fuzz.selected].Index]) view.SwitchRoom(roomList[fuzz.matches[fuzz.selected].Index].Tags()[0].Tag, roomList[fuzz.matches[fuzz.selected].Index])
} }
view.parent.views.RemovePage("fuzzy") view.parent.views.RemovePage("fuzzy")
fuzzyResults.Clear() fuzzyResults.Clear()