Skip to content

Commit 0f7d005

Browse files
rsteubersteube
authored
Merge pull request #158 from rsteube/move-net-actions
moved net actions
2 parents 1cf0d33 + 469602e commit 0f7d005

24 files changed

+203
-128
lines changed

‎completers/git_completer/cmd/action/action.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ func ActionRemotes() carapace.Action {
2424
if output, err := exec.Command("git", "remote").Output(); err != nil {
2525
return carapace.ActionMessage(err.Error())
2626
} else {
27-
return carapace.ActionValues(strings.Split(string(output), "\n")...)
27+
lines := strings.Split(string(output), "\n")
28+
return carapace.ActionValues(lines[:len(lines)-1]...)
2829
}
2930
})
3031
}

‎completers/nmcli_completer/cmd/action/action.go‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,9 @@
11
package action
22

33
import (
4-
"os/exec"
5-
"strings"
6-
74
"github.com/rsteube/carapace"
85
)
96

107
func ActionYesNo() carapace.Action {
118
return carapace.ActionValues("yes", "no")
129
}
13-
14-
func ActionConnections() carapace.Action {
15-
return carapace.ActionCallback(func(args []string) carapace.Action {
16-
if output, err := exec.Command("nmcli", "--terse", "connection", "show").Output(); err != nil {
17-
return carapace.ActionMessage(err.Error())
18-
} else {
19-
lines := strings.Split(string(output), "\n")
20-
vals := make([]string, (len(lines)-1)*2)
21-
for index, line := range lines[:len(lines)-1] {
22-
parts := strings.Split(line, ":")
23-
vals[index*2] = parts[0]
24-
vals[index*2+1] = parts[1]
25-
}
26-
return carapace.ActionValuesDescribed(vals...)
27-
}
28-
})
29-
}
30-
31-
// ActionDevices completes network devices (optionally filtered by deviceType)
32-
// ActionDevices("") // all
33-
// ActionDevices("wifi") // only wifi devices
34-
func ActionDevices(deviceType string) carapace.Action {
35-
return carapace.ActionCallback(func(args []string) carapace.Action {
36-
if output, err := exec.Command("nmcli", "--terse", "--fields", "device,type", "device", "status").Output(); err != nil {
37-
return carapace.ActionMessage(err.Error())
38-
} else {
39-
lines := strings.Split(string(output), "\n")
40-
vals := make([]string, 0)
41-
for _, line := range lines[:len(lines)-1] {
42-
parts := strings.Split(line, ":")
43-
if deviceType == "" || deviceType == parts[1] {
44-
vals = append(vals, parts[0], parts[1])
45-
}
46-
}
47-
return carapace.ActionValuesDescribed(vals...)
48-
}
49-
})
50-
}
51-
52-
func ActionBssids() carapace.Action {
53-
return carapace.ActionCallback(func(args []string) carapace.Action {
54-
if output, err := exec.Command("nmcli", "--terse", "--fields", "bssid,ssid", "device", "wifi", "list").Output(); err != nil {
55-
return carapace.ActionMessage(err.Error())
56-
} else {
57-
lines := strings.Split(string(output), "\n")
58-
vals := make([]string, (len(lines)-1)*2)
59-
for index, line := range lines[:len(lines)-1] {
60-
vals[index*2] = line[:22]
61-
vals[index*2+1] = line[23:]
62-
}
63-
return carapace.ActionValuesDescribed(vals...)
64-
}
65-
})
66-
}
67-
68-
func ActionSsids() carapace.Action {
69-
return carapace.ActionCallback(func(args []string) carapace.Action {
70-
if output, err := exec.Command("nmcli", "--terse", "--fields", "bssid,ssid", "device", "wifi", "list").Output(); err != nil {
71-
return carapace.ActionMessage(err.Error())
72-
} else {
73-
lines := strings.Split(string(output), "\n")
74-
vals := make([]string, 0)
75-
for _, line := range lines[:len(lines)-1] {
76-
if ssid := line[23:]; ssid != "" {
77-
vals = append(vals, line[23:], line[:22])
78-
}
79-
}
80-
return carapace.ActionValuesDescribed(vals...)
81-
}
82-
})
83-
}

‎completers/nmcli_completer/cmd/connection_clone.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -19,6 +19,6 @@ func init() {
1919
connectionCmd.AddCommand(connection_cloneCmd)
2020

2121
carapace.Gen(connection_cloneCmd).PositionalCompletion(
22-
action.ActionConnections(),
22+
net.ActionConnections(),
2323
)
2424
}

‎completers/nmcli_completer/cmd/connection_delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -18,6 +18,6 @@ func init() {
1818
connectionCmd.AddCommand(connection_deleteCmd)
1919

2020
carapace.Gen(connection_deleteCmd).PositionalCompletion(
21-
action.ActionConnections(),
21+
net.ActionConnections(),
2222
)
2323
}

‎completers/nmcli_completer/cmd/connection_down.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -18,6 +18,6 @@ func init() {
1818
connectionCmd.AddCommand(connection_downCmd)
1919

2020
carapace.Gen(connection_downCmd).PositionalCompletion(
21-
action.ActionConnections(),
21+
net.ActionConnections(),
2222
)
2323
}

‎completers/nmcli_completer/cmd/connection_edit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -18,6 +18,6 @@ func init() {
1818
connectionCmd.AddCommand(connection_editCmd)
1919

2020
carapace.Gen(connection_editCmd).PositionalCompletion(
21-
action.ActionConnections(),
21+
net.ActionConnections(),
2222
)
2323
}

‎completers/nmcli_completer/cmd/connection_export.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -18,7 +18,7 @@ func init() {
1818
connectionCmd.AddCommand(connection_exportCmd)
1919

2020
carapace.Gen(connection_exportCmd).PositionalCompletion(
21-
action.ActionConnections(),
21+
net.ActionConnections(),
2222
carapace.ActionFiles(""),
2323
)
2424
}

‎completers/nmcli_completer/cmd/connection_modify.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -19,6 +19,6 @@ func init() {
1919
connectionCmd.AddCommand(connection_modifyCmd)
2020

2121
carapace.Gen(connection_modifyCmd).PositionalCompletion(
22-
action.ActionConnections(),
22+
net.ActionConnections(),
2323
)
2424
}

‎completers/nmcli_completer/cmd/connection_monitor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -18,6 +18,6 @@ func init() {
1818
connectionCmd.AddCommand(connection_monitorCmd)
1919

2020
carapace.Gen(connection_monitorCmd).PositionalCompletion(
21-
action.ActionConnections(),
21+
net.ActionConnections(),
2222
)
2323
}

‎completers/nmcli_completer/cmd/connection_show.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package cmd
22

33
import (
44
"github.com/rsteube/carapace"
5-
"github.com/rsteube/carapace-bin/completers/nmcli_completer/cmd/action"
5+
"github.com/rsteube/carapace-bin/pkg/actions/net"
66
"github.com/spf13/cobra"
77
)
88

@@ -20,5 +20,5 @@ func init() {
2020

2121
connectionCmd.AddCommand(connection_showCmd)
2222

23-
carapace.Gen(connection_showCmd).PositionalAnyCompletion(action.ActionConnections())
23+
carapace.Gen(connection_showCmd).PositionalAnyCompletion(net.ActionConnections())
2424
}

0 commit comments

Comments
 (0)