Compare commits
4 Commits
feat/tui_r
...
cicd/fix-n
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dbc845bb21 | ||
|
|
49948de0ed | ||
|
|
933da8bad2 | ||
|
|
9b09ee7c6c |
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
@@ -32,9 +32,9 @@ jobs:
|
|||||||
go-version: "1.25.0"
|
go-version: "1.25.0"
|
||||||
|
|
||||||
- name: lint
|
- name: lint
|
||||||
uses: golangci/golangci-lint-action@v8
|
uses: golangci/golangci-lint-action@v6
|
||||||
with:
|
with:
|
||||||
version: v2.5.0
|
version: latest
|
||||||
|
|
||||||
nix-build:
|
nix-build:
|
||||||
strategy:
|
strategy:
|
||||||
@@ -44,7 +44,9 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: DeterminateSystems/nix-installer-action@v17
|
- uses: cachix/install-nix-action@v30
|
||||||
|
with:
|
||||||
|
github_access_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- uses: nix-community/cache-nix-action@v6
|
- uses: nix-community/cache-nix-action@v6
|
||||||
with:
|
with:
|
||||||
|
|||||||
33
README.md
33
README.md
@@ -6,29 +6,13 @@ a friendlier `ss` / `netstat` for humans. inspect network connections with a cle
|
|||||||
|
|
||||||
## install
|
## install
|
||||||
|
|
||||||
### homebrew
|
|
||||||
|
|
||||||
```bash
|
|
||||||
brew install snitch
|
|
||||||
```
|
|
||||||
|
|
||||||
> thanks to [@bevanjkay](https://github.com/bevanjkay) for adding snitch to homebrew-core
|
|
||||||
|
|
||||||
### go
|
### go
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
go install github.com/karol-broda/snitch@latest
|
go install github.com/karol-broda/snitch@latest
|
||||||
```
|
```
|
||||||
|
|
||||||
### nixpkgs
|
### nixos / nix
|
||||||
|
|
||||||
```bash
|
|
||||||
nix-env -iA nixpkgs.snitch
|
|
||||||
```
|
|
||||||
|
|
||||||
> thanks to [@DieracDelta](https://github.com/DieracDelta) for adding snitch to nixpkgs
|
|
||||||
|
|
||||||
### nixos / nix (flake)
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# try it
|
# try it
|
||||||
@@ -238,23 +222,8 @@ optional config file at `~/.config/snitch/snitch.toml`:
|
|||||||
numeric = false # disable name resolution
|
numeric = false # disable name resolution
|
||||||
dns_cache = true # cache dns lookups (set to false to disable)
|
dns_cache = true # cache dns lookups (set to false to disable)
|
||||||
theme = "auto" # color theme: auto, dark, light, mono
|
theme = "auto" # color theme: auto, dark, light, mono
|
||||||
|
|
||||||
[tui]
|
|
||||||
remember_state = false # remember view options between sessions
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### remembering view options
|
|
||||||
|
|
||||||
when `remember_state = true`, the tui will save and restore:
|
|
||||||
|
|
||||||
- filter toggles (tcp/udp, listen/established/other)
|
|
||||||
- sort field and direction
|
|
||||||
- address and port resolution settings
|
|
||||||
|
|
||||||
state is saved to `$XDG_STATE_HOME/snitch/tui.json` (defaults to `~/.local/state/snitch/tui.json`).
|
|
||||||
|
|
||||||
cli flags always take priority over saved state.
|
|
||||||
|
|
||||||
### environment variables
|
### environment variables
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
"github.com/karol-broda/snitch/internal/testutil"
|
"github.com/karol-broda/snitch/internal/testutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -408,16 +407,16 @@ func TestEnvironmentVariables(t *testing.T) {
|
|||||||
oldEnvVars := make(map[string]string)
|
oldEnvVars := make(map[string]string)
|
||||||
for key, value := range tt.envVars {
|
for key, value := range tt.envVars {
|
||||||
oldEnvVars[key] = os.Getenv(key)
|
oldEnvVars[key] = os.Getenv(key)
|
||||||
errutil.Setenv(key, value)
|
os.Setenv(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clean up environment variables
|
// Clean up environment variables
|
||||||
defer func() {
|
defer func() {
|
||||||
for key, oldValue := range oldEnvVars {
|
for key, oldValue := range oldEnvVars {
|
||||||
if oldValue == "" {
|
if oldValue == "" {
|
||||||
errutil.Unsetenv(key)
|
os.Unsetenv(key)
|
||||||
} else {
|
} else {
|
||||||
errutil.Setenv(key, oldValue)
|
os.Setenv(key, oldValue)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|||||||
16
cmd/ls.go
16
cmd/ls.go
@@ -8,18 +8,16 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"github.com/karol-broda/snitch/internal/collector"
|
||||||
|
"github.com/karol-broda/snitch/internal/color"
|
||||||
|
"github.com/karol-broda/snitch/internal/config"
|
||||||
|
"github.com/karol-broda/snitch/internal/resolver"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"text/tabwriter"
|
"text/tabwriter"
|
||||||
|
|
||||||
"github.com/charmbracelet/lipgloss"
|
"github.com/charmbracelet/lipgloss"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
|
||||||
"github.com/karol-broda/snitch/internal/color"
|
|
||||||
"github.com/karol-broda/snitch/internal/config"
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
"github.com/karol-broda/snitch/internal/resolver"
|
|
||||||
"github.com/tidwall/pretty"
|
"github.com/tidwall/pretty"
|
||||||
"golang.org/x/term"
|
"golang.org/x/term"
|
||||||
)
|
)
|
||||||
@@ -187,7 +185,7 @@ func printCSV(conns []collector.Connection, headers bool, timestamp bool, select
|
|||||||
|
|
||||||
func printPlainTable(conns []collector.Connection, headers bool, timestamp bool, selectedFields []string) {
|
func printPlainTable(conns []collector.Connection, headers bool, timestamp bool, selectedFields []string) {
|
||||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
|
||||||
defer errutil.Flush(w)
|
defer w.Flush()
|
||||||
|
|
||||||
if len(selectedFields) == 0 {
|
if len(selectedFields) == 0 {
|
||||||
selectedFields = []string{"pid", "process", "user", "proto", "state", "laddr", "lport", "raddr", "rport"}
|
selectedFields = []string{"pid", "process", "user", "proto", "state", "laddr", "lport", "raddr", "rport"}
|
||||||
@@ -201,7 +199,7 @@ func printPlainTable(conns []collector.Connection, headers bool, timestamp bool,
|
|||||||
for _, field := range selectedFields {
|
for _, field := range selectedFields {
|
||||||
headerRow = append(headerRow, strings.ToUpper(field))
|
headerRow = append(headerRow, strings.ToUpper(field))
|
||||||
}
|
}
|
||||||
errutil.Ignore(fmt.Fprintln(w, strings.Join(headerRow, "\t")))
|
fmt.Fprintln(w, strings.Join(headerRow, "\t"))
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, conn := range conns {
|
for _, conn := range conns {
|
||||||
@@ -210,7 +208,7 @@ func printPlainTable(conns []collector.Connection, headers bool, timestamp bool,
|
|||||||
for _, field := range selectedFields {
|
for _, field := range selectedFields {
|
||||||
row = append(row, fieldMap[field])
|
row = append(row, fieldMap[field])
|
||||||
}
|
}
|
||||||
errutil.Ignore(fmt.Fprintln(w, strings.Join(row, "\t")))
|
fmt.Fprintln(w, strings.Join(row, "\t"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
34
cmd/stats.go
34
cmd/stats.go
@@ -8,6 +8,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"github.com/karol-broda/snitch/internal/collector"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -16,9 +17,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type StatsData struct {
|
type StatsData struct {
|
||||||
@@ -229,19 +227,19 @@ func printStatsCSV(stats *StatsData, headers bool) {
|
|||||||
|
|
||||||
func printStatsTable(stats *StatsData, headers bool) {
|
func printStatsTable(stats *StatsData, headers bool) {
|
||||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
|
||||||
defer errutil.Flush(w)
|
defer w.Flush()
|
||||||
|
|
||||||
if headers {
|
if headers {
|
||||||
errutil.Ignore(fmt.Fprintf(w, "TIMESTAMP\t%s\n", stats.Timestamp.Format(time.RFC3339)))
|
fmt.Fprintf(w, "TIMESTAMP\t%s\n", stats.Timestamp.Format(time.RFC3339))
|
||||||
errutil.Ignore(fmt.Fprintf(w, "TOTAL CONNECTIONS\t%d\n", stats.Total))
|
fmt.Fprintf(w, "TOTAL CONNECTIONS\t%d\n", stats.Total)
|
||||||
errutil.Ignore(fmt.Fprintln(w))
|
fmt.Fprintln(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Protocol breakdown
|
// Protocol breakdown
|
||||||
if len(stats.ByProto) > 0 {
|
if len(stats.ByProto) > 0 {
|
||||||
if headers {
|
if headers {
|
||||||
errutil.Ignore(fmt.Fprintln(w, "BY PROTOCOL:"))
|
fmt.Fprintln(w, "BY PROTOCOL:")
|
||||||
errutil.Ignore(fmt.Fprintln(w, "PROTO\tCOUNT"))
|
fmt.Fprintln(w, "PROTO\tCOUNT")
|
||||||
}
|
}
|
||||||
protocols := make([]string, 0, len(stats.ByProto))
|
protocols := make([]string, 0, len(stats.ByProto))
|
||||||
for proto := range stats.ByProto {
|
for proto := range stats.ByProto {
|
||||||
@@ -249,16 +247,16 @@ func printStatsTable(stats *StatsData, headers bool) {
|
|||||||
}
|
}
|
||||||
sort.Strings(protocols)
|
sort.Strings(protocols)
|
||||||
for _, proto := range protocols {
|
for _, proto := range protocols {
|
||||||
errutil.Ignore(fmt.Fprintf(w, "%s\t%d\n", strings.ToUpper(proto), stats.ByProto[proto]))
|
fmt.Fprintf(w, "%s\t%d\n", strings.ToUpper(proto), stats.ByProto[proto])
|
||||||
}
|
}
|
||||||
errutil.Ignore(fmt.Fprintln(w))
|
fmt.Fprintln(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
// State breakdown
|
// State breakdown
|
||||||
if len(stats.ByState) > 0 {
|
if len(stats.ByState) > 0 {
|
||||||
if headers {
|
if headers {
|
||||||
errutil.Ignore(fmt.Fprintln(w, "BY STATE:"))
|
fmt.Fprintln(w, "BY STATE:")
|
||||||
errutil.Ignore(fmt.Fprintln(w, "STATE\tCOUNT"))
|
fmt.Fprintln(w, "STATE\tCOUNT")
|
||||||
}
|
}
|
||||||
states := make([]string, 0, len(stats.ByState))
|
states := make([]string, 0, len(stats.ByState))
|
||||||
for state := range stats.ByState {
|
for state := range stats.ByState {
|
||||||
@@ -266,16 +264,16 @@ func printStatsTable(stats *StatsData, headers bool) {
|
|||||||
}
|
}
|
||||||
sort.Strings(states)
|
sort.Strings(states)
|
||||||
for _, state := range states {
|
for _, state := range states {
|
||||||
errutil.Ignore(fmt.Fprintf(w, "%s\t%d\n", state, stats.ByState[state]))
|
fmt.Fprintf(w, "%s\t%d\n", state, stats.ByState[state])
|
||||||
}
|
}
|
||||||
errutil.Ignore(fmt.Fprintln(w))
|
fmt.Fprintln(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process breakdown (top 10)
|
// Process breakdown (top 10)
|
||||||
if len(stats.ByProc) > 0 {
|
if len(stats.ByProc) > 0 {
|
||||||
if headers {
|
if headers {
|
||||||
errutil.Ignore(fmt.Fprintln(w, "BY PROCESS (TOP 10):"))
|
fmt.Fprintln(w, "BY PROCESS (TOP 10):")
|
||||||
errutil.Ignore(fmt.Fprintln(w, "PID\tPROCESS\tCOUNT"))
|
fmt.Fprintln(w, "PID\tPROCESS\tCOUNT")
|
||||||
}
|
}
|
||||||
limit := 10
|
limit := 10
|
||||||
if len(stats.ByProc) < limit {
|
if len(stats.ByProc) < limit {
|
||||||
@@ -283,7 +281,7 @@ func printStatsTable(stats *StatsData, headers bool) {
|
|||||||
}
|
}
|
||||||
for i := 0; i < limit; i++ {
|
for i := 0; i < limit; i++ {
|
||||||
proc := stats.ByProc[i]
|
proc := stats.ByProc[i]
|
||||||
errutil.Ignore(fmt.Fprintf(w, "%d\t%s\t%d\n", proc.PID, proc.Process, proc.Count))
|
fmt.Fprintf(w, "%d\t%s\t%d\n", proc.PID, proc.Process, proc.Count)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ var topCmd = &cobra.Command{
|
|||||||
ResolveAddrs: resolveAddrs,
|
ResolveAddrs: resolveAddrs,
|
||||||
ResolvePorts: resolvePorts,
|
ResolvePorts: resolvePorts,
|
||||||
NoCache: effectiveNoCache,
|
NoCache: effectiveNoCache,
|
||||||
RememberState: cfg.TUI.RememberState,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// if any filter flag is set, use exclusive mode
|
// if any filter flag is set, use exclusive mode
|
||||||
|
|||||||
195
cmd/upgrade.go
195
cmd/upgrade.go
@@ -18,7 +18,6 @@ import (
|
|||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
"github.com/karol-broda/snitch/internal/tui"
|
"github.com/karol-broda/snitch/internal/tui"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -94,13 +93,13 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
|
|||||||
|
|
||||||
if currentClean == latestClean {
|
if currentClean == latestClean {
|
||||||
green := color.New(color.FgGreen)
|
green := color.New(color.FgGreen)
|
||||||
errutil.Println(green, tui.SymbolSuccess+" you are running the latest version")
|
green.Println(tui.SymbolSuccess + " you are running the latest version")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if current == "dev" {
|
if current == "dev" {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" you are running a development build")
|
yellow.Println(tui.SymbolWarning + " you are running a development build")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
fmt.Println("use one of the methods below to install a release version:")
|
fmt.Println("use one of the methods below to install a release version:")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
@@ -109,7 +108,7 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
green := color.New(color.FgGreen, color.Bold)
|
green := color.New(color.FgGreen, color.Bold)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", current, latest)
|
green.Printf(tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", current, latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
if !upgradeYes {
|
if !upgradeYes {
|
||||||
@@ -117,8 +116,8 @@ func runUpgrade(cmd *cobra.Command, args []string) error {
|
|||||||
fmt.Println()
|
fmt.Println()
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
cmdStyle := color.New(color.FgCyan)
|
cmdStyle := color.New(color.FgCyan)
|
||||||
errutil.Print(faint, " in-place ")
|
faint.Print(" in-place ")
|
||||||
errutil.Println(cmdStyle, "snitch upgrade --yes")
|
cmdStyle.Println("snitch upgrade --yes")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -135,17 +134,17 @@ func handleSpecificVersion(current, target string) error {
|
|||||||
|
|
||||||
if isVersionLower(targetClean, firstUpgradeVersion) {
|
if isVersionLower(targetClean, firstUpgradeVersion) {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Printf(yellow, tui.SymbolWarning+" warning: the upgrade command was introduced in v%s\n", firstUpgradeVersion)
|
yellow.Printf(tui.SymbolWarning+" warning: the upgrade command was introduced in v%s\n", firstUpgradeVersion)
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
errutil.Printf(faint, " version %s does not include this command\n", target)
|
faint.Printf(" version %s does not include this command\n", target)
|
||||||
errutil.Println(faint, " you will need to use other methods to upgrade from that version")
|
faint.Println(" you will need to use other methods to upgrade from that version")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
||||||
currentClean := strings.TrimPrefix(current, "v")
|
currentClean := strings.TrimPrefix(current, "v")
|
||||||
if currentClean == targetClean {
|
if currentClean == targetClean {
|
||||||
green := color.New(color.FgGreen)
|
green := color.New(color.FgGreen)
|
||||||
errutil.Println(green, tui.SymbolSuccess+" you are already running this version")
|
green.Println(tui.SymbolSuccess + " you are already running this version")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,15 +153,15 @@ func handleSpecificVersion(current, target string) error {
|
|||||||
cmdStyle := color.New(color.FgCyan)
|
cmdStyle := color.New(color.FgCyan)
|
||||||
if isVersionLower(targetClean, currentClean) {
|
if isVersionLower(targetClean, currentClean) {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Printf(yellow, tui.SymbolArrowDown+" this will downgrade from %s to %s\n", current, target)
|
yellow.Printf(tui.SymbolArrowDown+" this will downgrade from %s to %s\n", current, target)
|
||||||
} else {
|
} else {
|
||||||
green := color.New(color.FgGreen)
|
green := color.New(color.FgGreen)
|
||||||
errutil.Printf(green, tui.SymbolArrowUp+" this will upgrade from %s to %s\n", current, target)
|
green.Printf(tui.SymbolArrowUp+" this will upgrade from %s to %s\n", current, target)
|
||||||
}
|
}
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
errutil.Print(faint, "run ")
|
faint.Print("run ")
|
||||||
errutil.Printf(cmdStyle, "snitch upgrade --version %s --yes", target)
|
cmdStyle.Printf("snitch upgrade --version %s --yes", target)
|
||||||
errutil.Println(faint, " to proceed")
|
faint.Println(" to proceed")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,20 +175,20 @@ func handleNixUpgrade(current, latest string) error {
|
|||||||
currentCommit := extractCommitFromVersion(current)
|
currentCommit := extractCommitFromVersion(current)
|
||||||
dirty := isNixDirty(current)
|
dirty := isNixDirty(current)
|
||||||
|
|
||||||
errutil.Print(faint, "current ")
|
faint.Print("current ")
|
||||||
errutil.Print(version, current)
|
version.Print(current)
|
||||||
if currentCommit != "" {
|
if currentCommit != "" {
|
||||||
errutil.Printf(faint, " (commit %s)", currentCommit)
|
faint.Printf(" (commit %s)", currentCommit)
|
||||||
}
|
}
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
errutil.Print(faint, "latest ")
|
faint.Print("latest ")
|
||||||
errutil.Println(version, latest)
|
version.Println(latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
if dirty {
|
if dirty {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" you are running a dirty nix build (uncommitted changes)")
|
yellow.Println(tui.SymbolWarning + " you are running a dirty nix build (uncommitted changes)")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
@@ -197,8 +196,8 @@ func handleNixUpgrade(current, latest string) error {
|
|||||||
|
|
||||||
if currentCommit == "" {
|
if currentCommit == "" {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
|
yellow.Println(tui.SymbolWarning + " this is a nix installation")
|
||||||
errutil.Println(faint, " nix store is immutable; use nix commands to upgrade")
|
faint.Println(" nix store is immutable; use nix commands to upgrade")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
@@ -206,11 +205,11 @@ func handleNixUpgrade(current, latest string) error {
|
|||||||
|
|
||||||
releaseCommit, err := fetchCommitForTag(latest)
|
releaseCommit, err := fetchCommitForTag(latest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errutil.Printf(faint, " (could not fetch release commit: %v)\n", err)
|
faint.Printf(" (could not fetch release commit: %v)\n", err)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
|
yellow.Println(tui.SymbolWarning + " this is a nix installation")
|
||||||
errutil.Println(faint, " nix store is immutable; use nix commands to upgrade")
|
faint.Println(" nix store is immutable; use nix commands to upgrade")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
@@ -223,20 +222,20 @@ func handleNixUpgrade(current, latest string) error {
|
|||||||
|
|
||||||
if strings.HasPrefix(releaseCommit, currentCommit) || strings.HasPrefix(currentCommit, releaseShort) {
|
if strings.HasPrefix(releaseCommit, currentCommit) || strings.HasPrefix(currentCommit, releaseShort) {
|
||||||
green := color.New(color.FgGreen)
|
green := color.New(color.FgGreen)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
|
green.Printf(tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
comparison, err := compareCommits(latest, currentCommit)
|
comparison, err := compareCommits(latest, currentCommit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
green := color.New(color.FgGreen, color.Bold)
|
green := color.New(color.FgGreen, color.Bold)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", currentCommit, latest)
|
green.Printf(tui.SymbolSuccess+" update available: %s "+tui.SymbolArrowRight+" %s\n", currentCommit, latest)
|
||||||
errutil.Printf(faint, " your commit: %s\n", currentCommit)
|
faint.Printf(" your commit: %s\n", currentCommit)
|
||||||
errutil.Printf(faint, " release: %s (%s)\n", releaseShort, latest)
|
faint.Printf(" release: %s (%s)\n", releaseShort, latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
|
yellow.Println(tui.SymbolWarning + " this is a nix installation")
|
||||||
errutil.Println(faint, " nix store is immutable; use nix commands to upgrade")
|
faint.Println(" nix store is immutable; use nix commands to upgrade")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
@@ -244,30 +243,30 @@ func handleNixUpgrade(current, latest string) error {
|
|||||||
|
|
||||||
if comparison.AheadBy > 0 {
|
if comparison.AheadBy > 0 {
|
||||||
cyan := color.New(color.FgCyan)
|
cyan := color.New(color.FgCyan)
|
||||||
errutil.Printf(cyan, tui.SymbolArrowUp+" you are %d commit(s) ahead of %s\n", comparison.AheadBy, latest)
|
cyan.Printf(tui.SymbolArrowUp+" you are %d commit(s) ahead of %s\n", comparison.AheadBy, latest)
|
||||||
errutil.Printf(faint, " your commit: %s\n", currentCommit)
|
faint.Printf(" your commit: %s\n", currentCommit)
|
||||||
errutil.Printf(faint, " release: %s (%s)\n", releaseShort, latest)
|
faint.Printf(" release: %s (%s)\n", releaseShort, latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
errutil.Println(faint, "you are running a newer build than the latest release")
|
faint.Println("you are running a newer build than the latest release")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if comparison.BehindBy > 0 {
|
if comparison.BehindBy > 0 {
|
||||||
green := color.New(color.FgGreen, color.Bold)
|
green := color.New(color.FgGreen, color.Bold)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" update available: %d commit(s) behind %s\n", comparison.BehindBy, latest)
|
green.Printf(tui.SymbolSuccess+" update available: %d commit(s) behind %s\n", comparison.BehindBy, latest)
|
||||||
errutil.Printf(faint, " your commit: %s\n", currentCommit)
|
faint.Printf(" your commit: %s\n", currentCommit)
|
||||||
errutil.Printf(faint, " release: %s (%s)\n", releaseShort, latest)
|
faint.Printf(" release: %s (%s)\n", releaseShort, latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
|
yellow.Println(tui.SymbolWarning + " this is a nix installation")
|
||||||
errutil.Println(faint, " nix store is immutable; use nix commands to upgrade")
|
faint.Println(" nix store is immutable; use nix commands to upgrade")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
green := color.New(color.FgGreen)
|
green := color.New(color.FgGreen)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
|
green.Printf(tui.SymbolSuccess+" you are running %s (commit %s)\n", latest, releaseShort)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -279,22 +278,22 @@ func handleNixSpecificVersion(current, target string) error {
|
|||||||
printVersionComparisonTarget(current, target)
|
printVersionComparisonTarget(current, target)
|
||||||
|
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" this is a nix installation")
|
yellow.Println(tui.SymbolWarning + " this is a nix installation")
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
errutil.Println(faint, " nix store is immutable; in-place upgrades are not supported")
|
faint.Println(" nix store is immutable; in-place upgrades are not supported")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
bold := color.New(color.Bold)
|
bold := color.New(color.Bold)
|
||||||
cmd := color.New(color.FgCyan)
|
cmd := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Println(bold, "to install a specific version with nix:")
|
bold.Println("to install a specific version with nix:")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
errutil.Print(faint, " specific ref ")
|
faint.Print(" specific ref ")
|
||||||
errutil.Printf(cmd, "nix profile install github:%s/%s/%s\n", repoOwner, repoName, target)
|
cmd.Printf("nix profile install github:%s/%s/%s\n", repoOwner, repoName, target)
|
||||||
|
|
||||||
errutil.Print(faint, " latest ")
|
faint.Print(" latest ")
|
||||||
errutil.Printf(cmd, "nix profile install github:%s/%s\n", repoOwner, repoName)
|
cmd.Printf("nix profile install github:%s/%s\n", repoOwner, repoName)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -334,7 +333,7 @@ func fetchLatestVersion() (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
defer errutil.Close(resp.Body)
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
|
return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
|
||||||
@@ -356,10 +355,10 @@ func printVersionComparison(current, latest string) {
|
|||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
version := color.New(color.FgCyan)
|
version := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Print(faint, "current ")
|
faint.Print("current ")
|
||||||
errutil.Println(version, current)
|
version.Println(current)
|
||||||
errutil.Print(faint, "latest ")
|
faint.Print("latest ")
|
||||||
errutil.Println(version, latest)
|
version.Println(latest)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -367,10 +366,10 @@ func printVersionComparisonTarget(current, target string) {
|
|||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
version := color.New(color.FgCyan)
|
version := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Print(faint, "current ")
|
faint.Print("current ")
|
||||||
errutil.Println(version, current)
|
version.Println(current)
|
||||||
errutil.Print(faint, "target ")
|
faint.Print("target ")
|
||||||
errutil.Println(version, target)
|
version.Println(target)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -379,20 +378,20 @@ func printUpgradeInstructions() {
|
|||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
cmd := color.New(color.FgCyan)
|
cmd := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Println(bold, "upgrade options:")
|
bold.Println("upgrade options:")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
errutil.Print(faint, " go install ")
|
faint.Print(" go install ")
|
||||||
errutil.Printf(cmd, "go install github.com/%s/%s@latest\n", repoOwner, repoName)
|
cmd.Printf("go install github.com/%s/%s@latest\n", repoOwner, repoName)
|
||||||
|
|
||||||
errutil.Print(faint, " shell script ")
|
faint.Print(" shell script ")
|
||||||
errutil.Printf(cmd, "curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | sh\n", repoOwner, repoName)
|
cmd.Printf("curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | sh\n", repoOwner, repoName)
|
||||||
|
|
||||||
errutil.Print(faint, " arch (aur) ")
|
faint.Print(" arch (aur) ")
|
||||||
errutil.Println(cmd, "yay -S snitch-bin")
|
cmd.Println("yay -S snitch-bin")
|
||||||
|
|
||||||
errutil.Print(faint, " nix ")
|
faint.Print(" nix ")
|
||||||
errutil.Printf(cmd, "nix profile upgrade --inputs-from github:%s/%s\n", repoOwner, repoName)
|
cmd.Printf("nix profile upgrade --inputs-from github:%s/%s\n", repoOwner, repoName)
|
||||||
}
|
}
|
||||||
|
|
||||||
func performUpgrade(version string) error {
|
func performUpgrade(version string) error {
|
||||||
@@ -408,7 +407,7 @@ func performUpgrade(version string) error {
|
|||||||
|
|
||||||
if strings.HasPrefix(execPath, "/nix/store/") {
|
if strings.HasPrefix(execPath, "/nix/store/") {
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Println(yellow, tui.SymbolWarning+" cannot perform in-place upgrade for nix installation")
|
yellow.Println(tui.SymbolWarning + " cannot perform in-place upgrade for nix installation")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
printNixUpgradeInstructions()
|
printNixUpgradeInstructions()
|
||||||
return nil
|
return nil
|
||||||
@@ -424,15 +423,15 @@ func performUpgrade(version string) error {
|
|||||||
|
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
cyan := color.New(color.FgCyan)
|
cyan := color.New(color.FgCyan)
|
||||||
errutil.Print(faint, tui.SymbolDownload+" downloading ")
|
faint.Print(tui.SymbolDownload + " downloading ")
|
||||||
errutil.Printf(cyan, "%s", archiveName)
|
cyan.Printf("%s", archiveName)
|
||||||
errutil.Println(faint, "...")
|
faint.Println("...")
|
||||||
|
|
||||||
resp, err := http.Get(downloadURL)
|
resp, err := http.Get(downloadURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to download: %w", err)
|
return fmt.Errorf("failed to download: %w", err)
|
||||||
}
|
}
|
||||||
defer errutil.Close(resp.Body)
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return fmt.Errorf("download failed with status %d", resp.StatusCode)
|
return fmt.Errorf("download failed with status %d", resp.StatusCode)
|
||||||
@@ -442,7 +441,7 @@ func performUpgrade(version string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to create temp directory: %w", err)
|
return fmt.Errorf("failed to create temp directory: %w", err)
|
||||||
}
|
}
|
||||||
defer errutil.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
|
||||||
binaryPath, err := extractBinaryFromTarGz(resp.Body, tmpDir)
|
binaryPath, err := extractBinaryFromTarGz(resp.Body, tmpDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -459,14 +458,14 @@ func performUpgrade(version string) error {
|
|||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
cmdStyle := color.New(color.FgCyan)
|
cmdStyle := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Printf(yellow, tui.SymbolWarning+" elevated permissions required to install to %s\n", targetDir)
|
yellow.Printf(tui.SymbolWarning+" elevated permissions required to install to %s\n", targetDir)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
errutil.Println(faint, "run with sudo or install to a user-writable location:")
|
faint.Println("run with sudo or install to a user-writable location:")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
errutil.Print(faint, " sudo ")
|
faint.Print(" sudo ")
|
||||||
errutil.Println(cmdStyle, "sudo snitch upgrade --yes")
|
cmdStyle.Println("sudo snitch upgrade --yes")
|
||||||
errutil.Print(faint, " custom dir ")
|
faint.Print(" custom dir ")
|
||||||
errutil.Printf(cmdStyle, "curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | INSTALL_DIR=~/.local/bin sh\n",
|
cmdStyle.Printf("curl -sSL https://raw.githubusercontent.com/%s/%s/master/install.sh | INSTALL_DIR=~/.local/bin sh\n",
|
||||||
repoOwner, repoName)
|
repoOwner, repoName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -492,11 +491,11 @@ func performUpgrade(version string) error {
|
|||||||
if err := os.Remove(backupPath); err != nil {
|
if err := os.Remove(backupPath); err != nil {
|
||||||
// non-fatal, just warn
|
// non-fatal, just warn
|
||||||
yellow := color.New(color.FgYellow)
|
yellow := color.New(color.FgYellow)
|
||||||
errutil.Fprintf(yellow, os.Stderr, tui.SymbolWarning+" warning: failed to remove backup file %s: %v\n", backupPath, err)
|
yellow.Fprintf(os.Stderr, tui.SymbolWarning + " warning: failed to remove backup file %s: %v\n", backupPath, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
green := color.New(color.FgGreen, color.Bold)
|
green := color.New(color.FgGreen, color.Bold)
|
||||||
errutil.Printf(green, tui.SymbolSuccess+" successfully upgraded to %s\n", version)
|
green.Printf(tui.SymbolSuccess + " successfully upgraded to %s\n", version)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -505,7 +504,7 @@ func extractBinaryFromTarGz(r io.Reader, destDir string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
defer errutil.Close(gzr)
|
defer gzr.Close()
|
||||||
|
|
||||||
tr := tar.NewReader(gzr)
|
tr := tar.NewReader(gzr)
|
||||||
|
|
||||||
@@ -535,10 +534,10 @@ func extractBinaryFromTarGz(r io.Reader, destDir string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if _, err := io.Copy(outFile, tr); err != nil {
|
if _, err := io.Copy(outFile, tr); err != nil {
|
||||||
errutil.Close(outFile)
|
outFile.Close()
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
errutil.Close(outFile)
|
outFile.Close()
|
||||||
|
|
||||||
return destPath, nil
|
return destPath, nil
|
||||||
}
|
}
|
||||||
@@ -552,8 +551,8 @@ func isWritable(path string) bool {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
errutil.Close(f)
|
f.Close()
|
||||||
errutil.Remove(testFile)
|
os.Remove(testFile)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -562,13 +561,13 @@ func copyFile(src, dst string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer errutil.Close(srcFile)
|
defer srcFile.Close()
|
||||||
|
|
||||||
dstFile, err := os.Create(dst)
|
dstFile, err := os.Create(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer errutil.Close(dstFile)
|
defer dstFile.Close()
|
||||||
|
|
||||||
if _, err := io.Copy(dstFile, srcFile); err != nil {
|
if _, err := io.Copy(dstFile, srcFile); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -581,7 +580,7 @@ func removeQuarantine(path string) {
|
|||||||
cmd := exec.Command("xattr", "-d", "com.apple.quarantine", path)
|
cmd := exec.Command("xattr", "-d", "com.apple.quarantine", path)
|
||||||
if err := cmd.Run(); err == nil {
|
if err := cmd.Run(); err == nil {
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
errutil.Println(faint, " removed macOS quarantine attribute")
|
faint.Println(" removed macOS quarantine attribute")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -634,7 +633,7 @@ func fetchCommitForTag(tag string) (string, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
defer errutil.Close(resp.Body)
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
|
return "", fmt.Errorf("github api returned status %d", resp.StatusCode)
|
||||||
@@ -655,7 +654,7 @@ func compareCommits(base, head string) (*githubCompare, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer errutil.Close(resp.Body)
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("github api returned status %d", resp.StatusCode)
|
return nil, fmt.Errorf("github api returned status %d", resp.StatusCode)
|
||||||
@@ -674,16 +673,16 @@ func printNixUpgradeInstructions() {
|
|||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
cmd := color.New(color.FgCyan)
|
cmd := color.New(color.FgCyan)
|
||||||
|
|
||||||
errutil.Println(bold, "nix upgrade options:")
|
bold.Println("nix upgrade options:")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
errutil.Print(faint, " flake profile ")
|
faint.Print(" flake profile ")
|
||||||
errutil.Printf(cmd, "nix profile install github:%s/%s\n", repoOwner, repoName)
|
cmd.Printf("nix profile install github:%s/%s\n", repoOwner, repoName)
|
||||||
|
|
||||||
errutil.Print(faint, " flake update ")
|
faint.Print(" flake update ")
|
||||||
errutil.Println(cmd, "nix flake update snitch (in your system/home-manager config)")
|
cmd.Println("nix flake update snitch (in your system/home-manager config)")
|
||||||
|
|
||||||
errutil.Print(faint, " rebuild ")
|
faint.Print(" rebuild ")
|
||||||
errutil.Println(cmd, "nixos-rebuild switch or home-manager switch")
|
cmd.Println("nixos-rebuild switch or home-manager switch")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@ import (
|
|||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -24,20 +22,20 @@ var versionCmd = &cobra.Command{
|
|||||||
cyan := color.New(color.FgCyan)
|
cyan := color.New(color.FgCyan)
|
||||||
faint := color.New(color.Faint)
|
faint := color.New(color.Faint)
|
||||||
|
|
||||||
errutil.Print(bold, "snitch ")
|
bold.Print("snitch ")
|
||||||
errutil.Println(cyan, Version)
|
cyan.Println(Version)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
errutil.Print(faint, " commit ")
|
faint.Print(" commit ")
|
||||||
fmt.Println(Commit)
|
fmt.Println(Commit)
|
||||||
|
|
||||||
errutil.Print(faint, " built ")
|
faint.Print(" built ")
|
||||||
fmt.Println(Date)
|
fmt.Println(Date)
|
||||||
|
|
||||||
errutil.Print(faint, " go ")
|
faint.Print(" go ")
|
||||||
fmt.Println(runtime.Version())
|
fmt.Println(runtime.Version())
|
||||||
|
|
||||||
errutil.Print(faint, " os ")
|
faint.Print(" os ")
|
||||||
fmt.Printf("%s/%s\n", runtime.GOOS, runtime.GOARCH)
|
fmt.Printf("%s/%s\n", runtime.GOOS, runtime.GOARCH)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// set SNITCH_DEBUG_TIMING=1 to enable timing diagnostics
|
// set SNITCH_DEBUG_TIMING=1 to enable timing diagnostics
|
||||||
@@ -140,7 +138,7 @@ func buildInodeToProcessMap() (map[int64]*processInfo, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer errutil.Close(procDir)
|
defer procDir.Close()
|
||||||
|
|
||||||
entries, err := procDir.Readdir(-1)
|
entries, err := procDir.Readdir(-1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -280,7 +278,7 @@ func getProcessInfo(pid int) (*processInfo, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return info, nil
|
return info, nil
|
||||||
}
|
}
|
||||||
defer errutil.Close(statusFile)
|
defer statusFile.Close()
|
||||||
|
|
||||||
scanner := bufio.NewScanner(statusFile)
|
scanner := bufio.NewScanner(statusFile)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
@@ -306,7 +304,7 @@ func parseProcNet(path, proto string, ipVersion int, inodeMap map[int64]*process
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer errutil.Close(file)
|
defer file.Close()
|
||||||
|
|
||||||
var connections []Connection
|
var connections []Connection
|
||||||
scanner := bufio.NewScanner(file)
|
scanner := bufio.NewScanner(file)
|
||||||
@@ -475,7 +473,7 @@ func GetUnixSockets() ([]Connection, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return connections, nil
|
return connections, nil
|
||||||
}
|
}
|
||||||
defer errutil.Close(file)
|
defer file.Close()
|
||||||
|
|
||||||
scanner := bufio.NewScanner(file)
|
scanner := bufio.NewScanner(file)
|
||||||
scanner.Scan()
|
scanner.Scan()
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestInit(t *testing.T) {
|
func TestInit(t *testing.T) {
|
||||||
@@ -31,8 +29,8 @@ func TestInit(t *testing.T) {
|
|||||||
origTerm := os.Getenv("TERM")
|
origTerm := os.Getenv("TERM")
|
||||||
|
|
||||||
// Set test env vars
|
// Set test env vars
|
||||||
errutil.Setenv("NO_COLOR", tc.noColor)
|
os.Setenv("NO_COLOR", tc.noColor)
|
||||||
errutil.Setenv("TERM", tc.term)
|
os.Setenv("TERM", tc.term)
|
||||||
|
|
||||||
Init(tc.mode)
|
Init(tc.mode)
|
||||||
|
|
||||||
@@ -41,8 +39,8 @@ func TestInit(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Restore original env vars
|
// Restore original env vars
|
||||||
errutil.Setenv("NO_COLOR", origNoColor)
|
os.Setenv("NO_COLOR", origNoColor)
|
||||||
errutil.Setenv("TERM", origTerm)
|
os.Setenv("TERM", origTerm)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,12 +14,6 @@ import (
|
|||||||
// Config represents the application configuration
|
// Config represents the application configuration
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Defaults DefaultConfig `mapstructure:"defaults"`
|
Defaults DefaultConfig `mapstructure:"defaults"`
|
||||||
TUI TUIConfig `mapstructure:"tui"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TUIConfig contains TUI-specific configuration
|
|
||||||
type TUIConfig struct {
|
|
||||||
RememberState bool `mapstructure:"remember_state"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultConfig contains default values for CLI options
|
// DefaultConfig contains default values for CLI options
|
||||||
@@ -111,9 +105,6 @@ func setDefaults(v *viper.Viper) {
|
|||||||
v.SetDefault("defaults.no_headers", false)
|
v.SetDefault("defaults.no_headers", false)
|
||||||
v.SetDefault("defaults.output_format", "table")
|
v.SetDefault("defaults.output_format", "table")
|
||||||
v.SetDefault("defaults.sort_by", "")
|
v.SetDefault("defaults.sort_by", "")
|
||||||
|
|
||||||
// tui settings
|
|
||||||
v.SetDefault("tui.remember_state", false)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleSpecialEnvVars(v *viper.Viper) {
|
func handleSpecialEnvVars(v *viper.Viper) {
|
||||||
@@ -155,9 +146,6 @@ func Get() *Config {
|
|||||||
OutputFormat: "table",
|
OutputFormat: "table",
|
||||||
SortBy: "",
|
SortBy: "",
|
||||||
},
|
},
|
||||||
TUI: TUIConfig{
|
|
||||||
RememberState: false,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
@@ -211,11 +199,6 @@ ipv6 = false
|
|||||||
no_headers = false
|
no_headers = false
|
||||||
output_format = "table"
|
output_format = "table"
|
||||||
sort_by = ""
|
sort_by = ""
|
||||||
|
|
||||||
[tui]
|
|
||||||
# remember view options (filters, sort, resolution) between sessions
|
|
||||||
# state is saved to $XDG_STATE_HOME/snitch/tui.json
|
|
||||||
remember_state = false
|
|
||||||
`, themeList, theme.DefaultTheme)
|
`, themeList, theme.DefaultTheme)
|
||||||
|
|
||||||
// Ensure directory exists
|
// Ensure directory exists
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
package errutil
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/fatih/color"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Ignore[T any](val T, _ error) T {
|
|
||||||
return val
|
|
||||||
}
|
|
||||||
|
|
||||||
func IgnoreErr(_ error) {}
|
|
||||||
|
|
||||||
func Close(c io.Closer) {
|
|
||||||
if c != nil {
|
|
||||||
_ = c.Close()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// color.Color wrappers - these discard the (int, error) return values
|
|
||||||
|
|
||||||
func Print(c *color.Color, a ...any) {
|
|
||||||
_, _ = c.Print(a...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func Println(c *color.Color, a ...any) {
|
|
||||||
_, _ = c.Println(a...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func Printf(c *color.Color, format string, a ...any) {
|
|
||||||
_, _ = c.Printf(format, a...)
|
|
||||||
}
|
|
||||||
|
|
||||||
func Fprintf(c *color.Color, w io.Writer, format string, a ...any) {
|
|
||||||
_, _ = c.Fprintf(w, format, a...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// os function wrappers for test cleanup where errors are non-critical
|
|
||||||
|
|
||||||
func Setenv(key, value string) {
|
|
||||||
_ = os.Setenv(key, value)
|
|
||||||
}
|
|
||||||
|
|
||||||
func Unsetenv(key string) {
|
|
||||||
_ = os.Unsetenv(key)
|
|
||||||
}
|
|
||||||
|
|
||||||
func Remove(name string) {
|
|
||||||
_ = os.Remove(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
func RemoveAll(path string) {
|
|
||||||
_ = os.RemoveAll(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Flush calls Flush on a tabwriter and discards the error
|
|
||||||
type Flusher interface {
|
|
||||||
Flush() error
|
|
||||||
}
|
|
||||||
|
|
||||||
func Flush(f Flusher) {
|
|
||||||
_ = f.Flush()
|
|
||||||
}
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
package state
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TUIState holds view options that can be persisted between sessions
|
|
||||||
type TUIState struct {
|
|
||||||
ShowTCP bool `json:"show_tcp"`
|
|
||||||
ShowUDP bool `json:"show_udp"`
|
|
||||||
ShowListening bool `json:"show_listening"`
|
|
||||||
ShowEstablished bool `json:"show_established"`
|
|
||||||
ShowOther bool `json:"show_other"`
|
|
||||||
SortField collector.SortField `json:"sort_field"`
|
|
||||||
SortReverse bool `json:"sort_reverse"`
|
|
||||||
ResolveAddrs bool `json:"resolve_addrs"`
|
|
||||||
ResolvePorts bool `json:"resolve_ports"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
saveMu sync.Mutex
|
|
||||||
saveChan chan TUIState
|
|
||||||
once sync.Once
|
|
||||||
)
|
|
||||||
|
|
||||||
// Path returns the XDG-compliant state file path
|
|
||||||
func Path() string {
|
|
||||||
stateDir := os.Getenv("XDG_STATE_HOME")
|
|
||||||
if stateDir == "" {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
stateDir = filepath.Join(home, ".local", "state")
|
|
||||||
}
|
|
||||||
return filepath.Join(stateDir, "snitch", "tui.json")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load reads the TUI state from disk.
|
|
||||||
// returns nil if state file doesn't exist or can't be read.
|
|
||||||
func Load() *TUIState {
|
|
||||||
path := Path()
|
|
||||||
if path == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var state TUIState
|
|
||||||
if err := json.Unmarshal(data, &state); err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return &state
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save writes the TUI state to disk synchronously.
|
|
||||||
// creates parent directories if needed.
|
|
||||||
func Save(state TUIState) error {
|
|
||||||
path := Path()
|
|
||||||
if path == "" {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
saveMu.Lock()
|
|
||||||
defer saveMu.Unlock()
|
|
||||||
|
|
||||||
dir := filepath.Dir(path)
|
|
||||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := json.MarshalIndent(state, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return os.WriteFile(path, data, 0644)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SaveAsync queues a state save to happen in the background.
|
|
||||||
// only the most recent state is saved if multiple saves are queued.
|
|
||||||
func SaveAsync(state TUIState) {
|
|
||||||
once.Do(func() {
|
|
||||||
saveChan = make(chan TUIState, 1)
|
|
||||||
go saveWorker()
|
|
||||||
})
|
|
||||||
|
|
||||||
// non-blocking send, replace pending save with newer state
|
|
||||||
select {
|
|
||||||
case saveChan <- state:
|
|
||||||
default:
|
|
||||||
// channel full, drain and replace
|
|
||||||
select {
|
|
||||||
case <-saveChan:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
select {
|
|
||||||
case saveChan <- state:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func saveWorker() {
|
|
||||||
for state := range saveChan {
|
|
||||||
_ = Save(state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default returns a TUIState with default values
|
|
||||||
func Default() TUIState {
|
|
||||||
return TUIState{
|
|
||||||
ShowTCP: true,
|
|
||||||
ShowUDP: true,
|
|
||||||
ShowListening: true,
|
|
||||||
ShowEstablished: true,
|
|
||||||
ShowOther: true,
|
|
||||||
SortField: collector.SortByLport,
|
|
||||||
SortReverse: false,
|
|
||||||
ResolveAddrs: false,
|
|
||||||
ResolvePorts: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,236 +0,0 @@
|
|||||||
package state
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestPath_XDGStateHome(t *testing.T) {
|
|
||||||
t.Setenv("XDG_STATE_HOME", "/custom/state")
|
|
||||||
path := Path()
|
|
||||||
|
|
||||||
expected := "/custom/state/snitch/tui.json"
|
|
||||||
if path != expected {
|
|
||||||
t.Errorf("Path() = %q, want %q", path, expected)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPath_DefaultFallback(t *testing.T) {
|
|
||||||
t.Setenv("XDG_STATE_HOME", "")
|
|
||||||
path := Path()
|
|
||||||
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
t.Skip("cannot determine home directory")
|
|
||||||
}
|
|
||||||
|
|
||||||
expected := filepath.Join(home, ".local", "state", "snitch", "tui.json")
|
|
||||||
if path != expected {
|
|
||||||
t.Errorf("Path() = %q, want %q", path, expected)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestDefault(t *testing.T) {
|
|
||||||
d := Default()
|
|
||||||
|
|
||||||
if d.ShowTCP != true {
|
|
||||||
t.Error("expected ShowTCP to be true")
|
|
||||||
}
|
|
||||||
if d.ShowUDP != true {
|
|
||||||
t.Error("expected ShowUDP to be true")
|
|
||||||
}
|
|
||||||
if d.ShowListening != true {
|
|
||||||
t.Error("expected ShowListening to be true")
|
|
||||||
}
|
|
||||||
if d.ShowEstablished != true {
|
|
||||||
t.Error("expected ShowEstablished to be true")
|
|
||||||
}
|
|
||||||
if d.ShowOther != true {
|
|
||||||
t.Error("expected ShowOther to be true")
|
|
||||||
}
|
|
||||||
if d.SortField != collector.SortByLport {
|
|
||||||
t.Errorf("expected SortField to be %q, got %q", collector.SortByLport, d.SortField)
|
|
||||||
}
|
|
||||||
if d.SortReverse != false {
|
|
||||||
t.Error("expected SortReverse to be false")
|
|
||||||
}
|
|
||||||
if d.ResolveAddrs != false {
|
|
||||||
t.Error("expected ResolveAddrs to be false")
|
|
||||||
}
|
|
||||||
if d.ResolvePorts != false {
|
|
||||||
t.Error("expected ResolvePorts to be false")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSaveAndLoad(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
state := TUIState{
|
|
||||||
ShowTCP: false,
|
|
||||||
ShowUDP: true,
|
|
||||||
ShowListening: true,
|
|
||||||
ShowEstablished: false,
|
|
||||||
ShowOther: true,
|
|
||||||
SortField: collector.SortByProcess,
|
|
||||||
SortReverse: true,
|
|
||||||
ResolveAddrs: true,
|
|
||||||
ResolvePorts: false,
|
|
||||||
}
|
|
||||||
|
|
||||||
err := Save(state)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Save() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// verify file was created
|
|
||||||
path := Path()
|
|
||||||
if _, err := os.Stat(path); os.IsNotExist(err) {
|
|
||||||
t.Fatal("expected state file to exist after Save()")
|
|
||||||
}
|
|
||||||
|
|
||||||
loaded := Load()
|
|
||||||
if loaded == nil {
|
|
||||||
t.Fatal("Load() returned nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
if loaded.ShowTCP != state.ShowTCP {
|
|
||||||
t.Errorf("ShowTCP = %v, want %v", loaded.ShowTCP, state.ShowTCP)
|
|
||||||
}
|
|
||||||
if loaded.ShowUDP != state.ShowUDP {
|
|
||||||
t.Errorf("ShowUDP = %v, want %v", loaded.ShowUDP, state.ShowUDP)
|
|
||||||
}
|
|
||||||
if loaded.ShowListening != state.ShowListening {
|
|
||||||
t.Errorf("ShowListening = %v, want %v", loaded.ShowListening, state.ShowListening)
|
|
||||||
}
|
|
||||||
if loaded.ShowEstablished != state.ShowEstablished {
|
|
||||||
t.Errorf("ShowEstablished = %v, want %v", loaded.ShowEstablished, state.ShowEstablished)
|
|
||||||
}
|
|
||||||
if loaded.ShowOther != state.ShowOther {
|
|
||||||
t.Errorf("ShowOther = %v, want %v", loaded.ShowOther, state.ShowOther)
|
|
||||||
}
|
|
||||||
if loaded.SortField != state.SortField {
|
|
||||||
t.Errorf("SortField = %v, want %v", loaded.SortField, state.SortField)
|
|
||||||
}
|
|
||||||
if loaded.SortReverse != state.SortReverse {
|
|
||||||
t.Errorf("SortReverse = %v, want %v", loaded.SortReverse, state.SortReverse)
|
|
||||||
}
|
|
||||||
if loaded.ResolveAddrs != state.ResolveAddrs {
|
|
||||||
t.Errorf("ResolveAddrs = %v, want %v", loaded.ResolveAddrs, state.ResolveAddrs)
|
|
||||||
}
|
|
||||||
if loaded.ResolvePorts != state.ResolvePorts {
|
|
||||||
t.Errorf("ResolvePorts = %v, want %v", loaded.ResolvePorts, state.ResolvePorts)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoad_NonExistent(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
loaded := Load()
|
|
||||||
if loaded != nil {
|
|
||||||
t.Error("expected Load() to return nil for non-existent file")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoad_InvalidJSON(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
// create directory and invalid json file
|
|
||||||
stateDir := filepath.Join(tmpDir, "snitch")
|
|
||||||
if err := os.MkdirAll(stateDir, 0755); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
stateFile := filepath.Join(stateDir, "tui.json")
|
|
||||||
if err := os.WriteFile(stateFile, []byte("not valid json"), 0644); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
loaded := Load()
|
|
||||||
if loaded != nil {
|
|
||||||
t.Error("expected Load() to return nil for invalid JSON")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSave_CreatesDirectories(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
// snitch directory should not exist yet
|
|
||||||
snitchDir := filepath.Join(tmpDir, "snitch")
|
|
||||||
if _, err := os.Stat(snitchDir); err == nil {
|
|
||||||
t.Fatal("expected snitch directory to not exist initially")
|
|
||||||
}
|
|
||||||
|
|
||||||
err := Save(Default())
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Save() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// directory should now exist
|
|
||||||
if _, err := os.Stat(snitchDir); os.IsNotExist(err) {
|
|
||||||
t.Error("expected Save() to create parent directories")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSaveAsync(t *testing.T) {
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
state := TUIState{
|
|
||||||
ShowTCP: false,
|
|
||||||
SortField: collector.SortByPID,
|
|
||||||
}
|
|
||||||
|
|
||||||
SaveAsync(state)
|
|
||||||
|
|
||||||
// wait for background save with timeout
|
|
||||||
deadline := time.Now().Add(100 * time.Millisecond)
|
|
||||||
for time.Now().Before(deadline) {
|
|
||||||
if loaded := Load(); loaded != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
time.Sleep(5 * time.Millisecond)
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Log("SaveAsync may not have completed in time (non-fatal in CI)")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestTUIState_JSONRoundtrip(t *testing.T) {
|
|
||||||
// verify all sort fields serialize correctly
|
|
||||||
sortFields := []collector.SortField{
|
|
||||||
collector.SortByLport,
|
|
||||||
collector.SortByProcess,
|
|
||||||
collector.SortByPID,
|
|
||||||
collector.SortByState,
|
|
||||||
collector.SortByProto,
|
|
||||||
}
|
|
||||||
|
|
||||||
tmpDir := t.TempDir()
|
|
||||||
t.Setenv("XDG_STATE_HOME", tmpDir)
|
|
||||||
|
|
||||||
for _, sf := range sortFields {
|
|
||||||
state := TUIState{
|
|
||||||
ShowTCP: true,
|
|
||||||
SortField: sf,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := Save(state); err != nil {
|
|
||||||
t.Fatalf("Save() error for %q: %v", sf, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
loaded := Load()
|
|
||||||
if loaded == nil {
|
|
||||||
t.Fatalf("Load() returned nil for %q", sf)
|
|
||||||
}
|
|
||||||
|
|
||||||
if loaded.SortField != sf {
|
|
||||||
t.Errorf("SortField roundtrip failed: got %q, want %q", loaded.SortField, sf)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
"github.com/karol-broda/snitch/internal/collector"
|
||||||
"github.com/karol-broda/snitch/internal/errutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestCollector wraps MockCollector for use in tests
|
// TestCollector wraps MockCollector for use in tests
|
||||||
@@ -48,13 +47,13 @@ func SetupTestEnvironment(t *testing.T) (string, func()) {
|
|||||||
oldConfig := os.Getenv("SNITCH_CONFIG")
|
oldConfig := os.Getenv("SNITCH_CONFIG")
|
||||||
oldNoColor := os.Getenv("SNITCH_NO_COLOR")
|
oldNoColor := os.Getenv("SNITCH_NO_COLOR")
|
||||||
|
|
||||||
errutil.Setenv("SNITCH_NO_COLOR", "1")
|
os.Setenv("SNITCH_NO_COLOR", "1") // Disable colors in tests
|
||||||
|
|
||||||
// Cleanup function
|
// Cleanup function
|
||||||
cleanup := func() {
|
cleanup := func() {
|
||||||
errutil.RemoveAll(tempDir)
|
os.RemoveAll(tempDir)
|
||||||
errutil.Setenv("SNITCH_CONFIG", oldConfig)
|
os.Setenv("SNITCH_CONFIG", oldConfig)
|
||||||
errutil.Setenv("SNITCH_NO_COLOR", oldNoColor)
|
os.Setenv("SNITCH_NO_COLOR", oldNoColor)
|
||||||
}
|
}
|
||||||
|
|
||||||
return tempDir, cleanup
|
return tempDir, cleanup
|
||||||
@@ -193,8 +192,8 @@ func (oc *OutputCapture) Stop() (string, string, error) {
|
|||||||
os.Stderr = oc.oldStderr
|
os.Stderr = oc.oldStderr
|
||||||
|
|
||||||
// Close files
|
// Close files
|
||||||
errutil.Close(oc.stdout)
|
oc.stdout.Close()
|
||||||
errutil.Close(oc.stderr)
|
oc.stderr.Close()
|
||||||
|
|
||||||
// Read captured content
|
// Read captured content
|
||||||
stdoutContent, err := os.ReadFile(oc.stdoutFile)
|
stdoutContent, err := os.ReadFile(oc.stdoutFile)
|
||||||
@@ -208,9 +207,9 @@ func (oc *OutputCapture) Stop() (string, string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Cleanup
|
// Cleanup
|
||||||
errutil.Remove(oc.stdoutFile)
|
os.Remove(oc.stdoutFile)
|
||||||
errutil.Remove(oc.stderrFile)
|
os.Remove(oc.stderrFile)
|
||||||
errutil.Remove(filepath.Dir(oc.stdoutFile))
|
os.Remove(filepath.Dir(oc.stdoutFile))
|
||||||
|
|
||||||
return string(stdoutContent), string(stderrContent), nil
|
return string(stdoutContent), string(stderrContent), nil
|
||||||
}
|
}
|
||||||
@@ -118,39 +118,31 @@ func (m model) handleNormalKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
|||||||
case "t":
|
case "t":
|
||||||
m.showTCP = !m.showTCP
|
m.showTCP = !m.showTCP
|
||||||
m.clampCursor()
|
m.clampCursor()
|
||||||
m.saveState()
|
|
||||||
case "u":
|
case "u":
|
||||||
m.showUDP = !m.showUDP
|
m.showUDP = !m.showUDP
|
||||||
m.clampCursor()
|
m.clampCursor()
|
||||||
m.saveState()
|
|
||||||
case "l":
|
case "l":
|
||||||
m.showListening = !m.showListening
|
m.showListening = !m.showListening
|
||||||
m.clampCursor()
|
m.clampCursor()
|
||||||
m.saveState()
|
|
||||||
case "e":
|
case "e":
|
||||||
m.showEstablished = !m.showEstablished
|
m.showEstablished = !m.showEstablished
|
||||||
m.clampCursor()
|
m.clampCursor()
|
||||||
m.saveState()
|
|
||||||
case "o":
|
case "o":
|
||||||
m.showOther = !m.showOther
|
m.showOther = !m.showOther
|
||||||
m.clampCursor()
|
m.clampCursor()
|
||||||
m.saveState()
|
|
||||||
case "a":
|
case "a":
|
||||||
m.showTCP = true
|
m.showTCP = true
|
||||||
m.showUDP = true
|
m.showUDP = true
|
||||||
m.showListening = true
|
m.showListening = true
|
||||||
m.showEstablished = true
|
m.showEstablished = true
|
||||||
m.showOther = true
|
m.showOther = true
|
||||||
m.saveState()
|
|
||||||
|
|
||||||
// sorting
|
// sorting
|
||||||
case "s":
|
case "s":
|
||||||
m.cycleSort()
|
m.cycleSort()
|
||||||
m.saveState()
|
|
||||||
case "S":
|
case "S":
|
||||||
m.sortReverse = !m.sortReverse
|
m.sortReverse = !m.sortReverse
|
||||||
m.applySorting()
|
m.applySorting()
|
||||||
m.saveState()
|
|
||||||
|
|
||||||
// search
|
// search
|
||||||
case "/":
|
case "/":
|
||||||
@@ -228,7 +220,6 @@ func (m model) handleNormalKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
|||||||
m.statusMessage = "address resolution: off"
|
m.statusMessage = "address resolution: off"
|
||||||
}
|
}
|
||||||
m.statusExpiry = time.Now().Add(2 * time.Second)
|
m.statusExpiry = time.Now().Add(2 * time.Second)
|
||||||
m.saveState()
|
|
||||||
return m, clearStatusAfter(2 * time.Second)
|
return m, clearStatusAfter(2 * time.Second)
|
||||||
|
|
||||||
// toggle port resolution
|
// toggle port resolution
|
||||||
@@ -240,7 +231,6 @@ func (m model) handleNormalKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
|||||||
m.statusMessage = "port resolution: off"
|
m.statusMessage = "port resolution: off"
|
||||||
}
|
}
|
||||||
m.statusExpiry = time.Now().Add(2 * time.Second)
|
m.statusExpiry = time.Now().Add(2 * time.Second)
|
||||||
m.saveState()
|
|
||||||
return m, clearStatusAfter(2 * time.Second)
|
return m, clearStatusAfter(2 * time.Second)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ package tui
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/karol-broda/snitch/internal/collector"
|
||||||
|
"github.com/karol-broda/snitch/internal/theme"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
|
||||||
"github.com/karol-broda/snitch/internal/collector"
|
|
||||||
"github.com/karol-broda/snitch/internal/state"
|
|
||||||
"github.com/karol-broda/snitch/internal/theme"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type model struct {
|
type model struct {
|
||||||
@@ -53,9 +51,6 @@ type model struct {
|
|||||||
// status message (temporary feedback)
|
// status message (temporary feedback)
|
||||||
statusMessage string
|
statusMessage string
|
||||||
statusExpiry time.Time
|
statusExpiry time.Time
|
||||||
|
|
||||||
// state persistence
|
|
||||||
rememberState bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type Options struct {
|
type Options struct {
|
||||||
@@ -70,7 +65,6 @@ type Options struct {
|
|||||||
ResolveAddrs bool // when true, resolve IP addresses to hostnames
|
ResolveAddrs bool // when true, resolve IP addresses to hostnames
|
||||||
ResolvePorts bool // when true, resolve port numbers to service names
|
ResolvePorts bool // when true, resolve port numbers to service names
|
||||||
NoCache bool // when true, disable DNS caching
|
NoCache bool // when true, disable DNS caching
|
||||||
RememberState bool // when true, persist view options between sessions
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func New(opts Options) model {
|
func New(opts Options) model {
|
||||||
@@ -85,27 +79,8 @@ func New(opts Options) model {
|
|||||||
showListening := true
|
showListening := true
|
||||||
showEstablished := true
|
showEstablished := true
|
||||||
showOther := true
|
showOther := true
|
||||||
sortField := collector.SortByLport
|
|
||||||
sortReverse := false
|
|
||||||
resolveAddrs := opts.ResolveAddrs
|
|
||||||
resolvePorts := opts.ResolvePorts
|
|
||||||
|
|
||||||
// load saved state if enabled and no CLI filter flags were specified
|
// if user specified filters, use those instead
|
||||||
if opts.RememberState && !opts.FilterSet {
|
|
||||||
if saved := state.Load(); saved != nil {
|
|
||||||
showTCP = saved.ShowTCP
|
|
||||||
showUDP = saved.ShowUDP
|
|
||||||
showListening = saved.ShowListening
|
|
||||||
showEstablished = saved.ShowEstablished
|
|
||||||
showOther = saved.ShowOther
|
|
||||||
sortField = saved.SortField
|
|
||||||
sortReverse = saved.SortReverse
|
|
||||||
resolveAddrs = saved.ResolveAddrs
|
|
||||||
resolvePorts = saved.ResolvePorts
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if user specified filters, use those instead (CLI flags take precedence)
|
|
||||||
if opts.FilterSet {
|
if opts.FilterSet {
|
||||||
showTCP = opts.TCP
|
showTCP = opts.TCP
|
||||||
showUDP = opts.UDP
|
showUDP = opts.UDP
|
||||||
@@ -133,15 +108,13 @@ func New(opts Options) model {
|
|||||||
showListening: showListening,
|
showListening: showListening,
|
||||||
showEstablished: showEstablished,
|
showEstablished: showEstablished,
|
||||||
showOther: showOther,
|
showOther: showOther,
|
||||||
sortField: sortField,
|
sortField: collector.SortByLport,
|
||||||
sortReverse: sortReverse,
|
resolveAddrs: opts.ResolveAddrs,
|
||||||
resolveAddrs: resolveAddrs,
|
resolvePorts: opts.ResolvePorts,
|
||||||
resolvePorts: resolvePorts,
|
|
||||||
theme: theme.GetTheme(opts.Theme),
|
theme: theme.GetTheme(opts.Theme),
|
||||||
interval: interval,
|
interval: interval,
|
||||||
lastRefresh: time.Now(),
|
lastRefresh: time.Now(),
|
||||||
watchedPIDs: make(map[int]bool),
|
watchedPIDs: make(map[int]bool),
|
||||||
rememberState: opts.RememberState,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -318,25 +291,3 @@ func (m *model) toggleWatch(pid int) {
|
|||||||
func (m model) watchedCount() int {
|
func (m model) watchedCount() int {
|
||||||
return len(m.watchedPIDs)
|
return len(m.watchedPIDs)
|
||||||
}
|
}
|
||||||
|
|
||||||
// currentState returns the current view options as a TUIState for persistence
|
|
||||||
func (m model) currentState() state.TUIState {
|
|
||||||
return state.TUIState{
|
|
||||||
ShowTCP: m.showTCP,
|
|
||||||
ShowUDP: m.showUDP,
|
|
||||||
ShowListening: m.showListening,
|
|
||||||
ShowEstablished: m.showEstablished,
|
|
||||||
ShowOther: m.showOther,
|
|
||||||
SortField: m.sortField,
|
|
||||||
SortReverse: m.sortReverse,
|
|
||||||
ResolveAddrs: m.resolveAddrs,
|
|
||||||
ResolvePorts: m.resolvePorts,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// saveState persists current view options in the background
|
|
||||||
func (m model) saveState() {
|
|
||||||
if m.rememberState {
|
|
||||||
state.SaveAsync(m.currentState())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user