Changeset 772 in code

Timestamp:

Feb 7, 2022, 8:33:16 PM (3 years ago)

Author:

contact

Message:

service: make name arg optional for network commands

Makes commands less verbose.

Location:

trunk

Files:

• doc/soju.1.scd (modified) (2 diffs)
• service.go (modified) (5 diffs)

trunk/doc/soju.1.scd

@@ -237 +237 @@
                 To clear all commands, set it to the empty string.
 
-*network update* <name> [options...]
+*network update* [name] [options...]
         Update an existing network. The options are the same as the
         _network create_ command.
@@ -244 +244 @@
         network.
 
-*network delete* <name>
+        If _name_ is not specified, the current network is updated.
+
+*network delete* [name]
         Disconnect and delete a network.
 
-*network quote* <name> <command>
+        If _name_ is not specified, the current network is deleted.
+
+*network quote* [name] <command>
         Send a raw IRC line as-is to a network.
+
+        If _name_ is not specified, the command is sent to the current network.
 
 *network status*

trunk/service.go

@@ -209 +209 @@
                                 },
                                 "update": {
-                                        usage:  "<name> [-addr addr] [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-enabled enabled] [-connect-command command]...",
+                                        usage:  "[name] [-addr addr] [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-enabled enabled] [-connect-command command]...",
                                         desc:   "update a network",
                                         handle: handleServiceNetworkUpdate,
                                 },
                                 "delete": {
-                                        usage:  "<name>",
+                                        usage:  "[name]",
                                         desc:   "delete a network",
                                         handle: handleServiceNetworkDelete,
                                 },
                                 "quote": {
-                                        usage:  "<name> <command>",
+                                        usage:  "[name] <command>",
                                         desc:   "send a raw line to a network",
                                         handle: handleServiceNetworkQuote,
@@ -410 +410 @@
         *f.ptr = &v
         return nil
+}
+
+func getNetworkFromArg(dc *downstreamConn, params []string) (*network, []string, error) {
+        name, params := popArg(params)
+        if name == "" {
+                if dc.network == nil {
+                        return nil, params, fmt.Errorf("no network selected, a name argument is required")
+                }
+                return dc.network, params, nil
+        } else {
+                net := dc.user.getNetwork(name)
+                if net == nil {
+                        return nil, params, fmt.Errorf("unknown network %q", name)
+                }
+                return net, params, nil
+        }
 }
 
@@ -551 +567 @@
 
 func handleServiceNetworkUpdate(ctx context.Context, dc *downstreamConn, params []string) error {
-        if len(params) < 1 {
-                return fmt.Errorf("expected at least one argument")
+        net, params, err := getNetworkFromArg(dc, params)
+        if err != nil {
+                return err
         }
 
         fs := newNetworkFlagSet()
-        if err := fs.Parse(params[1:]); err != nil {
-                return err
-        }
-
-        net := dc.user.getNetwork(params[0])
-        if net == nil {
-                return fmt.Errorf("unknown network %q", params[0])
+        if err := fs.Parse(params); err != nil {
+                return err
         }
 
@@ -580 +592 @@
 
 func handleServiceNetworkDelete(ctx context.Context, dc *downstreamConn, params []string) error {
-        if len(params) != 1 {
-                return fmt.Errorf("expected exactly one argument")
-        }
-
-        net := dc.user.getNetwork(params[0])
-        if net == nil {
-                return fmt.Errorf("unknown network %q", params[0])
+        net, params, err := getNetworkFromArg(dc, params)
+        if err != nil {
+                return err
         }
 
@@ -598 +606 @@
 
 func handleServiceNetworkQuote(ctx context.Context, dc *downstreamConn, params []string) error {
-        if len(params) != 2 {
-                return fmt.Errorf("expected exactly two arguments")
-        }
-
-        net := dc.user.getNetwork(params[0])
-        if net == nil {
-                return fmt.Errorf("unknown network %q", params[0])
+        if len(params) != 1 && len(params) != 2 {
+                return fmt.Errorf("expected one or two arguments")
+        }
+
+        raw := params[len(params)-1]
+        params = params[:len(params)-1]
+
+        net, params, err := getNetworkFromArg(dc, params)
+        if err != nil {
+                return err
         }
 
         uc := net.conn
         if uc == nil {
-                return fmt.Errorf("network %q is not currently connected", params[0])
-        }
-
-        m, err := irc.ParseMessage(params[1])
-        if err != nil {
-                return fmt.Errorf("failed to parse command %q: %v", params[1], err)
+                return fmt.Errorf("network %q is not currently connected", net.GetName())
+        }
+
+        m, err := irc.ParseMessage(raw)
+        if err != nil {
+                return fmt.Errorf("failed to parse command %q: %v", raw, err)
         }
         uc.SendMessage(ctx, m)