Implemented multiple choice for ListSelect dialog. You can now select multiple entry tags

Author: aQaTL

dialog/list_select.go

@@ -12,8 +12,10 @@ const (
 	listSelectViewName = "listSelectViewName"
 )
 
-func ListSelect(gui *gocui.Gui, title string, slice interface{}) (
-	<-chan int, CleanUpFunc, error,
+// Displays a list created from given slice / array.
+// If allowMultipleSelection is set, you can select multiple entries with space.
+func ListSelect(gui *gocui.Gui, title string, slice interface{}, allowMultipleSelection bool) (
+	<-chan []int, CleanUpFunc, error,
 ) {
 	value := reflect.ValueOf(slice)
 	if k := value.Kind(); k != reflect.Slice && k != reflect.Array {
@@ -27,7 +29,7 @@ func ListSelect(gui *gocui.Gui, title string, slice interface{}) (
 		idxLen, _ := buf.WriteString(strconv.Itoa(i))
 		buf.WriteByte('.')
 		strBytes := []byte(fmt.Sprint(value.Index(i).Interface()))
-		if bLen := len(strBytes) + idxLen + 1; bLen > listW {
+		if bLen := len(strBytes) + idxLen + 2; bLen > listW {
 			listW = bLen
 		}
 		buf.Write(strBytes)
@@ -36,14 +38,16 @@ func ListSelect(gui *gocui.Gui, title string, slice interface{}) (
 	listW += 2
 
 	cleanUp := cleanUpFunc(gui, listSelectViewName)
-	selectedIdx, v, err := listSelect(gui, title, listW, listH)
+	selectedIdxes, v, err := listSelect(gui, title, listW, listH, allowMultipleSelection)
 	if v != nil {
 		buf.WriteTo(v)
 	}
-	return selectedIdx, cleanUp, err
+	return selectedIdxes, cleanUp, err
 }
 
-func listSelect(gui *gocui.Gui, title string, listW, listH int) (chan int, *gocui.View, error) {
+func listSelect(gui *gocui.Gui, title string, listW, listH int, multiSel bool) (
+	chan []int, *gocui.View, error,
+) {
 	w, h := gui.Size()
 
 	//TODO wrap list if list is too wide (handle moving up & down correctly)
@@ -68,9 +72,10 @@ func listSelect(gui *gocui.Gui, title string, listW, listH int) (chan int, *gocu
 	v.Highlight = true
 	v.Editable = true
 
-	selectedIdx := make(chan int)
+	selectedIdxes := make(chan []int)
 	chanClosed := false
 
+	idxs := make([]int, 0, listH)
 	v.Editor = gocui.EditorFunc(func(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
 		switch {
 		case key == gocui.KeyArrowDown || ch == 'j':
@@ -82,23 +87,55 @@ func listSelect(gui *gocui.Gui, title string, listW, listH int) (chan int, *gocu
 			}
 		case key == gocui.KeyArrowUp || ch == 'k':
 			v.MoveCursor(0, -1, false)
-		case key == gocui.KeyEnter:
-			//TODO mutliple selection (color / highlight selected row) (buffered channels?)
+		case key == gocui.KeySpace:
+			if !multiSel {
+				return
+			}
 			_, oy := v.Origin()
 			_, y := v.Cursor()
 			y += oy
+			idxsIdx := -1
+			for i, v := range idxs {
+				if v == y {
+					idxsIdx = i
+					break
+				}
+			}
+			v.SetCursor(0, y-oy)
+			if idxsIdx != -1 {
+				idxs = append(idxs[:idxsIdx], idxs[idxsIdx+1:]...)
+				v.EditDelete(false)
+			} else {
+				idxs = append(idxs, y)
+				v.EditWrite('*')
+			}
+		case key == gocui.KeyEnter:
 			if !chanClosed {
-				selectedIdx <- y
-				close(selectedIdx)
+				_, oy := v.Origin()
+				_, y := v.Cursor()
+				y += oy
+				contains := false
+				for _, v := range idxs {
+					if v == y {
+						contains = true
+						break
+					}
+				}
+				if !contains {
+					idxs = append(idxs, y)
+				}
+
+				selectedIdxes <- idxs
+				close(selectedIdxes)
 				chanClosed = true
 			}
 		case key == gocui.KeyCtrlQ || key == gocui.KeyEsc || ch == 'q':
 			if !chanClosed {
-				close(selectedIdx)
+				close(selectedIdxes)
 				chanClosed = true
 			}
 		}
 	})
 
-	return selectedIdx, v, err
+	return selectedIdxes, v, err
 }

nyaa_cui.go

@@ -345,30 +345,30 @@ func (nc *nyaaCui) LoadNextPage() {
 }
 
 func (nc *nyaaCui) ChangeCategory() {
-	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select category", ns.Categories)
+	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select category", ns.Categories, false)
 	if err != nil {
 		gocuiReturnError(nc.Gui, err)
 	}
 	go func() {
-		idx, ok := <-selIdxChan
+		idxs, ok := <-selIdxChan
 		nc.Gui.Update(cleanUp)
 		if ok {
-			nc.Category = ns.Categories[idx]
+			nc.Category = ns.Categories[idxs[0]]
 			nc.Reload()
 		}
 	}()
 }
 
 func (nc *nyaaCui) ChangeFilter() {
-	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select filter", ns.Filters)
+	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select filter", ns.Filters, false)
 	if err != nil {
 		gocuiReturnError(nc.Gui, err)
 	}
 	go func() {
-		idx, ok := <-selIdxChan
+		idxs, ok := <-selIdxChan
 		nc.Gui.Update(cleanUp)
 		if ok {
-			nc.Filter = ns.Filters[idx]
+			nc.Filter = ns.Filters[idxs[0]]
 			nc.Reload()
 		}
 	}()
@@ -391,18 +391,35 @@ func (nc *nyaaCui) FilterByTag() {
 	sort.Strings(tags)
 	tags[0] = "None"
 
-	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select title filter", tags)
+	selIdxChan, cleanUp, err := dialog.ListSelect(nc.Gui, "Select title filter", tags, true)
 	if err != nil {
 		gocuiReturnError(nc.Gui, err)
 	}
 	go func() {
-		idx, ok := <-selIdxChan
+		idxs, ok := <-selIdxChan
 		nc.Gui.Update(cleanUp)
 		if ok {
-			if idx == 0 {
+			containsNone := false
+			for _, v := range idxs {
+				if v == 0 {
+					containsNone = true
+					break
+				}
+			}
+			if len(idxs) == 0 || containsNone {
 				nc.TitleFilter = nil
 			} else {
-				regex, err := regexp.Compile("\\[" + regexp.QuoteMeta(tags[idx]) + "\\]")
+				tagBuffer := strings.Builder{}
+				for i, v := range idxs {
+					tagBuffer.WriteString("\\[")
+					tagBuffer.WriteString(regexp.QuoteMeta(tags[v]))
+					tagBuffer.WriteString("\\]")
+					if i < len(idxs)-1 {
+						tagBuffer.WriteString("|")
+					}
+				}
+
+				regex, err := regexp.Compile(tagBuffer.String())
 				if err != nil {
 					gocuiReturnError(nc.Gui, err)
 				}