#56 handle missing head fields, print make/model/serial when available (

#57) * handle missing serial number when marshalling IPC response * handle missing fields when printing, add make/model/serial
alex-courtis · Dec 16, 2022 · 68bf6d5 · 68bf6d5
1 parent c162290
commit 68bf6d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/info.c b/src/info.c
@@ -245,8 +245,16 @@ void print_head(enum LogThreshold t, enum InfoEvent event, struct Head *head) {
 		case NONE:
 			log_(t, "\n%s%s:", head->name, event == ARRIVED ? " Arrived" : "");
 			log_(t, "  info:");
-			log_(t, "    name:     '%s'", head->name);
-			log_(t, "    desc:     '%s'", head->description);
+			if (head->name)
+				log_(t, "    name:     '%s'", head->name);
+			if (head->make)
+				log_(t, "    make:     '%s'", head->make);
+			if (head->model)
+				log_(t, "    model:    '%s'", head->model);
+			if (head->serial_number)
+				log_(t, "    serial:   '%s'", head->serial_number);
+			if (head->description)
+				log_(t, "    desc:     '%s'", head->description);
 			if (head->width_mm && head->height_mm) {
 				log_(t, "    width:    %dmm", head->width_mm);
 				log_(t, "    height:   %dmm", head->height_mm);
@@ -264,8 +272,10 @@ void print_head(enum LogThreshold t, enum InfoEvent event, struct Head *head) {
 			break;
 		case DEPARTED:
 			log_(t, "\n%s Departed:", head->name);
-			log_(t, "    name:     '%s'", head->name);
-			log_(t, "    desc:     '%s'", head->description);
+			if (head->name)
+				log_(t, "    name:     '%s'", head->name);
+			if (head->description)
+				log_(t, "    desc:     '%s'", head->description);
 			break;
 		case DELTA:
 			if (head_current_not_desired(head)) {

diff --git a/src/marshalling.cpp b/src/marshalling.cpp
@@ -199,14 +199,19 @@ YAML::Emitter& operator << (YAML::Emitter& e, struct HeadState& head_state) {
 
 YAML::Emitter& operator << (YAML::Emitter& e, struct Head& head) {
 
-	e << YAML::Key << "NAME" << YAML::Value << head.name;
-	e << YAML::Key << "DESCRIPTION" << YAML::Value << head.description;
+	if (head.name)
+		e << YAML::Key << "NAME" << YAML::Value << head.name;
+	if (head.description)
+		e << YAML::Key << "DESCRIPTION" << YAML::Value << head.description;
+	if (head.make)
+		e << YAML::Key << "MAKE" << YAML::Value << head.make;
+	if (head.model)
+		e << YAML::Key << "MODEL" << YAML::Value << head.model;
+	if (head.serial_number)
+		e << YAML::Key << "SERIAL_NUMBER" << YAML::Value << head.serial_number;
 	e << YAML::Key << "WIDTH_MM" << YAML::Value << head.width_mm;
 	e << YAML::Key << "HEIGHT_MM" << YAML::Value << head.height_mm;
 	e << YAML::Key << "TRANSFORM" << YAML::Value << head.transform;
-	e << YAML::Key << "MAKE" << YAML::Value << head.make;
-	e << YAML::Key << "MODEL" << YAML::Value << head.model;
-	e << YAML::Key << "SERIAL_NUMBER" << YAML::Value << head.serial_number;
 
 	e << YAML::Key << "CURRENT" << YAML::BeginMap;		// CURRENT
 	e << head.current;