Commit Graph

399 Commits

Author SHA1 Message Date
Ralf Ramsauer 8f8db8950b Remove TODO entry
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-22 23:37:14 +00:00
Ralf Ramsauer f72f731b59 doorlockd.py: Add LDAP authentication support
Shamelessly copied from moep's DSS tool.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
Cc: Markus Hauschild <moepman@binary-kitchen.de>
2018-03-22 23:36:46 +00:00
Ralf Ramsauer d82272f53a config: don't run hooks
For the moment, don't run hooks

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-22 23:36:46 +00:00
Ralf Ramsauer c0e89c1be9 Add Binary Kitchen CA
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-22 23:36:46 +00:00
Ralf Ramsauer 910ec8ba5b Add more TODOs
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-22 01:40:54 +01:00
Ralf Ramsauer 4d1682d1bd doorlockd.py: Add config parameter for hooks
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-21 00:58:30 +01:00
Ralf Ramsauer 6e2655e6e5 doorlockd.py: Add compatibility layer for old doorlockd-app
This commit will be reverted once everyone has updated their app.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-21 00:40:56 +01:00
Ralf Ramsauer 82d09ddede static: add dummy token image
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-21 00:28:57 +01:00
Ralf Ramsauer 96de37d27d doorlockd.py: remove Markup import statement
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-20 23:49:11 +01:00
Ralf Ramsauer 153f066ef7 doorlockd.py: avoid encoding warnings
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-20 00:54:52 +01:00
Ralf Ramsauer be0ab6b58a doorlockd.py: Add schnapper support
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-20 00:18:46 +01:00
Ralf Ramsauer d17f5c964a correct path
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-19 18:54:18 +01:00
Ralf Ramsauer 90528bb7d9 doorlockd.py: Add RS232 logic
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-19 18:47:04 +01:00
Ralf Ramsauer 6961821c04 re-add scripts
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-19 18:42:34 +01:00
Ralf Ramsauer 79599e2a45 doorlockd.py: Add lock/unlock scripts
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 22:04:14 +01:00
Ralf Ramsauer 8cdf528032 update TODOs
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 18:36:05 +01:00
Ralf Ramsauer 67879a659d doorlockd: add simulation mode
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 18:32:15 +01:00
Ralf Ramsauer bccd9432af Add TODOs 2018-03-18 18:32:11 +01:00
Ralf Ramsauer 9cf149c12f doorlockd.py: add proper license header
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 18:32:11 +01:00
Ralf Ramsauer 56ac823852 display: Add request_status timer
This will cyclically reset the status to Open/Close, independent of incoming
messages

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 18:21:32 +01:00
Ralf Ramsauer a6e117ffd9 doorlockd.py: move emit status to Logic class
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:48:06 +01:00
Ralf Ramsauer 93a34b7755 display: improve java script
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:48:06 +01:00
Ralf Ramsauer 78a0cc300f display: reindent
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:48:06 +01:00
Ralf Ramsauer 1268e28a5d layout: improve design
All pages now user twitter bootstrap layout.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 84e9440ed6 doorlockd.py: remove argparse dependency
by replacing its logic with flask's config parameter file.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 3e8fce5b81 display: improve page layout
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 5fe83e59f9 config: serve local bootstrap and jquery copies
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer a21beefe74 doorlockd.py: switch to config file
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer ae0d4f5aa2 socketio: deliver local static copy of scripts
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 746b68eaf1 index: don't show labels for buttons
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 1b59b273d8 index: refactor render_field to render_field_label
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer ef198b74c0 index: reindent lines
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 17:22:39 +01:00
Ralf Ramsauer 1c13e58f02 Clean up imports
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 15:49:35 +01:00
Ralf Ramsauer 8bf57eaf54 display: allow only local connections
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 15:49:35 +01:00
Ralf Ramsauer eeafa6350f Reimplement doorlockd in python
Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
2018-03-18 15:49:32 +01:00
Ralf Ramsauer 020ac1b38b scripts: simplify mqtt
Only publish door status topic, rest will be done by the opennhab server.

Username, password and mqtt's hostname are stored in user's local .config.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2018-01-06 22:29:30 +01:00
Ralf Ramsauer 9ae9304551 scripts: replace mac
we have a new cash-desk PC

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2017-01-07 00:29:58 +01:00
Ralf Ramsauer d04ba6ef63 doorlock-client: add mainwindow.showFullscreen() call
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-08-01 21:51:55 +02:00
Ralf Ramsauer d1d0d5b160 Fix QT quirk
So far, we used QT interfaces in a wrong way. QT is not thread safe, so
use its signal/slot concept and move network communication stuff to a
separate QThread.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-31 15:48:19 +02:00
Ralf Ramsauer 4ccf8e4f24 doorlock-client: refactor run to app_run
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:57:31 +02:00
Ralf Ramsauer 48d0fcaf6f doorlock-client: be even more verbose
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:50:32 +02:00
Ralf Ramsauer 42f168ff19 doorlick-client: remove misleading comment line
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:45 +02:00
Ralf Ramsauer ee481009e1 doorlock-client: Add more error output
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-21 20:40:32 +02:00
Ralf Ramsauer 951e1de987 Door: Redirect output to logfile
And use nohup for detached call.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:58 +02:00
Ralf Ramsauer c058e1e4d0 door, logic: propagate new logfile to Door class
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:48:54 +02:00
Ralf Ramsauer 7e522e59af Door: Refactor system() to own function
Preparatory work for script logging

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:17:00 +02:00
Ralf Ramsauer 573d9e7c65 Door: fix coding style
Consequently use _ for private member variables/functions.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:12:51 +02:00
Ralf Ramsauer f713ef6124 Doorlockd: Replace logfile by logdir
In future, we might have several different logfiles.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 20:12:46 +02:00
Ralf Ramsauer 3721259f3e scripts: add nodered twitter sink
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-20 19:22:43 +02:00
Ralf Ramsauer 660a7297ee scripts: Wake up cashdesk PC
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
2016-07-18 21:17:30 +02:00