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

misc: small fix or general refactoring i did not bother commenting

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-23 19:46:26 +02:00
parent d16180189e
commit 84616827ad
No known key found for this signature in database
GPG Key ID: 82E42E7F3B34C97E
2 changed files with 4 additions and 2 deletions
pwnagotchi
plugins
__init__.py
voice.py

4
pwnagotchi/plugins/__init__.py

@ -21,6 +21,7 @@ def on(event_name, *args, **kwargs):
plugin.__dict__[cb_name](*args, **kwargs) plugin.__dict__[cb_name](*args, **kwargs)
except Exception as e: except Exception as e:
logging.error("error while running %s.%s : %s" % (plugin_name, cb_name, e)) logging.error("error while running %s.%s : %s" % (plugin_name, cb_name, e))
logging.error(e, exc_info=True)
def load_from_file(filename): def load_from_file(filename):
@ -47,7 +48,8 @@ def load_from_path(path, enabled=()):
def load(config): def load(config):
enabled = [name for name, options in config['main']['plugins'].items() if 'enabled' in options and options['enabled']] enabled = [name for name, options in config['main']['plugins'].items() if
'enabled' in options and options['enabled']]
custom_path = config['main']['custom_plugins'] if 'custom_plugins' in config['main'] else None custom_path = config['main']['custom_plugins'] if 'custom_plugins' in config['main'] else None
# load default plugins # load default plugins
loaded = load_from_path(default_path, enabled=enabled) loaded = load_from_path(default_path, enabled=enabled)

2
pwnagotchi/voice.py

@ -136,7 +136,7 @@ class Voice:
def on_unread_messages(self, count, total): def on_unread_messages(self, count, total):
s = 's' if count > 1 else '' s = 's' if count > 1 else ''
return self._('You have {count} new message{plural}!').format(num=count, plural=s) return self._('You have {count} new message{plural}!').format(count=count, plural=s)
def on_rebooting(self): def on_rebooting(self):
return self._("Ops, something went wrong ... Rebooting ...") return self._("Ops, something went wrong ... Rebooting ...")