Changeset 542 in code for trunk/service.go

Timestamp:

May 26, 2021, 8:51:02 AM (4 years ago)

Author:

contact

Message:

Allow networks to be disabled

File:

• trunk/service.go (modified) (8 diffs)

trunk/service.go

@@ -19 +19 @@
         "math/big"
         "sort"
+        "strconv"
         "strings"
         "time"
@@ -150 +151 @@
                         children: serviceCommandSet{
                                 "create": {
-                                        usage:  "-addr <addr> [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-connect-command command]...",
+                                        usage:  "-addr <addr> [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-enabled enabled] [-connect-command command]...",
                                         desc:   "add a new network",
                                         handle: handleServiceNetworkCreate,
@@ -159 +160 @@
                                 },
                                 "update": {
-                                        usage:  "<name> [-addr addr] [-name name] [-username username] [-pass pass] [-realname realname] [-nick nick] [-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,
@@ -318 +319 @@
 }
 
+type boolPtrFlag struct {
+        ptr **bool
+}
+
+func (f boolPtrFlag) String() string {
+        if f.ptr == nil || *f.ptr == nil {
+                return "<nil>"
+        }
+        return strconv.FormatBool(**f.ptr)
+}
+
+func (f boolPtrFlag) Set(s string) error {
+        v, err := strconv.ParseBool(s)
+        if err != nil {
+                return err
+        }
+        *f.ptr = &v
+        return nil
+}
+
 type networkFlagSet struct {
         *flag.FlagSet
         Addr, Name, Nick, Username, Pass, Realname *string
+        Enabled                                    *bool
         ConnectCommands                            []string
 }
@@ -332 +354 @@
         fs.Var(stringPtrFlag{&fs.Pass}, "pass", "")
         fs.Var(stringPtrFlag{&fs.Realname}, "realname", "")
+        fs.Var(boolPtrFlag{&fs.Enabled}, "enabled", "")
         fs.Var((*stringSliceFlag)(&fs.ConnectCommands), "connect-command", "")
         return fs
@@ -362 +385 @@
         if fs.Realname != nil {
                 network.Realname = *fs.Realname
+        }
+        if fs.Enabled != nil {
+                network.Enabled = *fs.Enabled
         }
         if fs.ConnectCommands != nil {
@@ -389 +415 @@
 
         record := &Network{
-                Addr: *fs.Addr,
-                Nick: dc.nick,
+                Addr:    *fs.Addr,
+                Nick:    dc.nick,
+                Enabled: true,
         }
         if err := fs.update(record); err != nil {
@@ -416 +443 @@
                         }
                         details = fmt.Sprintf("%v channels", uc.channels.Len())
+                } else if !net.Enabled {
+                        statuses = append(statuses, "disabled")
                 } else {
                         statuses = append(statuses, "disconnected")