pogmommy/gonetworkmanager
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor callAndPanic to callWithReturnAndPanic

Browse source
This commit is contained in:
Christian Müller 2019-05-28 11:06:28 +02:00
parent a165df46fa
commit b9e95e8780
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Connection.go
View file

@ -34,7 +34,7 @@ type Connection interface {
// GetSettings gets the settings maps describing this network configuration. // GetSettings gets the settings maps describing this network configuration.
// This will never include any secrets required for connection to the // This will never include any secrets required for connection to the
// network, as those are often protected. Secrets must be requested // network, as those are often protected. Secrets must be requested
// separately using the GetSecrets() callAndPanic. // separately using the GetSecrets() callWithReturnAndPanic.
GetSettings() ConnectionSettings GetSettings() ConnectionSettings
MarshalJSON() ([]byte, error) MarshalJSON() ([]byte, error)
@ -55,7 +55,7 @@ func (c *connection) GetPath() dbus.ObjectPath {
func (c *connection) GetSettings() ConnectionSettings { func (c *connection) GetSettings() ConnectionSettings {
var settings map[string]map[string]dbus.Variant var settings map[string]map[string]dbus.Variant
c.callAndPanic(&settings, ConnectionGetSettings) c.callWithReturnAndPanic(&settings, ConnectionGetSettings)
rv := make(ConnectionSettings) rv := make(ConnectionSettings)

6
NetworkManager.go
View file

@ -107,7 +107,7 @@ type networkManager struct {
func (n *networkManager) GetDevices() []Device { func (n *networkManager) GetDevices() []Device {
var devicePaths []dbus.ObjectPath var devicePaths []dbus.ObjectPath
n.callAndPanic(&devicePaths, NetworkManagerGetDevices) n.callWithReturnAndPanic(&devicePaths, NetworkManagerGetDevices)
devices := make([]Device, len(devicePaths)) devices := make([]Device, len(devicePaths))
var err error var err error
@ -124,7 +124,7 @@ func (n *networkManager) GetDevices() []Device {
func (n *networkManager) GetAllDevices() []Device { func (n *networkManager) GetAllDevices() []Device {
var devicePaths []dbus.ObjectPath var devicePaths []dbus.ObjectPath
n.callAndPanic(&devicePaths, NetworkManagerGetAllDevices) n.callWithReturnAndPanic(&devicePaths, NetworkManagerGetAllDevices)
devices := make([]Device, len(devicePaths)) devices := make([]Device, len(devicePaths))
var err error var err error
@ -159,7 +159,7 @@ func (n *networkManager) GetActiveConnections() []ActiveConnection {
func (n *networkManager) ActivateWirelessConnection(c Connection, d Device, ap AccessPoint) ActiveConnection { func (n *networkManager) ActivateWirelessConnection(c Connection, d Device, ap AccessPoint) ActiveConnection {
var opath dbus.ObjectPath var opath dbus.ObjectPath
n.callAndPanic(&opath, NetworkManagerActivateConnection, c.GetPath(), d.GetPath(), ap.GetPath()) n.callWithReturnAndPanic(&opath, NetworkManagerActivateConnection, c.GetPath(), d.GetPath(), ap.GetPath())
return nil return nil
} }

6
Settings.go
View file

@ -27,7 +27,7 @@ type Settings interface {
// ListConnections gets list the saved network connections known to NetworkManager // ListConnections gets list the saved network connections known to NetworkManager
ListConnections() []Connection ListConnections() []Connection
// AddConnection callAndPanic new connection and save it to disk. // AddConnection callWithReturnAndPanic new connection and save it to disk.
AddConnection(settings ConnectionSettings) Connection AddConnection(settings ConnectionSettings) Connection
// Save the hostname to persistent configuration. // Save the hostname to persistent configuration.
@ -49,7 +49,7 @@ type settings struct {
func (s *settings) ListConnections() []Connection { func (s *settings) ListConnections() []Connection {
var connectionPaths []dbus.ObjectPath var connectionPaths []dbus.ObjectPath
s.callAndPanic(&connectionPaths, SettingsListConnections) s.callWithReturnAndPanic(&connectionPaths, SettingsListConnections)
connections := make([]Connection, len(connectionPaths)) connections := make([]Connection, len(connectionPaths))
var err error var err error
@ -65,7 +65,7 @@ func (s *settings) ListConnections() []Connection {
func (s *settings) AddConnection(settings ConnectionSettings) Connection { func (s *settings) AddConnection(settings ConnectionSettings) Connection {
var path dbus.ObjectPath var path dbus.ObjectPath
s.callAndPanic(&path, SettingsAddConnection, settings) s.callWithReturnAndPanic(&path, SettingsAddConnection, settings)
con, err := NewConnection(path) con, err := NewConnection(path)
if err != nil { if err != nil {
panic(err) panic(err)

2
WirelessDevice.go
View file

@ -37,7 +37,7 @@ type wirelessDevice struct {
func (d *wirelessDevice) GetAccessPoints() []AccessPoint { func (d *wirelessDevice) GetAccessPoints() []AccessPoint {
var apPaths []dbus.ObjectPath var apPaths []dbus.ObjectPath
d.callAndPanic(&apPaths, WirelessDeviceGetAccessPoints) d.callWithReturnAndPanic(&apPaths, WirelessDeviceGetAccessPoints)
aps := make([]AccessPoint, len(apPaths)) aps := make([]AccessPoint, len(apPaths))
var err error var err error

12
utils.go
View file

@ -30,17 +30,17 @@ func (d *dbusBase) init(iface string, objectPath dbus.ObjectPath) error {
return nil return nil
} }
func (d *dbusBase) callAndPanic(value interface{}, method string, args ...interface{}) { func (d *dbusBase) call(method string, args ...interface{}) error {
err := d.callWithReturn(value, method, args...) return d.obj.Call(method, 0, args...).Err
}
func (d *dbusBase) callWithReturnAndPanic(ret interface{}, method string, args ...interface{}) {
err := d.callWithReturn(ret, method, args...)
if err != nil { if err != nil {
panic(err) panic(err)
} }
} }
func (d *dbusBase) call(method string, args ...interface{}) error {
return d.obj.Call(method, 0, args...).Err
}
func (d *dbusBase) callWithReturn(ret interface{}, method string, args ...interface{}) error { func (d *dbusBase) callWithReturn(ret interface{}, method string, args ...interface{}) error {
return d.obj.Call(method, 0, args...).Store(ret) return d.obj.Call(method, 0, args...).Store(ret)
} }