tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

doorlockd: move all scripting stuff to DoorHandler

Browse Source 
Use this chance to get rid of most global variables.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
This commit is contained in:
Ralf Ramsauer 2018-10-09 00:15:54 +02:00
parent bb65e38640
commit aa3369baa8
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
doorlockd
View File

@ -35,9 +35,6 @@ from pydoorlock.Doorlock import DoorlockResponse
SYSCONFDIR = '.' SYSCONFDIR = '.'
PREFIX = '.' PREFIX = '.'
root_prefix = join(PREFIX, 'share', 'doorlockd')
scripts_prefix = join(root_prefix, 'scripts')
__author__ = 'Ralf Ramsauer' __author__ = 'Ralf Ramsauer'
__copyright = 'Copyright (c) Ralf Ramsauer, 2018' __copyright = 'Copyright (c) Ralf Ramsauer, 2018'
__license__ = 'GPLv2' __license__ = 'GPLv2'
@ -51,6 +48,7 @@ date_fmt = '%Y-%m-%d %H:%M:%S'
log_fmt = '%(asctime)-15s %(levelname)-8s %(message)s' log_fmt = '%(asctime)-15s %(levelname)-8s %(message)s'
log = logging.getLogger() log = logging.getLogger()
class Config: class Config:
config_topic = 'doorlock' config_topic = 'doorlock'
@ -65,19 +63,9 @@ class Config:
def str(self, key): def str(self, key):
return self.config.get(self.config_topic, key) return self.config.get(self.config_topic, key)
cfg = Config(SYSCONFDIR) cfg = Config(SYSCONFDIR)
# Booleans
run_hooks = cfg.boolean('RUN_HOOKS')
def start_hook(script):
if not run_hooks:
log.info('Hooks disabled: not starting %s' % script)
return
log.info('Starting hook %s' % script)
Popen(['nohup', join(scripts_prefix, script)])
class DoorHandler: class DoorHandler:
state = DoorState.Closed state = DoorState.Closed
@ -104,11 +92,14 @@ class DoorHandler:
wave_zonk = 'zonk.wav' wave_zonk = 'zonk.wav'
def __init__(self, cfg, sounds_prefix): def __init__(self, cfg, sounds_prefix, scripts_prefix):
self.sounds = cfg.boolean('SOUNDS') self.sounds = cfg.boolean('SOUNDS')
if self.sounds: if self.sounds:
self.sounds_prefix = sounds_prefix self.sounds_prefix = sounds_prefix
self.scripts_prefix = scripts_prefix
self.run_hooks = cfg.boolean('RUN_HOOKS')
if cfg.boolean('SIMULATE_SERIAL'): if cfg.boolean('SIMULATE_SERIAL'):
return return
@ -168,7 +159,7 @@ class DoorHandler:
return DoorlockResponse.AlreadyActive return DoorlockResponse.AlreadyActive
self.state = DoorState.Open self.state = DoorState.Open
start_hook('post_unlock') self.run_hook('post_unlock')
return DoorlockResponse.Success return DoorlockResponse.Success
def present(self): def present(self):
@ -176,7 +167,7 @@ class DoorHandler:
return DoorlockResponse.AlreadyActive return DoorlockResponse.AlreadyActive
self.state = DoorState.Present self.state = DoorState.Present
start_hook('post_present') self.run_hook('post_present')
return DoorlockResponse.Success return DoorlockResponse.Success
def close(self): def close(self):
@ -185,7 +176,7 @@ class DoorHandler:
self.do_close = True self.do_close = True
self.state = DoorState.Closed self.state = DoorState.Closed
start_hook('post_lock') self.run_hook('post_lock')
return DoorlockResponse.Success return DoorlockResponse.Success
def request(self, state): def request(self, state):
@ -227,11 +218,18 @@ class DoorHandler:
Popen(['nohup', 'aplay', join(self.sounds_prefix, filename)]) Popen(['nohup', 'aplay', join(self.sounds_prefix, filename)])
def run_hook(self, script):
if not self.run_hooks:
log.info('Hooks disabled: not starting %s' % script)
return
log.info('Starting hook %s' % script)
Popen(['nohup', join(self.scripts_prefix, script)])
class Logic: class Logic:
def __init__(self, cfg, sounds_prefix): def __init__(self, cfg, sounds_prefix, scripts_prefix):
self.auth = Authenticator(cfg) self.auth = Authenticator(cfg)
self.door_handler = DoorHandler(cfg, sounds_prefix) self.door_handler = DoorHandler(cfg, sounds_prefix, scripts_prefix)
def request(self, state, credentials): def request(self, state, credentials):
err = self.auth.try_auth(credentials) err = self.auth.try_auth(credentials)
@ -250,8 +248,11 @@ if __name__ == '__main__':
format=log_fmt, datefmt=date_fmt) format=log_fmt, datefmt=date_fmt)
log.info('Starting doorlockd') log.info('Starting doorlockd')
root_prefix = join(PREFIX, 'share', 'doorlockd')
sounds_prefix = join(root_prefix, 'sounds') sounds_prefix = join(root_prefix, 'sounds')
logic = Logic(cfg, sounds_prefix) scripts_prefix = join(root_prefix, 'scripts')
logic = Logic(cfg, sounds_prefix, scripts_prefix)
static_folder = abspath(join(root_prefix, 'static')) static_folder = abspath(join(root_prefix, 'static'))
template_folder = abspath(join(root_prefix, 'templates')) template_folder = abspath(join(root_prefix, 'templates'))