security/hakurei
6
3
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

final: refactor for removal of system package and reduction of interactions to state package

Browse Source 
State query command has been moved to main where it belongs, "system" information are now fetched in app.New and stored in *App with accessors for relevant values. Exit (cleanup-related) functions are separated into its dedicated "final" package.

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra
2024-09-16 20:31:15 +09:00
parent d49b97b1d4
commit 8bdae74ebe
20 changed files with 324 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/util/std.go
View File

@@ -3,11 +3,10 @@ package util
import (
"errors"
"fmt"
"git.ophivana.moe/cat/fortify/internal/final"
"io/fs"
"os"
"path"
"git.ophivana.moe/cat/fortify/internal/state"
)
const (
@@ -43,7 +42,7 @@ func DiscoverPulseCookie() string {
p = path.Join(p, ".pulse-cookie")
if s, err := os.Stat(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
state.Fatal("Error accessing PulseAudio cookie:", err)
final.Fatal("Error accessing PulseAudio cookie:", err)
// unreachable
return p
}
@@ -56,7 +55,7 @@ func DiscoverPulseCookie() string {
p = path.Join(p, "pulse", "cookie")
if s, err := os.Stat(p); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
state.Fatal("Error accessing PulseAudio cookie:", err)
final.Fatal("Error accessing PulseAudio cookie:", err)
// unreachable
return p
}
@@ -65,7 +64,7 @@ func DiscoverPulseCookie() string {
}
}
state.Fatal(fmt.Sprintf("Cannot locate PulseAudio cookie (tried $%s, $%s/pulse/cookie, $%s/.pulse-cookie)",
final.Fatal(fmt.Sprintf("Cannot locate PulseAudio cookie (tried $%s, $%s/pulse/cookie, $%s/.pulse-cookie)",
PulseCookie, xdgConfigHome, home))
return ""
}