Merge pull request #58 from jluebbe/api-description

Add slot description and improve dbus API
rauc · Jul 5, 2016 · 2f37240 · 2f37240
2 parents d12cf6f + 0c51c73
commit 2f37240
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/include/config_file.h b/include/config_file.h
@@ -40,6 +40,8 @@ typedef enum {
 typedef struct _RaucSlot {
 	/** name of the slot. A glib intern string. */
 	const gchar *name;
+	/** user-friendly description of the slot. A glib intern string. */
+	gchar *description;
 	/** slot class the slot belongs to. A glib intern string. */
 	const gchar *sclass;
 	/** device this slot uses */

diff --git a/src/config_file.c b/src/config_file.c
@@ -11,6 +11,7 @@ G_DEFINE_QUARK(r-config-error-quark, r_config_error)
 static void free_slot(gpointer value) {
 	RaucSlot *slot = (RaucSlot*)value;
 
+	g_clear_pointer(&slot->description, g_free);
 	g_clear_pointer(&slot->device, g_free);
 	g_clear_pointer(&slot->type, g_free);
 	g_clear_pointer(&slot->bootname, g_free);
@@ -154,6 +155,10 @@ gboolean load_config(const gchar *filename, RaucConfig **config, GError **error)
 			slot->name = g_intern_string(value);
 			g_free(value);
 
+			slot->description = g_key_file_get_string(key_file, groups[i], "description", NULL);
+			if (!slot->description)
+				slot->description = g_strdup("");
+
 			slot->sclass = g_intern_string(groupsplit[1]);
 
 			value = resolve_path(filename,

diff --git a/src/main.c b/src/main.c
@@ -385,7 +385,7 @@ static gboolean status_start(int argc, char **argv)
 		}
 		g_print("  %s: class=%s, device=%s, type=%s, bootname=%s\n",
 			name, slot->sclass, slot->device, slot->type, slot->bootname);
-		g_print("      state=%s", state);
+		g_print("      state=%s, description=%s", state, slot->description);
 		if (slot->parent)
 			g_print(", parent=%s", slot->parent->name);
 		else

diff --git a/src/rauc-installer.xml b/src/rauc-installer.xml
@@ -6,12 +6,7 @@
 
     <property name="Operation" type="s" access="read"/>
     <property name="LastError" type="s" access="read"/>
-
-    <signal name="ProgressUpdated">
-      <arg name="percentage" type="i"/>
-      <arg name="description" type="s"/>
-      <arg name="nesting_depth" type="i"/>
-    </signal>
+    <property name="ProgressUpdated" type="(isi)" access="read"/>
 
     <signal name="Completed">
       <arg name="result" type="i"/>

diff --git a/src/service.c b/src/service.c
@@ -123,8 +123,16 @@ static void send_progress_callback(gint percentage,
 				   const gchar *message,
 				   gint nesting_depth) {
 
-	r_installer_emit_progress_updated(r_installer, percentage, message,
-					  nesting_depth);
+	GVariant **progress_update;
+	GVariant *progress_update_tuple;
+
+	progress_update = g_new(GVariant*, 3);
+	progress_update[0] = g_variant_new_int32(percentage);
+	progress_update[1] = g_variant_new_string(message);
+	progress_update[2] = g_variant_new_int32(nesting_depth);
+
+	progress_update_tuple = g_variant_new_tuple(progress_update, 3);
+	r_installer_set_progress_updated(r_installer, progress_update_tuple);
 }
 
 static void r_on_bus_acquired(GDBusConnection *connection,

diff --git a/test/config_file.c b/test/config_file.c
@@ -46,27 +46,32 @@ mountprefix=/mnt/myrauc/\n\
 path=/etc/rauc/keyring/\n\
 \n\
 [slot.rescue.0]\n\
+description=Rescue partition\n\
 device=/dev/mtd4\n\
 type=raw\n\
 bootname=factory0\n\
 readonly=true\n\
 \n\
 [slot.rootfs.0]\n\
+description=Root filesystem partition 0\n\
 device=/dev/sda0\n\
 type=ext4\n\
 bootname=system0\n\
 \n\
 [slot.rootfs.1]\n\
+description=Root filesystem partition 1\n\
 device=/dev/sda1\n\
 type=ext4\n\
 bootname=system1\n\
 \n\
 [slot.appfs.0]\n\
+description=Application filesystem partition 0\n\
 device=/dev/sda2\n\
 type=ext4\n\
 parent=rootfs.0\n\
 \n\
 [slot.appfs.1]\n\
+description=Application filesystem partition 1\n\
 device=/dev/sda3\n\
 type=ext4\n\
 parent=rootfs.1\n";
@@ -85,6 +90,7 @@ parent=rootfs.1\n";
 
 	slot = g_hash_table_lookup(config->slots, "rescue.0");
 	g_assert_cmpstr(slot->name, ==, "rescue.0");
+	g_assert_cmpstr(slot->description, ==, "Rescue partition");
 	g_assert_cmpstr(slot->device, ==, "/dev/mtd4");
 	g_assert_cmpstr(slot->bootname, ==, "factory0");
 	g_assert_cmpstr(slot->type, ==, "raw");
@@ -94,6 +100,7 @@ parent=rootfs.1\n";
 
 	slot = g_hash_table_lookup(config->slots, "rootfs.0");
 	g_assert_cmpstr(slot->name, ==, "rootfs.0");
+	g_assert_cmpstr(slot->description, ==, "Root filesystem partition 0");
 	g_assert_cmpstr(slot->device, ==, "/dev/sda0");
 	g_assert_cmpstr(slot->bootname, ==, "system0");
 	g_assert_cmpstr(slot->type, ==, "ext4");
@@ -103,6 +110,7 @@ parent=rootfs.1\n";
 
 	slot = g_hash_table_lookup(config->slots, "rootfs.1");
 	g_assert_cmpstr(slot->name, ==, "rootfs.1");
+	g_assert_cmpstr(slot->description, ==, "Root filesystem partition 1");
 	g_assert_cmpstr(slot->device, ==, "/dev/sda1");
 	g_assert_cmpstr(slot->bootname, ==, "system1");
 	g_assert_cmpstr(slot->type, ==, "ext4");
@@ -112,6 +120,7 @@ parent=rootfs.1\n";
 
 	slot = g_hash_table_lookup(config->slots, "appfs.0");
 	g_assert_cmpstr(slot->name, ==, "appfs.0");
+	g_assert_cmpstr(slot->description, ==, "Application filesystem partition 0");
 	g_assert_cmpstr(slot->device, ==, "/dev/sda2");
 	g_assert_null(slot->bootname);
 	g_assert_cmpstr(slot->type, ==, "ext4");
@@ -121,6 +130,7 @@ parent=rootfs.1\n";
 
 	slot = g_hash_table_lookup(config->slots, "appfs.1");
 	g_assert_cmpstr(slot->name, ==, "appfs.1");
+	g_assert_cmpstr(slot->description, ==, "Application filesystem partition 1");
 	g_assert_cmpstr(slot->device, ==, "/dev/sda3");
 	g_assert_null(slot->bootname);
 	g_assert_cmpstr(slot->type, ==, "ext4");