Add option -i|--ignore <file>

...to specify a file listing .desktop files to exclude from the output.

Author: johanmalm

Makefile

@@ -19,7 +19,7 @@ PROG = labwc-menu-generator
 
 all: $(PROG)
 
-$(PROG): main.o desktop.o
+$(PROG): main.o desktop.o ignore.o
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 clean:

desktop.c

@@ -14,6 +14,7 @@
 #include <dirent.h>
 #include <stdbool.h>
 #include "desktop.h"
+#include "ignore.h"
 
 static GList *apps;
 
@@ -223,6 +224,10 @@ add_app(FILE *fp, char *filename)
 	char line[4096], *p;
 	int is_desktop_entry;
 
+	if (should_ignore(filename)) {
+		return NULL;
+	}
+
 	struct app *app = calloc(1, sizeof(struct app));
 	is_desktop_entry = 0;
 	while (fgets(line, sizeof(line), fp)) {

ignore.c

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (C) Johan Malm 2024 */
+#define _POSIX_C_SOURCE 200809L
+#include <glib.h>
+#include <stdio.h>
+#include <string.h>
+#include "ignore.h"
+
+static GList *ignore_files;
+
+void
+ignore_init(const char *filename)
+{
+	if (!filename || !*filename) {
+		return;
+	}
+	FILE *stream = fopen(filename, "r");
+	if (!stream) {
+		return;
+	}
+	char *line = NULL;
+	size_t len = 0;
+	while (getline(&line, &len, stream) != -1) {
+		char *p = strrchr(line, '\n');
+		if (p) {
+			*p = '\0';
+		}
+		ignore_files = g_list_append(ignore_files,
+			g_strdup(g_strstrip(line)));
+	}
+	free(line);
+	fclose(stream);
+}
+
+void
+ignore_finish(void)
+{
+	g_list_free_full(ignore_files, g_free);
+}
+
+bool
+should_ignore(const char *filename)
+{
+	GList *iter;
+	for (iter = ignore_files; iter; iter = iter->next) {
+		if (!g_strcmp0((char *)iter->data, filename)) {
+			return true;
+		}
+	}
+	return false;
+}

ignore.h

@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef IGNORE_H
+#define IGNORE_H
+#include <stdbool.h>
+
+void ignore_init(const char *filename);
+void ignore_finish(void);
+bool should_ignore(const char *filename);
+
+#endif /* IGNORE_H */

main.c

@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "desktop.h"
+#include "ignore.h"
 #include "schema.h"
 
 static bool no_duplicates;
@@ -23,6 +24,7 @@ static bool pipemenu;
 static const struct option long_options[] = {
 	{"bare", no_argument, NULL, 'b'},
 	{"help", no_argument, NULL, 'h'},
+	{"ignore", required_argument, NULL, 'i'},
 	{"no-duplicates", no_argument, NULL, 'n'},
 	{"pipemenu", no_argument, NULL, 'p'},
 	{0, 0, 0, 0}
@@ -32,6 +34,7 @@ static const char labwc_menu_generator_usage[] =
 "Usage: labwc-menu-generator [options...]\n"
 "  -b, --bare               Show no header or footer\n"
 "  -h, --help               Show help message and quit\n"
+"  -i, --ignore <file>      Specify file listing .desktop files to ignore\n"
 "  -n, --no-duplicates      Limit desktop entries to one directory only\n"
 "  -p, --pipemenu           Output in pipemenu format\n";
 
@@ -284,7 +287,7 @@ main(int argc, char **argv)
 	int c;
 	while (1) {
 		int index = 0;
-		c = getopt_long(argc, argv, "bhnp", long_options, &index);
+		c = getopt_long(argc, argv, "bhi:np", long_options, &index);
 		if (c == -1) {
 			break;
 		}
@@ -293,6 +296,9 @@ main(int argc, char **argv)
 			no_footer = true;
 			no_header = true;
 			break;
+		case 'i':
+			ignore_init(optarg);
+			break;
 		case 'n':
 			no_duplicates = true;
 			break;
@@ -315,6 +321,7 @@ main(int argc, char **argv)
 
 	desktop_entries_destroy(apps);
 	directory_entries_destroy(dirs);
+	ignore_finish();
 
 	return 0;
 }

meson.build

@@ -14,7 +14,7 @@ glib = dependency('glib-2.0')
 
 executable(
   meson.project_name(),
-  sources: files('main.c', 'desktop.c'),
+  sources: files('main.c', 'desktop.c', 'ignore.c'),
   dependencies: [glib],
   install: true,
 )