l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/bluetooth2] Update to latest API

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-29 20:23:10 +02:00
parent 2028d51e15
commit b16579447a
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/contrib/bluetooth2.py
View file

@ -12,38 +12,33 @@ import re
import subprocess import subprocess
import dbus import dbus
import dbus.mainloop.glib import dbus.mainloop.glib
import bumblebee.input
import bumblebee.output
import bumblebee.engine
import bumblebee.util
import bumblebee.popup
import logging import logging
import core.module
import core.widget
import core.input
class Module(bumblebee.engine.Module): import util.cli
"""Bluetooth module."""
def __init__(self, engine, config): class Module(core.module.Module):
"""Initialize.""" def __init__(self, config, theme):
super(Module, self).__init__(engine, config, super().__init__(config, theme, core.widget.Widget(self.status))
bumblebee.output.Widget(
full_text=self.status))
self.manager = self.parameter('manager', 'blueman-manager') self.manager = self.parameter('manager', 'blueman-manager')
self._status = 'Off' self._status = 'Off'
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
self._bus = dbus.SystemBus() self._bus = dbus.SystemBus()
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, core.input.register(self, button=core.input.LEFT_MOUSE,
cmd=self.manager) cmd=self.manager)
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, core.input.register(self, button=core.input.RIGHT_MOUSE,
cmd=self._toggle) cmd=self._toggle)
def status(self, widget): def status(self, widget):
"""Get status.""" """Get status."""
return self._status return self._status
def update(self, widgets): def update(self):
"""Update current state.""" """Update current state."""
state = len(subprocess.run(['bluetoothctl', 'list'], stdout=subprocess.PIPE).stdout) state = len(subprocess.run(['bluetoothctl', 'list'], stdout=subprocess.PIPE).stdout)
if state > 0: if state > 0:
@ -56,10 +51,6 @@ class Module(bumblebee.engine.Module):
self._status = 'No Adapter Found' self._status = 'No Adapter Found'
return return
def manager(self, widget):
"""Launch manager."""
bumblebee.util.execute(self.manager)
def _toggle(self, widget=None): def _toggle(self, widget=None):
"""Toggle bluetooth state.""" """Toggle bluetooth state."""
if 'On' in self._status: if 'On' in self._status:
@ -70,7 +61,7 @@ class Module(bumblebee.engine.Module):
cmd = 'dbus-send --system --print-reply --dest=org.blueman.Mechanism /org/blueman/mechanism org.blueman.Mechanism.SetRfkillState boolean:%s' % state cmd = 'dbus-send --system --print-reply --dest=org.blueman.Mechanism /org/blueman/mechanism org.blueman.Mechanism.SetRfkillState boolean:%s' % state
logging.debug('bt: toggling bluetooth') logging.debug('bt: toggling bluetooth')
bumblebee.util.execute(cmd) core.util.execute(cmd)
def state(self, widget): def state(self, widget):
"""Get current state.""" """Get current state."""
@ -102,3 +93,5 @@ class Module(bumblebee.engine.Module):
): ):
devices += 1 devices += 1
return devices return devices
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4