Add -cats for category filtering #34

main.go

@@ -31,6 +31,7 @@ var (
 	id2entry        map[string]desktopEntry
 	preferredApps   map[string]interface{}
 	exclusions      []string
+	catsFilter      []string
 )
 
 var categoryNames = [...]string{
@@ -129,9 +130,10 @@ var fileManager = flag.String("fm", "thunar", "File Manager")
 var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "alacritty"), "Terminal emulator")
 var nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
 var noCats = flag.Bool("nocats", false, "Disable filtering by category")
-var noFS = flag.Bool("nofs", false, "Disable file search")
-var resident = flag.Bool("r", false, "Leave the program resident in memory")
-var debug = flag.Bool("d", false, "Turn on Debug messages")
+var cats = flag.String("cats", "", "case sensitive, comma-separated list of CATegorieS to show, e.g. Utility,TerminalEmulator,System")
+var noFS = flag.Bool("nofs", false, "disable file search")
+var resident = flag.Bool("r", false, "leave the program Resident in memory")
+var debug = flag.Bool("d", false, "turn on Debug messages")
 
 func main() {
 	timeStart := time.Now()
@@ -260,6 +262,19 @@ func main() {
 
 	appDirs = getAppDirs()
 
+	// if categories filter given w/ -cats argument
+	if *cats != "" {
+		*noCats = true
+
+		cf := strings.Split(*cats, ",")
+		for _, c := range cf {
+			if c != "" {
+				catsFilter = append(catsFilter, c)
+			}
+		}
+		log.Info(fmt.Sprintf("Using category filter: %s", catsFilter))
+	}
+
 	setUpCategories()
 
 	desktopFiles := listDesktopFiles()
@@ -411,7 +426,11 @@ func main() {
 
 	pinnedFlowBoxWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	outerVBox.PackStart(pinnedFlowBoxWrapper, false, false, 0)
-	pinnedFlowBox = setUpPinnedFlowBox()
+
+	// Avoid missing items if category filter enabled with -cats argument
+	if *cats == "" {
+		pinnedFlowBox = setUpPinnedFlowBox()
+	}
 
 	resultWindow, _ = gtk.ScrolledWindowNew(nil, nil)
 	resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
@@ -439,14 +458,16 @@ func main() {
 	appFlowBox = setUpAppsFlowBox(nil, "")
 
 	// Focus 1st pinned item if any, otherwise focus 1st found app icon
-	var button gtk.IWidget
-	if pinnedFlowBox.GetChildren().Length() > 0 {
-		button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
-	} else {
-		button, err = appFlowBox.GetChildAtIndex(0).GetChild()
-	}
-	if err == nil {
-		button.ToWidget().GrabFocus()
+	if pinnedFlowBox != nil {
+		var button gtk.IWidget
+		if pinnedFlowBox.GetChildren().Length() > 0 {
+			button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
+		} else {
+			button, err = appFlowBox.GetChildAtIndex(0).GetChild()
+		}
+		if err == nil {
+			button.ToWidget().GrabFocus()
+		}
 	}
 
 	userDirsMap = mapXdgUserDirs()

tools.go

@@ -380,14 +380,30 @@ func parseDesktopFiles(desktopFiles []string) string {
 			// Fixes bug introduced in #19
 		}
 
-		id2entry[entry.DesktopID] = entry
-		desktopEntries = append(desktopEntries, entry)
-		assignToLists(entry.DesktopID, entry.Category)
+		// Add category filter requested in #34
+		inCategoryFilter := true
+
+		if *cats != "" && len(catsFilter) > 0 {
+			inCategoryFilter = false
+			entryCategories := strings.Split(entry.Category, ";")
+			for _, ec := range entryCategories {
+				if isIn(catsFilter, ec) {
+					inCategoryFilter = true
+					break
+				}
+			}
+		}
+
+		if inCategoryFilter {
+			id2entry[entry.DesktopID] = entry
+			desktopEntries = append(desktopEntries, entry)
+			assignToLists(entry.DesktopID, entry.Category)
+		}
 	}
 	sort.Slice(desktopEntries, func(i, j int) bool {
 		return desktopEntries[i].NameLoc < desktopEntries[j].NameLoc
 	})
-	summary := fmt.Sprintf("%v entries (+%v hidden)", len(desktopEntries)-hidden, hidden)
+	summary := fmt.Sprintf("%v entries (%v hidden)", len(desktopEntries), hidden)
 	log.Infof("Skipped %v duplicates; %v .desktop entries hidden by \"NoDisplay=true\"", skipped, hidden)
 	return summary
 }