From 89aff23c112b2dc01fb94d03ae2944b600a31b5a Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Fri, 20 Oct 2017 23:43:10 +0200
Subject: [PATCH] use SVGs from the source dir in .devel

When using ratbagctl.devel we would use the .device files
from the source dir. This patch also makes it use the .svg
files from the source dir. This makes it easier to edit the
svg and less surprising now that it follows the .devices files.

To match the source file layout the .devices files are now
installed into a 'devices' subdirectory.
---
 meson.build              | 4 ++--
 ratbagd/ratbagd-device.c | 7 ++++++-
 src/libratbag-data.c     | 9 ++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index caab4c24..701f06a0 100644
--- a/meson.build
+++ b/meson.build
@@ -41,7 +41,7 @@ config_h.set_quoted('FALLBACK_SVG_NAME', 'fallback.svg')
 libratbag_data_dir = join_paths(get_option('prefix'),
 				get_option('datadir'),
 				'libratbag')
-libratbag_data_dir_devel = join_paths(meson.source_root(), 'data', 'devices')
+libratbag_data_dir_devel = join_paths(meson.source_root(), 'data')
 config_h.set_quoted('LIBRATBAG_DATA_DIR', libratbag_data_dir)
 
 # dependencies
@@ -276,7 +276,7 @@ data_files = files(
 )
 
 install_data(data_files,
-	     install_dir : join_paths(get_option('datadir'), 'libratbag'))
+	     install_dir : join_paths(get_option('datadir'), 'libratbag', 'devices'))
 
 data_parse_test = find_program(join_paths(meson.source_root(), 'data/devices/data-parse-test.py'))
 test('data-parse-test', data_parse_test,
diff --git a/ratbagd/ratbagd-device.c b/ratbagd/ratbagd-device.c
index 38417d2e..181b0bf8 100644
--- a/ratbagd/ratbagd-device.c
+++ b/ratbagd/ratbagd-device.c
@@ -163,6 +163,11 @@ static int ratbagd_device_get_theme_svg(sd_bus_message *m,
 	const char *theme;
 	const char *svg;
 	int r;
+	const char *datadir;
+
+	datadir = getenv("LIBRATBAG_DATA_DIR");
+	if (!datadir)
+		datadir = LIBRATBAG_DATA_DIR;
 
 	r = sd_bus_message_read(m, "s", &theme);
 	if (r < 0)
@@ -176,7 +181,7 @@ static int ratbagd_device_get_theme_svg(sd_bus_message *m,
 		svg = FALLBACK_SVG_NAME;
 	}
 
-	sprintf(svg_path, "%s/%s/%s", LIBRATBAG_DATA_DIR, theme, svg);
+	snprintf(svg_path, sizeof(svg_path), "%s/%s/%s", datadir, theme, svg);
 
 	return sd_bus_reply_method_return(m, "s", svg_path);
 }
diff --git a/src/libratbag-data.c b/src/libratbag-data.c
index 5ba72e7c..2832993f 100644
--- a/src/libratbag-data.c
+++ b/src/libratbag-data.c
@@ -446,15 +446,18 @@ ratbag_device_data_new_for_id(struct ratbag *ratbag, const struct input_id *id)
 	struct dirent **files;
 	int n, nfiles;
 	const char *datadir;
+	char devicedir[PATH_MAX] = {0};
 
 	datadir = getenv("LIBRATBAG_DATA_DIR");
 	if (!datadir)
 		datadir = LIBRATBAG_DATA_DIR;
 
-	n = scandir(datadir, &files, filter_device_files, alphasort);
+	snprintf(devicedir, sizeof(devicedir), "%s/devices", datadir);
+
+	n = scandir(devicedir, &files, filter_device_files, alphasort);
 	if (n <= 0) {
 		log_error(ratbag, "Unable to locate device files in %s: %s\n",
-			  datadir, n == 0 ? "No files found" : strerror(errno));
+			  devicedir, n == 0 ? "No files found" : strerror(errno));
 		return NULL;
 	}
 
@@ -463,7 +466,7 @@ ratbag_device_data_new_for_id(struct ratbag *ratbag, const struct input_id *id)
 		_cleanup_(freep) char *file = NULL;
 		int rc;
 
-		rc = xasprintf(&file, "%s/%s", datadir, files[n]->d_name);
+		rc = xasprintf(&file, "%s/%s", devicedir, files[n]->d_name);
 		if (rc == -1)
 			goto out;
 		if (file_data_matches(ratbag, file, id, &data))