Handle RST error names.

Because obex is just different enough to cause much pain.

Author: Zeph / Liz Loss-Cutler-Hull

gen/generator/generator_tpl.go

@@ -64,8 +64,13 @@ func ErrorsTemplate(filename string, apis []*types.ApiGroup) error {
 	}
 
 	for i, err := range errors {
+		base := err[strings.LastIndex(err, ".")+1:]
+		if strings.Contains(err, "obex") {
+			base = "Obex" + base
+		}
 		errorsList.List[i] = types.BluezError{
-			Name: strings.Replace(err, "org.bluez.Error.", "", 1),
+			Name: err,
+			Base: base,
 		}
 	}
 

gen/generator/tpl/errors.go.tpl

@@ -8,10 +8,10 @@ import (
 
 var (
 {{- range .List }}
-	// {{.Name}} map to org.bluez.Error.{{.Name}}
-	Err{{.Name}} = dbus.Error{
-		Name: "org.bluez.Error.{{.Name}}",
-		Body: []interface{}{"{{.Name}}"},
+	// {{.Base}} map to {{.Name}}
+	Err{{.Base}} = dbus.Error{
+		Name: "{{.Name}}",
+		Body: []interface{}{"{{.Base}}"},
 	}
 {{- end }}
 )

gen/types/generator.go

@@ -2,6 +2,7 @@ package types
 
 type BluezError struct {
 	Name  string
+	Base  string
 	Error string
 }