Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add context for GetProperty and SetProperty #336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add context for GetProperty and SetProperty #336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ type BusObject interface {
AddMatchSignal(iface, member string, options ...MatchOption) *Call
RemoveMatchSignal(iface, member string, options ...MatchOption) *Call
GetProperty(p string) (Variant, error)
GetPropertyWithContext(ctx context.Context, p string) (Variant, error)
StoreProperty(p string, value interface{}) error
StorePropertyWithContext(ctx context.Context, p string, value interface{}) error
SetProperty(p string, v interface{}) error
SetPropertyWithContext(ctx context.Context, p string, v interface{}) error
Destination() string
Path() ObjectPath
}
Expand Down Expand Up @@ -133,6 +136,13 @@ func (o *Object) GetProperty(p string) (Variant, error) {
return result, err
}

// GetPropertyWithContext acts like GetProperty but takes a context
func (o *Object) GetPropertyWithContext(ctx context.Context, p string) (Variant, error) {
var result Variant
err := o.StorePropertyWithContext(ctx, p, &result)
return result, err
}

// StoreProperty calls org.freedesktop.DBus.Properties.Get on the given
// object. The property name must be given in interface.member notation.
// It stores the returned property into the provided value.
Expand All @@ -149,6 +159,20 @@ func (o *Object) StoreProperty(p string, value interface{}) error {
Store(value)
}

// StorePropertyWithContext acts like StoreProperty but takes a context
func (o *Object) StorePropertyWithContext(ctx context.Context, p string, value interface{}) error {
idx := strings.LastIndex(p, ".")
if idx == -1 || idx+1 == len(p) {
return errors.New("dbus: invalid property " + p)
}

iface := p[:idx]
prop := p[idx+1:]

return o.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Get", 0, iface, prop).
Store(value)
}

// SetProperty calls org.freedesktop.DBus.Properties.Set on the given
// object. The property name must be given in interface.member notation.
func (o *Object) SetProperty(p string, v interface{}) error {
Expand All @@ -163,6 +187,19 @@ func (o *Object) SetProperty(p string, v interface{}) error {
return o.Call("org.freedesktop.DBus.Properties.Set", 0, iface, prop, v).Err
}

// SetPropertyWithContext acts like SetProperty but takes a context
func (o *Object) SetPropertyWithContext(ctx context.Context, p string, v interface{}) error {
idx := strings.LastIndex(p, ".")
if idx == -1 || idx+1 == len(p) {
return errors.New("dbus: invalid property " + p)
}

iface := p[:idx]
prop := p[idx+1:]

return o.CallWithContext(ctx, "org.freedesktop.DBus.Properties.Set", 0, iface, prop, v).Err
}

// Destination returns the destination that calls on (o *Object) are sent to.
func (o *Object) Destination() string {
return o.dest
Expand Down