system: wrap op errors

This passes more information allowing for better error handling. This eliminates generic WrapErr from system.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 8 insertions, 21 deletions

diff --git a/system/xhost.go b/system/xhost.go
index 7bbc3725..27b2fc64 100644
--- a/system/xhost.go
+++ b/system/xhost.go
@@ -1,8 +1,6 @@
 package system
 
 import (
-	"fmt"
-
 	"hakurei.app/system/internal/xcb"
 )
 
@@ -18,36 +16,25 @@ func (sys *I) ChangeHosts(username string) *I {
 
 type XHost string
 
-func (x XHost) Type() Enablement {
-	return EX11
-}
+func (x XHost) Type() Enablement { return EX11 }
 
 func (x XHost) apply(*I) error {
 	msg.Verbosef("inserting entry %s to X11", x)
-	return wrapErrSuffix(xcb.ChangeHosts(xcb.HostModeInsert, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)),
-		fmt.Sprintf("cannot insert entry %s to X11:", x))
+	return newOpError("xhost",
+		xcb.ChangeHosts(xcb.HostModeInsert, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), false)
 }
 
 func (x XHost) revert(_ *I, ec *Criteria) error {
 	if ec.hasType(x) {
 		msg.Verbosef("deleting entry %s from X11", x)
-		return wrapErrSuffix(xcb.ChangeHosts(xcb.HostModeDelete, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)),
-			fmt.Sprintf("cannot delete entry %s from X11:", x))
+		return newOpError("xhost",
+			xcb.ChangeHosts(xcb.HostModeDelete, xcb.FamilyServerInterpreted, "localuser\x00"+string(x)), false)
 	} else {
 		msg.Verbosef("skipping entry %s in X11", x)
 		return nil
 	}
 }
 
-func (x XHost) Is(o Op) bool {
-	x0, ok := o.(XHost)
-	return ok && x == x0
-}
-
-func (x XHost) Path() string {
-	return string(x)
-}
-
-func (x XHost) String() string {
-	return string("SI:localuser:" + x)
-}
+func (x XHost) Is(o Op) bool   { x0, ok := o.(XHost); return ok && x == x0 }
+func (x XHost) Path() string   { return string(x) }
+func (x XHost) String() string { return string("SI:localuser:" + x) }