scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move code out of ui update hook

Browse Source
This commit is contained in:
dadav 2020-04-18 16:46:29 +02:00
parent d9d268ea81
commit ff4f5c672a
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pwnagotchi/plugins/default/bt-tether.py
View File

@ -419,15 +419,19 @@ class Device:
class BTTether(plugins.Plugin): class BTTether(plugins.Plugin):
__author__ = '33197631+dadav@users.noreply.github.com' __author__ = '33197631+dadav@users.noreply.github.com'
__version__ = '1.0.0' __version__ = '1.1.0'
__license__ = 'GPL3' __license__ = 'GPL3'
__description__ = 'This makes the display reachable over bluetooth' __description__ = 'This makes the display reachable over bluetooth'
def __init__(self): def __init__(self):
self.ready = False self.ready = False
self.options = dict() self.options = dict()
self.devices = dict() self.devices = dict()
self.lock = Lock() self.lock = Lock()
self.running = True
self.status = '-'
def on_loaded(self): def on_loaded(self):
# new config # new config
@ -449,7 +453,7 @@ class BTTether(plugins.Plugin):
if 'mac' in self.options: if 'mac' in self.options:
for opt in ['share_internet', 'mac', 'ip', 'netmask', 'interval']: for opt in ['share_internet', 'mac', 'ip', 'netmask', 'interval']:
if opt not in self.options or self.options[opt] is None: if opt not in self.options or self.options[opt] is None:
logging.error("BT-TETHER: Please specify the %s in your config.yml.", opt) logging.error("BT-TETHER: Please specify the %s in your config.toml.", opt)
return return
self.devices['legacy'] = Device(name='legacy', **self.options) self.devices['legacy'] = Device(name='legacy', **self.options)
@ -466,22 +470,10 @@ class BTTether(plugins.Plugin):
return return
logging.info("BT-TETHER: Successfully loaded ...") logging.info("BT-TETHER: Successfully loaded ...")
self.ready = True
def on_unload(self, ui): while self.running:
with ui._lock: time.sleep(1)
ui.remove_element('bluetooth')
def on_ui_setup(self, ui):
with ui._lock:
ui.add_element('bluetooth', LabeledValue(color=BLACK, label='BT', value='-', position=(ui.width() / 2 - 15, 0),
label_font=fonts.Bold, text_font=fonts.Medium))
def on_ui_update(self, ui):
if not self.ready:
return
with self.lock:
devices_to_try = list() devices_to_try = list()
connected_priorities = list() connected_priorities = list()
any_device_connected = False # if this is true, last status on screen should be C any_device_connected = False # if this is true, last status on screen should be C
@ -508,11 +500,11 @@ class BTTether(plugins.Plugin):
dev_remote = bt.wait_for_device(timeout=device.scantime) dev_remote = bt.wait_for_device(timeout=device.scantime)
if dev_remote is None: if dev_remote is None:
logging.debug('BT-TETHER: Could not find %s, try again in %d minutes.', device.name, device.interval) logging.debug('BT-TETHER: Could not find %s, try again in %d minutes.', device.name, device.interval)
ui.set('bluetooth', 'NF') self.status = 'NF'
continue continue
except Exception as bt_ex: except Exception as bt_ex:
logging.error(bt_ex) logging.error(bt_ex)
ui.set('bluetooth', 'NF') self.status = 'NF'
continue continue
paired = bt.is_paired() paired = bt.is_paired()
@ -521,7 +513,7 @@ class BTTether(plugins.Plugin):
logging.debug('BT-TETHER: Paired with %s.', device.name) logging.debug('BT-TETHER: Paired with %s.', device.name)
else: else:
logging.debug('BT-TETHER: Pairing with %s failed ...', device.name) logging.debug('BT-TETHER: Pairing with %s failed ...', device.name)
ui.set('bluetooth', 'PE') self.status = 'PE'
continue continue
else: else:
logging.debug('BT-TETHER: Already paired.') logging.debug('BT-TETHER: Already paired.')
@ -539,17 +531,17 @@ class BTTether(plugins.Plugin):
continue continue
if interface is None: if interface is None:
ui.set('bluetooth', 'BE') self.status = 'BE'
logging.debug('BT-TETHER: Could not establish nap connection with %s', device.name) logging.debug('BT-TETHER: Could not establish nap connection with %s', device.name)
continue continue
logging.debug('BT-TETHER: Created interface (%s)', interface) logging.debug('BT-TETHER: Created interface (%s)', interface)
ui.set('bluetooth', 'C') self.status = 'C'
any_device_connected = True any_device_connected = True
device.tries = 0 # reset tries device.tries = 0 # reset tries
else: else:
logging.debug('BT-TETHER: Could not establish nap connection with %s', device.name) logging.debug('BT-TETHER: Could not establish nap connection with %s', device.name)
ui.set('bluetooth', 'NF') self.status = 'NF'
continue continue
addr = f"{device.ip}/{device.netmask}" addr = f"{device.ip}/{device.netmask}"
@ -561,7 +553,7 @@ class BTTether(plugins.Plugin):
wrapped_interface = IfaceWrapper(interface) wrapped_interface = IfaceWrapper(interface)
logging.debug('BT-TETHER: Add ip to %s', interface) logging.debug('BT-TETHER: Add ip to %s', interface)
if not wrapped_interface.set_addr(addr): if not wrapped_interface.set_addr(addr):
ui.set('bluetooth', 'AE') self.status = 'AE'
logging.debug("BT-TETHER: Could not add ip to %s", interface) logging.debug("BT-TETHER: Could not add ip to %s", interface)
continue continue
@ -580,4 +572,20 @@ class BTTether(plugins.Plugin):
resolv.write(nameserver + 'nameserver 9.9.9.9\n') resolv.write(nameserver + 'nameserver 9.9.9.9\n')
if any_device_connected: if any_device_connected:
ui.set('bluetooth', 'C') self.status = 'C'
def on_unload(self, ui):
self.running = False
with ui._lock:
ui.remove_element('bluetooth')
def on_ui_setup(self, ui):
with ui._lock:
ui.add_element('bluetooth', LabeledValue(color=BLACK, label='BT', value='-', position=(ui.width() / 2 - 15, 0),
label_font=fonts.Bold, text_font=fonts.Medium))
def on_ui_update(self, ui):
ui.set('bluetooth', self.status)