Merge pull request #9 from RasmusLindroth/bugfix

Bugfix for web output with empty modes. Sort by most used group

Author: RasmusLindroth

i3keys.go

@@ -11,7 +11,7 @@ import (
 	"github.com/RasmusLindroth/i3keys/internal/web"
 )
 
-const version string = "0.0.6"
+const version string = "0.0.7"
 
 func helpText(exitCode int) {
 	fmt.Printf("Usage:\n\n\ti3keys <command> [arguments]\n\n")

internal/i3parse/group.go

@@ -1,5 +1,7 @@
 package i3parse
 
+import "sort"
+
 func compareSlices(a []string, b []string) bool {
 	if len(a) != len(b) {
 		return false
@@ -14,6 +16,14 @@ func compareSlices(a []string, b []string) bool {
 	return true
 }
 
+type sortByNumBindings []ModifierGroup
+
+func (a sortByNumBindings) Len() int      { return len(a) }
+func (a sortByNumBindings) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+func (a sortByNumBindings) Less(i, j int) bool {
+	return len(a[i].Bindings) > len(a[j].Bindings)
+}
+
 //GetModifierGroups groups bindings that have the same modifiers
 func GetModifierGroups(bindings []Binding) []ModifierGroup {
 	var groups []ModifierGroup
@@ -33,6 +43,7 @@ func GetModifierGroups(bindings []Binding) []ModifierGroup {
 			})
 		}
 	}
+	sort.Sort(sortByNumBindings(groups))
 
 	return groups
 }

internal/web/template.go

@@ -229,13 +229,13 @@ function generateKeyboard(layout, generated, modes) {
     headingEl.innerHTML = "Mode: Default";
     keyboardHolder.appendChild(headingEl);
 
-    for (let i = 0; i < generated.length; i++) {
+    for (let i = 0; generated !== null && i < generated.length; i++) {
         let newKeyboardGroup = generateKeyboardGroup(kbLayout, generated[i]);
         keyboardHolder.appendChild(newKeyboardGroup);
     }
 
 
-    for (let i = 0; i < modes.length; i++) {
+    for (let i = 0; modes !== null && i < modes.length; i++) {
         let headingEl = document.createElement('h2');
         headingEl.innerHTML = "Mode: " + modes[i].Name;
         keyboardHolder.appendChild(headingEl);