Added call to service

Author: djthorpe

cmd/api/flags.go

@@ -97,8 +97,12 @@ func (flags *Flags) Parse(args []string) (*Fn, []string, error) {
 		// If the name of the command is the same as the name of the application
 		flags.cmd = cmd
 		flags.root = cmd.Name
-		flags.fn = ""
-		flags.args = flags.Args()
+		if len(flags.Args()) > 0 {
+			flags.fn = flags.Arg(0)
+			if len(flags.Args()) > 1 {
+				flags.args = flags.Args()[1:]
+			}
+		}
 	} else if flags.NArg() > 0 {
 		if cmd := flags.getCommandSet(flags.Arg(0)); cmd != nil {
 			flags.cmd = cmd

cmd/api/homeassistant.go

@@ -53,7 +53,7 @@ func haRegister(flags *Flags) {
 			{Name: "domains", Call: haDomains, Description: "Enumerate entity domains"},
 			{Name: "states", Call: haStates, Description: "Show current entity states", MaxArgs: 1, Syntax: "(<name>)"},
 			{Name: "services", Call: haServices, Description: "Show services for an entity", MinArgs: 1, MaxArgs: 1, Syntax: "<entity>"},
-			{Name: "call", Call: haCall, Description: "Call a service for an entity", MinArgs: 2, MaxArgs: 2, Syntax: "<service> <entity>"},
+			{Name: "call", Call: haCall, Description: "Call a service for an entity", MinArgs: 2, MaxArgs: 2, Syntax: "<call> <entity>"},
 		},
 	})
 }

pkg/homeassistant/services.go

@@ -16,12 +16,13 @@ import (
 // TYPES
 
 type Domain struct {
-	Domain   string             `json:"domain"`
-	Services map[string]Service `json:"services,omitempty"`
+	Domain   string              `json:"domain"`
+	Services map[string]*Service `json:"services,omitempty"`
 }
 
 type Service struct {
-	Name        string           `json:"name"`
+	Call        string           `json:"call,omitempty"`
+	Name        string           `json:"name,omitempty"`
 	Description string           `json:"description,omitempty,wrap"`
 	Fields      map[string]Field `json:"fields,omitempty,wrap"`
 }
@@ -59,7 +60,7 @@ func (c *Client) Domains() ([]Domain, error) {
 }
 
 // Return callable services for a domain
-func (c *Client) Services(domain string) ([]Service, error) {
+func (c *Client) Services(domain string) ([]*Service, error) {
 	var response []Domain
 	if err := c.Do(nil, &response, client.OptPath("services")); err != nil {
 		return nil, err
@@ -69,11 +70,13 @@ func (c *Client) Services(domain string) ([]Service, error) {
 			continue
 		}
 		if len(v.Services) == 0 {
-			// No services found
-			return []Service{}, nil
-		} else {
-			return maps.Values(v.Services), nil
+			return nil, nil
 		}
+		// Populate the Id field
+		for k, v := range v.Services {
+			v.Call = k
+		}
+		return maps.Values(v.Services), nil
 	}
 	// Return not found
 	return nil, ErrNotFound.Withf("domain not found: %q", domain)