summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/minimaws/minimaws.py
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-10-02 02:11:58 +1000
committer Vas Crabb <vas@vastheman.com>2019-10-02 02:11:58 +1000
commit9a6e04b01f830d8491e1c98eabf19015f817c852 (patch)
tree5b5fcba7e8f612a9a4ebea1a17e778cb7b6e72cc /scripts/minimaws/minimaws.py
parentf7afeebdafa16eedcc2c0bd8c2819a9950212078 (diff)
(nw) misc cleanup:
* subhuntr.cpp: S2636 PVI was seemingly uncommented by mistake in 93308b483ee73cecc46a6b44fccc126edf3c512a - offsets and sound routing seem to be copy/pasted from somewhere * phi: prettier config * scramble.cpp, wallc.cpp: avoid some calls to subdevice<...>(...) * makedep.py: open source files as UTF-8 (GitHub #5482) * minimaws: be less trusting
Diffstat (limited to 'scripts/minimaws/minimaws.py')
-rwxr-xr-xscripts/minimaws/minimaws.py28
1 files changed, 13 insertions, 15 deletions
diff --git a/scripts/minimaws/minimaws.py b/scripts/minimaws/minimaws.py
index e690fcd818f..5b657af5524 100755
--- a/scripts/minimaws/minimaws.py
+++ b/scripts/minimaws/minimaws.py
@@ -78,19 +78,9 @@
## and see dependent slots update. Required command-line arguments to
## produce the selected configuration are also displayed.
-import argparse
-import os
-import os.path
-import sys
-
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-import lib.auxverbs
-import lib.lxparse
-import lib.wsgiserve
-
-
if __name__ == '__main__':
+ import argparse
+
parser = argparse.ArgumentParser()
parser.add_argument('--database', metavar='<dbfile>', default='minimaws.sqlite3', help='SQLite 3 info database file (defaults to minimaws.sqlite3)')
subparsers = parser.add_subparsers(title='commands', dest='command', metavar='<command>')
@@ -123,6 +113,8 @@ if __name__ == '__main__':
group.add_argument('--file', metavar='<xmlfile>', help='XML machine information file')
options = parser.parse_args()
+
+ import lib.auxverbs
if options.command == 'listfull':
lib.auxverbs.do_listfull(options)
elif options.command == 'listsource':
@@ -136,8 +128,14 @@ if __name__ == '__main__':
elif options.command == 'romident':
lib.auxverbs.do_romident(options)
elif options.command == 'serve':
- lib.wsgiserve.run_server(options)
+ import wsgiref.simple_server
+ import lib.wsgiserve
+ application = lib.wsgiserve.MiniMawsApp(options.database)
+ server = wsgiref.simple_server.make_server(options.host, options.port, application)
+ try:
+ server.serve_forever()
+ except KeyboardInterrupt:
+ pass
elif options.command == 'load':
+ import lib.lxparse
lib.lxparse.load_info(options)
-else:
- application = lib.wsgiserve.MiniMawsApp(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'minimaws.sqlite3'))