Merge pull request #102 from google/uuid

CUPS < 1.5 doesn't send printer-uuid attribute.
google · Oct 4, 2015 · 149c605 · 149c605
2 parents 73a61d7 + d3fc912
commit 149c605
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/cups/translate-attrs.go b/cups/translate-attrs.go
@@ -59,6 +59,9 @@ func getUUID(printerTags map[string][]string) string {
 		uuid = u[0]
 		uuid = strings.TrimPrefix(uuid, "urn:")
 		uuid = strings.TrimPrefix(uuid, "uuid:")
+	} else if u, ok := printerTags[attrPrinterName]; ok {
+		// CUPS < 1.5 doesn't send a printer-uuid attribute.
+		uuid = u[0]
 	}
 	return uuid
 }

diff --git a/cups/translate-attrs_test.go b/cups/translate-attrs_test.go
@@ -67,6 +67,26 @@ func TestGetUUID(t *testing.T) {
 		t.Logf("expected %s, got %s", expected, u)
 		t.Fail()
 	}
+
+	pt = map[string][]string{
+		attrPrinterUUID: []string{"urn:uuid:123"},
+		attrPrinterName: []string{"my-name"},
+	}
+	u = getUUID(pt)
+	if u != expected {
+		t.Logf("expected %s, got %s", expected, u)
+		t.Fail()
+	}
+
+	pt = map[string][]string{
+		attrPrinterName: []string{"my-name"},
+	}
+	expected = "my-name"
+	u = getUUID(pt)
+	if u != expected {
+		t.Logf("expected %s, got %s", expected, u)
+		t.Fail()
+	}
 }
 
 func TestGetState(t *testing.T) {